add RoughnessForm

Fit/Adapter/MinimizerAdapter.cpp

@@ -124,11 +124,12 @@ void MinimizerAdapter::propagateResults(mumufit::Parameters& parameters)
     parameters.setErrors(parErrorsAtMinimum());
     // sets correlation matrix
     if (providesError()) {
-	auto lambda = [&](size_t i, size_t j) -> double
-	    { return rootMinimizer()->Correlation(static_cast<unsigned int>(i),
-						  static_cast<unsigned int>(j)); };
-	double2d_t matrix = FieldUtil::make<double>(fitRank(), fitRank(), lambda);
-	parameters.setCorrelationMatrix(matrix);
+        auto lambda = [&](size_t i, size_t j) -> double {
+            return rootMinimizer()->Correlation(static_cast<unsigned int>(i),
+                                                static_cast<unsigned int>(j));
+        };
+        double2d_t matrix = FieldUtil::make<double>(fitRank(), fitRank(), lambda);
+        parameters.setCorrelationMatrix(matrix);
     }
 }
 

GUI/View/Sample/HeinzFormLayout.cpp

@@ -93,12 +93,6 @@ void HeinzFormLayout::addVector(VectorProperty& d, bool vertically /*= true*/)
     addBoldRow(d.label(), w);
 }
 
-void HeinzFormLayout::setRowVisible(int row, bool visible)
-{
-    QFormLayout::itemAt(row, QFormLayout::LabelRole)->widget()->setVisible(visible);
-    QFormLayout::itemAt(row, QFormLayout::FieldRole)->widget()->setVisible(visible);
-}
-
 void HeinzFormLayout::addStructureEditingRow(QPushButton* button)
 {
     auto* w = new QWidget(QFormLayout::parentWidget());

GUI/View/Sample/HeinzFormLayout.h

@@ -108,9 +108,6 @@ public:
     //! (vertically=false).
     void addVector(VectorProperty& d, bool vertically = true);
 
-    //! Shows or hides the widgets in a row.
-    void setRowVisible(int row, bool visible);
-
     //! Adds a button for structure editing.
     //!
     //! Creates a widget, places the given button as a child left-aligned into this widget and adds

GUI/View/Sample/LayerForm.cpp

@@ -27,6 +27,7 @@
 #include "GUI/View/Sample/HeinzFormLayout.h"
 #include "GUI/View/Sample/MaterialInplaceForm.h"
 #include "GUI/View/Sample/ParticleLayoutForm.h"
+#include "GUI/View/Sample/RoughnessForm.h"
 #include "GUI/View/Widget/WidgetMoverButton.h"
 #include <QLineEdit>
 #include <QMenu>
@@ -111,7 +112,8 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorControll
                                                   "Used for Average Layer Material calculations \n"
                                                   "when corresponding simulation option is set."));
 
-    m_layout->addSelection(m_layer->roughnessSelection());
+    //    m_layout->addSelection(m_layer->roughnessSelection());
+    m_layout->addRow(new RoughnessForm(this, m_layer->roughnessSelection(), m_ec));
     m_roughness_row = m_layout->rowCount() - 1;
 
     // -- layouts

GUI/View/Sample/RoughnessForm.cpp

