diff --git a/src/Gui/DlgSettingsColorGradient.ui b/src/Gui/DlgSettingsColorGradient.ui
index 2f4ed4a12e..09678172c2 100644
--- a/src/Gui/DlgSettingsColorGradient.ui
+++ b/src/Gui/DlgSettingsColorGradient.ui
@@ -6,7 +6,7 @@
0
0
- 260
+ 255
313
@@ -19,8 +19,8 @@
true
-
- -
+
+
-
Color model
@@ -68,7 +68,7 @@
QSizePolicy::Expanding
-
+
3
20
@@ -79,7 +79,7 @@
- -
+
-
Style
@@ -113,7 +113,7 @@
- -
+
-
&Zero
@@ -123,10 +123,10 @@
-
+
- -
+
-
Visibility
@@ -170,73 +170,42 @@
- -
+
-
Parameter range
-
-
- 11
-
-
- 11
-
-
- 11
-
-
- 11
-
-
- 6
-
-
-
-
-
- 0
+
+
-
+
+
+ Ma&ximum:
-
- 0
+
+ floatLineEditMax
-
- 0
-
-
- 0
-
-
- 6
-
-
-
-
-
- Ma&ximum:
-
-
- floatLineEditMax
-
-
-
- -
-
-
- -
-
-
- Mi&nimum:
-
-
- floatLineEditMin
-
-
-
- -
-
-
-
+
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 60
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
Qt::Horizontal
@@ -244,70 +213,99 @@
QSizePolicy::Expanding
-
+
- 35
+ 20
20
- -
-
-
- 0
+
-
+
+
+ &Labels:
-
- 0
+
+ spinBoxLabel
-
- 0
+
+
+ -
+
+
+
+ 40
+ 0
+
-
- 0
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
+
+
+ -
+
+
+ Mi&nimum:
+
+
+ floatLineEditMin
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 60
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ &Decimals:
+
+
+ spinBoxDecimals
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
6
-
-
-
-
- &Labels:
-
-
- spinBoxLabel
-
-
-
- -
-
-
- -
-
-
- &Decimals:
-
-
- spinBoxDecimals
-
-
-
- -
-
-
- 6
-
-
- 2
-
-
-
-
+
+ 2
+
+
-
+
- -
+
-
QDialogButtonBox::Cancel|QDialogButtonBox::Ok
diff --git a/src/Gui/DlgSettingsColorGradientImp.cpp b/src/Gui/DlgSettingsColorGradientImp.cpp
index 98521d0a33..2226b2eefa 100644
--- a/src/Gui/DlgSettingsColorGradientImp.cpp
+++ b/src/Gui/DlgSettingsColorGradientImp.cpp
@@ -48,13 +48,17 @@ DlgSettingsColorGradientImp::DlgSettingsColorGradientImp( QWidget* parent, Qt::W
, ui(new Ui_DlgSettingsColorGradient)
{
ui->setupUi(this);
- fMaxVal = new QDoubleValidator(-1000,1000,ui->spinBoxDecimals->maximum(),this);
- ui->floatLineEditMax->setValidator(fMaxVal);
- fMinVal = new QDoubleValidator(-1000,1000,ui->spinBoxDecimals->maximum(),this);
- ui->floatLineEditMin->setValidator(fMinVal);
-
+ // remove the automatic help button in dialog title since we don't use it
+ setWindowFlag(Qt::WindowContextHelpButtonHint, false);
+ // the elementary charge is 1.6e-19, since such values might be the result of
+ // simulations, use this as boundary for a scientific validator
+ validator = new QDoubleValidator(-2e19, 2e19, ui->spinBoxDecimals->maximum(), this);
+ validator->setNotation(QDoubleValidator::ScientificNotation);
+ ui->floatLineEditMax->setValidator(validator);
+ ui->floatLineEditMin->setValidator(validator);
+ // assure that the LineEdit is as wide to contain numbers with 4 digits and 6 decimals
QFontMetrics fm(ui->floatLineEditMax->font());
- ui->floatLineEditMax->setMinimumWidth(QtTools::horizontalAdvance(fm, QString::fromLatin1("-1000.000000")));
+ ui->floatLineEditMax->setMinimumWidth(QtTools::horizontalAdvance(fm, QString::fromLatin1("-8000.000000")));
}
/**
diff --git a/src/Gui/DlgSettingsColorGradientImp.h b/src/Gui/DlgSettingsColorGradientImp.h
index a49fd18017..0b376e525b 100644
--- a/src/Gui/DlgSettingsColorGradientImp.h
+++ b/src/Gui/DlgSettingsColorGradientImp.h
@@ -79,8 +79,7 @@ public:
private:
std::unique_ptr ui;
- QDoubleValidator* fMaxVal;
- QDoubleValidator* fMinVal;
+ QDoubleValidator* validator;
};
} // namespace Dialog
diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp
index 4d12f721cb..5c3f769454 100644
--- a/src/Gui/SoFCColorGradient.cpp
+++ b/src/Gui/SoFCColorGradient.cpp
@@ -316,7 +316,7 @@ bool SoFCColorGradient::customize()
dlg.setRange(fMin, fMax);
QPoint pos(QCursor::pos());
- pos += QPoint((int)(-1.1*dlg.width()),(int)(-0.1*dlg.height()));
+ pos += QPoint((int)(-1.1 * dlg.width()), (int)(-0.1 * dlg.height()));
dlg.move( pos );
if (dlg.exec() == QDialog::Accepted) {