Skip to content
Snippets Groups Projects
Commit a1e52faa authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

disambiguate signals sampleModified, seModified

parent 3d4aeb12
No related branches found
No related tags found
1 merge request!2696PolyItem -> PolyPtr, with BaseItem as separate template parameter
......@@ -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();
});
}
......
......@@ -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);
......
......@@ -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"));
......
......@@ -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,
......
......@@ -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"
......
......@@ -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();
}
}
......
......@@ -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();
......
......@@ -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;
......
......@@ -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();
}
......@@ -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;
......
......@@ -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();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment