Skip to content
Snippets Groups Projects
Commit 9951b6d7 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

rm ScientificSpinBox dependency from EditUtil

parent 82351988
No related branches found
No related tags found
1 merge request!883GUI refactoring: diminished cyclic include dependence in View
......@@ -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)
......
......@@ -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)
......
......@@ -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));
}
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment