[QGIS Commit] r8746 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-07-09 07:05:44 -0400 (Wed, 09 Jul 2008)
New Revision: 8746

Modified:
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Formatting changes only for draw polygon routine

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2008-07-09 10:46:52 UTC (rev 8745)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2008-07-09 11:05:44 UTC (rev 8746)
@@ -482,9 +482,9 @@
     return feature + 9;
 
   unsigned int wkbType = *((int*)(feature+1));
-  
+
   bool hasZValue = (wkbType == QGis::WKBPolygon25D);
-  
+
   int total_points = 0;
 
   // A vector containing a pointer to a pair of double vectors.The
@@ -519,10 +519,10 @@
       ptr += sizeof(double);
       ring->second[jdx] = *((double *) ptr);
       ptr += sizeof(double);
-      
+
       if (hasZValue)
         ptr += sizeof(double);
-      
+
       /*
 #ifdef QGISDEBUG
 std::cerr << jdx << ": " 
@@ -585,7 +585,7 @@
   // this means that adding inner rings to the path creates
   // holes in outer ring
   QPainterPath path; // OddEven fill rule by default
-  
+
   // Only try to draw polygons if there is something to draw
   if (total_points > 0)
   {
@@ -619,18 +619,18 @@
     // needed :)
     QgsDebugMsg("Pixel points are:");
     for (int i = 0; i < pa.size(); ++i)
-      {
-	QgsDebugMsgLevel("i" + QString::number(i), 2);
-	QgsDebugMsgLevel("pa[i].x()" + QString::number(pa[i].x()), 2);
-	QgsDebugMsgLevel("pa[i].y()" + QString::number(pa[i].y()), 2);
-      }
+    {
+      QgsDebugMsgLevel("i" + QString::number(i), 2);
+      QgsDebugMsgLevel("pa[i].x()" + QString::number(pa[i].x()), 2);
+      QgsDebugMsgLevel("pa[i].y()" + QString::number(pa[i].y()), 2);
+    }
     std::cerr << "Ring positions are:\n";
     QgsDebugMsg("Ring positions are:");
     for (int i = 0; i < ringDetails.size(); ++i)
-      {
-	QgsDebugMsgLevel("ringDetails[i].first" + QString::number(ringDetails[i].first), 2);
-	QgsDebugMsgLevel("ringDetails[i].second" + QString::number(ringDetails[i].second), 2);
-      }
+    {
+      QgsDebugMsgLevel("ringDetails[i].first" + QString::number(ringDetails[i].first), 2);
+      QgsDebugMsgLevel("ringDetails[i].second" + QString::number(ringDetails[i].second), 2);
+    }
     QgsDebugMsg("Outer ring point is " + QString::number(outerRingPt.x()) + ", " + QString::number(outerRingPt.y()));
 #endif
 
@@ -664,58 +664,58 @@
     //
     QBrush myTransparentBrush = p->brush();
     QColor myColor = brush.color();
-    
+
     //only set transparency from layer level if renderer does not provide
     //transparency on class level
     if(!mRenderer->usesTransparency())
-      {
-	myColor.setAlpha(mTransparencyLevel);
-      }
+    {
+      myColor.setAlpha(mTransparencyLevel);
+    }
     myTransparentBrush.setColor(myColor);
     QPen myTransparentPen = p->pen(); // store current pen
     myColor = myTransparentPen.color();
-    
+
     //only set transparency from layer level if renderer does not provide
     //transparency on class level
     if(!mRenderer->usesTransparency())
-      {
-	myColor.setAlpha(mTransparencyLevel);
-      }
+    {
+      myColor.setAlpha(mTransparencyLevel);
+    }
     myTransparentPen.setColor(myColor);
-    
+
     p->setBrush(myTransparentBrush);
     p->setPen (myTransparentPen);
-    
+
     //
     // draw the polygon
     // 
     p->drawPath(path);
-    
 
+
     // draw vertex markers if in editing mode, but only to the main canvas
     if (
         (mEditable) &&
         (drawingToEditingCanvas)
        )
-      {
+    {
 
-	QgsVectorLayer::VertexMarkerType markerType = currentVertexMarkerType();
+      QgsVectorLayer::VertexMarkerType markerType = currentVertexMarkerType();
 
-	for(int i = 0; i < path.elementCount(); ++i)
-	  {
-            const QPainterPath::Element & e = path.elementAt(i);
-	    drawVertexMarker((int)e.x, (int)e.y, *p, markerType);
-	  }
+      for(int i = 0; i < path.elementCount(); ++i)
+      {
+        const QPainterPath::Element & e = path.elementAt(i);
+        drawVertexMarker((int)e.x, (int)e.y, *p, markerType);
       }
+    }
 
     //
     //restore brush and pen to original
     //
     p->setBrush ( brush );
     p->setPen ( pen );
-  
+
   } // totalPoints > 0
-  
+
   return ptr;
 }