Skip to content

Commit ba0f9d4

Browse files
ccrookccrook
committedOct 3, 2014
Reverting to preferred QgsRenderRangeV2LabelFormat
·
ltr-3_40archive/master_2
1 parent 0d1f719 commit ba0f9d4

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed
 

‎python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ typedef QList<QgsRendererRangeV2> QgsRangeList;
4141

4242

4343
// @note added in 2.6
44-
class QgsRendererRangeV2LegendFormat
44+
class QgsRendererRangeV2LabelFormat
4545
{
4646
%TypeHeaderCode
4747
#include <qgsgraduatedsymbolrendererv2.h>
4848
%End
4949
public:
50-
QgsRendererRangeV2LegendFormat();
51-
QgsRendererRangeV2LegendFormat( QString format, int precision = 4, bool trimTrailingZeroes = false );
50+
QgsRendererRangeV2LabelFormat();
51+
QgsRendererRangeV2LabelFormat( QString format, int precision = 4, bool trimTrailingZeroes = false );
5252

53-
bool operator==( const QgsRendererRangeV2LegendFormat & other ) const;
54-
bool operator!=( const QgsRendererRangeV2LegendFormat & other ) const;
53+
bool operator==( const QgsRendererRangeV2LabelFormat & other ) const;
54+
bool operator!=( const QgsRendererRangeV2LabelFormat & other ) const;
5555

5656
QString format() const;
5757
void setFormat( QString format );
@@ -63,8 +63,8 @@ class QgsRendererRangeV2LegendFormat
6363
void setTrimTrailingZeroes( bool trimTrailingZeroes );
6464

6565
//! @note labelForLowerUpper in python bindings
66-
QString legendForRange( double lower, double upper ) const;
67-
QString legendForRange( const QgsRendererRangeV2 &range ) const;
66+
QString labelForRange( double lower, double upper ) const;
67+
QString labelForRange( const QgsRendererRangeV2 &range ) const;
6868
QString formatNumber( double value ) const;
6969

7070
void setFromDomElement( QDomElement &element );
@@ -160,12 +160,12 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
160160

161161
//! Return the label format used to generate default classification labels
162162
//! @note Added in 2.6
163-
const QgsRendererRangeV2LegendFormat &legendFormat() const;
163+
const QgsRendererRangeV2LabelFormat &labelFormat() const;
164164
//! Set the label format used to generate default classification labels
165165
//! @param labelFormat The string appended to classification labels
166166
//! @param updateRanges If true then ranges ending with the old unit string are updated to the new.
167167
//! @note Added in 2.6
168-
void setLegendFormat( const QgsRendererRangeV2LegendFormat &legendFormat, bool updateRanges = true );
168+
void setLabelFormat( const QgsRendererRangeV2LabelFormat &labelFormat, bool updateRanges = true );
169169

170170
//! Reset the label decimal places to a numberbased on the minimum class interval
171171
//! @param updateRanges if true then ranges currently using the default label will be updated
@@ -180,7 +180,7 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
180180
QgsSymbolV2* symbol /Transfer/,
181181
QgsVectorColorRampV2* ramp /Transfer/,
182182
bool inverted = false,
183-
QgsRendererRangeV2LegendFormat labelFormat=QgsRendererRangeV2LegendFormat()
183+
QgsRendererRangeV2LabelFormat labelFormat=QgsRendererRangeV2LabelFormat()
184184
);
185185

186186
//! create renderer from XML element

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ void QgsRendererRangeV2::toSld( QDomDocument &doc, QDomElement &element, QgsStri
169169

170170
///////////
171171

172-
int QgsRendererRangeV2LegendFormat::MaxPrecision=15;
173-
int QgsRendererRangeV2LegendFormat::MinPrecision=-6;
172+
int QgsRendererRangeV2LabelFormat::MaxPrecision=15;
173+
int QgsRendererRangeV2LabelFormat::MinPrecision=-6;
174174

175-
QgsRendererRangeV2LegendFormat::QgsRendererRangeV2LegendFormat():
175+
QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat():
176176
mFormat( " %1 - %2 " ),
177177
mPrecision( 4 ),
178178
mTrimTrailingZeroes( false ),
@@ -182,7 +182,7 @@ QgsRendererRangeV2LegendFormat::QgsRendererRangeV2LegendFormat():
182182
{
183183
}
184184

185-
QgsRendererRangeV2LegendFormat::QgsRendererRangeV2LegendFormat( QString format, int precision, bool trimTrailingZeroes ):
185+
QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( QString format, int precision, bool trimTrailingZeroes ):
186186
mReTrailingZeroes( "[.,]?0*$" )
187187
{
188188
setFormat( format );
@@ -191,20 +191,20 @@ QgsRendererRangeV2LegendFormat::QgsRendererRangeV2LegendFormat( QString format,
191191
}
192192

193193

194-
bool QgsRendererRangeV2LegendFormat::operator==( const QgsRendererRangeV2LegendFormat &other ) const
194+
bool QgsRendererRangeV2LabelFormat::operator==( const QgsRendererRangeV2LabelFormat &other ) const
195195
{
196196
return
197197
format() == other.format() &&
198198
precision() == other.precision() &&
199199
trimTrailingZeroes() == other.trimTrailingZeroes();
200200
}
201201

202-
bool QgsRendererRangeV2LegendFormat::operator!=( const QgsRendererRangeV2LegendFormat &other ) const
202+
bool QgsRendererRangeV2LabelFormat::operator!=( const QgsRendererRangeV2LabelFormat &other ) const
203203
{
204204
return !( *this == other );
205205
}
206206

207-
void QgsRendererRangeV2LegendFormat::setPrecision( int precision )
207+
void QgsRendererRangeV2LabelFormat::setPrecision( int precision )
208208
{
209209
// Limit the range of decimal places to a reasonable range
210210
if ( precision < MinPrecision ) precision = MinPrecision;
@@ -220,12 +220,12 @@ void QgsRendererRangeV2LegendFormat::setPrecision( int precision )
220220
}
221221
}
222222

223-
QString QgsRendererRangeV2LegendFormat::legendForRange( const QgsRendererRangeV2 &range ) const
223+
QString QgsRendererRangeV2LabelFormat::labelForRange( const QgsRendererRangeV2 &range ) const
224224
{
225-
return legendForRange( range.lowerValue(), range.upperValue() );
225+
return labelForRange( range.lowerValue(), range.upperValue() );
226226
}
227227

228-
QString QgsRendererRangeV2LegendFormat::formatNumber( double value ) const
228+
QString QgsRendererRangeV2LabelFormat::formatNumber( double value ) const
229229
{
230230
if( mPrecision > 0 )
231231
{
@@ -241,7 +241,7 @@ QString QgsRendererRangeV2LegendFormat::formatNumber( double value ) const
241241
}
242242
}
243243

244-
QString QgsRendererRangeV2LegendFormat::legendForRange( double lower, double upper ) const
244+
QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper ) const
245245
{
246246
QString lowerStr=formatNumber(lower);
247247
QString upperStr=formatNumber(upper);
@@ -250,7 +250,7 @@ QString QgsRendererRangeV2LegendFormat::legendForRange( double lower, double upp
250250
return legend.replace( "%1",lowerStr).replace("%2",upperStr );
251251
}
252252

253-
void QgsRendererRangeV2LegendFormat::setFromDomElement( QDomElement &element )
253+
void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element )
254254
{
255255
mFormat = element.attribute( "format",
256256
element.attribute( "prefix", " " ) + "%1" +
@@ -261,7 +261,7 @@ void QgsRendererRangeV2LegendFormat::setFromDomElement( QDomElement &element )
261261
mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true";
262262
}
263263

264-
void QgsRendererRangeV2LegendFormat::saveToDomElement( QDomElement &element )
264+
void QgsRendererRangeV2LabelFormat::saveToDomElement( QDomElement &element )
265265
{
266266
element.setAttribute( "format", mFormat );
267267
element.setAttribute( "decimalplaces", mPrecision );
@@ -450,9 +450,9 @@ bool QgsGraduatedSymbolRendererV2::updateRangeUpperValue( int rangeIndex, double
450450
if ( rangeIndex < 0 || rangeIndex >= mRanges.size() )
451451
return false;
452452
QgsRendererRangeV2 &range = mRanges[rangeIndex];
453-
bool isDefaultLabel = range.label() == mLabelFormat.legendForRange( range );
453+
bool isDefaultLabel = range.label() == mLabelFormat.labelForRange( range );
454454
range.setUpperValue( value );
455-
if ( isDefaultLabel ) range.setLabel( mLabelFormat.legendForRange( range ) );
455+
if ( isDefaultLabel ) range.setLabel( mLabelFormat.labelForRange( range ) );
456456
return true;
457457
}
458458

@@ -461,9 +461,9 @@ bool QgsGraduatedSymbolRendererV2::updateRangeLowerValue( int rangeIndex, double
461461
if ( rangeIndex < 0 || rangeIndex >= mRanges.size() )
462462
return false;
463463
QgsRendererRangeV2 &range = mRanges[rangeIndex];
464-
bool isDefaultLabel = range.label() == mLabelFormat.legendForRange( range );
464+
bool isDefaultLabel = range.label() == mLabelFormat.labelForRange( range );
465465
range.setLowerValue( value );
466-
if ( isDefaultLabel ) range.setLabel( mLabelFormat.legendForRange( range ) );
466+
if ( isDefaultLabel ) range.setLabel( mLabelFormat.labelForRange( range ) );
467467
return true;
468468
}
469469

@@ -498,7 +498,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::clone() const
498498
r->setRotationField( rotationField() );
499499
r->setSizeScaleField( sizeScaleField() );
500500
r->setScaleMethod( scaleMethod() );
501-
r->setLegendFormat( legendFormat() );
501+
r->setLabelFormat( labelFormat() );
502502
return r;
503503
}
504504

@@ -926,7 +926,7 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(
926926
QgsSymbolV2* symbol,
927927
QgsVectorColorRampV2* ramp,
928928
bool inverted,
929-
QgsRendererRangeV2LegendFormat labelFormat
929+
QgsRendererRangeV2LabelFormat labelFormat
930930
)
931931
{
932932
QgsRangeList ranges;
@@ -935,7 +935,7 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(
935935
r->setSourceColorRamp( ramp->clone() );
936936
r->setInvertedColorRamp( inverted );
937937
r->setMode( mode );
938-
r->setLegendFormat( labelFormat, false );
938+
r->setLabelFormat( labelFormat, false );
939939
r->updateClasses( vlayer, mode, classes );
940940
return r;
941941
}
@@ -1076,7 +1076,7 @@ void QgsGraduatedSymbolRendererV2::updateClasses( QgsVectorLayer *vlayer, Mode m
10761076
}
10771077
else
10781078
{
1079-
label = mLabelFormat.legendForRange( lower, upper );
1079+
label = mLabelFormat.labelForRange( lower, upper );
10801080
}
10811081
QgsSymbolV2* newSymbol = mSourceSymbol->clone();
10821082
addClass( QgsRendererRangeV2( lower, upper, newSymbol, label ) );
@@ -1176,9 +1176,9 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element
11761176
QDomElement labelFormatElem = element.firstChildElement( "labelformat" );
11771177
if ( ! labelFormatElem.isNull() )
11781178
{
1179-
QgsRendererRangeV2LegendFormat labelFormat;
1179+
QgsRendererRangeV2LabelFormat labelFormat;
11801180
labelFormat.setFromDomElement( labelFormatElem );
1181-
r->setLegendFormat( labelFormat );
1181+
r->setLabelFormat( labelFormat );
11821182
}
11831183
// TODO: symbol levels
11841184
return r;
@@ -1422,7 +1422,7 @@ void QgsGraduatedSymbolRendererV2::addClass( QgsSymbolV2* symbol )
14221422
void QgsGraduatedSymbolRendererV2::addClass( double lower, double upper )
14231423
{
14241424
QgsSymbolV2* newSymbol = mSourceSymbol->clone();
1425-
QString label = mLabelFormat.legendForRange( lower, upper );
1425+
QString label = mLabelFormat.labelForRange( lower, upper );
14261426
mRanges.append( QgsRendererRangeV2( lower, upper, newSymbol, label ) );
14271427
}
14281428

@@ -1441,13 +1441,13 @@ void QgsGraduatedSymbolRendererV2::deleteAllClasses()
14411441
mRanges.clear();
14421442
}
14431443

1444-
void QgsGraduatedSymbolRendererV2::setLegendFormat( const QgsRendererRangeV2LegendFormat &labelFormat, bool updateRanges )
1444+
void QgsGraduatedSymbolRendererV2::setLabelFormat( const QgsRendererRangeV2LabelFormat &labelFormat, bool updateRanges )
14451445
{
14461446
if ( updateRanges && labelFormat != mLabelFormat )
14471447
{
14481448
for ( QgsRangeList::iterator it = mRanges.begin(); it != mRanges.end(); ++it )
14491449
{
1450-
it->setLabel( labelFormat.legendForRange( *it ) );
1450+
it->setLabel( labelFormat.labelForRange( *it ) );
14511451
}
14521452
}
14531453
mLabelFormat = labelFormat;
@@ -1477,7 +1477,7 @@ void QgsGraduatedSymbolRendererV2::calculateLabelPrecision( bool updateRanges )
14771477
nextDpMinRange *= 10.0;
14781478
}
14791479
mLabelFormat.setPrecision( ndp );
1480-
if ( updateRanges ) setLegendFormat( mLabelFormat, true );
1480+
if ( updateRanges ) setLabelFormat( mLabelFormat, true );
14811481
}
14821482

14831483
void QgsGraduatedSymbolRendererV2::moveClass( int from, int to )

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ typedef QList<QgsRendererRangeV2> QgsRangeList;
6767

6868

6969
// @note added in 2.6
70-
class CORE_EXPORT QgsRendererRangeV2LegendFormat
70+
class CORE_EXPORT QgsRendererRangeV2LabelFormat
7171
{
7272
public:
73-
QgsRendererRangeV2LegendFormat();
74-
QgsRendererRangeV2LegendFormat( QString format, int precision = 4, bool trimTrailingZeroes = false );
73+
QgsRendererRangeV2LabelFormat();
74+
QgsRendererRangeV2LabelFormat( QString format, int precision = 4, bool trimTrailingZeroes = false );
7575

76-
bool operator==( const QgsRendererRangeV2LegendFormat & other ) const;
77-
bool operator!=( const QgsRendererRangeV2LegendFormat & other ) const;
76+
bool operator==( const QgsRendererRangeV2LabelFormat & other ) const;
77+
bool operator!=( const QgsRendererRangeV2LabelFormat & other ) const;
7878

7979
QString format() const { return mFormat; }
8080
void setFormat( QString format ) { mFormat = format; }
@@ -86,8 +86,8 @@ class CORE_EXPORT QgsRendererRangeV2LegendFormat
8686
void setTrimTrailingZeroes( bool trimTrailingZeroes ) { mTrimTrailingZeroes = trimTrailingZeroes; }
8787

8888
//! @note labelForLowerUpper in python bindings
89-
QString legendForRange( double lower, double upper ) const;
90-
QString legendForRange( const QgsRendererRangeV2 &range ) const;
89+
QString labelForRange( double lower, double upper ) const;
90+
QString labelForRange( const QgsRendererRangeV2 &range ) const;
9191
QString formatNumber( double value ) const;
9292

9393
void setFromDomElement( QDomElement &element );
@@ -190,12 +190,12 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
190190

191191
//! Return the label format used to generate default classification labels
192192
//! @note Added in 2.6
193-
const QgsRendererRangeV2LegendFormat &legendFormat() const { return mLabelFormat; }
193+
const QgsRendererRangeV2LabelFormat &labelFormat() const { return mLabelFormat; }
194194
//! Set the label format used to generate default classification labels
195195
//! @param labelFormat The string appended to classification labels
196196
//! @param updateRanges If true then ranges ending with the old unit string are updated to the new.
197197
//! @note Added in 2.6
198-
void setLegendFormat( const QgsRendererRangeV2LegendFormat &legendFormat, bool updateRanges = true );
198+
void setLabelFormat( const QgsRendererRangeV2LabelFormat &labelFormat, bool updateRanges = true );
199199

200200
//! Reset the label decimal places to a numberbased on the minimum class interval
201201
//! @param updateRanges if true then ranges currently using the default label will be updated
@@ -210,7 +210,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
210210
QgsSymbolV2* symbol,
211211
QgsVectorColorRampV2* ramp,
212212
bool inverted = false,
213-
QgsRendererRangeV2LegendFormat legendFormat = QgsRendererRangeV2LegendFormat()
213+
QgsRendererRangeV2LabelFormat legendFormat = QgsRendererRangeV2LabelFormat()
214214
);
215215

