diff --git a/GUI/View/PropertyEditor/ScientificSpinBox.cpp b/GUI/View/PropertyEditor/ScientificSpinBox.cpp index b1e43160963a1bd8984ace0cda8537a930000117..a17382e415a884b376fe076d340b3688948eb7da 100644 --- a/GUI/View/PropertyEditor/ScientificSpinBox.cpp +++ b/GUI/View/PropertyEditor/ScientificSpinBox.cpp @@ -29,7 +29,7 @@ bool useExponentialNotation(double val); } // namespace ScientificSpinBox::ScientificSpinBox(QWidget* parent) - : QAbstractSpinBox(parent) + : QDoubleSpinBox(parent) , m_value(0.0) , m_min(-max_val) , m_max(max_val) diff --git a/GUI/View/PropertyEditor/ScientificSpinBox.h b/GUI/View/PropertyEditor/ScientificSpinBox.h index 0ef0a8a24cf74e828d745a6b2b8d6d6b5934380f..73415196b26da10d8f38f91786845892d7813fc1 100644 --- a/GUI/View/PropertyEditor/ScientificSpinBox.h +++ b/GUI/View/PropertyEditor/ScientificSpinBox.h @@ -15,9 +15,9 @@ #ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SCIENTIFICSPINBOX_H #define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SCIENTIFICSPINBOX_H -#include <QAbstractSpinBox> +#include <QDoubleSpinBox> -class ScientificSpinBox : public QAbstractSpinBox { +class ScientificSpinBox : public QDoubleSpinBox { Q_OBJECT Q_PROPERTY(double value MEMBER m_value READ value WRITE setValue NOTIFY valueChanged USER true) diff --git a/GUI/View/Tool/EditUtil.cpp b/GUI/View/Tool/EditUtil.cpp index d872b890eda5c5e472b26ddb1cb3071c4f731d5f..c01e23da56b226d82fe15955291c3297d8c012c3 100644 --- a/GUI/View/Tool/EditUtil.cpp +++ b/GUI/View/Tool/EditUtil.cpp @@ -14,7 +14,6 @@ #include "GUI/View/Tool/EditUtil.h" #include "Fit/Param/RealLimits.h" -#include "GUI/View/PropertyEditor/ScientificSpinBox.h" #include <QDoubleSpinBox> #include <QDoubleValidator> #include <QLineEdit> @@ -60,18 +59,3 @@ void GUI::View::EditUtil::configSpinbox(QDoubleSpinBox* spinBox, int decimals, spinBox->setDecimals(decimals); spinBox->setSingleStep(singleStep(decimals)); } - -void GUI::View::EditUtil::configSpinbox(ScientificSpinBox* spinBox, int decimals, - const RealLimits& limits) -{ - spinBox->setMaximum(std::numeric_limits<double>::max()); - spinBox->setMinimum(std::numeric_limits<double>::lowest()); - - if (limits.hasLowerLimit()) - spinBox->setMinimum(limits.lowerLimit()); - if (limits.hasUpperLimit()) - spinBox->setMaximum(limits.upperLimit()); - - spinBox->setDecimals(decimals); - spinBox->setSingleStep(singleStep(decimals)); -} diff --git a/GUI/View/Tool/EditUtil.h b/GUI/View/Tool/EditUtil.h index 5c8d4cf0b0aed18bb990751625b64cca1a973cf1..5005143de5f12f6e1cbd2787e02485c1b5588ce8 100644 --- a/GUI/View/Tool/EditUtil.h +++ b/GUI/View/Tool/EditUtil.h @@ -20,14 +20,12 @@ class RealLimits; class QDoubleSpinBox; class QLineEdit; -class ScientificSpinBox; namespace GUI::View::EditUtil { void configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits); void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits); -void configSpinbox(ScientificSpinBox* spinBox, int decimals, const RealLimits& limits); } // namespace GUI::View::EditUtil