[QGIS Commit] r13161 - trunk/qgis/src/core/symbology

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-03-25 16:07:18 -0400 (Thu, 25 Mar 2010)
New Revision: 13161

Modified:
   trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp
Log:
Remove minimum sizes in marker catalogue (patch from ticket #1912)

Modified: trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp	2010-03-25 12:27:54 UTC (rev 13160)
+++ trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp	2010-03-25 20:07:18 UTC (rev 13161)
@@ -118,12 +118,6 @@
   // First prepare the paintdevice that the marker will be drawn onto
   //
 
-  // Introduce a minimum size, we don't want it to disappear.
-  if ( size < 4 )
-  {
-    size = 4;
-  }
-
   QImage myImage;
   int imageSize;
   if ( fullName.startsWith( "hard:" ) )
@@ -311,8 +305,7 @@
 
   QgsDebugMsgLevel( QString( "Hard marker radius %1" ).arg( r ), 3 );
 
-  // If radius is 0, draw a circle, so it wont disappear.
-  if ( name == "circle" || r < 1 )
+  if ( name == "circle" )
   {
     // "A stroked ellipse has a size of rectangle.size() plus the pen width."
     // (from Qt doc)