[FEATURE] symbology enhancements:

- add QgsMarkerCatalogue::refreshList() to refresh the symbol list w/o restart
- allow refresh of symbols via popup menu on the renderer's symbol selection
- add support for data define symbol(name)s
- add support for font symbol markers (only data define - no gui yet)
- pass QgsRenderContext to rendering methods
- add symbol size in map units (ie. symbols that keep the size in mapunits
  independant of the mapscale)



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11152 c8812cc2-4d05-0410-92ff-de0c093fc19c

python/core/qgscontinuouscolorrenderer.sip

@@ -10,8 +10,9 @@ class QgsContinuousColorRenderer : QgsRenderer
     QgsContinuousColorRenderer(QGis::GeometryType type);
     QgsContinuousColorRenderer(const QgsContinuousColorRenderer& other);
     virtual ~QgsContinuousColorRenderer();
-    /**Renders the feature using the minimum and maximum value of the classification field*/
-    void renderFeature(QPainter* p, QgsFeature& f, QImage* img, bool selected, double widthScale = 1.0, double rasterScaleFactor = 1.0);
+    /**Renders the feature using the minimum and maximum value of the classification field
+      * added in 1.2 */
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
     /**Returns the number of the classification field*/
     int classificationField() const;
     /**Sets the id of the classification field*/

python/core/qgsgraduatedsymbolrenderer.sip

@@ -48,11 +48,11 @@ class QgsGraduatedSymbolRenderer : QgsRenderer
 	  @param f a pointer to the feature to determine if rendering will happen*/
     bool willRenderFeature(QgsFeature *f);
 
-    /**Renders an OGRFeature
+    /**Renders a feature
      \param p a painter (usually the one from the current map canvas)
      \param f a pointer to a feature to render
      \param t the transform object containing the information how to transform the map coordinates to screen coordinates*/
-    void renderFeature(QPainter* p, QgsFeature& f, QImage* img, bool selected, double widthScale = 1.0, double rasterScaleFactor = 1.0);	
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);	
 
     /**Sets the number of the classicifation field
     \param field the number of the field to classify*/

python/core/qgslabel.sip

@@ -45,14 +45,24 @@ public:
       QgsPoint p;
       double angle;
     };
-
+
+
     /** \brief render label
-     *  \param sizeScale global scale factor for size in pixels, labels in map units are not scaled
-    */
+        \note deprecated
+      */
     void renderLabel ( QPainter* painter, QgsRectangle& viewExtent, 
                        QgsCoordinateTransform* coordinateTransform,
                        QgsMapToPixel *transform,
                        QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes=0, double sizeScale = 1, double rasterScaleFactor = 1);
+
+    /** \brief render label
+     *  \param renderContext renderer context 
+     *  \param feature feature to render
+     *  \param selected is to be shown selected
+     *  \param classAttributes attributes to use for labeling
+     *  \note added in 1.2
+    */
+    void renderLabel ( QgsRenderContext &renderContext, QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes=0);
 
     /** Reads the renderer configuration from an XML file
      @param rnode the Dom node to read 

python/core/qgsmarkercatalogue.sip

@@ -1,6 +1,6 @@
 
 /** Catalogue of point symbols */
-class QgsMarkerCatalogue /NoDefaultCtors/
+class QgsMarkerCatalogue : QObject /NoDefaultCtors/
 {
 %TypeHeaderCode
 #include <qgsmarkercatalogue.h>
@@ -29,5 +29,15 @@ public:
     /** Returns a pixmap given a file name of a svg marker
      *  NOTE: this method needs to be public static for QgsMarkerDialog::visualizeMarkers */
     static void svgMarker (QPainter * thepPainter, QString name, int size );
+
+  public slots:
+    // reload the symbols
+    // added in 1.2
+    void refreshList();
+
+  signals:
+    // symbols were reloaded
+    // added in 1.2
+    void markersRefreshed();
 };
 

python/core/qgsrenderer.sip

@@ -15,8 +15,22 @@ class QgsRenderer
      @param p the painter storing brush and pen
      @param f a pointer to the feature to be rendered
      @param pic pointer to a marker from SVG (is only used by marker renderers)
