highlight identified feature using real feature shape

qgis · Jan 12, 2014 · a18b4a3 · a18b4a3 · haubourg · Jan 13, 2014
1 parent d59ab80
commit a18b4a3
Show file tree

Hide file tree

Showing 15 changed files with 294 additions and 62 deletions.
diff --git a/python/core/qgsfeaturestore.sip b/python/core/qgsfeaturestore.sip
@@ -28,6 +28,12 @@ class QgsFeatureStore
     /** Set crs */
     void setCrs( const QgsCoordinateReferenceSystem& crs );
 
+    /** Add feature. Feature's fields will be set to pointer to the store fields.
+     * @param feature
+     * @note added in 2.1
+     */
+    void addFeature ( const QgsFeature& feature );
+
     /** Get features list reference */
     QgsFeatureList& features();
 

diff --git a/python/core/qgsrectangle.sip b/python/core/qgsrectangle.sip
@@ -58,6 +58,10 @@ class QgsRectangle
     QgsPoint center() const;
     //! Scale the rectangle around its center point
     void scale( double, const QgsPoint *c = 0 );
+    void scale( double scaleFactor, double centerX, double centerY );
+    /** Get rectangle enlarged by buffer.
+     * @note added in 2.1 */
+    QgsRectangle buffer( double width );
     //! Expand the rectangle to support zoom out scaling
     //! return the intersection with the given rectangle
     QgsRectangle intersect( const QgsRectangle *rect ) const;

diff --git a/python/core/symbology-ng/qgsfillsymbollayerv2.sip b/python/core/symbology-ng/qgsfillsymbollayerv2.sip
@@ -40,6 +40,12 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
     QColor borderColor() const;
     void setBorderColor( QColor borderColor );
 
+    virtual QColor outlineColor() const;
+    virtual void setOutlineColor( const QColor& color );
+
+    virtual QColor fillColor() const;
+    virtual void setFillColor( const QColor& color );
+
     Qt::PenStyle borderStyle() const;
     void setBorderStyle( Qt::PenStyle borderStyle );
 

diff --git a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip b/python/core/symbology-ng/qgsmarkersymbollayerv2.sip
@@ -42,6 +42,12 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
     double outlineWidth() const;
     void setOutlineWidth( double w );
 
+    virtual QColor outlineColor() const;
+    virtual void setOutlineColor( const QColor& color );
+
+    virtual QColor fillColor() const;
+    virtual void setFillColor( const QColor& color );
+
     QgsSymbolV2::OutputUnit outlineWidthUnit() const;
     void setOutlineWidthUnit( QgsSymbolV2::OutputUnit u );
 

diff --git a/python/core/symbology-ng/qgssymbollayerv2.sip b/python/core/symbology-ng/qgssymbollayerv2.sip
@@ -63,6 +63,10 @@ class QgsSymbolLayerV2
     // not necessarily supported by all symbol layers...
     virtual void setColor( const QColor& color );
     virtual QColor color() const;
+    virtual void setOutlineColor( const QColor& color );
+    virtual QColor outlineColor() const;
+    virtual void setFillColor( const QColor& color );
+    virtual QColor fillColor() const;
 
     virtual ~QgsSymbolLayerV2();
 

diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -1172,14 +1172,24 @@ void QgsIdentifyResultsDialog::highlightFeature( QTreeWidgetItem *item )
   if ( !featItem->feature().geometry() || featItem->feature().geometry()->wkbType() == QGis::WKBUnknown )
     return;
 
-  QgsHighlight *h = new QgsHighlight( mCanvas, featItem->feature().geometry(), layer );
-  if ( h )
+  if ( vlayer )
   {
-    h->setWidth( 2 );
+    QgsHighlight *h = new QgsHighlight( mCanvas, featItem->feature(), vlayer );
     h->setColor( Qt::red );
     h->show();
     mHighlights.insert( featItem, h );
   }
+  else
+  {
+    QgsHighlight *h = new QgsHighlight( mCanvas, featItem->feature().geometry(), layer );
+    if ( h )
+    {
+      h->setWidth( 2 );
+      h->setColor( Qt::red );
+      h->show();
+      mHighlights.insert( featItem, h );
+    }
+  }
 }
 
 void QgsIdentifyResultsDialog::zoomToFeature()

diff --git a/src/core/qgsfeaturestore.cpp b/src/core/qgsfeaturestore.cpp
@@ -37,3 +37,18 @@ QgsFeatureStore::~QgsFeatureStore( )
 {
 }
 
+void QgsFeatureStore::setFields( const QgsFields & fields )
+{
+  mFields = fields;
+  foreach ( QgsFeature feature, mFeatures )
+  {
+    feature.setFields( &mFields );
+  }
+}
+
+void QgsFeatureStore::addFeature( const QgsFeature& feature )
+{
+  QgsFeature f( feature );
+  f.setFields( &mFields );
+  mFeatures.append( f );
+}
diff --git a/src/core/qgsfeaturestore.h b/src/core/qgsfeaturestore.h
@@ -45,15 +45,21 @@ class CORE_EXPORT QgsFeatureStore
     /** Get fields list */
     QgsFields& fields() { return mFields; }
 
