[QGIS Commit] r12772 - trunk/qgis/src/core/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-01-15 19:59:47 -0500 (Fri, 15 Jan 2010)
New Revision: 12772

Modified:
   trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.h
   trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.h
   trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.h
Log:
Corrected default symbol layer sizes to work with milimeters


Modified: trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.h	2010-01-15 23:55:23 UTC (rev 12771)
+++ trunk/qgis/src/core/symbology-ng/qgsfillsymbollayerv2.h	2010-01-16 00:59:47 UTC (rev 12772)
@@ -8,7 +8,7 @@
 #define DEFAULT_SIMPLEFILL_STYLE        Qt::SolidPattern
 #define DEFAULT_SIMPLEFILL_BORDERCOLOR  QColor(0,0,0)
 #define DEFAULT_SIMPLEFILL_BORDERSTYLE  Qt::SolidLine
-#define DEFAULT_SIMPLEFILL_BORDERWIDTH  1.0
+#define DEFAULT_SIMPLEFILL_BORDERWIDTH  DEFAULT_LINE_WIDTH
 
 #include <QPen>
 #include <QBrush>

Modified: trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.h	2010-01-15 23:55:23 UTC (rev 12771)
+++ trunk/qgis/src/core/symbology-ng/qgslinesymbollayerv2.h	2010-01-16 00:59:47 UTC (rev 12772)
@@ -7,7 +7,7 @@
 #include <QPen>
 
 #define DEFAULT_SIMPLELINE_COLOR     QColor(0,0,0)
-#define DEFAULT_SIMPLELINE_WIDTH     1
+#define DEFAULT_SIMPLELINE_WIDTH     DEFAULT_LINE_WIDTH
 #define DEFAULT_SIMPLELINE_PENSTYLE  Qt::SolidLine
 #define DEFAULT_SIMPLELINE_JOINSTYLE Qt::BevelJoin
 #define DEFAULT_SIMPLELINE_CAPSTYLE  Qt::SquareCap
@@ -63,7 +63,7 @@
 /////////
 
 #define DEFAULT_MARKERLINE_ROTATE     true
-#define DEFAULT_MARKERLINE_INTERVAL   10
+#define DEFAULT_MARKERLINE_INTERVAL   3
 
 class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2
 {

Modified: trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.h	2010-01-15 23:55:23 UTC (rev 12771)
+++ trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.h	2010-01-16 00:59:47 UTC (rev 12772)
@@ -7,7 +7,7 @@
 #define DEFAULT_SIMPLEMARKER_NAME         "circle"
 #define DEFAULT_SIMPLEMARKER_COLOR        QColor(255,0,0)
 #define DEFAULT_SIMPLEMARKER_BORDERCOLOR  QColor(0,0,0)
-#define DEFAULT_SIMPLEMARKER_SIZE         9
+#define DEFAULT_SIMPLEMARKER_SIZE         DEFAULT_POINT_SIZE
 #define DEFAULT_SIMPLEMARKER_ANGLE        0
 
 #include <QPen>
@@ -63,7 +63,7 @@
 //////////
 
 #define DEFAULT_SVGMARKER_NAME         "/symbol/Star1.svg"
-#define DEFAULT_SVGMARKER_SIZE         9
+#define DEFAULT_SVGMARKER_SIZE         2*DEFAULT_POINT_SIZE
 #define DEFAULT_SVGMARKER_ANGLE        0
 
 class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2