-     @param scalefactor pointer to the scale factor for the marker image*/
-	virtual void renderFeature(QPainter* p, QgsFeature& f,QImage* pic, bool selected, double widthScale = 1.0, double rasterScaleFactor = 1.0)=0;
+     @param selected feature is to be shown selected
+     @param widthScale scale factor
+     @param rasterScaleFactor scale factor for rasters
+
+     deprecated */
+    void renderFeature(QPainter* p, QgsFeature& f,QImage* pic, bool selected, double widthScale = 1.0, double rasterScaleFactor = 1.0);
+
+    /**A vector layer passes features to a renderer object to change the brush ans pen of the qpainter
+      @param renderContext context of the rendering operation
+      @param f the feature to render
+      @param pic pointer to marker to render (is only used by marker renderers)
+      @param selected the feature is to be shown selected
+
+      added in 1.2 */
+    virtual void renderFeature(QgsRenderContext &renderContext, QgsFeature& f,QImage* pic, bool selected)=0;
+
     /**Reads the renderer configuration from an XML file
      @param rnode the Dom node to read 
      @param vl the vector layer which will be associated with the renderer*/

python/core/qgssinglesymbolrenderer.sip

@@ -9,12 +9,15 @@ class QgsSingleSymbolRenderer : QgsRenderer
     QgsSingleSymbolRenderer(QGis::GeometryType type);
     QgsSingleSymbolRenderer(const QgsSingleSymbolRenderer& other);
     virtual ~QgsSingleSymbolRenderer();
+
     /**Replaces the current mSymbol by sy*/
     void addSymbol(QgsSymbol* sy /Transfer/);
     /*Returns a pointer to mSymbol*/
     const QgsSymbol* symbol() const;
-    /**Renders an OGRFeature*/
-    void renderFeature(QPainter* p, QgsFeature& f, QImage* img, bool selected, double widthScale = 1.0, double rasterScaleFactor = 1.0);
+
+    /**Renders a feature added in 1.2 */
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
+
     /**Reads the renderer configuration from an XML file
      @param rnode the Dom node to read 
      @param vl the vector layer which will be associated with the renderer*/

python/core/qgsuniquevaluerenderer.sip

@@ -11,7 +11,11 @@ class QgsUniqueValueRenderer : QgsRenderer
     /** Determines if a feature will be rendered or not 
 	@param f a pointer to the feature to determine if rendering will happen*/
     bool willRenderFeature(QgsFeature *f);
-    void renderFeature(QPainter* p, QgsFeature& f, QImage* img, bool selected, double widthScale = 1.0, double rasterScaleFactor = 1.0);
+
+    /* render feature
+     * added in 1.2 */
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
+
     /**Reads the renderer configuration from an XML file
      @param rnode the Dom node to read 
      @param vl the vector layer which will be associated with the renderer*/

src/app/qgssinglesymboldialog.cpp

@@ -40,7 +40,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog(): QDialog(), mVectorLayer( 0 )
   QgsDebugMsg( "entered." );
 }
 
-QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disabled ): QDialog(), mVectorLayer( layer )
+QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disabled ): QDialog(), mVectorLayer( layer ), mDisabled( disabled )
 {
   setupUi( this );
   QgsDebugMsg( "entered." );
@@ -59,6 +59,43 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
   // loops can be removed now with changes I have made to use combo
   // boxes for line style and fill style...test and remove if poss.
 
+  QAction *refreshAction = new QAction( tr( "Refresh markers" ), lstSymbols );
+  lstSymbols->addAction( refreshAction );
+  connect( refreshAction, SIGNAL( triggered() ), QgsMarkerCatalogue::instance(), SLOT( refreshList() ) );
+  connect( QgsMarkerCatalogue::instance(), SIGNAL( markersRefreshed() ), this, SLOT( refreshMarkers() ) );
+  lstSymbols->setContextMenuPolicy( Qt::ActionsContextMenu );
+
+  //do the signal/slot connections
+  connect( btnOutlineColor, SIGNAL( clicked() ), this, SLOT( selectOutlineColor() ) );
+  connect( btnFillColor, SIGNAL( clicked() ), this, SLOT( selectFillColor() ) );
+  connect( outlinewidthspinbox, SIGNAL( valueChanged( double ) ), this, SLOT( resendSettingsChanged() ) );
+  connect( mLabelEdit, SIGNAL( textChanged( const QString& ) ), this, SLOT( resendSettingsChanged() ) );
+  connect( lstSymbols, SIGNAL( currentItemChanged( QListWidgetItem *, QListWidgetItem * ) ),
+           this, SLOT( symbolChanged( QListWidgetItem *, QListWidgetItem * ) ) );
+  connect( mPointSizeSpinBox, SIGNAL( valueChanged( double ) ), this, SLOT( resendSettingsChanged() ) );
+  connect( mPointSizeUnitsCheckBox, SIGNAL( toggled() ), this, SLOT( resendSettingsChanged() ) );
+  connect( mRotationClassificationComboBox, SIGNAL( currentIndexChanged( const QString & ) ),
+           this, SLOT( resendSettingsChanged() ) );
+  connect( mScaleClassificationComboBox, SIGNAL( currentIndexChanged( const QString & ) ),
+           this, SLOT( resendSettingsChanged() ) );
+  connect( mSymbolComboBox, SIGNAL( currentIndexChanged( const QString & ) ),
+           this, SLOT( resendSettingsChanged() ) );
+  connect( cboOutlineStyle, SIGNAL(
+             currentIndexChanged( const QString & ) ), this, SLOT( resendSettingsChanged() ) );
+  connect( cboFillStyle, SIGNAL(
+             currentIndexChanged( const QString & ) ), this, SLOT( resendSettingsChanged() ) );
+  //need this to deal with when texture fill is selected or deselected
+  connect( cboFillStyle, SIGNAL(
+             currentIndexChanged( int ) ), this, SLOT( fillStyleChanged( int ) ) );
+  connect( toolSelectTexture, SIGNAL( clicked() ), this, SLOT( selectTextureImage() ) );
+
+  refreshMarkers();
+}
+
+void QgsSingleSymbolDialog::refreshMarkers()
+{
+  lstSymbols->blockSignals( true );
+  lstSymbols->clear();
 
   QPen pen( QColor( 0, 0, 255 ) );
   QBrush brush( QColor( 220, 220, 220 ), Qt::SolidPattern );
@@ -73,17 +110,18 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
     myIcon.addPixmap( myPixmap );
     mypItem->setIcon( myIcon );
     mypItem->setText( "" );
+    mypItem->setToolTip( *it );
     //store the symbol offset in the UserData role for later retrieval
     mypItem->setData( Qt::UserRole, *it );
     mypItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-    if ( layer->geometryType() != QGis::Point )
+    if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Point )
     {
       break;
     }
     ++myCounter;
   }
 
-  // Find out the numerical fields of mVectorLayer, and populate the ComboBox
+  // Find out the numerical fields of mVectorLayer, and populate the ComboBoxes
   QgsVectorDataProvider *provider = mVectorLayer->dataProvider();
   if ( provider )
   {
@@ -92,6 +130,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
 
     mRotationClassificationComboBox->addItem( DO_NOT_USE_STR, -1 );
     mScaleClassificationComboBox->addItem( DO_NOT_USE_STR, -1 );
+    mSymbolComboBox->addItem( DO_NOT_USE_STR, -1 );
     for ( QgsFieldMap::const_iterator it = fields.begin();
           it != fields.end();
           ++it )
@@ -102,6 +141,10 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
         mRotationClassificationComboBox->addItem( it->name(), it.key() );
         mScaleClassificationComboBox->addItem( it->name(), it.key() );
       }
+      else if ( type == QVariant::String )
+      {
+        mSymbolComboBox->addItem( it->name(), it.key() );
+      }
     }
   }
   else
@@ -139,13 +182,13 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "No Brush" ), "NoBrush" );
   cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "TexturePattern" ) ), tr( "Texture" ), "TexturePattern" );
 