+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/View/Sample/RoughnessForm.cpp
+//! @brief     Implements class RoughnessForm.
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2024
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#include "GUI/View/Sample/RoughnessForm.h"
+#include "GUI/Model/Sample/RoughnessCatalog.h"
+#include "GUI/Model/Sample/RoughnessItems.h"
+#include "GUI/View/Sample/HeinzFormLayout.h"
+
+RoughnessForm::RoughnessForm(QWidget* parent,
+                             PolyPtr<RoughnessItem, RoughnessCatalog>& roughnessSelection,
+                             SampleEditorController* ec)
+    : CollapsibleGroupBox(parent, expandRoughness)
+    , m_cb(new QComboBox(this))
+    , m_rs(roughnessSelection)
+{
+    m_layout = new HeinzFormLayout(ec);
+    body()->setLayout(m_layout);
+
+    WheelEventEater::install(m_cb);
+    m_cb->addItems(m_rs.menuEntries());
+    m_cb->setCurrentIndex(m_rs.certainIndex());
+    m_cb->setMaxVisibleItems(m_cb->count());
+    m_cb->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    m_layout->addBoldRow("Type:", m_cb);
+
+    createRoughnessWidgets();
+    updateTitle();
+
+    connect(m_cb, &QComboBox::currentIndexChanged, [this](int) { onRoughnessTypeChanged(); });
+}
+
+void RoughnessForm::updateTitle()
+{
+    setTitle("Roughness (" + m_cb->currentText() + ")");
+}
+
+void RoughnessForm::onRoughnessTypeChanged()
+{
+    while (m_layout->rowCount() > 1)
+        m_layout->removeRow(1);
+
+    createRoughnessWidgets();
+    updateTitle();
+}
+
+void RoughnessForm::createRoughnessWidgets()
+{
+    RoughnessItem* roughness = m_rs.certainItem();
+
+    if (auto* rsi = dynamic_cast<BasicRoughnessItem*>(roughness)) {
+
+        m_layout->addGroupOfValues("Parameters", rsi->roughnessProperties());
+
+        //        m_layout->addValue(itf->positionVariance());
+        //        m_layout->addValue(itf->length());
+        //        m_layout->addValue(itf->rotationAngle());
+        //        m_layout->addSelection(itf->decayFunctionSelection());
+    }
+    //    else if (auto* itf = dynamic_cast<InterferenceRadialParacrystalItem*>(interference)) {
+    //        m_layout->addValue(itf->positionVariance());
+    //        m_layout->addValue(itf->peakDistance());
+    //        m_layout->addValue(itf->dampingLength());
+    //        m_layout->addValue(itf->domainSize());
+    //        m_layout->addValue(itf->kappa());
+    //        m_layout->addSelection(itf->probabilityDistributionSelection());
+    //    } else if (auto* itf = dynamic_cast<InterferenceHardDiskItem*>(interference)) {
+    //        m_layout->addValue(itf->positionVariance());
+    //        m_layout->addValue(itf->radius());
+    //        addDensityRelatedValue(itf->density());
+    //    } else if (auto* itf = dynamic_cast<Interference2DLatticeItem*>(interference)) {
+    //        m_layout->addValue(itf->positionVariance());
+    //        auto* w = new LatticeTypeSelectionForm(this, itf, m_ec);
+    //        m_layout->addBoldRow(itf->latticeTypeSelection().piLabel(), w);
+    //        m_layout->addSelection(itf->decayFunctionSelection());
+    //    } else if (auto* itf = dynamic_cast<InterferenceFinite2DLatticeItem*>(interference)) {
+    //        m_layout->addValue(itf->positionVariance());
+    //        m_layout->addBoldRow("Domain size 1:",
+    //                             GUI::Util::createIntSpinBox([itf] { return itf->domainSize1(); },
+    //        [itf](int v) {
+    //            itf->setDomainSize1(v);
+    //            emit gDoc->sampleChanged();
+    //        },
+    //        RealLimits::lowerLimited(1),
+    //        "Domain size 1 in number of unit
+    //        cells"));
+    //        m_layout->addBoldRow("Domain size 2:",
+    //                             GUI::Util::createIntSpinBox([itf] { return itf->domainSize2(); },
+    //        [itf](int v) {
+    //            itf->setDomainSize2(v);
+    //            emit gDoc->sampleChanged();
+    //        },
+    //        RealLimits::lowerLimited(1),
+    //        "Domain size 2 in number of unit
+    //        cells"));
+    //        auto* w = new LatticeTypeSelectionForm(this, itf, m_ec);
+    //                             m_layout->addBoldRow(itf->latticeTypeSelection().piLabel(), w);
+    //    } else if (auto* itf = dynamic_cast<Interference2DParacrystalItem*>(interference)) {
+    //        m_layout->addValue(itf->positionVariance());
+    //        m_layout->addValue(itf->dampingLength());
+    //        m_layout->addValue(itf->domainSize1());
+    //        m_layout->addValue(itf->domainSize2());
+    //        auto* w = new LatticeTypeSelectionForm(this, itf, m_ec);
+    //        m_layout->addBoldRow(itf->latticeTypeSelection().piLabel(), w);
+    //        m_layout->addSelection(itf->probabilityDistributionSelection1());
+    //        m_layout->addSelection(itf->probabilityDistributionSelection2());
+    //    }
+}

GUI/View/Sample/RoughnessForm.h

+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/View/Sample/RoughnessForm.h
+//! @brief     Defines class RoughnessForm.
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2024
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLE_ROUGHNESSFORM_H
+#define BORNAGAIN_GUI_VIEW_SAMPLE_ROUGHNESSFORM_H
+
+#include "GUI/Model/Descriptor/PolyPtr.h"
+#include "GUI/View/Widget/GroupBoxes.h"
+#include <QComboBox>
+
+class HeinzFormLayout;
+class RoughnessCatalog;
+class RoughnessItem;
+class SampleEditorController;
+
+class RoughnessForm : public CollapsibleGroupBox {
+public:
+    RoughnessForm(QWidget* parent, PolyPtr<RoughnessItem, RoughnessCatalog>& roughnessSelection,
+                  SampleEditorController* ec);
+
+    void onRoughnessTypeChanged();
+
+private:
+    void updateTitle();
+    void createRoughnessWidgets();
+
+    HeinzFormLayout* m_layout;
+    QComboBox* m_cb;
+    PolyPtr<RoughnessItem, RoughnessCatalog>& m_rs;
+
+    bool expandRoughness = true;
+};
+
+#endif // BORNAGAIN_GUI_VIEW_SAMPLE_ROUGHNESSFORM_H