Modified labelling to include prefix, separator, suffix.

qgis · Sep 26, 2014 · 25a7be2 · 25a7be2
1 parent c309a31
commit 25a7be2
Show file tree

Hide file tree

Showing 7 changed files with 435 additions and 195 deletions.
diff --git a/python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip b/python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip
@@ -5,7 +5,8 @@ class QgsRendererRangeV2
 %End
 
   public:
-    QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbolV2* symbol /Transfer/, QString label, bool render = true );
+    QgsRendererRangeV2();
+    QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbolV2* symbol, QString label, bool render = true );
     QgsRendererRangeV2( const QgsRendererRangeV2& range );
 
     // default dtor is ok
@@ -38,6 +39,42 @@ class QgsRendererRangeV2
 
 typedef QList<QgsRendererRangeV2> QgsRangeList;
 
+class QgsRendererRangeV2LabelFormat
+{
+%TypeHeaderCode
+#include <qgsgraduatedsymbolrendererv2.h>
+%End
+  public:
+    QgsRendererRangeV2LabelFormat();
+    QgsRendererRangeV2LabelFormat( QString prefix, QString separator, QString suffix, int decimalPlaces=4, bool trimTrailingZeroes=false );
+
+    bool operator==( const QgsRendererRangeV2LabelFormat & other ) const;
+    bool operator!=( const QgsRendererRangeV2LabelFormat & other ) const;
+
+        QString prefix() const;
+    void setPrefix( QString prefix );
+
+    QString separator() const;
+    void setSeparator( QString separator );
+
+    QString suffix() const;
+    void setSuffix( QString suffix );
+
+    int decimalPlaces() const;
+    void setDecimalPlaces( int decimalPlaces );
+
+    bool trimTrailingZeroes() const;
+    void setTrimTrailingZeroes( bool trimTrailingZeroes );
+
+    //! @note labelForLowerUpper in python bindings
+    QString labelForRange( double lower, double upper ) /PyName=labelForLowerUpper/;
+    QString labelForRange( const QgsRendererRangeV2 &range );
+
+    void setFromDomElement( QDomElement &element );
+    void saveToDomElement( QDomElement &element );
+};
+
+
 class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
 {
 %TypeHeaderCode
@@ -80,12 +117,12 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
     bool updateRangeLowerValue( int rangeIndex, double value );
     //! @note added in 2.5
     bool updateRangeRenderState( int rangeIndex, bool render );
-    QString defaultRangeLabel( const QgsRendererRangeV2 &range );
-
 
     void addClass( QgsSymbolV2* symbol );
     //! @note available in python bindings as addClassRange
     void addClass( QgsRendererRangeV2 range ) /PyName=addClassRange/;
+    //! @note available in python bindings as addClassLowerUpper
+    void addClass( double lower, double upper ) /PyName=addClassLowerUpper/;
     void deleteClass( int idx );
     void deleteAllClasses();
 
@@ -107,33 +144,30 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
 
     Mode mode() const;
     void setMode( Mode mode );
+    //! Recalculate classes for a layer
+    //! @param vlayer  The layer being rendered (from which data values are calculated)
+    //! @param mode    The calculation mode
+    //! @param nclasses The number of classes to calculate (approximate for some modes)
+    //! @note Added in 2.6
     void updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses );
     //! Evaluates the data expression and returns the list of values from the layer
     //! @param vlayer  The layer for which to evaluate the expression
     //! @note Added in 2.6
     QList<double> getDataValues( QgsVectorLayer *vlayer );
 
-    //! Return the units string used to generate default classification labels
+    //! Return the label format used to generate default classification labels
     //! @note Added in 2.6
-    QString units() const ;
-    //! Set the units string used to generate default classification labels
-    //! @param units The string appended to classification labels
+    const QgsRendererRangeV2LabelFormat &labelFormat();
+    //! Set the label format used to generate default classification labels
+    //! @param labelFormat The string appended to classification labels
     //! @param updateRanges If true then ranges ending with the old unit string are updated to the new.
     //! @note Added in 2.6
-    void setUnits( QString units, bool updateRanges=true );
+    void setLabelFormat( const QgsRendererRangeV2LabelFormat &labelFormat, bool updateRanges=true );
 
-    //! Return the number of decimal places used to generate labels
-    //! @note Added in 2.6
-    int decimalPlaces() const;
-    //! Reset the number of decimal places used to generate labels
-    //! @param decimalPlaces the number of decimal places
-    //! @param updateRanges if true then ranges currently using the default label will be updated
-    //! @note Added in 2.6
-    void setDecimalPlaces( int decimalPlaces, bool updateRanges=true );
-    //! Determine an appropriate number of decimal places based on the minimum class interval
+    //! Reset the label decimal places to a numberbased on the minimum class interval
     //! @param updateRanges if true then ranges currently using the default label will be updated
     //! @note Added in 2.6
-    void calculateDecimalPlaces( bool updateRanges=true );
+    void calculateLabelDecimalPlaces( bool updateRanges=true );
 
     static QgsGraduatedSymbolRendererV2* createRenderer(
       QgsVectorLayer* vlayer,
@@ -143,8 +177,8 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
       QgsSymbolV2* symbol /Transfer/,
       QgsVectorColorRampV2* ramp /Transfer/,
       bool inverted = false,
-      QString units = "",
-      int decimalPlaces = 4 ) /Factory/;
+      QgsRendererRangeV2LabelFormat labelFormat=QgsRendererRangeV2LabelFormat()
+      );
 
     //! create renderer from XML element
     static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
@@ -204,15 +238,15 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
     // @note added in 2.5
     virtual void checkLegendSymbolItem( QString key, bool state = true );
 
+    //! If supported by the renderer, return classification attribute for the use in legend
+    //! @note added in 2.6
+    virtual QString legendClassificationAttribute();
+
     //! creates a QgsGraduatedSymbolRendererV2 from an existing renderer.
     //! @note added in 2.5
     //! @returns a new renderer if the conversion was possible, otherwise 0.
     static QgsGraduatedSymbolRendererV2* convertFromRenderer( const QgsFeatureRendererV2 *renderer ) /Factory/;
 
-    //! If supported by the renderer, return classification attribute for the use in legend
-    //! @note added in 2.6
-    virtual QString legendClassificationAttribute();
-
   protected:
     QgsSymbolV2* symbolForValue( double value );
 

diff --git a/python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip b/python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
@@ -32,17 +32,18 @@ class QgsGraduatedSymbolRendererV2Widget : QgsRendererV2Widget
     void rotationFieldChanged( QString fldName );
     void sizeScaleFieldChanged( QString fldName );
     void scaleMethodChanged( QgsSymbolV2::ScaleMethod scaleMethod );
-    void decimalPlacesChanged();
-    void unitsChanged( QString units );
+    void labelFormatChanged();
 
     void showSymbolLevels();
 
     void rowsMoved();
+    void modelDataChanged();
 
   protected:
     void updateUiFromRenderer( bool updateCount=true );
     void connectUpdateHandlers();
     void disconnectUpdateHandlers();
+    bool rowsOrdered();
 
     void updateGraduatedSymbolIcon();