[QGIS Commit] r9710 - in trunk/qgis/src: app core core/renderer core/symbology

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-11-26 02:55:01 -0500 (Wed, 26 Nov 2008)
New Revision: 9710

Modified:
   trunk/qgis/src/app/qgscontinuouscolordialog.cpp
   trunk/qgis/src/core/qgis.h
   trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp
   trunk/qgis/src/core/symbology/qgssymbol.cpp
Log:
Use 0.2 as default line width thoughout.

Modified: trunk/qgis/src/app/qgscontinuouscolordialog.cpp
===================================================================
--- trunk/qgis/src/app/qgscontinuouscolordialog.cpp	2008-11-25 23:42:35 UTC (rev 9709)
+++ trunk/qgis/src/app/qgscontinuouscolordialog.cpp	2008-11-26 07:55:01 UTC (rev 9710)
@@ -19,6 +19,7 @@
 
 #include "qgscontinuouscolordialog.h"
 #include "qgscontinuouscolorrenderer.h"
+#include "qgis.h"
 #include "qgsfield.h"
 #include "qgssymbol.h"
 #include "qgsvectordataprovider.h"
@@ -122,7 +123,7 @@
   else
   {
     cb_polygonOutline->setCheckState( Qt::Checked );
-    outlinewidthspinbox->setValue( 0.4 );
+    outlinewidthspinbox->setValue( DEFAULT_LINE_WIDTH );
     if ( mVectorLayer->geometryType() != QGis::Polygon )
       cb_polygonOutline->setVisible( false );
 

Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h	2008-11-25 23:42:35 UTC (rev 9709)
+++ trunk/qgis/src/core/qgis.h	2008-11-26 07:55:01 UTC (rev 9710)
@@ -151,6 +151,7 @@
 const double MINIMUM_POINT_SIZE = 0.1;
 /** Magic number that determines the default point size for point symbols */
 const double DEFAULT_POINT_SIZE = 2.0;
+const double DEFAULT_LINE_WIDTH = 0.2;
 
 // FIXME: also in qgisinterface.h
 #ifndef QGISEXTERN

Modified: trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp	2008-11-25 23:42:35 UTC (rev 9709)
+++ trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp	2008-11-26 07:55:01 UTC (rev 9710)
@@ -53,7 +53,7 @@
     sy->setFillStyle( Qt::SolidPattern );
     sy->setColor( QColor( 0, 0, 0 ) );
   }
-  sy->setLineWidth( 0.2 );
+  sy->setLineWidth( DEFAULT_LINE_WIDTH ); //declared in qgis.h
   mSymbol = sy;
   updateSymbolAttributes();
 }

Modified: trunk/qgis/src/core/symbology/qgssymbol.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.cpp	2008-11-25 23:42:35 UTC (rev 9709)
+++ trunk/qgis/src/core/symbology/qgssymbol.cpp	2008-11-26 07:55:01 UTC (rev 9710)
@@ -18,6 +18,7 @@
 /* $Id$ */
 #include <cmath>
 
+#include "qgis.h"
 #include "qgssymbol.h"
 #include "qgslogger.h"
 #include "qgssymbologyutils.h"
@@ -47,7 +48,9 @@
     mCacheUpToDate2( false ),
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
-{}
+{
+  mPen.setWidth( DEFAULT_LINE_WIDTH );
+}
 
 
 QgsSymbol::QgsSymbol( QGis::GeometryType t, QString lvalue, QString uvalue, QString label, QColor c ) :
@@ -65,7 +68,9 @@
     mCacheUpToDate2( false ),
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
-{}
+{
+  mPen.setWidth( DEFAULT_LINE_WIDTH );
+}
 
 QgsSymbol::QgsSymbol()
     : mPointSymbolName( "hard:circle" ),
@@ -76,7 +81,9 @@
     mCacheUpToDate2( false ),
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
-{}
+{
+  mPen.setWidth( DEFAULT_LINE_WIDTH );
+}
 
 
 QgsSymbol::QgsSymbol( QColor c )
@@ -90,7 +97,9 @@
     mCacheUpToDate2( false ),
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
-{}
+{
+  mPen.setWidth( DEFAULT_LINE_WIDTH );
+}
 
 QgsSymbol::QgsSymbol( const QgsSymbol& s )
 {