kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[skip CI] [Gui] some UI improvements for the color gradient dialog

Browse Source 
- mostly by Qt Designer
- also some code style fixes by MSVC
This commit is contained in:
Uwe
2022-03-28 10:38:19 +02:00
parent 51c7a8c2d3
commit b3d74905ca
2 changed files with 102 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/Gui/DlgSettingsColorGradient.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>361</width>
<height>342</height>
<width>260</width>
<height>313</height>
</rect>
</property>
<property name="windowTitle">
@@ -25,72 +25,56 @@
<property name="title">
<string>Color model</string>
</property>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>11</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
<widget class="QLabel" name="textLabel5">
<property name="text">
<string>&amp;Gradient:</string>
</property>
<property name="margin">
<number>0</number>
<property name="buddy">
<cstring>comboBoxModel</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBoxModel">
<item>
<widget class="QLabel" name="textLabel5">
<property name="text">
<string>&amp;Gradient:</string>
</property>
<property name="buddy">
<cstring>comboBoxModel</cstring>
</property>
</widget>
<property name="text">
<string>red-yellow-green-cyan-blue</string>
</property>
</item>
<item>
<widget class="QComboBox" name="comboBoxModel">
<item>
<property name="text">
<string>red-yellow-green-cyan-blue</string>
</property>
</item>
<item>
<property name="text">
<string>blue-cyan-green-yellow-red</string>
</property>
</item>
<item>
<property name="text">
<string>white-black</string>
</property>
</item>
<item>
<property name="text">
<string>black-white</string>
</property>
</item>
</widget>
<property name="text">
<string>blue-cyan-green-yellow-red</string>
</property>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>20</height>
</size>
</property>
</spacer>
<property name="text">
<string>white-black</string>
</property>
</item>
</layout>
<item>
<property name="text">
<string>black-white</string>
</property>
</item>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>3</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
@@ -101,7 +85,16 @@
<string>Style</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
@@ -142,7 +135,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<item>
@@ -174,7 +176,16 @@
<string>Parameter range</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
@@ -198,7 +209,16 @@
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -234,7 +254,16 @@
</item>
<item row="0" column="2">
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">

18
src/Gui/SoFCColorGradient.cpp
View File

@@ -186,21 +186,21 @@ std::vector<float> 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);
}
}