diff --git a/src/Gui/DlgSettingsColorGradient.ui b/src/Gui/DlgSettingsColorGradient.ui
index 3a2ba1fc6b..b4e3cf8478 100644
--- a/src/Gui/DlgSettingsColorGradient.ui
+++ b/src/Gui/DlgSettingsColorGradient.ui
@@ -6,8 +6,8 @@
0
0
- 361
- 342
+ 260
+ 313
@@ -25,72 +25,56 @@
Color model
-
-
- 6
-
-
- 11
-
+
-
-
-
- 6
+
+
+ &Gradient:
-
- 0
+
+ comboBoxModel
+
+
+ -
+
-
-
-
- &Gradient:
-
-
- comboBoxModel
-
-
+
+ red-yellow-green-cyan-blue
+
-
-
-
-
-
- red-yellow-green-cyan-blue
-
-
- -
-
- blue-cyan-green-yellow-red
-
-
- -
-
- white-black
-
-
- -
-
- black-white
-
-
-
+
+ blue-cyan-green-yellow-red
+
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- 100
- 20
-
-
-
+
+ white-black
+
-
+ -
+
+ black-white
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 3
+ 20
+
+
+
@@ -101,7 +85,16 @@
Style
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
9
@@ -142,7 +135,16 @@
0
-
+
+ 11
+
+
+ 11
+
+
+ 11
+
+
11
-
@@ -174,7 +176,16 @@
Parameter range
-
+
+ 11
+
+
+ 11
+
+
+ 11
+
+
11
@@ -198,7 +209,16 @@
-
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
@@ -234,7 +254,16 @@
-
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp
index d9717980f9..4d12f721cb 100644
--- a/src/Gui/SoFCColorGradient.cpp
+++ b/src/Gui/SoFCColorGradient.cpp
@@ -186,21 +186,21 @@ std::vector SoFCColorGradient::getMarkerValues(float fMin, float fMax, in
count++;
int half = count / 2;
for (int j = 0; j < half + 1; j++) {
- float w = (float)j/((float)half);
- float fValue = (1.0f-w)*fMax;
- labels.push_back( fValue );
+ float w = (float)j / ((float)half);
+ float fValue = (1.0f - w) * fMax;
+ labels.push_back(fValue);
}
for (int k = half + 1; k < count; k++) {
- float w = (float)(k-half+1)/((float)(count-half));
- float fValue = w*fMin;
- labels.push_back( fValue );
+ float w = (float)(k - half + 1) / ((float)(count - half));
+ float fValue = w * fMin;
+ labels.push_back(fValue);
}
}
else { // either not zero based or 0 is not in between [fMin,fMax]
for (int j = 0; j < count; j++) {
- float w = (float)j/((float)count-1.0f);
- float fValue = (1.0f-w)*fMax+w*fMin;
- labels.push_back( fValue );
+ float w = (float)j / ((float)count - 1.0f);
+ float fValue = (1.0f - w) * fMax + w * fMin;
+ labels.push_back(fValue);
}
}