From 962f1401fce149b8493ffcb078f1edd30d2847cf Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Thu, 1 Jun 2017 00:09:49 +0100 Subject: [PATCH 1/7] Moves Classify related widgets next to the Color Ramp --- ...singlebandpseudocolorrendererwidgetbase.ui | 211 +++++++++--------- 1 file changed, 107 insertions(+), 104 deletions(-) diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index b46c6de0a52a..e07712d9a990 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -6,66 +6,17 @@ 0 0 - 396 - 605 + 688 + 525 Form - + 3 - - 3 - - - 3 - - - 3 - - - - - - 0 - 0 - - - - - 0 - 250 - - - - 70 - - - 10 - - - true - - - - Value - - - - - Color - - - - - Label - - - - @@ -88,15 +39,8 @@ - - - - Color ramp - - - - - + + @@ -111,17 +55,47 @@ - - - - - + + - - - - Band + + + + + 0 + 0 + + + + + 0 + 250 + + + 70 + + + 10 + + + true + + + + Value + + + + + Color + + + + + Label + + @@ -137,22 +111,18 @@ - - - - Interpolation + + + + Unit suffix - + + + + - - - - Classify - - - @@ -223,20 +193,52 @@ + + + + Band + + + + + + + Label unit +suffix + + + - + If checked, any pixels with a value out of range will not be rendered - Clip out of range values + Hide out of range values - + + + + Interpolation + + + + + + + + + + Color ramp + + + + @@ -287,26 +289,28 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Classify + + + - - - - Unit suffix - - - - - - - - - - Label unit -suffix - - - @@ -332,7 +336,6 @@ suffix mColormapTreeWidget mClassificationModeComboBox mNumberOfEntriesSpinBox - mClassifyButton mAddEntryButton mDeleteEntryButton mLoadFromBandButton From 2f4e71621d92073cffd1128da062c7da24e63637 Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Mon, 24 Jul 2017 23:16:12 +0100 Subject: [PATCH 2/7] Reorganizes Classify widgets in Dialogs --- .../qgscategorizedsymbolrendererv2widget.ui | 175 ++++---- src/ui/qgsgraduatedsymbolrendererv2widget.ui | 423 +++++++++--------- ...singlebandpseudocolorrendererwidgetbase.ui | 270 ++++++----- 3 files changed, 435 insertions(+), 433 deletions(-) diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererv2widget.ui index df4ca9a3f4be..fc9fbdae4eb5 100644 --- a/src/ui/qgscategorizedsymbolrendererv2widget.ui +++ b/src/ui/qgscategorizedsymbolrendererv2widget.ui @@ -6,47 +6,15 @@ 0 0 - 378 - 368 + 339 + 566 - - - - - 0 - 0 - - + + - Column - - - - - - - - 500 - 16777215 - - - - Qt::StrongFocus - - - - - - - - 0 - 0 - - - - Symbol + Classify @@ -63,46 +31,7 @@ - - - - - 0 - 0 - - - - Color ramp - - - - - - - - - - 0 - 0 - - - - - 120 - 0 - - - - - 16777215 - 16777215 - - - - - - - + Qt::CustomContextMenu @@ -136,15 +65,8 @@ - + - - - - Classify - - - @@ -196,6 +118,83 @@ + + + + + 0 + 0 + + + + Column + + + + + + + + 0 + 0 + + + + Color ramp + + + + + + + + 500 + 16777215 + + + + Qt::StrongFocus + + + + + + + + 0 + 0 + + + + Symbol + + + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + btnAddCategories + btnAddCategories + btnAddCategories + + viewCategories btnChangeCategorizedSymbol @@ -203,12 +202,14 @@ label_10 mExpressionWidget label_3 + btnAddCategories + btnColorRamp QgsFieldExpressionWidget QWidget -
qgsfieldexpressionwidget.h
+
qgsfieldexpressionwidget.h
1 @@ -221,8 +222,6 @@ mExpressionWidget btnChangeCategorizedSymbol - btnColorRamp - btnAddCategories btnAddCategory btnDeleteCategories btnDeleteAllCategories diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index 726a5bebd2b1..27cdc463ac96 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -6,20 +6,36 @@ 0 0 - 442 + 434 554 - - + + + + + 1 + 0 + + - Column + Change... + + + + + + + Symbol + + + btnChangeGraduatedSymbol - + 0 @@ -43,121 +59,59 @@ - - - - Symbol - - - btnChangeGraduatedSymbol - - - - - - - - 1 - 0 - - - - Change... - - - - - - - Legend Format - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - txtLegendFormat - - - - - - - 0 - + + - - - Template for the legend text associated with each classification. -Use "%1" for the lower bound of the classification, and "%2" for the upper bound. + + + Classes - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + spinGraduatedClasses - + 0 0 - - Precision of upper and lower values in label text. -Positive is number of decimal places -Negative rounds to powers of 10 - - - Precision - - 0 + 1 - 10 + 999 - 4 + 5 - - - Check to remove trailing zeroes after the decimal point from the upper and lower values in the legend. + + + Qt::Horizontal + + + + 40 + 20 + + + + + - Trim + Classify - - - - Method - - - - - - - <html><head/><body><p>Choose between color and size graduation. </p><p><br/></p><p>If you want to combine both, use a data-defined size for the symbol and graduate by color.</p></body></html> - - - - - - - Color ramp - - - btnColorRamp - - - @@ -180,17 +134,17 @@ Negative rounds to powers of 10 - - + + - Size from + Color ramp - minSizeSpinBox + btnColorRamp - + @@ -245,20 +199,75 @@ Negative rounds to powers of 10 - - - - - 14 - 0 - + + + + 0 - - Qt::StrongFocus + + + + Template for the legend text associated with each classification. +Use "%1" for the lower bound of the classification, and "%2" for the upper bound. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Precision of upper and lower values in label text. +Positive is number of decimal places +Negative rounds to powers of 10 + + + Precision + + + 0 + + + 10 + + + 4 + + + + + + + Check to remove trailing zeroes after the decimal point from the upper and lower values in the legend. + + + Trim + + + + + + + + + Legend Format + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + txtLegendFormat - + 0 @@ -302,100 +311,8 @@ Negative rounds to powers of 10 - - - - - - Mode - - - cboGraduatedMode - - - - - - - - Equal Interval - - - - - Quantile (Equal Count) - - - - - Natural Breaks (Jenks) - - - - - Standard Deviation - - - - - Pretty Breaks - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Classes - - - spinGraduatedClasses - - - - - - - - 0 - 0 - - - - 1 - - - 999 - - - 5 - - - - - - - - - Classify - - - @@ -475,6 +392,99 @@ Negative rounds to powers of 10 + + + + Column + + + + + + + <html><head/><body><p>Choose between color and size graduation. </p><p><br/></p><p>If you want to combine both, use a data-defined size for the symbol and graduate by color.</p></body></html> + + + + + + + Method + + + + + + + + + Mode + + + cboGraduatedMode + + + + + + + + 0 + 0 + + + + + Equal Interval + + + + + Quantile (Equal Count) + + + + + Natural Breaks (Jenks) + + + + + Standard Deviation + + + + + Pretty Breaks + + + + + + + + + + Size from + + + minSizeSpinBox + + + + + + + + 14 + 0 + + + + Qt::StrongFocus + + + @@ -489,18 +499,18 @@ Negative rounds to powers of 10
qgsfieldexpressionwidget.h
1 - - QgsUnitSelectionWidget - QWidget -
qgsunitselectionwidget.h
- 1 - QgsColorRampButton QToolButton
qgscolorrampbutton.h
1 + + QgsUnitSelectionWidget + QWidget +
qgsunitselectionwidget.h
+ 1 + QgsGraduatedHistogramWidget QWidget @@ -518,12 +528,9 @@ Negative rounds to powers of 10 btnColorRamp minSizeSpinBox maxSizeSpinBox - mSizeUnitWidget tabWidget viewGraduated cboGraduatedMode - spinGraduatedClasses - btnGraduatedClassify btnGraduatedAdd btnGraduatedDelete btnDeleteAllClasses diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index e07712d9a990..e8fda66e56e2 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -6,8 +6,8 @@ 0 0 - 688 - 525 + 355 + 557 @@ -17,7 +17,7 @@ 3 - + @@ -39,26 +39,106 @@ - + + + + Interpolation + + + + + + + + + Mode + + + + + + + + 0 + 0 + + + + + + + + + + + + Classes + + + + + + + + 0 + 0 + + + + 2 + + + 255 + + + 5 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Classify + + + + + + - - - - - 0 - 0 - - + + + + + - Min + Label unit +suffix - - + + + + Unit suffix + + - + @@ -98,30 +178,7 @@ - - - - - 0 - 0 - - - - Max - - - - - - - Unit suffix - - - - - - - + @@ -193,123 +250,64 @@ - - + + + + If checked, any pixels with a value out of range will not be rendered + - Band + Hide out of range values - - + + + + + 0 + 0 + + - Label unit -suffix + Max - - - - - - - If checked, any pixels with a value out of range will not be rendered - + + - Hide out of range values + Color ramp - - + + + + + 0 + 0 + + - Interpolation + Min - + - - + + + + + - Color ramp + Band - - - - - - Mode - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Classes - - - - - - - - 0 - 0 - - - - 2 - - - 255 - - - 5 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Classify - - - - + + @@ -334,8 +332,6 @@ suffix btnColorRamp mUnitLineEdit mColormapTreeWidget - mClassificationModeComboBox - mNumberOfEntriesSpinBox mAddEntryButton mDeleteEntryButton mLoadFromBandButton From 2308dc91bc776205228f02f8500135fe09743941 Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Tue, 25 Jul 2017 14:42:22 +0100 Subject: [PATCH 3/7] removes indenting in interpolation mode move classify back to original place --- .../qgscategorizedsymbolrendererv2widget.ui | 24 +- src/ui/qgsgraduatedsymbolrendererv2widget.ui | 516 +++++++++--------- ...singlebandpseudocolorrendererwidgetbase.ui | 205 ++++--- 3 files changed, 362 insertions(+), 383 deletions(-) diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererv2widget.ui index fc9fbdae4eb5..235b6bd6c051 100644 --- a/src/ui/qgscategorizedsymbolrendererv2widget.ui +++ b/src/ui/qgscategorizedsymbolrendererv2widget.ui @@ -11,13 +11,6 @@ - - - - Classify - - - @@ -67,6 +60,13 @@ + + + + Classify + + + @@ -145,7 +145,7 @@ - + 500 @@ -190,9 +190,6 @@ 16777215 - btnAddCategories - btnAddCategories - btnAddCategories @@ -202,7 +199,6 @@ label_10 mExpressionWidget label_3 - btnAddCategories btnColorRamp @@ -222,11 +218,13 @@ mExpressionWidget btnChangeCategorizedSymbol + btnColorRamp + viewCategories + btnAddCategories btnAddCategory btnDeleteCategories btnDeleteAllCategories btnAdvanced - viewCategories diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index 27cdc463ac96..7e7878bb9f1b 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -11,6 +11,19 @@ + + + + Legend Format + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + txtLegendFormat + + + @@ -24,123 +37,182 @@ - - - - Symbol + + + + 0 - - btnChangeGraduatedSymbol + + true + + + Classes + + + + 0 + + + 0 + + + + + Qt::CustomContextMenu + + + true + + + QAbstractItemView::InternalMove + + + QAbstractItemView::ExtendedSelection + + + false + + + false + + + true + + + + + + + + + Classify + + + + + + + Add class + + + + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg + + + + + + + Delete + + + + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg + + + + + + + Delete all + + + + + + + Qt::Horizontal + + + + 0 + 20 + + + + + + + + Advanced + + + + + + + + + + + Link class boundaries + + + true + + + + + + + + + + Histogram + + + + + + + - - + + - + 0 0 - 10 + 120 0 - 500 + 16777215 16777215 - - Qt::StrongFocus - - - - - - - Classes - - - spinGraduatedClasses - - - - - - - - 0 - 0 - - - - 1 - - - 999 - - - 5 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Classify - - - - - - - + + - + 0 0 - 120 + 10 0 - 16777215 + 500 16777215 - - - - - - Color ramp - - - btnColorRamp + + Qt::StrongFocus @@ -160,7 +232,7 @@ 1.000000000000000 - + false @@ -192,13 +264,67 @@ 10.000000000000000 - + false + + + + Method + + + + + + + Color ramp + + + btnColorRamp + + + + + + + <html><head/><body><p>Choose between color and size graduation. </p><p><br/></p><p>If you want to combine both, use a data-defined size for the symbol and graduate by color.</p></body></html> + + + + + + + Column + + + + + + + + 14 + 0 + + + + Qt::StrongFocus + + + + + + + Size from + + + minSizeSpinBox + + + @@ -254,177 +380,28 @@ Negative rounds to powers of 10 - - + + - Legend Format - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Symbol - txtLegendFormat + btnChangeGraduatedSymbol - - - - 0 - - - true - - - - Classes - - - - 0 - - - 0 - - - - - Qt::CustomContextMenu - - - true - - - QAbstractItemView::InternalMove - - - QAbstractItemView::ExtendedSelection - - - false - - - false - - - true - - - - - - - - - Add class - - - - :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg - - - - - - - Delete - - - - :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg - - - - - - - Delete all - - - - - - - Qt::Horizontal - - - - 0 - 20 - - - - - - - - Advanced - - - - - - - - - - - Link class boundaries - - - true - - - - - - - - - - Histogram - - - - - - - - - - - + + - Column + Mode - - - - - - <html><head/><body><p>Choose between color and size graduation. </p><p><br/></p><p>If you want to combine both, use a data-defined size for the symbol and graduate by color.</p></body></html> - - - - - - - Method + + cboGraduatedMode - - - - Mode - - - cboGraduatedMode - - - @@ -460,31 +437,37 @@ Negative rounds to powers of 10 + + + + Classes + + + spinGraduatedClasses + + + + + + + + 0 + 0 + + + + 1 + + + 999 + + + 5 + + + - - - - Size from - - - minSizeSpinBox - - - - - - - - 14 - 0 - - - - Qt::StrongFocus - - - @@ -528,9 +511,12 @@ Negative rounds to powers of 10 btnColorRamp minSizeSpinBox maxSizeSpinBox + mSizeUnitWidget + cboGraduatedMode + spinGraduatedClasses tabWidget viewGraduated - cboGraduatedMode + btnGraduatedClassify btnGraduatedAdd btnGraduatedDelete btnDeleteAllClasses diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index e8fda66e56e2..2f342ea92fc6 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -14,47 +14,20 @@ Form - + 3 - - - - - 0 - 0 - - - - - 120 - 0 - - - - - 16777215 - 16777215 - - - - - - - - Interpolation - - - - + + 3 + + + 3 + + + 3 + + - - - - Mode - - - @@ -65,10 +38,6 @@ - - - - @@ -95,50 +64,9 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Classify - - - - - - - - - - - - - Label unit -suffix - - - - - - - Unit suffix - - - - + @@ -178,8 +106,78 @@ suffix - + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + + + + + + Interpolation + + + + + + + + + + + + + Label unit +suffix + + + + + + + + + + Unit suffix + + + + + + + If checked, any pixels with a value out of range will not be rendered + + + Hide out of range values + + + + + + + + Classify + + + @@ -250,17 +248,7 @@ suffix - - - - If checked, any pixels with a value out of range will not be rendered - - - Hide out of range values - - - - + @@ -293,10 +281,10 @@ suffix - + - + @@ -306,23 +294,27 @@ suffix - - + + + + Mode + + - - QgsRasterBandComboBox - QComboBox -
raster/qgsrasterbandcombobox.h
- QgsColorRampButton QToolButton
qgscolorrampbutton.h
1 + + QgsRasterBandComboBox + QComboBox +
raster/qgsrasterbandcombobox.h
+ mBandComboBox @@ -330,8 +322,11 @@ suffix mMaxLineEdit mColorInterpolationComboBox btnColorRamp + mClassificationModeComboBox + mNumberOfEntriesSpinBox mUnitLineEdit mColormapTreeWidget + mClassifyButton mAddEntryButton mDeleteEntryButton mLoadFromBandButton From 93044ecfb8db513292946296f7f573f7e334a73b Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Tue, 25 Jul 2017 15:16:08 +0100 Subject: [PATCH 4/7] Adds Tooltips to dialogs --- src/ui/qgscategorizedsymbolrendererv2widget.ui | 14 ++++++++++---- src/ui/qgsgraduatedsymbolrendererv2widget.ui | 13 ++++++++----- src/ui/qgsrulebasedrendererv2widget.ui | 13 ++----------- ...qgssinglebandpseudocolorrendererwidgetbase.ui | 16 +++++----------- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererv2widget.ui index 235b6bd6c051..2c5b9b0e8ba0 100644 --- a/src/ui/qgscategorizedsymbolrendererv2widget.ui +++ b/src/ui/qgscategorizedsymbolrendererv2widget.ui @@ -6,7 +6,7 @@ 0 0 - 339 + 381 566 @@ -62,6 +62,9 @@ + + Add all missing categories from column or expression unique values + Classify @@ -70,7 +73,7 @@ - Add + Add categories manually @@ -81,7 +84,7 @@ - Delete + Remove selected categories @@ -91,6 +94,9 @@ + + Remove all categories + Delete all @@ -145,7 +151,7 @@ - + 500 diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index 7e7878bb9f1b..2d88c6fed25d 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -93,7 +93,7 @@ - Add class + Add class manually @@ -104,7 +104,7 @@ - Delete + Remove selected class(es) @@ -114,6 +114,9 @@ + + Remove all classes + Delete all @@ -192,7 +195,7 @@ - + 0 @@ -232,7 +235,7 @@ 1.000000000000000 - + false @@ -264,7 +267,7 @@ 10.000000000000000 - + false diff --git a/src/ui/qgsrulebasedrendererv2widget.ui b/src/ui/qgsrulebasedrendererv2widget.ui index ab73f990278d..24df888a21f1 100644 --- a/src/ui/qgsrulebasedrendererv2widget.ui +++ b/src/ui/qgsrulebasedrendererv2widget.ui @@ -11,16 +11,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -73,7 +64,7 @@ - Remove selected rules + Remove selected rule(s) diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index 2f342ea92fc6..de5ccc9417f1 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -14,16 +14,7 @@ Form - - 3 - - - 3 - - - 3 - - + 3 @@ -173,6 +164,9 @@ suffix + + Calculate all classes + Classify @@ -192,7 +186,7 @@ suffix - Remove selected row(s) + Remove selected value(s) From e3683145609385179338a719589e83dbb859c9bf Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Tue, 25 Jul 2017 15:56:25 +0100 Subject: [PATCH 5/7] Cleans move min and max widgets to horizontal layout remove unneccessary columns --- ...singlebandpseudocolorrendererwidgetbase.ui | 234 +++++++++--------- 1 file changed, 118 insertions(+), 116 deletions(-) diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index de5ccc9417f1..9c59b5f6096a 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -6,8 +6,8 @@ 0 0 - 355 - 557 + 337 + 559 @@ -17,7 +17,107 @@ 3 - + + + + Band + + + + + + + Interpolation + + + + + + + Mode + + + + + + + Label unit +suffix + + + + + + + Color ramp + + + + + + + + + + + + + 0 + 0 + + + + Min + + + + + + + + + + + 0 + 0 + + + + Max + + + + + + + + + + + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + + + @@ -57,7 +157,14 @@ - + + + + Unit suffix + + + + @@ -97,70 +204,7 @@ - - - - - 0 - 0 - - - - - 120 - 0 - - - - - 16777215 - 16777215 - - - - - - - - Interpolation - - - - - - - - - - - - - Label unit -suffix - - - - - - - - - - Unit suffix - - - - - - - If checked, any pixels with a value out of range will not be rendered - - - Hide out of range values - - - - + @@ -242,59 +286,19 @@ suffix - - - - - 0 - 0 - - - - Max - - - - - - - Color ramp - - - - - - - - 0 - 0 - + + + + If checked, any pixels with a value out of range will not be rendered - Min + Hide out of range values - - - - + - - - - Band - - - - - - - Mode - - - @@ -312,8 +316,6 @@ suffix mBandComboBox - mMinLineEdit - mMaxLineEdit mColorInterpolationComboBox btnColorRamp mClassificationModeComboBox From 1fc3ca05d15a093dcf35672928616f9284034075 Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Tue, 5 Jun 2018 11:11:20 +0100 Subject: [PATCH 6/7] Add spacer to palleted renderer widget --- src/ui/qgspalettedrendererwidgetbase.ui | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ui/qgspalettedrendererwidgetbase.ui b/src/ui/qgspalettedrendererwidgetbase.ui index 85d761c3e79e..98ea8b5baf59 100644 --- a/src/ui/qgspalettedrendererwidgetbase.ui +++ b/src/ui/qgspalettedrendererwidgetbase.ui @@ -6,7 +6,7 @@ 0 0 - 277 + 373 459 @@ -79,13 +79,26 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + Advanced options - … + Advanced QToolButton::InstantPopup From 90ed1e3934d2f0b11944caf3c3f0aea608a511a9 Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Thu, 28 Jun 2018 16:48:02 +0100 Subject: [PATCH 7/7] moves classify button to the top of the values table --- .../qgscategorizedsymbolrendererv2widget.ui | 27 ++-- src/ui/qgsgraduatedsymbolrendererv2widget.ui | 46 ++----- src/ui/qgspalettedrendererwidgetbase.ui | 65 +++++----- ...singlebandpseudocolorrendererwidgetbase.ui | 122 ++++++++++-------- 4 files changed, 126 insertions(+), 134 deletions(-) diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererv2widget.ui index 2c5b9b0e8ba0..37fd440df14e 100644 --- a/src/ui/qgscategorizedsymbolrendererv2widget.ui +++ b/src/ui/qgscategorizedsymbolrendererv2widget.ui @@ -60,16 +60,6 @@ - - - - Add all missing categories from column or expression unique values - - - Classify - - - @@ -117,6 +107,9 @@ + + Advanced options + Advanced @@ -151,7 +144,7 @@ - + 500 @@ -198,6 +191,16 @@ + + + + Add all missing categories from column or expression unique values + + + Classify + + + viewCategories btnChangeCategorizedSymbol @@ -206,6 +209,7 @@ mExpressionWidget label_3 btnColorRamp + btnAddCategories @@ -226,7 +230,6 @@ btnChangeCategorizedSymbol btnColorRamp viewCategories - btnAddCategories btnAddCategory btnDeleteCategories btnDeleteAllCategories diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index 2d88c6fed25d..f4cd3677f652 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -6,11 +6,18 @@ 0 0 - 434 + 442 554 + + + + Classify + + + @@ -83,13 +90,6 @@ - - - - Classify - - - @@ -137,6 +137,9 @@ + + Advanced options + Advanced @@ -195,7 +198,7 @@ - + 0 @@ -235,7 +238,7 @@ 1.000000000000000 - + false @@ -267,7 +270,7 @@ 10.000000000000000 - + false @@ -305,19 +308,6 @@ - - - - - 14 - 0 - - - - Qt::StrongFocus - - - @@ -491,12 +481,6 @@ Negative rounds to powers of 10
qgscolorrampbutton.h
1 - - QgsUnitSelectionWidget - QWidget -
qgsunitselectionwidget.h
- 1 - QgsGraduatedHistogramWidget QWidget @@ -514,12 +498,10 @@ Negative rounds to powers of 10 btnColorRamp minSizeSpinBox maxSizeSpinBox - mSizeUnitWidget cboGraduatedMode spinGraduatedClasses tabWidget viewGraduated - btnGraduatedClassify btnGraduatedAdd btnGraduatedDelete btnDeleteAllClasses diff --git a/src/ui/qgspalettedrendererwidgetbase.ui b/src/ui/qgspalettedrendererwidgetbase.ui index 98ea8b5baf59..e4ec4121dca9 100644 --- a/src/ui/qgspalettedrendererwidgetbase.ui +++ b/src/ui/qgspalettedrendererwidgetbase.ui @@ -27,17 +27,7 @@ 3 - - - - - Adds all missing unique values from the raster - - - Classify - - - + @@ -143,22 +133,6 @@ 0 - - - - - 0 - 0 - - - - Band - - - - - - @@ -194,28 +168,53 @@ + + + + + 0 + 0 + + + + Band + + + + + + + + + + Adds all missing unique values from the raster + + + Classify + + + - - QgsRasterBandComboBox - QComboBox -
raster/qgsrasterbandcombobox.h
- QgsColorRampButton QToolButton
qgscolorrampbutton.h
1 + + QgsRasterBandComboBox + QComboBox +
raster/qgsrasterbandcombobox.h
+ mBandComboBox btnColorRamp mTreeView - mClassifyButton mAddEntryButton mDeleteEntryButton mButtonDeleteAll diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index 9c59b5f6096a..f40255189542 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -14,9 +14,58 @@ Form - + 3 + + 3 + + + 3 + + + 3 + + + + + + 0 + 0 + + + + + 0 + 250 + + + + 70 + + + 10 + + + true + + + + Value + + + + + Color + + + + + Label + + + + @@ -56,6 +105,9 @@ suffix + + + @@ -92,9 +144,6 @@ suffix - - - @@ -164,58 +213,8 @@ suffix - - - - - 0 - 0 - - - - - 0 - 250 - - - - 70 - - - 10 - - - true - - - - Value - - - - - Color - - - - - Label - - - - - + - - - - Calculate all classes - - - Classify - - - @@ -286,7 +285,7 @@ suffix - + If checked, any pixels with a value out of range will not be rendered @@ -299,6 +298,16 @@ suffix + + + + Calculate all classes + + + Classify + + + @@ -322,7 +331,6 @@ suffix mNumberOfEntriesSpinBox mUnitLineEdit mColormapTreeWidget - mClassifyButton mAddEntryButton mDeleteEntryButton mLoadFromBandButton