rename class and sources GUI/View/Device/SphericalAxisForm -> GUI/View/Device/ScanRangeForm

GUI/View/Device/AlphaScanEditor.cpp

@@ -17,7 +17,7 @@
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/View/Device/DistributionPlot.h"
 #include "GUI/View/Device/DistributionSelector.h"
-#include "GUI/View/Device/SphericalAxisForm.h"
+#include "GUI/View/Device/ScanRangeForm.h"
 
 AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr)
     : StaticGroupBox("Grazing angles (deg)", parent)
@@ -34,8 +34,8 @@ AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool al
     layout->addRow("Axis type:", typeComboBox);
 
     //... axis parameters
-    m_form = new SphericalAxisForm(layout);
-    connect(m_form, &SphericalAxisForm::dataChanged, this, &AlphaScanEditor::dataChanged);
+    m_form = new ScanRangeForm(layout);
+    connect(m_form, &ScanRangeForm::dataChanged, this, &AlphaScanEditor::dataChanged);
 
     //... beam distribution
     m_selector = new DistributionSelector(std::nullopt, DistributionSelector::Category::Symmetric,

GUI/View/Device/AlphaScanEditor.h

@@ -20,7 +20,7 @@
 class DistributionPlot;
 class DistributionSelector;
 class GrazingScanItem;
-class SphericalAxisForm;
+class ScanRangeForm;
 
 //! Editor for scanning inclination angles
 
@@ -40,7 +40,7 @@ private slots:
 
 private:
     DistributionSelector* m_selector;
-    SphericalAxisForm* m_form;
+    ScanRangeForm* m_form;
     GrazingScanItem* m_item;
     DistributionPlot* m_plot;
 };

GUI/View/Device/SphericalAxisForm.cpp → GUI/View/Device/ScanRangeForm.cpp

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Device/SphericalAxisForm.cpp
-//! @brief     Implement class SphericalAxisForm
+//! @file      GUI/View/Device/ScanRangeForm.cpp
+//! @brief     Implement class ScanRangeForm
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,20 +12,19 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Device/SphericalAxisForm.h"
+#include "GUI/View/Device/ScanRangeForm.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/View/Numeric/SafeSpinBox.h"
 #include "GUI/View/Numeric/ScientificSpinBox.h"
 
-SphericalAxisForm::SphericalAxisForm(QFormLayout* form)
+ScanRangeForm::ScanRangeForm(QFormLayout* form)
     : m_nbins_spin_box(new SafeSpinBox)
     , m_minimum_spin_box(new ScientificSpinBox)
     , m_maximum_spin_box(new ScientificSpinBox)
     , m_axis_item(nullptr)
 {
     m_nbins_spin_box->setRange(1, 65536);
-    connect(m_nbins_spin_box, &QSpinBox::valueChanged, this,
-            &SphericalAxisForm::onNbinsValueChanged);
+    connect(m_nbins_spin_box, &QSpinBox::valueChanged, this, &ScanRangeForm::onNbinsValueChanged);
     form->addRow("# scan points:", m_nbins_spin_box);
 
     m_minimum_spin_box->setMinimum(0);
@@ -33,7 +32,7 @@ SphericalAxisForm::SphericalAxisForm(QFormLayout* form)
     m_minimum_spin_box->setDecimals(5);
     m_minimum_spin_box->setSingleStep(0.01);
     connect(m_minimum_spin_box, &ScientificSpinBox::valueChanged, this,
-            &SphericalAxisForm::onMinimumValueChanged);
+            &ScanRangeForm::onMinimumValueChanged);
     form->addRow("Initial angle [deg]:", m_minimum_spin_box);
 
     m_maximum_spin_box->setMinimum(0);
@@ -41,25 +40,25 @@ SphericalAxisForm::SphericalAxisForm(QFormLayout* form)
     m_maximum_spin_box->setDecimals(5);
     m_maximum_spin_box->setSingleStep(0.01);
     connect(m_maximum_spin_box, &ScientificSpinBox::valueChanged, this,
-            &SphericalAxisForm::onMaximumValueChanged);
+            &ScanRangeForm::onMaximumValueChanged);
     form->addRow("Final angle [deg]:", m_maximum_spin_box);
 }
 
-void SphericalAxisForm::setAxisItem(BasicAxisItem* axisItem)
+void ScanRangeForm::setAxisItem(BasicAxisItem* axisItem)
 {
     m_axis_item = axisItem;
     setEnabled(m_axis_item);
     updateData();
 }
 
-void SphericalAxisForm::setEnabled(bool enabled)
+void ScanRangeForm::setEnabled(bool enabled)
 {
     m_nbins_spin_box->setEnabled(enabled);
     m_minimum_spin_box->setEnabled(enabled);
     m_maximum_spin_box->setEnabled(enabled);
 }
 
-void SphericalAxisForm::updateData()
+void ScanRangeForm::updateData()
 {
     QSignalBlocker b1(m_nbins_spin_box);
     QSignalBlocker b2(m_minimum_spin_box);
@@ -75,7 +74,7 @@ void SphericalAxisForm::updateData()
     }
 }
 
-void SphericalAxisForm::onNbinsValueChanged(size_t value)
+void ScanRangeForm::onNbinsValueChanged(size_t value)
 {
     if (m_axis_item && m_axis_item->size() != value) {
         m_axis_item->resize(value);
@@ -83,7 +82,7 @@ void SphericalAxisForm::onNbinsValueChanged(size_t value)
     }
 }
 
-void SphericalAxisForm::onMinimumValueChanged(double value)
+void ScanRangeForm::onMinimumValueChanged(double value)
 {
     if (m_axis_item && m_axis_item->min() != value) {
         m_axis_item->setMin(value);
@@ -93,7 +92,7 @@ void SphericalAxisForm::onMinimumValueChanged(double value)
     }
 }
 
-void SphericalAxisForm::onMaximumValueChanged(double value)
+void ScanRangeForm::onMaximumValueChanged(double value)
 {
     if (m_axis_item && m_axis_item->max() != value) {
         m_axis_item->setMax(value);

GUI/View/Device/SphericalAxisForm.h → GUI/View/Device/ScanRangeForm.h

@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Device/SphericalAxisForm.h
-//! @brief     Defines class SphericalAxisForm.
+//! @file      GUI/View/Device/ScanRangeForm.h
+//! @brief     Defines class ScanRangeForm.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_DEVICE_SPHERICALAXISFORM_H
-#define BORNAGAIN_GUI_VIEW_DEVICE_SPHERICALAXISFORM_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_SCANRANGEFORM_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_SCANRANGEFORM_H
 
 #include <QFormLayout>
 
@@ -25,10 +25,10 @@ class ScientificSpinBox;
 //! the number of bins and to select the range in degrees (minimum & maximum)
 //! The input widgets will be inserted in the form given in the constructor
 
-class SphericalAxisForm : public QObject {
+class ScanRangeForm : public QObject {
     Q_OBJECT
 public:
-    SphericalAxisForm(QFormLayout* form);
+    ScanRangeForm(QFormLayout* form);
     void setAxisItem(BasicAxisItem* axisItem);
     void setEnabled(bool enabled);
 
@@ -50,4 +50,4 @@ private:
     BasicAxisItem* m_axis_item;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_DEVICE_SPHERICALAXISFORM_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_SCANRANGEFORM_H