-  if ( mVectorLayer && layer->geometryType() != QGis::Point )
+  if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Point )
   {
     mGroupPoint->setVisible( false );
     mGroupPoint->setEnabled( false );
   }
 
-  if ( disabled )
+  if ( mDisabled )
   {
     unset();
   }
@@ -173,27 +216,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
     }
   }
 
-  //do the signal/slot connections
-  connect( btnOutlineColor, SIGNAL( clicked() ), this, SLOT( selectOutlineColor() ) );
-  connect( btnFillColor, SIGNAL( clicked() ), this, SLOT( selectFillColor() ) );
-  connect( outlinewidthspinbox, SIGNAL( valueChanged( double ) ), this, SLOT( resendSettingsChanged() ) );
-  connect( mLabelEdit, SIGNAL( textChanged( const QString& ) ), this, SLOT( resendSettingsChanged() ) );
-  connect( lstSymbols, SIGNAL( currentItemChanged( QListWidgetItem *, QListWidgetItem * ) ),
-           this, SLOT( symbolChanged( QListWidgetItem *, QListWidgetItem * ) ) );
-  connect( mPointSizeSpinBox, SIGNAL( valueChanged( double ) ), this, SLOT( resendSettingsChanged() ) );
-  connect( mRotationClassificationComboBox, SIGNAL( currentIndexChanged( const QString & ) ),
-           this, SLOT( resendSettingsChanged() ) );
-  connect( mScaleClassificationComboBox, SIGNAL( currentIndexChanged( const QString & ) ),
-           this, SLOT( resendSettingsChanged() ) );
-  connect( cboOutlineStyle, SIGNAL(
-             currentIndexChanged( const QString & ) ), this, SLOT( resendSettingsChanged() ) );
-  connect( cboFillStyle, SIGNAL(
-             currentIndexChanged( const QString & ) ), this, SLOT( resendSettingsChanged() ) );
-  //need this to deal with when texture fill is selected or deselected
-  connect( cboFillStyle, SIGNAL(
-             currentIndexChanged( int ) ), this, SLOT( fillStyleChanged( int ) ) );
-  connect( toolSelectTexture, SIGNAL( clicked() ), this, SLOT( selectTextureImage() ) );
-
+  lstSymbols->blockSignals( false );
 }
 
 QgsSingleSymbolDialog::~QgsSingleSymbolDialog()
@@ -264,6 +287,8 @@ void QgsSingleSymbolDialog::apply( QgsSymbol *sy )
   if ( mPointSizeSpinBox->isEnabled() )
     sy->setPointSize( mPointSizeSpinBox->value() );
 
+  if ( mPointSizeUnitsCheckBox->isEnabled() )
+    sy->setPointSizeUnits( mPointSizeUnitsCheckBox->isChecked() );
 
   std::map<QString, int>::iterator iter;
   if ( mRotationClassificationComboBox->isEnabled() )
@@ -276,6 +301,11 @@ void QgsSingleSymbolDialog::apply( QgsSymbol *sy )
     sy->setScaleClassificationField( mScaleClassificationComboBox->itemData( mScaleClassificationComboBox->currentIndex() ).toInt() );
   }
 
+  if ( mSymbolComboBox->isEnabled() )
+  {
+    sy->setSymbolField( mSymbolComboBox->itemData( mSymbolComboBox->currentIndex() ).toInt() );
+  }
+
   //
   // Apply the line style
   //
@@ -323,8 +353,10 @@ void QgsSingleSymbolDialog::unset()
   mLabelEdit->setEnabled( false );
   lstSymbols->setEnabled( false );
   mPointSizeSpinBox->setEnabled( false );
+  mPointSizeUnitsCheckBox->setEnabled( false );
   mRotationClassificationComboBox->setEnabled( false );
   mScaleClassificationComboBox->setEnabled( false );
+  mSymbolComboBox->setEnabled( false );
   outlinewidthspinbox->setEnabled( false );
   btnOutlineColor->setEnabled( false );
   cboOutlineStyle->setEnabled( false );
