diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 9e2f33c268ab5dcb9fb18a07e83bbb6308789b99..50dc0dd2fd431398b065eec9972c253ab89dc176 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -31,7 +31,6 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent, ProjectDoc
, m_undoAction(nullptr)
, m_redoAction(nullptr)
, m_showInlineEditButtonsAction(nullptr)
- , m_asAngstromAction(nullptr)
, m_currentSample(nullptr)
, m_document(document)
{
@@ -54,30 +53,6 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent, ProjectDoc
m_showInlineEditButtonsAction->setCheckable(true);
m_showInlineEditButtonsAction->setChecked(true);
m_toolbar->addAction(m_showInlineEditButtonsAction);
-
- m_asAngstromAction = new QAction(this);
- m_asAngstromAction->setIcon(QIcon(":/images/unit_angstrom.svg"));
- m_asAngstromAction->setToolTip(u8"Use \u00c5ngstrom as unit (where applicable)");
- connect(m_asAngstromAction, &QAction::toggled, this,
- &LayerOrientedSampleEditor::onUnitActionToggled);
- m_asAngstromAction->setCheckable(true);
-
- auto* asNanometerAction = new QAction(this);
- asNanometerAction->setIcon(QIcon(":/images/unit_nm.svg"));
- asNanometerAction->setToolTip("Use nanometer as unit (where applicable)");
- connect(asNanometerAction, &QAction::toggled, this,
- &LayerOrientedSampleEditor::onUnitActionToggled);
- asNanometerAction->setCheckable(true);
-
- auto* ag = new QActionGroup(this);
- ag->addAction(asNanometerAction);
- ag->addAction(m_asAngstromAction);
- if (appSettings->defaultUnitIsAngstrom())
- m_asAngstromAction->setChecked(true);
- else
- asNanometerAction->setChecked(true);
-
- m_toolbar->addActions(ag->actions());
}
LayerOrientedSampleEditor::~LayerOrientedSampleEditor()
@@ -131,7 +106,6 @@ void LayerOrientedSampleEditor::setCurrentSample(SampleItem* sampleItem)
m_currentSampleWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
m_scrollArea->setWidget(m_currentSampleWidget);
m_currentSampleWidget->showInlineEditButtons(m_showInlineEditButtonsAction->isChecked());
- m_currentSampleWidget->setUseAngstrom(m_asAngstromAction->isChecked());
updateActionEnabling();
}
@@ -151,12 +125,6 @@ void LayerOrientedSampleEditor::onShowInlineEditButtonsToggled(bool checked)
m_currentSampleWidget->showInlineEditButtons(checked);
}
-void LayerOrientedSampleEditor::onUnitActionToggled()
-{
- if (m_currentSampleWidget)
- m_currentSampleWidget->setUseAngstrom(m_asAngstromAction->isChecked());
-}
-
void LayerOrientedSampleEditor::createLayerColors() // #baLayerEditor move to better place
{
if (!m_currentSample)
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h
index f31ee22f5cdd30ec10044af37f1ab1a001fc72f9..a9ee93651166ad436eee7abf3f93f5709db8da35 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h
@@ -44,7 +44,6 @@ signals:
private:
void updateActionEnabling();
void onShowInlineEditButtonsToggled(bool checked);
- void onUnitActionToggled();
void createLayerColors();
@@ -58,7 +57,6 @@ private:
QAction* m_undoAction; // dedicated to the current sample
QAction* m_redoAction;
QAction* m_showInlineEditButtonsAction;
- QAction* m_asAngstromAction;
SampleItem* m_currentSample = nullptr;
QMap<SampleItem*, SampleEditorController*> m_editControllers;
ProjectDocument* m_document;
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index ce21912f002bb3c67fccc99a60c441cbed08eaec..0449fd92e43175483e962b624a98a0b1326d4f6b 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -76,7 +76,6 @@ void MaterialInplaceForm::selectMaterial()
createWidgets();
connect(itemWithMaterial()->materialItem(), &MaterialItem::dataChanged, this,
&MaterialInplaceForm::onMaterialChanged);
- m_ec->sampleForm()->updateUnits(); // necessary on switch from refractive index to SLD
} else {
updateValues(); // necessary, since in the material editor the values could have been
// changed without selecting a different material
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index 38d1a04f8d26d3397c8864b6cf82acffabba1a91..569d941ee2f96455e2c38d5accb622533d7305dc 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -108,7 +108,6 @@ void SampleEditorController::onLayerAdded(LayerItem* layer)
{
ASSERT(m_sampleForm);
m_sampleForm->onLayerAdded(layer);
- m_sampleForm->updateUnits();
emit modified();
@@ -159,7 +158,6 @@ void SampleEditorController::removeLayerItemFromUndo(int atIndex)
void SampleEditorController::onLayoutAdded(LayerForm* layerForm, ParticleLayoutItem* layout)
{
layerForm->onLayoutAdded(layout);
- m_sampleForm->updateUnits();
for (auto* layoutForms : layerForm->findChildren<ParticleLayoutForm*>())
layoutForms->updateTitle(layerForm->layerItem());
@@ -202,7 +200,6 @@ void SampleEditorController::onParticleLayoutAdded(ParticleLayoutItem* layout,
for (auto* w : m_sampleForm->findChildren<ParticleLayoutForm*>())
if (w->layoutItem() == layout)
w->onParticleAdded(newItem);
- m_sampleForm->updateUnits();
}
void SampleEditorController::addParticleLayoutItem(ParticleLayoutItem* layoutItem,
@@ -247,7 +244,6 @@ void SampleEditorController::onParticleCompoundAdded(CompoundItem* composition,
for (auto* c : m_sampleForm->findChildren<CompoundForm*>())
if (c->compositionItem() == composition)
c->onParticleAdded(newItem);
- m_sampleForm->updateUnits();
}
void SampleEditorController::addCompoundItem(CompoundItem* compositionItem,
@@ -307,7 +303,6 @@ void SampleEditorController::setCoreFormFactor(CoreAndShellForm* widget,
particleCoreShell->coreItem()->setFormFactor(FormFactorItemCatalog::create(type));
widget->createCoreWidgets();
- m_sampleForm->updateUnits();
emit modified();
}
@@ -321,7 +316,6 @@ void SampleEditorController::setShellFormFactor(CoreAndShellForm* widget,
particleCoreShell->shellItem()->setFormFactor(FormFactorItemCatalog::create(type));
widget->createShellWidgets();
- m_sampleForm->updateUnits();
emit modified();
}
@@ -404,7 +398,6 @@ void SampleEditorController::setCurrentIndex(ISelectionContainerForm* widget, in
{
d.setCurrentIndex(index);
widget->createContent();
- m_sampleForm->updateUnits();
emit modified();
}
@@ -509,7 +502,6 @@ void SampleEditorController::setMesocrystalBasis(MesocrystalForm* widget,
auto* meso = widget->mesocrystalItem();
meso->setBasisItem(createAndInitItem(type));
widget->createBasisWidgets();
- m_sampleForm->updateUnits();
emit modified();
}
@@ -519,7 +511,6 @@ void SampleEditorController::setMesocrystalBasis(MesocrystalForm* widget,
auto* meso = widget->mesocrystalItem();
meso->setBasisItem(createAndInitItem(type));
widget->createBasisWidgets();
- m_sampleForm->updateUnits();
emit modified();
}
@@ -527,7 +518,6 @@ void SampleEditorController::selectInterference(InterferenceForm* widget, int ne
{
widget->layoutItem()->interferenceSelection().setCurrentIndex(newIndex);
widget->onInterferenceTypeChanged();
- m_sampleForm->updateUnits();
// Disable/enable total density property in the particle layout, depending on type of
// interference function.
diff --git a/GUI/View/SampleDesigner/SampleForm.cpp b/GUI/View/SampleDesigner/SampleForm.cpp
index bfc7c0d60e534b33d6386d1960d091d76afb8eba..594d7d105f1b7ab7b29424ed757eef898f5c7586 100644
--- a/GUI/View/SampleDesigner/SampleForm.cpp
+++ b/GUI/View/SampleDesigner/SampleForm.cpp
@@ -58,8 +58,6 @@ SampleForm::SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorCont
: QWidget(parent)
, m_sampleItem(sampleItem)
, m_ec(ec)
- , m_useAngstrom(false)
- , m_useRadiant(false)
{
setObjectName("MultiLayerForm"); // important for style sheet addressing
setAttribute(Qt::WA_StyledBackground, true);
@@ -218,70 +216,11 @@ void SampleForm::updateRowVisibilities()
}
-void SampleForm::updateUnits()
-{
- const auto set = [](DoubleSpinBox* spinbox, Unit valueUnit, Unit displayUnit) {
- if (spinbox->baseUnit() == valueUnit)
- spinbox->setDisplayUnit(displayUnit);
- };
-
- for (auto* editor : findChildren<DoubleSpinBox*>()) {
- if (m_useAngstrom) {
- set(editor, Unit::nanometer, Unit::angstrom);
- set(editor, Unit::angstrom, Unit::angstrom);
- set(editor, Unit::nanometer2, Unit::angstrom2);
- set(editor, Unit::angstrom2, Unit::angstrom2);
- set(editor, Unit::nanometerMinus2, Unit::angstromMinus2);
- set(editor, Unit::angstromMinus2, Unit::angstromMinus2);
- } else {
- set(editor, Unit::nanometer, Unit::nanometer);
- set(editor, Unit::angstrom, Unit::nanometer);
- set(editor, Unit::nanometer2, Unit::nanometer2);
- set(editor, Unit::angstrom2, Unit::nanometer2);
- set(editor, Unit::nanometerMinus2, Unit::nanometerMinus2);
- set(editor, Unit::angstromMinus2, Unit::nanometerMinus2);
- }
-
- if (m_useRadiant) {
- set(editor, Unit::degree, Unit::radiant);
- set(editor, Unit::radiant, Unit::radiant);
- } else {
- set(editor, Unit::degree, Unit::degree);
- set(editor, Unit::radiant, Unit::degree);
- }
- }
- for (auto* label : findChildren<QLabel*>())
- LayerEditorUtil::updateLabelUnit(label);
-}
-
void SampleForm::ensureVisible(QWidget* /*w*/)
{
// #baLayerEditor implement ensureVisible
}
-void SampleForm::setUseAngstrom(bool angstrom)
-{
- m_useAngstrom = angstrom;
- appSettings->setDefaultUnitIsAngstrom(angstrom);
- updateUnits();
-}
-
-bool SampleForm::useAngstrom() const
-{
- return m_useAngstrom;
-}
-
-void SampleForm::setUseRadiant(bool radiant)
-{
- m_useRadiant = radiant;
- updateUnits();
-}
-
-bool SampleForm::useRadiant() const
-{
- return m_useRadiant;
-}
-
void SampleForm::showAddLayerButtons(bool show)
{
for (auto* c : findChildren<QWidget*>())
diff --git a/GUI/View/SampleDesigner/SampleForm.h b/GUI/View/SampleDesigner/SampleForm.h
index 726ee12f470eab2cdfc979ef42868903d6d6445c..2cee8dddf26addf0de623b9581f6eefca7eb5018 100644
--- a/GUI/View/SampleDesigner/SampleForm.h
+++ b/GUI/View/SampleDesigner/SampleForm.h
@@ -47,19 +47,8 @@ public:
void updateRowVisibilities();
- //! Update the presented units in all contained widgets according to current settings.
- void updateUnits();
-
void ensureVisible(QWidget* w);
- //! Show values in Angstrom or nanometers
- void setUseAngstrom(bool angstrom);
- bool useAngstrom() const;
-
- //! Show values in radiants or degrees
- void setUseRadiant(bool radiant);
- bool useRadiant() const;
-
//! Shows or hides the "Add Layer" buttons.
void showAddLayerButtons(bool show);
@@ -74,8 +63,6 @@ private:
SampleItem* m_sampleItem; //!< Ptr is borrowed, don't delete
SampleEditorController* m_ec; //!< Ptr is borrowed, don't delete
bool m_showInlineEditButtons = false;
- bool m_useAngstrom;
- bool m_useRadiant;
QList<QPushButton*> m_addLayerButtons;
};