216216
//! create renderer from XML element
@@ -287,7 +287,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
287287
QScopedPointer<QgsSymbolV2> mSourceSymbol;
288288
QScopedPointer<QgsVectorColorRampV2> mSourceColorRamp;
289289
bool mInvertedColorRamp;
290-
QgsRendererRangeV2LegendFormat mLabelFormat;
290+
QgsRendererRangeV2LabelFormat mLabelFormat;
291291
QScopedPointer<QgsExpression> mRotation;
292292
QScopedPointer<QgsExpression> mSizeScale;
293293
QgsSymbolV2::ScaleMethod mScaleMethod;

‎src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ QVariant QgsGraduatedSymbolRendererV2Model::data( const QModelIndex &index, int
129129
{
130130
case 1:
131131
{
132-
int decimalPlaces=mRenderer->legendFormat().precision()+2;
132+
int decimalPlaces=mRenderer->labelFormat().precision()+2;
133133
if( decimalPlaces < 0 ) decimalPlaces=0;
134134
return QString::number( range.lowerValue(), 'f', decimalPlaces ) + " - " + QString::number( range.upperValue(), 'f', decimalPlaces );
135135
}
@@ -397,8 +397,8 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
397397

398398
cboGraduatedColorRamp->populate( mStyle );
399399

400-
spinPrecision->setMinimum( QgsRendererRangeV2LegendFormat::MinPrecision);
401-
spinPrecision->setMaximum( QgsRendererRangeV2LegendFormat::MaxPrecision);
400+
spinPrecision->setMinimum( QgsRendererRangeV2LabelFormat::MinPrecision);
401+
spinPrecision->setMaximum( QgsRendererRangeV2LabelFormat::MaxPrecision);
402402

403403
// set project default color ramp
404404
QString defaultColorRamp = QgsProject::instance()->readEntry( "DefaultStyles", "/ColorRamp", "" );
@@ -521,7 +521,7 @@ void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer( bool updateCount
521521
cbxInvertedColorRamp->setChecked( mRenderer->invertedColorRamp() );
522522
}
523523

524-
QgsRendererRangeV2LegendFormat labelFormat = mRenderer->legendFormat();
524+
QgsRendererRangeV2LabelFormat labelFormat = mRenderer->labelFormat();
525525
txtFormat->setText( labelFormat.format() );
526526
spinPrecision->setValue( labelFormat.precision() );
527527
cbxTrimTrailingZeroes->setChecked( labelFormat.trimTrailingZeroes() );
@@ -742,7 +742,7 @@ void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx )
742742
const QgsRendererRangeV2& range = mRenderer->ranges()[rangeIdx];
743743
// Add arbitrary 2 to number of decimal places to retain a bit extra.
744744
// Ensures users can see if legend is not completely honest!
745-
int decimalPlaces = mRenderer->legendFormat().precision()+2;
745+
int decimalPlaces = mRenderer->labelFormat().precision()+2;
746746
if( decimalPlaces < 0 ) decimalPlaces=0;
747747
dialog.setLowerValue( QString::number( range.lowerValue(), 'f', decimalPlaces ) );
748748
dialog.setUpperValue( QString::number( range.upperValue(), 'f', decimalPlaces ) );
@@ -858,11 +858,11 @@ void QgsGraduatedSymbolRendererV2Widget::scaleMethodChanged( QgsSymbolV2::ScaleM
858858

859859
void QgsGraduatedSymbolRendererV2Widget::labelFormatChanged()
860860
{
861-
QgsRendererRangeV2LegendFormat labelFormat = QgsRendererRangeV2LegendFormat(
861+
QgsRendererRangeV2LabelFormat labelFormat = QgsRendererRangeV2LabelFormat(
862862
txtFormat->text(),
863863
spinPrecision->value(),
864864
cbxTrimTrailingZeroes->isChecked() );
865-
mRenderer->setLegendFormat( labelFormat, true );
865+
mRenderer->setLabelFormat( labelFormat, true );
866866
mModel->updateLabels();
867867
}
868868

0 commit comments

Comments
 (0)
Please sign in to comment.