@@ -350,6 +382,7 @@ void QgsSingleSymbolDialog::set( const QgsSymbol *sy )
     }
   }
   mPointSizeSpinBox->setValue( sy->pointSize() );
+  mPointSizeUnitsCheckBox->setChecked( sy->pointSizeUnits() );
 
   int index;
 
@@ -359,6 +392,9 @@ void QgsSingleSymbolDialog::set( const QgsSymbol *sy )
   index = mScaleClassificationComboBox->findData( sy->scaleClassificationField() );
   mScaleClassificationComboBox->setCurrentIndex( index < 0 ? 0 : index );
 
+  index = mSymbolComboBox->findData( sy->symbolField() );
+  mSymbolComboBox->setCurrentIndex( index < 0 ? 0 : index );
+
   outlinewidthspinbox->setValue( sy->pen().widthF() );
 
   //set line width 1 as minimum to avoid confusion between line width 0 and no pen line style
@@ -418,8 +454,10 @@ void QgsSingleSymbolDialog::set( const QgsSymbol *sy )
   mLabelEdit->setEnabled( true );
   lstSymbols->setEnabled( true );
   mPointSizeSpinBox->setEnabled( true );
+  mPointSizeUnitsCheckBox->setEnabled( true );
   mRotationClassificationComboBox->setEnabled( true );
   mScaleClassificationComboBox->setEnabled( true );
+  mSymbolComboBox->setEnabled( true );
   outlinewidthspinbox->setEnabled( true );
   btnOutlineColor->setEnabled( true );
   cboOutlineStyle->setEnabled( true );
@@ -442,6 +480,9 @@ void QgsSingleSymbolDialog::updateSet( const QgsSymbol *sy )
   if ( mPointSizeSpinBox->isEnabled() && mPointSizeSpinBox->value() != sy->pointSize() )
     mPointSizeSpinBox->setEnabled( false );
 
+  if ( mPointSizeUnitsCheckBox->isEnabled() && mPointSizeUnitsCheckBox->isChecked() != sy->pointSizeUnits() )
+    mPointSizeUnitsCheckBox->setEnabled( false );
+
   if ( mRotationClassificationComboBox->isEnabled() &&
        mRotationClassificationComboBox->itemData( mRotationClassificationComboBox->currentIndex() ).toInt() != sy->rotationClassificationField() )
     mRotationClassificationComboBox->setEnabled( false );
@@ -450,6 +491,10 @@ void QgsSingleSymbolDialog::updateSet( const QgsSymbol *sy )
        mScaleClassificationComboBox->itemData( mScaleClassificationComboBox->currentIndex() ).toInt() != sy->scaleClassificationField() )
     mScaleClassificationComboBox->setEnabled( false );
 
+  if ( mSymbolComboBox->isEnabled() &&
+       mSymbolComboBox->itemData( mSymbolComboBox->currentIndex() ).toInt() != sy->symbolField() )
+    mSymbolComboBox->setEnabled( false );
+
   if ( outlinewidthspinbox->isEnabled() && outlinewidthspinbox->value() != sy->pen().widthF() )
     outlinewidthspinbox->setEnabled( false );
 

src/app/qgssinglesymboldialog.h

@@ -48,6 +48,7 @@ class QgsSingleSymbolDialog: public QDialog, private Ui::QgsSingleSymbolDialogBa
 
   protected:
     QgsVectorLayer* mVectorLayer;
+    bool mDisabled;
 
   public slots:
     /* arrange the widgets on this dialog to reflect the current state of QgsSymbol */
@@ -65,6 +66,8 @@ class QgsSingleSymbolDialog: public QDialog, private Ui::QgsSingleSymbolDialogBa
      */
     void fillStyleChanged( int theIndex );
 
+    void refreshMarkers();
+
   protected slots:
     void selectOutlineColor();
     void selectFillColor();

src/core/CMakeLists.txt

@@ -182,6 +182,7 @@ composer/qgscomposerpicture.h
 composer/qgscomposerscalebar.h
 composer/qgscomposeritemgroup.h
 composer/qgslegendmodel.h
+symbology/qgsmarkercatalogue.h
 raster/qgsrasterlayer.h
 )