-    /** Set fields */
-    void setFields( const QgsFields & fields ) { mFields = fields; }
+    /** Set fields. Resets feauters fields to pointer to new internal fields. */
+    void setFields( const QgsFields & fields );
 
     /** Get crs */
     QgsCoordinateReferenceSystem crs() const { return mCrs; }
 
     /** Set crs */
     void setCrs( const QgsCoordinateReferenceSystem& crs ) { mCrs = crs; }
 
+    /** Add feature. Feature's fields will be set to pointer to the store fields.
+     * @param feature
+     * @note added in 2.1
+     */
+    void addFeature( const QgsFeature& feature );
+
     /** Get features list reference */
     QgsFeatureList& features() { return mFeatures; }
 

diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp
@@ -122,6 +122,11 @@ void QgsRectangle::scale( double scaleFactor, double centerX, double centerY )
   ymax = centerY + newHeight / 2.0;
 }
 
+QgsRectangle QgsRectangle::buffer( double width )
+{
+  return QgsRectangle( xmin - width, ymin - width, xmax + width, ymax + width );
+}
+
 QgsRectangle QgsRectangle::intersect( const QgsRectangle * rect ) const
 {
   QgsRectangle intersection = QgsRectangle();

diff --git a/src/core/qgsrectangle.h b/src/core/qgsrectangle.h
@@ -82,6 +82,9 @@ class CORE_EXPORT QgsRectangle
     //! Scale the rectangle around its center point
     void scale( double scaleFactor, const QgsPoint *c = 0 );
     void scale( double scaleFactor, double centerX, double centerY );
+    /** Get rectangle enlarged by buffer.
+     * @note added in 2.1 */
+    QgsRectangle buffer( double width );
     //! return the intersection with the given rectangle
     QgsRectangle intersect( const QgsRectangle *rect ) const;
     //! returns true when rectangle intersects with other rectangle

diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -65,6 +65,20 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2
     QColor borderColor() const { return mBorderColor; }
     void setBorderColor( QColor borderColor ) { mBorderColor = borderColor; }
 
+    /** Get outline color.
+     * @note added in 2.1 */
+    QColor outlineColor() const { return borderColor(); }
+    /** Set outline color.
+     * @note added in 2.1 */
+    void setOutlineColor( const QColor& color ) { setBorderColor( color ); }
+
+    /** Get fill color.
+     * @note added in 2.1 */
+    QColor fillColor() const { return color(); }
+    /** Set fill color.
+     * @note added in 2.1 */
+    void setFillColor( const QColor& color ) { setColor( color ); }
+
     Qt::PenStyle borderStyle() const { return mBorderStyle; }
     void setBorderStyle( Qt::PenStyle borderStyle ) { mBorderStyle = borderStyle; }
 

diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
@@ -48,6 +48,8 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
 
     // implemented from base classes
 
+
+
     QString layerType() const;
 
     void startRender( QgsSymbolV2RenderContext& context );
@@ -73,6 +75,20 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
     Qt::PenStyle outlineStyle() const { return mOutlineStyle; }
     void setOutlineStyle( Qt::PenStyle outlineStyle ) { mOutlineStyle = outlineStyle; }
 
+    /** Get outline color.
+     * @note added in 2.1 */
+    QColor outlineColor() const { return borderColor(); }
+    /** Set outline color.
+     * @note added in 2.1 */
+    void setOutlineColor( const QColor& color ) { setBorderColor( color ); }
+
+    /** Get fill color.
+     * @note added in 2.1 */
+    QColor fillColor() const { return color(); }
+    /** Set fill color.
+     * @note added in 2.1 */
+    void setFillColor( const QColor& color ) { setColor( color ); }
+
     double outlineWidth() const { return mOutlineWidth; }
     void setOutlineWidth( double w ) { mOutlineWidth = w; }
 

diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -47,8 +47,20 @@ class CORE_EXPORT QgsSymbolLayerV2
   public:
 
     // not necessarily supported by all symbol layers...
-    virtual void setColor( const QColor& color ) { mColor = color; }
     virtual QColor color() const { return mColor; }
+    virtual void setColor( const QColor& color ) { mColor = color; }
+    /** Set outline color. Supported by marker and fill layers.
+     * @note added in 2.1 */
+    virtual void setOutlineColor( const QColor& color ) { Q_UNUSED( color ); }
+    /** Get outline color. Supported by marker and fill layers.
+     * @note added in 2.1 */
+    virtual QColor outlineColor() const { return QColor(); }
+    /** Set fill color. Supported by marker and fill layers.
+     * @note added in 2.1 */
+    virtual void setFillColor( const QColor& color ) { Q_UNUSED( color ); }
+    /** Get fill color. Supported by marker and fill layers.
+     * @note added in 2.1 */
+    virtual QColor fillColor() const { return QColor(); }
 
     virtual ~QgsSymbolLayerV2() { removeDataDefinedProperties(); }