mv ftcs to where they are used

GUI/View/SampleDesigner/FormLayouter.cpp

@@ -157,7 +157,7 @@ int FormLayouter::addValue(DoubleProperty& d, function<void(double)> onValueChan
 
 void FormLayouter::insertValue(int row, DoubleProperty& d)
 {
-    insertValue(row, d, [ec=m_ec, &d](double newValue) { ec->setDouble(newValue, d); });
+    insertValue(row, d, [ec = m_ec, &d](double newValue) { ec->setDouble(newValue, d); });
 }
 
 void FormLayouter::insertValue(int row, DoubleProperty& d, function<void(double)> onValueChange)

GUI/View/SampleDesigner/LayerEditorUtil.cpp

@@ -14,13 +14,11 @@
 
 #include "GUI/View/SampleDesigner/LayerEditorUtil.h"
 #include "Base/Util/Assert.h"
+#include "GUI/Model/Descriptor/VectorProperty.h"
 #include "GUI/Model/Sample/CompoundItem.h"
 #include "GUI/Model/Sample/CoreAndShellItem.h"
-#include "GUI/Model/Sample/FormFactorItems.h"
 #include "GUI/Model/Sample/MesocrystalItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/Model/Sample/ProfileItems.h"
-#include "GUI/Model/Sample/RoughnessItems.h"
 #include "GUI/View/Numeric/DoubleLineEdit.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/CompoundForm.h"
@@ -131,41 +129,6 @@ void LayerEditorUtil::addMagnetizationNoZToGrid(
                            addSpacer);
 }
 
-DoubleProperties LayerEditorUtil::doublePropertiesOfItem(RotationItem* item)
-{
-    if (!item)
-        return {};
-    return item->rotationProperties();
-}
-
-DoubleProperties LayerEditorUtil::doublePropertiesOfItem(Profile2DItem* item)
-{
-    if (!item)
-        return {};
-    return item->profileProperties();
-}
-
-DoubleProperties LayerEditorUtil::doublePropertiesOfItem(Profile1DItem* item)
-{
-    if (!item)
-        return {};
-    return item->profileProperties();
-}
-
-DoubleProperties LayerEditorUtil::doublePropertiesOfItem(FormFactorItem* item)
-{
-    if (!item)
-        return {};
-    return item->geometryProperties();
-}
-
-DoubleProperties LayerEditorUtil::doublePropertiesOfItem(RoughnessItem* item)
-{
-    if (!item)
-        return {};
-    return item->roughnessProperties();
-}
-
 QWidget* LayerEditorUtil::createWidgetForItemWithParticles(QWidget* parentWidget,
                                                            ItemWithParticles* itemWithParticles,
                                                            bool allowAbundance,

GUI/View/SampleDesigner/LayerEditorUtil.h

@@ -59,12 +59,6 @@ void addMagnetizationNoZToGrid(QGridLayout* m_gridLayout, int firstCol, VectorPr
                                std::function<void(double, DoubleProperty&)> setNewValue,
                                bool vertically, bool addSpacer);
 
-DoubleProperties doublePropertiesOfItem(RoughnessItem* item);
-DoubleProperties doublePropertiesOfItem(FormFactorItem* item);
-DoubleProperties doublePropertiesOfItem(Profile1DItem* item);
-DoubleProperties doublePropertiesOfItem(Profile2DItem* item);
-DoubleProperties doublePropertiesOfItem(RotationItem* item);
-
 QWidget* createWidgetForItemWithParticles(QWidget* parentWidget,
                                           ItemWithParticles* itemWithParticles, bool allowAbundance,
                                           SampleEditorController* ec, bool allowRemove = true);

GUI/View/SampleDesigner/SelectionContainerForm.cpp

@@ -13,6 +13,10 @@
 //  ************************************************************************************************
 
 #include "GUI/View/SampleDesigner/SelectionContainerForm.h"
+#include "GUI/Model/Sample/FormFactorItems.h"
+#include "GUI/Model/Sample/ProfileItems.h"
+#include "GUI/Model/Sample/RotationItems.h"
+#include "GUI/Model/Sample/RoughnessItems.h"
 #include "GUI/Support/Tool/LayoutUtil.h"
 
 ISelectionContainerForm::ISelectionContainerForm(QWidget* parent, SampleEditorController* ec)
@@ -29,9 +33,43 @@ void ISelectionContainerForm::clear()
     m_gridLayout->addWidget(layoutItemOfComboBox->widget(), 1, 0);
 }
 
-
 void SelectionContainerForm::createContent()
 {
     if (currentValues != nullptr)
         LayerEditorUtil::addMultiPropertyToGrid(m_gridLayout, 1, currentValues(), m_ec, true);
 }
+
+DoubleProperties SelectionContainerForm::doublePropertiesOfItem(RotationItem* item)
+{
+    if (!item)
+        return {};
+    return item->rotationProperties();
+}
+
+DoubleProperties SelectionContainerForm::doublePropertiesOfItem(Profile2DItem* item)
+{
+    if (!item)
+        return {};
+    return item->profileProperties();
+}
+
+DoubleProperties SelectionContainerForm::doublePropertiesOfItem(Profile1DItem* item)
+{
+    if (!item)
+        return {};
+    return item->profileProperties();
+}
+
+DoubleProperties SelectionContainerForm::doublePropertiesOfItem(FormFactorItem* item)
+{
+    if (!item)
+        return {};
+    return item->geometryProperties();
+}
+
+DoubleProperties SelectionContainerForm::doublePropertiesOfItem(RoughnessItem* item)
+{
+    if (!item)
+        return {};
+    return item->roughnessProperties();
+}

GUI/View/SampleDesigner/SelectionContainerForm.h

@@ -94,13 +94,19 @@ public:
     SelectionContainerForm(QWidget* parent, SelectionProperty<T>& d, SampleEditorController* ec)
         : ISelectionContainerForm(parent, ec)
     {
-        currentValues = [&d] { return LayerEditorUtil::doublePropertiesOfItem(d.currentItem()); };
+        currentValues = [&d] { return doublePropertiesOfItem(d.currentItem()); };
         initUI(d);
     }
 
     virtual void createContent();
 
 private:
+    static DoubleProperties doublePropertiesOfItem(RoughnessItem* item);
+    static DoubleProperties doublePropertiesOfItem(FormFactorItem* item);
+    static DoubleProperties doublePropertiesOfItem(Profile1DItem* item);
+    static DoubleProperties doublePropertiesOfItem(Profile2DItem* item);
+    static DoubleProperties doublePropertiesOfItem(RotationItem* item);
+
     std::function<DoubleProperties()> currentValues = nullptr;
 };