[m.i765] Allow (x,y,z) magnetization for particles in any layer (#765) (Closes #765)

Merging branch 'm.i765'  into 'main'.

See merge request !2021

GUI/View/SampleDesigner/LayerEditorUtil.cpp

@@ -100,16 +100,17 @@ void LayerEditorUtil::addMultiPropertyToGrid(QGridLayout* m_gridLayout, int firs
                            addSpacer);
 }
 
-void LayerEditorUtil::addMagnetizationNoZToGrid(
+void LayerEditorUtil::addMagnetizationToGrid(
     QGridLayout* m_gridLayout, int firstCol, VectorProperty& v,
-    std::function<void(double, DoubleProperty&)> setNewValue, bool vertically, bool addSpacer)
+    std::function<void(double, DoubleProperty&)> setNewValue, bool vertically, bool addSpacer,
+    bool with_z)
 {
-    // Setting z-component is temporary disabled (see issue #654)
-    // When interaction with magnetic field in fronting medium is implemented,
-    // delete this method and use 'addVectorToGrid' instead
-
-    addMultiPropertyToGrid(m_gridLayout, firstCol, {&v.x(), &v.y()}, setNewValue, vertically,
-                           addSpacer);
+    if (with_z)
+        addMultiPropertyToGrid(m_gridLayout, firstCol, {&v.x(), &v.y(), &v.z()}, setNewValue,
+                               vertically, addSpacer);
+    else
+        addMultiPropertyToGrid(m_gridLayout, firstCol, {&v.x(), &v.y()}, setNewValue, vertically,
+                               addSpacer);
 }
 
 QWidget* LayerEditorUtil::createWidgetForItemWithParticles(QWidget* parentWidget,

GUI/View/SampleDesigner/LayerEditorUtil.h

@@ -54,9 +54,9 @@ void addMultiPropertyToGrid(QGridLayout* m_gridLayout, int firstCol,
                             const DoubleProperties& valueProperties, SampleEditorController* ec,
                             bool addSpacer);
 
-void addMagnetizationNoZToGrid(QGridLayout* m_gridLayout, int firstCol, VectorProperty& v,
-                               std::function<void(double, DoubleProperty&)> setNewValue,
-                               bool vertically, bool addSpacer);
+void addMagnetizationToGrid(QGridLayout* m_gridLayout, int firstCol, VectorProperty& v,
+                            std::function<void(double, DoubleProperty&)> setNewValue,
+                            bool vertically, bool addSpacer, bool with_z);
 
 QWidget* createWidgetForItemWithParticles(QWidget* parentWidget,
                                           ItemWithParticles* itemWithParticles, bool allowAbundance,

GUI/View/SampleDesigner/MaterialInplaceForm.cpp

@@ -119,12 +119,13 @@ void MaterialInplaceForm::createWidgets()
     };
 
     // Processing z-magnetization is not implemented yet (see issue #654)
-    // LayerEditorUtil::addVectorToGrid(m_layout, col, material->magnetization(), setNewValue, true,
-    // false); When implemented, rm following lines and use 'addVectorToGrid'
     const LayerItem* layer_item = dynamic_cast<LayerItem*>(m_item);
     if (layer_item && !layer_item->isTopLayer())
-        LayerEditorUtil::addMagnetizationNoZToGrid(m_layout, col, material->magnetization(),
-                                                   setNewValue, true, false);
+        LayerEditorUtil::addMagnetizationToGrid(m_layout, col, material->magnetization(),
+                                                setNewValue, true, false, false);
+    if (!layer_item)
+        LayerEditorUtil::addMagnetizationToGrid(m_layout, col, material->magnetization(),
+                                                setNewValue, true, false, true);
 
     // -- Create UI for material selection button
     auto* btn = new QPushButton("...", this);

Resample/Slice/Slice.cpp

@@ -84,7 +84,7 @@ void Slice::initBField(R3 h_field, double h_z)
 {
     // Temporary forbid z-magnetization in all layers (see issue #654)
     if (m_material.magnetization().z() != 0)
-        throw std::runtime_error("Processing z-magnetization is not implemented yet.");
+        throw std::runtime_error("Processing z-magnetization of layers is not implemented.");
 
     static constexpr double Magnetic_Permeability = 4e-7 * pi;
     m_B_field = Magnetic_Permeability * (h_field + m_material.magnetization());