From a1e52faa616c0df8643c53dde0212b19d07c1e4b Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 26 Jul 2024 17:32:01 +0200
Subject: [PATCH] disambiguate signals sampleModified, seModified
---
GUI/View/Sample/HeinzFormLayout.cpp | 2 +-
GUI/View/Sample/ISelectionForm.h | 2 +-
GUI/View/Sample/InterferenceForm.cpp | 4 +--
GUI/View/Sample/LayerEditorUtil.cpp | 2 +-
GUI/View/Sample/LayerForm.cpp | 2 +-
GUI/View/Sample/MaterialInplaceForm.cpp | 2 +-
GUI/View/Sample/SampleEditor.cpp | 2 +-
GUI/View/Sample/SampleEditor.h | 2 +-
GUI/View/Sample/SampleEditorController.cpp | 38 +++++++++++-----------
GUI/View/Sample/SampleEditorController.h | 2 +-
GUI/View/View/SampleView.cpp | 6 ++--
11 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/GUI/View/Sample/HeinzFormLayout.cpp b/GUI/View/Sample/HeinzFormLayout.cpp
index e5dc7f0ee0f..b5a16c90458 100644
--- a/GUI/View/Sample/HeinzFormLayout.cpp
+++ b/GUI/View/Sample/HeinzFormLayout.cpp
@@ -123,7 +123,7 @@ void HeinzFormLayout::insertValue(int row, DoubleProperty& d)
{
insertValue(row, d, [ec = m_ec, &d](double val) {
d.setDVal(val);
- emit ec->modified();
+ emit ec->sampleModified();
});
}
diff --git a/GUI/View/Sample/ISelectionForm.h b/GUI/View/Sample/ISelectionForm.h
index 9285d2b858f..e616ff4fccb 100644
--- a/GUI/View/Sample/ISelectionForm.h
+++ b/GUI/View/Sample/ISelectionForm.h
@@ -49,7 +49,7 @@ protected:
clear();
d.setCertainIndex(current);
createContent();
- emit m_ec->modified();
+ emit m_ec->sampleModified();
});
m_grid_layout->addWidget(m_combo, 1, 0);
diff --git a/GUI/View/Sample/InterferenceForm.cpp b/GUI/View/Sample/InterferenceForm.cpp
index dacd1862578..dec33a0d956 100644
--- a/GUI/View/Sample/InterferenceForm.cpp
+++ b/GUI/View/Sample/InterferenceForm.cpp
@@ -96,7 +96,7 @@ void InterferenceForm::createInterferenceWidgets()
GUI::Util::createIntSpinBox([itf] { return itf->domainSize1(); },
[this, itf](int v) {
itf->setDomainSize1(v);
- emit m_ec->modified();
+ emit m_ec->sampleModified();
},
RealLimits::lowerLimited(1),
"Domain size 1 in number of unit cells"));
@@ -104,7 +104,7 @@ void InterferenceForm::createInterferenceWidgets()
GUI::Util::createIntSpinBox([itf] { return itf->domainSize2(); },
[this, itf](int v) {
itf->setDomainSize2(v);
- emit m_ec->modified();
+ emit m_ec->sampleModified();
},
RealLimits::lowerLimited(1),
"Domain size 2 in number of unit cells"));
diff --git a/GUI/View/Sample/LayerEditorUtil.cpp b/GUI/View/Sample/LayerEditorUtil.cpp
index 766caced9c4..d50b15a2b30 100644
--- a/GUI/View/Sample/LayerEditorUtil.cpp
+++ b/GUI/View/Sample/LayerEditorUtil.cpp
@@ -35,7 +35,7 @@ void GUI::Util::Layer::addMultiPropertyToGrid(QGridLayout* m_grid_layout, int fi
{
const auto setNewValue = [ec](double val, DoubleProperty& d) {
d.setDVal(val);
- emit ec->modified();
+ emit ec->sampleModified();
};
addMultiPropertyToGrid(m_grid_layout, firstCol, valueProperties, setNewValue, vertically,
diff --git a/GUI/View/Sample/LayerForm.cpp b/GUI/View/Sample/LayerForm.cpp
index b2dea277c36..82baa0714fc 100644
--- a/GUI/View/Sample/LayerForm.cpp
+++ b/GUI/View/Sample/LayerForm.cpp
@@ -103,7 +103,7 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorControll
[this] { return m_layer->numSlices(); },
[this](int v) {
m_layer->setNumSlices(v);
- emit m_ec->modified();
+ emit m_ec->sampleModified();
},
RealLimits::lowerLimited(1),
"Number of horizontal slices.\n"
diff --git a/GUI/View/Sample/MaterialInplaceForm.cpp b/GUI/View/Sample/MaterialInplaceForm.cpp
index 08c2b3ecef5..87b984d51b2 100644
--- a/GUI/View/Sample/MaterialInplaceForm.cpp
+++ b/GUI/View/Sample/MaterialInplaceForm.cpp
@@ -68,7 +68,7 @@ void MaterialInplaceForm::selectMaterial()
// If the list of materials was edited (e.g. a material added), but the current was not
// changed, no modified signal would be sent. Check now for changes and emit if necessary.
if (GUI::Util::createBackup(&m_ec->sampleItem()->materialModel()) != materialsBackup)
- m_ec->modified();
+ m_ec->sampleModified();
}
}
diff --git a/GUI/View/Sample/SampleEditor.cpp b/GUI/View/Sample/SampleEditor.cpp
index 9a93263a21c..cddcd33f8e6 100644
--- a/GUI/View/Sample/SampleEditor.cpp
+++ b/GUI/View/Sample/SampleEditor.cpp
@@ -40,7 +40,7 @@ void SampleEditor::setCurrentSample(SampleItem* t)
connect(ec, &SampleEditorController::requestViewInRealspace, this,
&SampleEditor::requestViewInRealspace);
connect(ec, &SampleEditorController::aboutToRemoveItem, this, &SampleEditor::aboutToRemoveItem);
- connect(ec, &SampleEditorController::modified, this, &SampleEditor::modified);
+ connect(ec, &SampleEditorController::sampleModified, this, &SampleEditor::seModified);
t->updateDefaultLayerColors();
diff --git a/GUI/View/Sample/SampleEditor.h b/GUI/View/Sample/SampleEditor.h
index 8679e269451..e5f2e12d0db 100644
--- a/GUI/View/Sample/SampleEditor.h
+++ b/GUI/View/Sample/SampleEditor.h
@@ -34,7 +34,7 @@ public:
signals:
void requestViewInRealspace(Item3D* itemToShow);
void aboutToRemoveItem(Item3D* item);
- void modified();
+ void seModified();
private:
std::unique_ptr<SampleEditorController> m_edit_controller;
diff --git a/GUI/View/Sample/SampleEditorController.cpp b/GUI/View/Sample/SampleEditorController.cpp
index 4162cee4ced..fbd1bee840a 100644
--- a/GUI/View/Sample/SampleEditorController.cpp
+++ b/GUI/View/Sample/SampleEditorController.cpp
@@ -100,7 +100,7 @@ void SampleEditorController::onLayerAdded(LayerItem* layer)
ASSERT(m_sample_form);
m_sample_form->onLayerAdded(layer);
- emit modified();
+ emit sampleModified();
// expand the new layer's form for better workflow
for (auto* c : m_sample_form->findChildren<LayerForm*>())
@@ -126,7 +126,7 @@ void SampleEditorController::removeLayerItem(LayerItem* layer)
m_sample_form->onAboutToRemoveLayer(layer);
m_sample_item->removeLayer(layer);
m_sample_form->updateRowVisibilities();
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::onLayoutAdded(LayerForm* layerForm, ParticleLayoutItem* layout)
@@ -136,7 +136,7 @@ void SampleEditorController::onLayoutAdded(LayerForm* layerForm, ParticleLayoutI
for (auto* layoutForms : layerForm->findChildren<ParticleLayoutForm*>())
layoutForms->updateTitle(layerForm->layerItem());
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::addLayoutItem(LayerForm* layerForm)
@@ -161,13 +161,13 @@ void SampleEditorController::removeLayoutItem(LayerForm* layerForm, ParticleLayo
for (auto* layoutForm : layerForm->findChildren<ParticleLayoutForm*>())
layoutForm->updateTitle(layerForm->layerItem());
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::onParticleLayoutAdded(ParticleLayoutItem* layout,
ItemWithParticles* newItem)
{
- emit modified();
+ emit sampleModified();
// search for particle layout widget for notification
ASSERT(m_sample_form);
@@ -211,7 +211,7 @@ void SampleEditorController::duplicateItemWithParticles(ItemWithParticles* item)
void SampleEditorController::onParticleCompoundAdded(CompoundItem* composition,
ItemWithParticles* newItem)
{
- emit modified();
+ emit sampleModified();
// search for composition widget for notification
ASSERT(m_sample_form);
@@ -276,7 +276,7 @@ void SampleEditorController::setCoreFormfactor(CoreAndShellForm* widget,
particleCoreShell->coreItem()->setFormfactor(FormfactorCatalog::create(type));
widget->createCoreWidgets();
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::setShellFormfactor(CoreAndShellForm* widget,
@@ -289,7 +289,7 @@ void SampleEditorController::setShellFormfactor(CoreAndShellForm* widget,
particleCoreShell->shellItem()->setFormfactor(FormfactorCatalog::create(type));
widget->createShellWidgets();
- emit modified();
+ emit sampleModified();
}
ParticleLayoutItem* SampleEditorController::parentLayoutItem(ItemWithParticles* item)
@@ -318,7 +318,7 @@ void SampleEditorController::removeParticle(ItemWithParticles* itemToRemove)
emit aboutToRemoveItem(itemToRemove);
layoutForm->layoutItem()->removeItemWithParticle(itemToRemove);
- emit modified();
+ emit sampleModified();
return;
}
@@ -328,7 +328,7 @@ void SampleEditorController::removeParticle(ItemWithParticles* itemToRemove)
emit aboutToRemoveItem(itemToRemove);
c->compositionItem()->removeItemWithParticle(itemToRemove);
- emit modified();
+ emit sampleModified();
return;
}
}
@@ -350,14 +350,14 @@ void SampleEditorController::selectMaterial(ItemWithMaterial* item,
c->updateTitle();
// #baLayerEditor notify all material users (update link info)
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::setMaterialValue(ItemWithMaterial* item, double value,
DoubleProperty& d)
{
d.setDVal(value);
- emit modified();
+ emit sampleModified();
// -- notify all other users of this material (update values in the UI)
ASSERT(m_sample_form);
@@ -365,14 +365,14 @@ void SampleEditorController::setMaterialValue(ItemWithMaterial* item, double val
if (c->itemWithMaterial() != item
&& c->itemWithMaterial()->materialIdentifier() == item->materialIdentifier())
c->updateValues();
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::setDensityRelatedValue(InterferenceItem* interferenceItem,
double value, DoubleProperty& d)
{
d.setDVal(value);
- emit modified();
+ emit sampleModified();
// -- notify the containing particle layout UI about changed value
ASSERT(m_sample_form);
@@ -397,7 +397,7 @@ void SampleEditorController::onStoppedToMoveLayer(QWidget* widgetToMove,
// #baLayerEditor: tab order!
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::setMesocrystalBasis(MesocrystalForm* widget,
@@ -406,7 +406,7 @@ void SampleEditorController::setMesocrystalBasis(MesocrystalForm* widget,
auto* meso = widget->mesocrystalItem();
meso->setBasisItem(createAndInitItem(type));
widget->createBasisWidgets();
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::setMesocrystalBasis(MesocrystalForm* widget,
@@ -415,7 +415,7 @@ void SampleEditorController::setMesocrystalBasis(MesocrystalForm* widget,
auto* meso = widget->mesocrystalItem();
meso->setBasisItem(createAndInitItem(type));
widget->createBasisWidgets();
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::selectInterference(InterferenceForm* widget, int newIndex)
@@ -434,12 +434,12 @@ void SampleEditorController::selectInterference(InterferenceForm* widget, int ne
particleLayoutForm->updateDensityValue();
}
- emit modified();
+ emit sampleModified();
}
void SampleEditorController::setIntegrateOverXi(LatticeTypeSelectionForm* widget, bool value)
{
widget->interferenceItem()->setXiIntegration(value);
widget->onIntegrateOverXiChanged();
- emit modified();
+ emit sampleModified();
}
diff --git a/GUI/View/Sample/SampleEditorController.h b/GUI/View/Sample/SampleEditorController.h
index 7c9801dc9e9..909564c54e6 100644
--- a/GUI/View/Sample/SampleEditorController.h
+++ b/GUI/View/Sample/SampleEditorController.h
@@ -108,7 +108,7 @@ public:
signals:
void requestViewInRealspace(Item3D* item);
void aboutToRemoveItem(Item3D* item);
- void modified();
+ void sampleModified();
private:
ItemWithParticles* createAndInitItem(FormfactorCatalog::Type formFactorType) const;
diff --git a/GUI/View/View/SampleView.cpp b/GUI/View/View/SampleView.cpp
index b63af3706e3..1679157d843 100644
--- a/GUI/View/View/SampleView.cpp
+++ b/GUI/View/View/SampleView.cpp
@@ -101,17 +101,17 @@ SampleView::SampleView()
updateActions();
});
- connect(editor, &SampleEditor::modified, script_panel, &ScriptPanel::onSampleModified);
+ connect(editor, &SampleEditor::seModified, script_panel, &ScriptPanel::onSampleModified);
connect(editor, &SampleEditor::requestViewInRealspace, this,
&SampleView::onRequestViewInRealspace);
connect(editor, &SampleEditor::aboutToRemoveItem, this, &SampleView::onAboutToRemoveItem);
- connect(editor, &SampleEditor::modified, m_realspace_panel->widget(),
+ connect(editor, &SampleEditor::seModified, m_realspace_panel->widget(),
&RealspaceWidget::updateRealScene);
- connect(editor, &SampleEditor::modified, gDoc.get(), &ProjectDocument::setModified);
+ connect(editor, &SampleEditor::seModified, gDoc.get(), &ProjectDocument::setModified);
updateActions();
}
--
GitLab