Skip to content

Commit 465219a

Browse files
ccrookccrook
committedSep 30, 2014
Using QString.replace instead of .arg to ensure that %1 and %2 are unambiguously replaced with lower and upper value. Also moving legend template to more sensible location, and adding tooltip for legend template
·
ltr-3_40archive/master_2
1 parent 834c1d0 commit 465219a

File tree

2 files changed

+57
-58
lines changed

2 files changed

+57
-58
lines changed
 

‎src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper
223223
if ( upperStr.contains( '.' ) ) upperStr = upperStr.replace( mReTrailingZeroes, "" );
224224
}
225225

226-
return mFormat.arg( lowerStr, upperStr );
226+
QString legend(mFormat);
227+
228+
return legend.replace( "%1",lowerStr).replace("%2",upperStr );
227229
}
228230

229231
void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )

‎src/ui/qgsgraduatedsymbolrendererv2widget.ui

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,48 @@
1919
<property name="rightMargin">
2020
<number>6</number>
2121
</property>
22-
<item row="6" column="2">
22+
<item row="6" column="3">
23+
<layout class="QHBoxLayout" name="horizontalLayout_7">
24+
<item>
25+
<widget class="QSpinBox" name="spinDecimalPlaces">
26+
<property name="sizePolicy">
27+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
28+
<horstretch>0</horstretch>
29+
<verstretch>0</verstretch>
30+
</sizepolicy>
31+
</property>
32+
<property name="minimum">
33+
<number>0</number>
34+
</property>
35+
<property name="maximum">
36+
<number>10</number>
37+
</property>
38+
<property name="value">
39+
<number>4</number>
40+
</property>
41+
</widget>
42+
</item>
43+
<item>
44+
<widget class="QCheckBox" name="cbxTrimTrailingZeroes">
45+
<property name="text">
46+
<string>Trim</string>
47+
</property>
48+
</widget>
49+
</item>
50+
</layout>
51+
</item>
52+
<item row="6" column="1">
53+
<widget class="QLineEdit" name="txtFormat">
54+
<property name="toolTip">
55+
<string>Template for the legend text associated with each classification.
56+
Use &quot;%1&quot; for the lower bound of the classification, and &quot;%2&quot; for the upper bound.</string>
57+
</property>
58+
<property name="alignment">
59+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
60+
</property>
61+
</widget>
62+
</item>
63+
<item row="5" column="2">
2364
<widget class="QLabel" name="label_8">
2465
<property name="text">
2566
<string>Mode</string>
@@ -32,7 +73,7 @@
3273
</property>
3374
</widget>
3475
</item>
35-
<item row="6" column="0">
76+
<item row="5" column="0">
3677
<widget class="QLabel" name="label_7">
3778
<property name="text">
3879
<string>Color ramp</string>
@@ -42,7 +83,7 @@
4283
</property>
4384
</widget>
4485
</item>
45-
<item row="6" column="3">
86+
<item row="5" column="3">
4687
<widget class="QComboBox" name="cboGraduatedMode">
4788
<item>
4889
<property name="text">
@@ -71,7 +112,7 @@
71112
</item>
72113
</widget>
73114
</item>
74-
<item row="5" column="0">
115+
<item row="4" column="0">
75116
<widget class="QLabel" name="label_6">
76117
<property name="text">
77118
<string>Symbol</string>
@@ -81,7 +122,7 @@
81122
</property>
82123
</widget>
83124
</item>
84-
<item row="5" column="1">
125+
<item row="4" column="1">
85126
<widget class="QPushButton" name="btnChangeGraduatedSymbol">
86127
<property name="sizePolicy">
87128
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -94,7 +135,7 @@
94135
</property>
95136
</widget>
96137
</item>
97-
<item row="5" column="3">
138+
<item row="4" column="3">
98139
<widget class="QSpinBox" name="spinGraduatedClasses">
99140
<property name="sizePolicy">
100141
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -113,7 +154,7 @@
113154
</property>
114155
</widget>
115156
</item>
116-
<item row="5" column="2">
157+
<item row="4" column="2">
117158
<widget class="QLabel" name="label_5">
118159
<property name="text">
119160
<string>Classes</string>
@@ -126,7 +167,7 @@
126167
</property>
127168
</widget>
128169
</item>
129-
<item row="6" column="1">
170+
<item row="5" column="1">
130171
<layout class="QHBoxLayout" name="horizontalLayout_2">
131172
<item>
132173
<widget class="QgsColorRampComboBox" name="cboGraduatedColorRamp"/>
@@ -183,7 +224,7 @@
183224
</item>
184225
</layout>
185226
</item>
186-
<item row="3" column="0">
227+
<item row="6" column="0">
187228
<widget class="QLabel" name="label">
188229
<property name="text">
189230
<string>Label Format</string>
@@ -196,51 +237,7 @@
196237
</property>
197238
</widget>
198239
</item>
199-
<item row="3" column="1">
200-
<layout class="QHBoxLayout" name="horizontalLayout_3">
201-
<property name="topMargin">
202-
<number>0</number>
203-
</property>
204-
<item>
205-
<widget class="QLineEdit" name="txtFormat">
206-
<property name="alignment">
207-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
208-
</property>
209-
</widget>
210-
</item>
211-
</layout>
212-
</item>
213-
<item row="3" column="3">
214-
<layout class="QHBoxLayout" name="horizontalLayout_7">
215-
<item>
216-
<widget class="QSpinBox" name="spinDecimalPlaces">
217-
<property name="sizePolicy">
218-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
219-
<horstretch>0</horstretch>
220-
<verstretch>0</verstretch>
221-
</sizepolicy>
222-
</property>
223-
<property name="minimum">
224-
<number>0</number>
225-
</property>
226-
<property name="maximum">
227-
<number>10</number>
228-
</property>
229-
<property name="value">
230-
<number>4</number>
231-
</property>
232-
</widget>
233-
</item>
234-
<item>
235-
<widget class="QCheckBox" name="cbxTrimTrailingZeroes">
236-
<property name="text">
237-
<string>Trim</string>
238-
</property>
239-
</widget>
240-
</item>
241-
</layout>
242-
</item>
243-
<item row="3" column="2">
240+
<item row="6" column="2">
244241
<widget class="QLabel" name="label_16">
245242
<property name="text">
246243
<string>Decimal places</string>
@@ -358,14 +355,14 @@
358355
</customwidget>
359356
</customwidgets>
360357
<tabstops>
361-
<tabstop>txtFormat</tabstop>
362-
<tabstop>spinDecimalPlaces</tabstop>
363-
<tabstop>cbxTrimTrailingZeroes</tabstop>
364358
<tabstop>btnChangeGraduatedSymbol</tabstop>
365359
<tabstop>spinGraduatedClasses</tabstop>
366360
<tabstop>cboGraduatedColorRamp</tabstop>
367361
<tabstop>cbxInvertedColorRamp</tabstop>
368362
<tabstop>cboGraduatedMode</tabstop>
363+
<tabstop>txtFormat</tabstop>
364+
<tabstop>spinDecimalPlaces</tabstop>
365+
<tabstop>cbxTrimTrailingZeroes</tabstop>
369366
<tabstop>viewGraduated</tabstop>
370367
<tabstop>btnGraduatedClassify</tabstop>
371368
<tabstop>btnGraduatedAdd</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.