diff --git a/GUI/View/Device/AlphaScanEditor.cpp b/GUI/View/Device/AlphaScanEditor.cpp
index 39990a5707116d47b38e84a91d260dbb8947dff5..e28ae6712844e0696d3d96d94da22e7897437694 100644
--- a/GUI/View/Device/AlphaScanEditor.cpp
+++ b/GUI/View/Device/AlphaScanEditor.cpp
@@ -38,8 +38,8 @@ AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool al
connect(m_form, &SphericalAxisForm::dataChanged, this, &AlphaScanEditor::dataChanged);
//... beam distribution
- m_selector = new DistributionSelector(std::nullopt, DistributionSelector::DistributionsCategory::Symmetric, this,
- m_item, allow_distr);
+ m_selector = new DistributionSelector(std::nullopt, DistributionSelector::Category::Symmetric,
+ this, m_item, allow_distr);
connect(m_selector, &DistributionSelector::distributionChanged, this,
&AlphaScanEditor::dataChanged);
connect(m_selector, &DistributionSelector::distributionChanged, this,
diff --git a/GUI/View/Device/DistributionEditor.cpp b/GUI/View/Device/DistributionEditor.cpp
index f68ff53f983e2cd55270932f4ce34b6661287e74..e7fa73fac284b3aea1f7458636caf6f7fe358278 100644
--- a/GUI/View/Device/DistributionEditor.cpp
+++ b/GUI/View/Device/DistributionEditor.cpp
@@ -19,9 +19,9 @@
DistributionEditor::DistributionEditor(const QString& title,
const std::optional<MeanConfig>& mean_config,
- DistributionSelector::DistributionsCategory distributions,
- QWidget* parent,
- BeamDistributionItem* item, bool allow_distr)
+ DistributionSelector::Category distributions,
+ QWidget* parent, BeamDistributionItem* item,
+ bool allow_distr)
: StaticGroupBox(title, parent)
, m_selector(new DistributionSelector(mean_config, distributions, this, item, allow_distr))
, m_plot(new DistributionPlot(this))
diff --git a/GUI/View/Device/DistributionEditor.h b/GUI/View/Device/DistributionEditor.h
index b7fad8f750a87af828827d2cd61db5075573b496..810a41515105f0380a9bf00e2ec649fc8ea2ad6a 100644
--- a/GUI/View/Device/DistributionEditor.h
+++ b/GUI/View/Device/DistributionEditor.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H
#define BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H
-#include "GUI/View/Device/DistributionSelector.h" // MeanConfig, DistributionsCategory
+#include "GUI/View/Device/DistributionSelector.h" // MeanConfig, Category
#include "GUI/View/Widget/GroupBoxes.h"
#include <optional>
@@ -29,7 +29,7 @@ class DistributionEditor : public StaticGroupBox {
Q_OBJECT
public:
DistributionEditor(const QString& title, const std::optional<MeanConfig>& mean_config,
- DistributionSelector::DistributionsCategory distributions, QWidget* parent,
+ DistributionSelector::Category distributions, QWidget* parent,
BeamDistributionItem* item, bool allow_distr = true);
//! Update UI from data
diff --git a/GUI/View/Device/DistributionSelector.cpp b/GUI/View/Device/DistributionSelector.cpp
index ec512f375531af288c087834f0c1efea37b74ee6..4f42b7b2860880a1d77873662662cf2576819d8e 100644
--- a/GUI/View/Device/DistributionSelector.cpp
+++ b/GUI/View/Device/DistributionSelector.cpp
@@ -22,9 +22,8 @@
#include "GUI/View/Numeric/NumWidgetUtil.h"
DistributionSelector::DistributionSelector(std::optional<MeanConfig> mean_config,
- DistributionsCategory distributions,
- QWidget* parent, BeamDistributionItem* item,
- bool allow_distr)
+ Category distributions, QWidget* parent,
+ BeamDistributionItem* item, bool allow_distr)
: QWidget(parent)
, m_item(item)
, m_mean_config(mean_config)
diff --git a/GUI/View/Device/DistributionSelector.h b/GUI/View/Device/DistributionSelector.h
index 98b7451202079178c344a321d93123a80c202fa6..198abbeb2258152dfed8c193351315f3351d4811 100644
--- a/GUI/View/Device/DistributionSelector.h
+++ b/GUI/View/Device/DistributionSelector.h
@@ -37,7 +37,7 @@ class DistributionSelector : public QWidget {
Q_OBJECT
public:
//! Which distributions should be available in the selector
- enum class DistributionsCategory { All, Symmetric };
+ enum class Category { All, Symmetric };
/// \param mean_config controls how the mean value is shown and can be input.
/// If this parameter is \c nullopt then the mean value can not be input
@@ -45,12 +45,11 @@ public:
/// \pre ! mean_config && distributions == Distributions::Symmetric
/// (i.e. the combination of all distributions without mean input is currently not
/// supported)
- DistributionSelector(std::optional<MeanConfig> mean_config,
- DistributionsCategory distributions, QWidget* parent,
- BeamDistributionItem* item, bool allow_distr);
+ DistributionSelector(std::optional<MeanConfig> mean_config, Category distributions,
+ QWidget* parent, BeamDistributionItem* item, bool allow_distr);
BeamDistributionItem* item() const { return m_item; }
- DistributionsCategory distributions() const { return m_distributions; }
+ Category distributions() const { return m_distributions; }
void refresh();
signals:
@@ -64,7 +63,7 @@ private:
BeamDistributionItem* m_item;
std::optional<MeanConfig> m_mean_config;
- DistributionsCategory m_distributions;
+ Category m_distributions;
QFormLayout* m_form_layout;
QComboBox* m_distribution_combo;
};
diff --git a/GUI/View/Device/GISASBeamEditor.cpp b/GUI/View/Device/GISASBeamEditor.cpp
index 0babafaf03150eefe3bf1a4aab3f9deefef96053..d52d19f7c8a98ee88020ac79b00e9134b35141d2 100644
--- a/GUI/View/Device/GISASBeamEditor.cpp
+++ b/GUI/View/Device/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}, DistributionSelector::DistributionsCategory::All,
- this, item->wavelengthItem());
+ new DistributionEditor("Wavelength (nm)", MeanConfig{true},
+ DistributionSelector::Category::All, this, item->wavelengthItem());
connect(wavelengthEditor, &DistributionEditor::distributionChanged, this,
&GISASBeamEditor::dataChanged);
- auto* inclinationEditor =
- new DistributionEditor("Grazing angle (deg)", MeanConfig{false},
- DistributionSelector::DistributionsCategory::All, this, item->beamDistributionItem());
+ auto* inclinationEditor = new DistributionEditor("Grazing angle (deg)", MeanConfig{false},
+ DistributionSelector::Category::All, this,
+ item->beamDistributionItem());
connect(inclinationEditor, &DistributionEditor::distributionChanged, this,
&GISASBeamEditor::dataChanged);
- auto* azimuthalEditor =
- new DistributionEditor("Azimuthal angle (deg)", MeanConfig{false},
- DistributionSelector::DistributionsCategory::All, this, item->azimuthalAngleItem());
+ auto* azimuthalEditor = new DistributionEditor("Azimuthal angle (deg)", MeanConfig{false},
+ DistributionSelector::Category::All, this,
+ item->azimuthalAngleItem());
connect(azimuthalEditor, &DistributionEditor::distributionChanged, this,
&GISASBeamEditor::dataChanged);
diff --git a/GUI/View/Device/ScanEditor.cpp b/GUI/View/Device/ScanEditor.cpp
index 0f47bad3332ca190b74668c7cfd50d3324e6abba..32aaa36c6e4e9a6e6b0070aa77b5d7c8028c4b96 100644
--- a/GUI/View/Device/ScanEditor.cpp
+++ b/GUI/View/Device/ScanEditor.cpp
@@ -50,7 +50,7 @@ ScanEditor::ScanEditor(QWidget* parent, InstrumentItem* instr_item, ScanItem* it
layout->addLayout(hLayout);
auto* wavelengthEditor = new DistributionEditor("Wavelength (nm)", MeanConfig{true},
- DistributionSelector::DistributionsCategory::Symmetric, this,
+ DistributionSelector::Category::Symmetric, this,
item->wavelengthItem(), allow_distr);
hLayout->addWidget(wavelengthEditor);
diff --git a/GUI/View/Main/CentralWidget.cpp b/GUI/View/Main/CentralWidget.cpp
index f60be072c777b3759a5dcda553f1a3fa754250c7..08d7be7f3a4185bac9eb1b9bc4c82a23a5911c8a 100644
--- a/GUI/View/Main/CentralWidget.cpp
+++ b/GUI/View/Main/CentralWidget.cpp
@@ -73,8 +73,7 @@ CentralWidget::CentralWidget()
"Import intensity data to fit");
addButton(ViewId::Instrument, QIcon(":/images/view/instrument.svg"), "Instrument",
"Define the beam and the detector");
- addButton(ViewId::Sample, QIcon(":/images/view/sample.svg"), "Sample",
- "Build the sample");
+ addButton(ViewId::Sample, QIcon(":/images/view/sample.svg"), "Sample", "Build the sample");
addButton(ViewId::Simulation, QIcon(":/images/view/simulate.svg"), "Simulation",
"Run simulation");
addButton(ViewId::Job, QIcon(":/images/view/job.svg"), "Jobs",
diff --git a/GUI/View/Main/CentralWidget.h b/GUI/View/Main/CentralWidget.h
index 23f0fca075f5b55cfcdc16a9597068e00403791e..9f53284d3b80e22661b5ac1527845be9a62f4d73 100644
--- a/GUI/View/Main/CentralWidget.h
+++ b/GUI/View/Main/CentralWidget.h
@@ -44,8 +44,7 @@ signals:
private:
enum ViewId { Datafile, Instrument, Sample, Simulation, Job };
- void addButton(ViewId id, const QIcon& icon, const QString& title,
- const QString& tooltip);
+ void addButton(ViewId id, const QIcon& icon, const QString& title, const QString& tooltip);
QToolButton* createViewSelectionButton() const;
//! Recalculate the size of the view selection buttons to show complete button text