[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot/gsoc2015-datapicker] src/kdefrontend: 1. Added tooltips to image edit widgets.
From: Alexander Semke <alexander.semke () web ! de>
Date: 2016-01-31 22:00:55
Message-ID: E1aQ03D-0006XA-7F () scm ! kde ! org
[Download RAW message or body]
Git commit b1b406448503db766c13f9510a9b13f33652830d by Alexander Semke.
Committed on 31/01/2016 at 22:00.
Pushed by asemke into branch 'gsoc2015-datapicker'.
1. Added tooltips to image edit widgets.
2. Some more polishment in ImageWidget.
M +251 -252 src/kdefrontend/ui/imagewidget.ui
M +40 -36 src/kdefrontend/widgets/ImageWidget.cpp
http://commits.kde.org/labplot/b1b406448503db766c13f9510a9b13f33652830d
diff --git a/src/kdefrontend/ui/imagewidget.ui b/src/kdefrontend/ui/imagewidget.ui
index 1201ee8..e88dd55 100644
--- a/src/kdefrontend/ui/imagewidget.ui
+++ b/src/kdefrontend/ui/imagewidget.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1051</width>
+ <width>1181</width>
<height>1181</height>
</rect>
</property>
@@ -34,23 +34,7 @@
</property>
</widget>
</item>
- <item row="0" column="3">
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>13</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="4">
+ <item row="0" column="5">
<widget class="KLineEdit" name="leName">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -60,14 +44,14 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="1" column="0" colspan="3">
<widget class="QLabel" name="lComment">
<property name="text">
<string>Comment</string>
</property>
</widget>
</item>
- <item row="1" column="4">
+ <item row="1" column="5">
<widget class="KLineEdit" name="leComment">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -77,7 +61,7 @@
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="2" column="1">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -93,7 +77,7 @@
</property>
</spacer>
</item>
- <item row="3" column="0">
+ <item row="3" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="font">
<font>
@@ -113,7 +97,7 @@
</property>
</widget>
</item>
- <item row="4" column="4">
+ <item row="4" column="5">
<widget class="KLineEdit" name="kleFileName">
<property name="toolTip">
<string>Specify the name of the image file.</string>
@@ -123,7 +107,7 @@
</property>
</widget>
</item>
- <item row="4" column="5">
+ <item row="4" column="6">
<widget class="QPushButton" name="bOpen">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -139,21 +123,47 @@
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="5" column="0" colspan="2">
<widget class="QLabel" name="lPlotType">
<property name="text">
<string>Type</string>
</property>
</widget>
</item>
- <item row="5" column="4">
+ <item row="5" column="5">
<widget class="KComboBox" name="cbGraphType">
<property name="toolTip">
<string/>
</property>
</widget>
</item>
- <item row="6" column="0">
+ <item row="6" column="0" colspan="3">
+ <widget class="QLabel" name="lRotation">
+ <property name="text">
+ <string>Rotation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="5">
+ <widget class="QDoubleSpinBox" name="sbRotation">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix">
+ <string> °</string>
+ </property>
+ <property name="minimum">
+ <double>-360.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>360.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -169,7 +179,7 @@
</property>
</spacer>
</item>
- <item row="7" column="0" colspan="3">
+ <item row="8" column="0" colspan="3">
<widget class="QLabel" name="lRefPoint">
<property name="font">
<font>
@@ -182,14 +192,14 @@
</property>
</widget>
</item>
- <item row="8" column="0" colspan="2">
+ <item row="9" column="0">
<widget class="QLabel" name="lRefPoint1">
<property name="text">
<string>1.</string>
</property>
</widget>
</item>
- <item row="8" column="4" rowspan="3">
+ <item row="9" column="5" rowspan="3">
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="4">
<widget class="QDoubleSpinBox" name="sbPoisitionY3">
@@ -469,47 +479,103 @@
</item>
</layout>
</item>
- <item row="9" column="0" colspan="2">
+ <item row="10" column="0">
<widget class="QLabel" name="lRefPoint2">
<property name="text">
<string>2.</string>
</property>
</widget>
</item>
- <item row="10" column="0" colspan="2">
+ <item row="11" column="0">
<widget class="QLabel" name="lRefPoint3">
<property name="text">
<string>3.</string>
</property>
</widget>
</item>
- <item row="11" column="1">
- <spacer name="verticalSpacer_9">
+ <item row="13" column="0" colspan="2">
+ <widget class="QLabel" name="lTernaryScale">
+ <property name="text">
+ <string>x+y+z=</string>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="5">
+ <widget class="QDoubleSpinBox" name="sbTernaryScale"/>
+ </item>
+ <item row="15" column="0" colspan="3">
+ <widget class="QLabel" name="lSegments">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Segments:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="0" colspan="2">
+ <widget class="QLabel" name="lMinSegmentLength">
+ <property name="text">
+ <string>Length</string>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="5">
+ <widget class="QSpinBox" name="sbMinSegmentLength">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix">
+ <string>px</string>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="0" colspan="4">
+ <widget class="QLabel" name="lPointSeparation">
+ <property name="text">
+ <string>Point separation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="4">
+ <spacer name="horizontalSpacer_4">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>18</height>
+ <width>13</width>
+ <height>23</height>
</size>
</property>
</spacer>
</item>
- <item row="12" column="0" colspan="3">
- <widget class="QLabel" name="lTernaryScale">
- <property name="text">
- <string>x+y+z=</string>
+ <item row="17" column="5">
+ <widget class="QSpinBox" name="sbPointSeparation">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix">
+ <string>px</string>
+ </property>
+ <property name="prefix">
+ <string/>
</property>
</widget>
</item>
- <item row="12" column="4">
- <widget class="QDoubleSpinBox" name="sbTernaryScale"/>
- </item>
- <item row="13" column="2">
+ <item row="18" column="3">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -522,6 +588,38 @@
</property>
</spacer>
</item>
+ <item row="12" column="0">
+ <spacer name="verticalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="14" column="0">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tSymbol">
@@ -529,7 +627,7 @@
<string>Ref. Points Symbol</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0" colspan="2">
+ <item row="0" column="0">
<widget class="QLabel" name="lSymbolGeneral">
<property name="font">
<font>
@@ -542,13 +640,29 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="1" column="0">
<widget class="QLabel" name="lSymbolStyle">
<property name="text">
<string>Style</string>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>13</width>
+ <height>23</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item row="1" column="2">
<widget class="KComboBox" name="cbSymbolStyle">
<property name="sizePolicy">
@@ -559,7 +673,7 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="2" column="0">
<widget class="QLabel" name="lSymbolSize">
<property name="text">
<string>Size</string>
@@ -579,7 +693,7 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
+ <item row="3" column="0">
<widget class="QLabel" name="lSymbolRotation">
<property name="text">
<string>Rotation</string>
@@ -614,7 +728,7 @@
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="4" column="0">
<widget class="QLabel" name="lSymbolOpacity">
<property name="text">
<string>Opacity</string>
@@ -649,7 +763,23 @@
</property>
</widget>
</item>
- <item row="6" column="0" colspan="2">
+ <item row="5" column="0">
+ <spacer name="verticalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="6" column="0">
<widget class="QLabel" name="lSymbolFilling">
<property name="font">
<font>
@@ -662,7 +792,7 @@
</property>
</widget>
</item>
- <item row="7" column="0" colspan="2">
+ <item row="7" column="0">
<widget class="QLabel" name="lSymbolFillingStyle">
<property name="text">
<string>Style</string>
@@ -672,7 +802,7 @@
<item row="7" column="2">
<widget class="KComboBox" name="cbSymbolFillingStyle"/>
</item>
- <item row="8" column="0" colspan="2">
+ <item row="8" column="0">
<widget class="QLabel" name="lSymbolFillingColor">
<property name="text">
<string>Color</string>
@@ -689,7 +819,23 @@
</property>
</widget>
</item>
- <item row="10" column="0" colspan="2">
+ <item row="9" column="0">
+ <spacer name="verticalSpacer_11">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="10" column="0">
<widget class="QLabel" name="lSymbolBorder">
<property name="font">
<font>
@@ -702,7 +848,7 @@
</property>
</widget>
</item>
- <item row="11" column="0" colspan="2">
+ <item row="11" column="0">
<widget class="QLabel" name="lSymbolBorderStyle">
<property name="text">
<string>Style</string>
@@ -712,7 +858,7 @@
<item row="11" column="2">
<widget class="KComboBox" name="cbSymbolBorderStyle"/>
</item>
- <item row="12" column="0" colspan="2">
+ <item row="12" column="0">
<widget class="QLabel" name="lSymbolBorderColor">
<property name="text">
<string>Color</string>
@@ -729,7 +875,7 @@
</property>
</widget>
</item>
- <item row="13" column="0" colspan="2">
+ <item row="13" column="0">
<widget class="QLabel" name="lSymbolBorderWidth">
<property name="text">
<string>Width</string>
@@ -759,45 +905,13 @@
</property>
</spacer>
</item>
- <item row="15" column="0" colspan="2">
+ <item row="15" column="0">
<widget class="QCheckBox" name="chbSymbolVisible">
<property name="text">
<string>visible</string>
</property>
</widget>
</item>
- <item row="5" column="0">
- <spacer name="verticalSpacer_10">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="9" column="0">
- <spacer name="verticalSpacer_11">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tEdit">
@@ -805,14 +919,32 @@
<string>Edit Image</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="lPlotImageType">
+ <item row="11" column="2">
+ <widget class="QWidget" name="wForegroud" native="true"/>
+ </item>
+ <item row="2" column="2">
+ <widget class="QWidget" name="whHue" native="true"/>
+ </item>
+ <item row="5" column="2">
+ <widget class="QWidget" name="wSaturation" native="true"/>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="lIntensity">
<property name="text">
- <string>Current Image</string>
+ <string>Intensity</string>
</property>
</widget>
</item>
- <item row="0" column="3">
+ <item row="6" column="2">
+ <widget class="QWidget" name="whValue" native="true"/>
+ </item>
+ <item row="10" column="2">
+ <widget class="QWidget" name="whForeground" native="true"/>
+ </item>
+ <item row="8" column="2">
+ <widget class="QWidget" name="whIntensity" native="true"/>
+ </item>
+ <item row="0" column="2">
<widget class="KComboBox" name="cbPlotImageType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -825,6 +957,9 @@
</property>
</widget>
</item>
+ <item row="9" column="2">
+ <widget class="QWidget" name="wIntensity" native="true"/>
+ </item>
<item row="1" column="0">
<spacer name="verticalSpacer_6">
<property name="orientation">
@@ -841,35 +976,6 @@
</property>
</spacer>
</item>
- <item row="2" column="3">
- <widget class="QWidget" name="whHue" native="true"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="lHue">
- <property name="text">
- <string>Hue</string>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QWidget" name="wHue" native="true"/>
- </item>
- <item row="4" column="3">
- <widget class="QWidget" name="whSaturation" native="true"/>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="lSaturation">
- <property name="text">
- <string>Saturation</string>
- </property>
- </widget>
- </item>
- <item row="5" column="3">
- <widget class="QWidget" name="wSaturation" native="true"/>
- </item>
- <item row="6" column="3">
- <widget class="QWidget" name="whValue" native="true"/>
- </item>
<item row="7" column="0">
<widget class="QLabel" name="lValue">
<property name="text">
@@ -877,135 +983,58 @@
</property>
</widget>
</item>
- <item row="7" column="3">
- <widget class="QWidget" name="wValue" native="true"/>
- </item>
- <item row="8" column="3">
- <widget class="QWidget" name="whIntensity" native="true"/>
- </item>
- <item row="9" column="0">
- <widget class="QLabel" name="lIntensity">
- <property name="text">
- <string>Intensity</string>
- </property>
- </widget>
- </item>
- <item row="9" column="3">
- <widget class="QWidget" name="wIntensity" native="true"/>
- </item>
- <item row="10" column="3">
- <widget class="QWidget" name="whForeground" native="true"/>
- </item>
- <item row="11" column="0">
- <widget class="QLabel" name="lForeground">
+ <item row="3" column="0">
+ <widget class="QLabel" name="lHue">
<property name="text">
- <string>Foreground</string>
+ <string>Hue</string>
</property>
</widget>
</item>
- <item row="11" column="3">
- <widget class="QWidget" name="wForegroud" native="true"/>
- </item>
<item row="12" column="0">
- <spacer name="verticalSpacer_5">
+ <spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>18</height>
+ <height>40</height>
</size>
</property>
</spacer>
</item>
- <item row="13" column="0">
- <widget class="QLabel" name="lRotation">
+ <item row="0" column="0">
+ <widget class="QLabel" name="lPlotImageType">
<property name="text">
- <string>Rotation</string>
+ <string>Current Image</string>
</property>
</widget>
</item>
- <item row="13" column="3" rowspan="2">
- <widget class="QDoubleSpinBox" name="sbRotation">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix">
- <string> °</string>
- </property>
- <property name="minimum">
- <double>-360.000000000000000</double>
- </property>
- <property name="maximum">
- <double>360.000000000000000</double>
- </property>
- </widget>
+ <item row="4" column="2">
+ <widget class="QWidget" name="whSaturation" native="true"/>
</item>
- <item row="14" column="0">
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
+ <item row="3" column="2">
+ <widget class="QWidget" name="wHue" native="true"/>
</item>
- <item row="15" column="0">
- <widget class="QLabel" name="lSegments">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
+ <item row="5" column="0">
+ <widget class="QLabel" name="lSaturation">
<property name="text">
- <string>Segments:</string>
+ <string>Saturation</string>
</property>
</widget>
</item>
- <item row="16" column="0">
- <widget class="QLabel" name="lMinSegmentLength">
+ <item row="11" column="0">
+ <widget class="QLabel" name="lForeground">
<property name="text">
- <string>Min. length</string>
- </property>
- </widget>
- </item>
- <item row="16" column="3">
- <widget class="QSpinBox" name="sbMinSegmentLength">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix">
- <string>px</string>
+ <string>Foreground</string>
</property>
</widget>
</item>
- <item row="17" column="0" colspan="2">
- <widget class="QLabel" name="lPointSeparation">
- <property name="text">
- <string>Min. point separation</string>
- </property>
- </widget>
+ <item row="7" column="2">
+ <widget class="QWidget" name="wValue" native="true"/>
</item>
- <item row="17" column="2">
- <spacer name="horizontalSpacer_4">
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -1020,35 +1049,6 @@
</property>
</spacer>
</item>
- <item row="17" column="3">
- <widget class="QSpinBox" name="sbPointSeparation">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix">
- <string>px</string>
- </property>
- <property name="prefix">
- <string/>
- </property>
- </widget>
- </item>
- <item row="18" column="1">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</widget>
@@ -1088,7 +1088,6 @@
<tabstop>lHue</tabstop>
<tabstop>lSaturation</tabstop>
<tabstop>lValue</tabstop>
- <tabstop>sbRotation</tabstop>
</tabstops>
<resources/>
<connections/>
diff --git a/src/kdefrontend/widgets/ImageWidget.cpp \
b/src/kdefrontend/widgets/ImageWidget.cpp index a33c8a6..658651c 100644
--- a/src/kdefrontend/widgets/ImageWidget.cpp
+++ b/src/kdefrontend/widgets/ImageWidget.cpp
@@ -131,25 +131,30 @@ ImageWidget::ImageWidget(QWidget *parent): QWidget(parent) {
editTabLayout->setHorizontalSpacing(2);
editTabLayout->setVerticalSpacing(4);
- ssIntensity = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
- ssIntensity->setRange(0, 100);
- editTabLayout->addWidget(ssIntensity, 3, 3);
-
- ssForeground = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
- ssForeground->setRange(0, 100);
- editTabLayout->addWidget(ssForeground, 5, 3);
-
ssHue = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
+ ssHue->setToolTip(i18n("Select the range for the hue.\nEverything outside of this \
range will be set to white.")); ssHue->setRange(0, 360);
- editTabLayout->addWidget(ssHue, 7, 3);
+ editTabLayout->addWidget(ssHue, 3, 2);
ssSaturation = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
+ ssSaturation->setToolTip(i18n("Select the range for the saturation.\nEverything \
outside of this range will be set to white.")); ssSaturation->setRange(0,100);
- editTabLayout->addWidget(ssSaturation, 9, 3);
+ editTabLayout->addWidget(ssSaturation, 5, 2);
ssValue = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
+ ssValue->setToolTip(i18n("Select the range for the value, the degree of lightness \
of the color.\nEverything outside of this range will be set to white.")); \
ssValue->setRange(0,100);
- editTabLayout->addWidget(ssValue, 11, 3);
+ editTabLayout->addWidget(ssValue, 7, 2);
+
+ ssIntensity = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
+ ssIntensity->setToolTip(i18n("Select the range for the intensity.\nEverything \
outside of this range will be set to white.")); + ssIntensity->setRange(0, 100);
+ editTabLayout->addWidget(ssIntensity, 9, 2);
+
+ ssForeground = new QxtSpanSlider(Qt::Horizontal, ui.tEdit);
+ ssForeground->setToolTip(i18n("Select the range for the colors that are not part of \
the background color.\nEverything outside of this range will be set to white.")); \
+ ssForeground->setRange(0, 100); + editTabLayout->addWidget(ssForeground, 11, 2);
ui.cbGraphType->addItem(i18n("Cartesian (x, y)"));
ui.cbGraphType->addItem(i18n("Polar (x, y °)"));
@@ -176,23 +181,28 @@ ImageWidget::ImageWidget(QWidget *parent): QWidget(parent) {
QString saturationFile = KStandardDirs::locate("data", \
"labplot2/pics/colorchooser/colorchooser_saturation.xpm");
gvHue = new HistogramView(ui.tEdit, \
ImageEditor::colorAttributeMax(DatapickerImage::Hue));
- editTabLayout->addWidget(gvHue, 2, 3);
+ gvHue->setToolTip(i18n("Select the range for the hue.\nEverything outside of this \
range will be set to white.")); + editTabLayout->addWidget(gvHue, 2, 2);
gvHue->setScalePixmap(hueFile);
gvSaturation = new HistogramView(ui.tEdit, \
ImageEditor::colorAttributeMax(DatapickerImage::Saturation));
- editTabLayout->addWidget(gvSaturation, 4, 3);
+ gvSaturation->setToolTip(i18n("Select the range for the saturation.\nEverything \
outside of this range will be set to white.")); \
+ editTabLayout->addWidget(gvSaturation, 4, 2); \
gvSaturation->setScalePixmap(saturationFile);
gvValue = new HistogramView(ui.tEdit, \
ImageEditor::colorAttributeMax(DatapickerImage::Value));
- editTabLayout->addWidget(gvValue, 6,3);
+ gvValue->setToolTip(i18n("Select the range for the value, the degree of lightness \
of the color.\nEverything outside of this range will be set to white.")); \
+ editTabLayout->addWidget(gvValue, 6,2); gvValue->setScalePixmap(valueFile);
gvIntensity = new HistogramView(ui.tEdit, \
ImageEditor::colorAttributeMax(DatapickerImage::Intensity));
- editTabLayout->addWidget(gvIntensity, 8, 3);
+ gvIntensity->setToolTip(i18n("Select the range for the intensity.\nEverything \
outside of this range will be set to white.")); \
+ editTabLayout->addWidget(gvIntensity, 8, 2); \
gvIntensity->setScalePixmap(valueFile);
gvForeground = new HistogramView(ui.tEdit, \
ImageEditor::colorAttributeMax(DatapickerImage::Foreground));
- editTabLayout->addWidget(gvForeground, 10, 3);
+ gvForeground->setToolTip(i18n("Select the range for the colors that are not part of \
the background color.\nEverything outside of this range will be set to white.")); \
+ editTabLayout->addWidget(gvForeground, 10, 2); \
gvForeground->setScalePixmap(valueFile);
connect( ssIntensity, SIGNAL(spanSliderMoved(int,int)), gvIntensity, \
SLOT(setSpan(int,int)) ); @@ -322,36 +332,30 @@ void ImageWidget::initConnections() {
connect( m_image, SIGNAL(pointBrushChanged(QBrush)), this, \
SLOT(symbolBrushChanged(QBrush)) ); connect( m_image, SIGNAL(pointPenChanged(QPen)), \
this, SLOT(symbolPenChanged(QPen)) ); connect( m_image, \
SIGNAL(pointVisibilityChanged(bool)), this, \
SLOT(symbolVisibleChanged(bool)) );
-
}
void ImageWidget::handleWidgetActions() {
QString fileName = ui.kleFileName->text().trimmed();
- if (!fileName.isEmpty()) {
- ui.tEdit->setEnabled(true);
- ui.cbGraphType->setEnabled(true);
- ui.sbPoisitionX1->setEnabled(true);
- ui.sbPoisitionX2->setEnabled(true);
- ui.sbPoisitionX3->setEnabled(true);
- ui.sbPoisitionY1->setEnabled(true);
- ui.sbPoisitionY2->setEnabled(true);
- ui.sbPoisitionY3->setEnabled(true);
-
+ bool b = !fileName.isEmpty();
+ ui.tEdit->setEnabled(b);
+ ui.cbGraphType->setEnabled(b);
+ ui.sbRotation->setEnabled(b);
+ ui.sbPoisitionX1->setEnabled(b);
+ ui.sbPoisitionX2->setEnabled(b);
+ ui.sbPoisitionX3->setEnabled(b);
+ ui.sbPoisitionY1->setEnabled(b);
+ ui.sbPoisitionY2->setEnabled(b);
+ ui.sbPoisitionY3->setEnabled(b);
+ ui.sbMinSegmentLength->setEnabled(b);
+ ui.sbPointSeparation->setEnabled(b);
+
+ if (b) {
//upload histogram to view
gvIntensity->bins = m_image->intensityBins;
gvForeground->bins = m_image->foregroundBins;
gvHue->bins = m_image->hueBins;
gvSaturation->bins = m_image->saturationBins;
gvValue->bins = m_image->valueBins;
- } else {
- ui.tEdit->setEnabled(false);
- ui.cbGraphType->setEnabled(false);
- ui.sbPoisitionX1->setEnabled(false);
- ui.sbPoisitionX2->setEnabled(false);
- ui.sbPoisitionX3->setEnabled(false);
- ui.sbPoisitionY1->setEnabled(false);
- ui.sbPoisitionY2->setEnabled(false);
- ui.sbPoisitionY3->setEnabled(false);
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic