ranged_gradient_render.diff

     /**This class contains the information for graduate symbol rendering*/
     class QgsGraduatedSymbolRenderer: public QgsRenderer
+    {
      private:
         /**Helper function for finding symbol having feature value in range*/
         std::list < QgsSymbol* >::iterator firstSymbolForFeature(QgsFeature *f);
      public:
         QgsGraduatedSymbolRenderer(QGis::VectorType type);
         QgsGraduatedSymbolRenderer(const QgsGraduatedSymbolRenderer& other);
-...
         int classificationField() const;
         /**Removes all symbols*/
         void removeSymbols();
         /**Determines if an OGRFeature is in range of any symbol's upper and lower bounds
          \param f a pointer to the feature to check*/
         bool willRenderFeature(QgsFeature *f);
         /**Renders an OGRFeature
          \param p a painter (usually the one from the current map canvas)
          \param f a pointer to a feature to render

               if(mDeletedFeatureIds.find(fet->featureId())==mDeletedFeatureIds.end())
+              {
                 bool sel=mSelectedFeatureIds.find(fet->featureId()) != mSelectedFeatureIds.end();
                 mLabel->renderLabel ( p, viewExtent, *mCoordinateTransform,
     	    if (m_renderer && m_renderer->willRenderFeature(fet))
+    	    {
                   mLabel->renderLabel ( p, viewExtent, *mCoordinateTransform,
                     projectionsEnabledFlag,
                     theMapToPixelTransform, fet, sel, 0, scale);
+    	    }
+              }
+            }
             delete fet;
-...
           for(std::vector<QgsFeature*>::iterator it=mAddedFeatures.begin();it!=mAddedFeatures.end();++it)
+          {
             bool sel=mSelectedFeatureIds.find((*it)->featureId()) != mSelectedFeatureIds.end();
             mLabel->renderLabel ( p, viewExtent, *mCoordinateTransform, projectionsEnabledFlag,
     	if (m_renderer && m_renderer->willRenderFeature(*it))
+    	{
               mLabel->renderLabel ( p, viewExtent, *mCoordinateTransform, projectionsEnabledFlag,
                 theMapToPixelTransform, *it, sel, 0, scale);
+    	}
+          }
+        }
         catch (QgsCsException &e)
-...
               sel = FALSE;
+            }
     	m_renderer->renderFeature(p, fet, &marker, &markerScaleFactor, sel, widthScale );
     	double scale = markerScaleFactor * symbolScale;
             drawFeature(p,
     	if (m_renderer->willRenderFeature(fet))
+    	{
     	  m_renderer->renderFeature(p, fet, &marker, &markerScaleFactor, sel, widthScale );
         	  double scale = markerScaleFactor * symbolScale;
               drawFeature(p,
                         fet,
                         theMapToPixelTransform,
                         &marker,
                         scale,
                         projectionsEnabledFlag,
                         drawingToEditingCanvas);
     	++featureCount;
     	delete fet;
     	  ++featureCount;
     	  delete fet;
+    	}
+          }
           //also draw the not yet commited features
-...
     	  for(std::vector<QgsFeature*>::iterator it = mAddedFeatures.begin(); it != mAddedFeatures.end(); ++it)
+    	    {
     	      bool sel=mSelectedFeatureIds.find((*it)->featureId()) != mSelectedFeatureIds.end();
     	      if (!m_renderer->willRenderFeature(*it))
+                  {
     	        continue;
+    	      }
     	      m_renderer->renderFeature(p, *it, &marker, &markerScaleFactor, sel, widthScale);
     	      double scale = markerScaleFactor * symbolScale;
     	      if (mChangedGeometries.find((*it)->featureId()) != mChangedGeometries.end())

         mSymbols.clear();
+    }
     void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
     	double* scalefactor, bool selected, double widthScale)
     std::list < QgsSymbol* >::iterator QgsGraduatedSymbolRenderer::firstSymbolForFeature(QgsFeature *f)
+    {
       //first find out the value for the classification attribute
       std::vector < QgsFeatureAttribute > vec = f->attributeMap();
       double value = vec[0].fieldValue().toDouble();
-...
           break;
+        }
+      }
       return it;
+    }
     bool QgsGraduatedSymbolRenderer::willRenderFeature(QgsFeature *f)
+    {
       std::list < QgsSymbol* >::iterator it = firstSymbolForFeature(f);
       if (it == mSymbols.end())      //only draw features which are covered by a render item
+      {
         return false;
+      }
       return true;
+    }
     void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature * f, QPixmap* pic,
     	double* scalefactor, bool selected, double widthScale)
+    {
       std::list < QgsSymbol* >::iterator it = firstSymbolForFeature(f);
       if (it == mSymbols.end())      //only draw features which are covered by a render item
+      {
         p->setPen(QPen(Qt::NoPen));
         p->setBrush(QBrush(Qt::NoBrush));
         return;

         QgsRenderer();
         /** Virtual destructor because we have virtual methods... */
         virtual ~QgsRenderer() {};
         /** Determines if a feature will be rendered or not
          * @param f a pointer to the feature to determine if rendering will happen*/
         virtual bool willRenderFeature(QgsFeature *f);
         /**A vector layer passes features to a renderer object to change the brush and pen of the qpainter
          @param p the painter storing brush and pen
          @param f a pointer to the feature to be rendered

src/core/qgsrenderer.cpp (working copy)
13	13
14	14	}
15	15
	16	bool QgsRenderer::willRenderFeature(QgsFeature *f)
	17	{
	18	// Normally render the feature, unless told otherwise
	19	return true;
	20	}
	21
16	22	void QgsRenderer::refreshLegend(std::list< std::pair<QString, QPixmap> >* symbologyList) const
17	23	{
18	24	if(symbologyList)

QGIS » QGIS Application