replace 'ID::Distributions' by 'DistributionsCategory'

GUI/Support/Data/ID.h

@@ -15,10 +15,14 @@
 #ifndef BORNAGAIN_GUI_SUPPORT_DATA_ID_H
 #define BORNAGAIN_GUI_SUPPORT_DATA_ID_H
 
-namespace GUI::ID {
+namespace GUI {
 
 //! Which distributions should be available in the selector
-enum class Distributions { All, Symmetric };
+enum class DistributionsCategory { All, Symmetric };
+
+} // namespace GUI
+
+namespace GUI::ID {
 
 //! Enumerates views of the main window
 enum ViewId { Projects, Instrument, Sample, Import, Simulation, Job };

GUI/View/Instrument/AlphaScanEditor.cpp

@@ -38,7 +38,7 @@ AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool al
     connect(m_form, &SphericalAxisForm::dataChanged, this, &AlphaScanEditor::dataChanged);
 
     //... beam distribution
-    m_selector = new DistributionSelector(std::nullopt, GUI::ID::Distributions::Symmetric, this,
+    m_selector = new DistributionSelector(std::nullopt, GUI::DistributionsCategory::Symmetric, this,
                                           m_item, allow_distr);
     connect(m_selector, &DistributionSelector::distributionChanged, this,
             &AlphaScanEditor::dataChanged);

GUI/View/Instrument/DistributionEditor.cpp

@@ -19,7 +19,7 @@
 
 DistributionEditor::DistributionEditor(const QString& title,
                                        const std::optional<MeanConfig>& mean_config,
-                                       GUI::ID::Distributions distributions, QWidget* parent,
+                                       GUI::DistributionsCategory distributions, QWidget* parent,
                                        BeamDistributionItem* item, bool allow_distr)
     : StaticGroupBox(title, parent)
     , m_selector(new DistributionSelector(mean_config, distributions, this, item, allow_distr))

GUI/View/Instrument/DistributionEditor.h

@@ -30,7 +30,7 @@ class DistributionEditor : public StaticGroupBox {
     Q_OBJECT
 public:
     DistributionEditor(const QString& title, const std::optional<MeanConfig>& mean_config,
-                       GUI::ID::Distributions distributions, QWidget* parent,
+                       GUI::DistributionsCategory distributions, QWidget* parent,
                        BeamDistributionItem* item, bool allow_distr = true);
 
     //! Update UI from data

GUI/View/Instrument/DistributionSelector.cpp

@@ -22,8 +22,9 @@
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 
 DistributionSelector::DistributionSelector(std::optional<MeanConfig> mean_config,
-                                           GUI::ID::Distributions distributions, QWidget* parent,
-                                           BeamDistributionItem* item, bool allow_distr)
+                                           GUI::DistributionsCategory distributions,
+                                           QWidget* parent, BeamDistributionItem* item,
+                                           bool allow_distr)
     : QWidget(parent)
     , m_item(item)
     , m_mean_config(mean_config)

GUI/View/Instrument/DistributionSelector.h

@@ -44,11 +44,11 @@ public:
     ///      (i.e. the combination of all distributions without mean input is currently not
     ///       supported)
     DistributionSelector(std::optional<MeanConfig> mean_config,
-                         GUI::ID::Distributions distributions, QWidget* parent,
+                         GUI::DistributionsCategory distributions, QWidget* parent,
                          BeamDistributionItem* item, bool allow_distr);
 
     BeamDistributionItem* item() const { return m_item; }
-    GUI::ID::Distributions distributions() const { return m_distributions; }
+    GUI::DistributionsCategory distributions() const { return m_distributions; }
     void refresh();
 
 signals:
@@ -62,7 +62,7 @@ private:
 
     BeamDistributionItem* m_item;
     std::optional<MeanConfig> m_mean_config;
-    GUI::ID::Distributions m_distributions;
+    GUI::DistributionsCategory m_distributions;
     QFormLayout* m_form_layout;
     QComboBox* m_distribution_combo;
 };

GUI/View/Instrument/GISASBeamEditor.cpp

@@ -40,20 +40,20 @@ GISASBeamEditor::GISASBeamEditor(QWidget* parent, BeamItem* item)
 
     // Main row: fixed values or distributions for wavelength and angles of incidence
     auto* wavelengthEditor =
-        new DistributionEditor("Wavelength (nm)", MeanConfig{true}, GUI::ID::Distributions::All,
+        new DistributionEditor("Wavelength (nm)", MeanConfig{true}, GUI::DistributionsCategory::All,
                                this, item->wavelengthItem());
     connect(wavelengthEditor, &DistributionEditor::distributionChanged, this,
             &GISASBeamEditor::dataChanged);
 
     auto* inclinationEditor =
         new DistributionEditor("Grazing angle (deg)", MeanConfig{false},
-                               GUI::ID::Distributions::All, this, item->beamDistributionItem());
+                               GUI::DistributionsCategory::All, this, item->beamDistributionItem());
     connect(inclinationEditor, &DistributionEditor::distributionChanged, this,
             &GISASBeamEditor::dataChanged);
 
     auto* azimuthalEditor =
         new DistributionEditor("Azimuthal angle (deg)", MeanConfig{false},
-                               GUI::ID::Distributions::All, this, item->azimuthalAngleItem());
+                               GUI::DistributionsCategory::All, this, item->azimuthalAngleItem());
     connect(azimuthalEditor, &DistributionEditor::distributionChanged, this,
             &GISASBeamEditor::dataChanged);
 

GUI/View/Instrument/ScanEditor.cpp

@@ -51,7 +51,7 @@ ScanEditor::ScanEditor(QWidget* parent, InstrumentItem* instr_item, ScanItem* it
     layout->addLayout(hLayout);
 
     auto* wavelengthEditor = new DistributionEditor("Wavelength (nm)", MeanConfig{true},
-                                                    GUI::ID::Distributions::Symmetric, this,
+                                                    GUI::DistributionsCategory::Symmetric, this,
                                                     item->wavelengthItem(), allow_distr);
     hLayout->addWidget(wavelengthEditor);