apply patch #1447 from smizuno (thanks!)

git-svn-id: http://svn.osgeo.org/qgis/trunk@9908 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 29, 2008 · f6d7e25 · f6d7e25
1 parent aa076d5
commit f6d7e25
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/app/qgsgraduatedsymboldialog.cpp b/src/app/qgsgraduatedsymboldialog.cpp
@@ -332,7 +332,7 @@ void QgsGraduatedSymbolDialog::adjustClassification()
       pen.setColor( Qt::black );
     }
 
-    pen.setWidth( 0.1 );
+    pen.setWidthF( symbol->lineWidth() );
     brush.setStyle( Qt::SolidPattern );
     symbol->setPen( pen );
     symbol->setBrush( brush );

diff --git a/src/app/qgsuniquevaluedialog.cpp b/src/app/qgsuniquevaluedialog.cpp
@@ -183,15 +183,15 @@ void QgsUniqueValueDialog::setSymbolColor( QgsSymbol *symbol, QColor thecolor )
   {
     pen.setColor( thecolor );
     pen.setStyle( Qt::SolidLine );
-    pen.setWidthF( 0.1 );
+    pen.setWidthF( symbol->lineWidth() );
   }
   else
   {
     brush.setColor( thecolor );
     brush.setStyle( Qt::SolidPattern );
     pen.setColor( Qt::black );
     pen.setStyle( Qt::SolidLine );
-    pen.setWidthF( 0.1 );
+    pen.setWidthF( symbol->lineWidth() );
   }
   symbol->setPen( pen );
   symbol->setBrush( brush );
@@ -247,7 +247,7 @@ void QgsUniqueValueDialog::randomizeColors()
 void QgsUniqueValueDialog::resetColors()
 {
   QColor white;
-  white.setRgb( 255.0, 255.0, 255.0 );
+  white.setRgb( 255, 255, 255 );
 
   QList<QListWidgetItem *> selection = mClassListWidget->selectedItems();
   if ( selection.size() == 0 )

diff --git a/src/core/renderer/qgssinglesymbolrenderer.cpp b/src/core/renderer/qgssinglesymbolrenderer.cpp
@@ -53,7 +53,6 @@ QgsSingleSymbolRenderer::QgsSingleSymbolRenderer( QGis::GeometryType type )
     sy->setFillStyle( Qt::SolidPattern );
     sy->setColor( QColor( 0, 0, 0 ) );
   }
-  sy->setLineWidth( DEFAULT_LINE_WIDTH ); //declared in qgis.h
   mSymbol = sy;
   updateSymbolAttributes();
 }

diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -50,7 +50,7 @@ QgsSymbol::QgsSymbol( QGis::GeometryType t, QString lvalue, QString uvalue, QStr
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
 {
-  mPen.setWidth( DEFAULT_LINE_WIDTH );
+  mPen.setWidthF( DEFAULT_LINE_WIDTH );
 }
 
 
@@ -70,7 +70,7 @@ QgsSymbol::QgsSymbol( QGis::GeometryType t, QString lvalue, QString uvalue, QStr
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
 {
-  mPen.setWidth( DEFAULT_LINE_WIDTH );
+  mPen.setWidthF( DEFAULT_LINE_WIDTH );
 }
 
 QgsSymbol::QgsSymbol()
@@ -83,7 +83,7 @@ QgsSymbol::QgsSymbol()
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
 {
-  mPen.setWidth( DEFAULT_LINE_WIDTH );
+  mPen.setWidthF( DEFAULT_LINE_WIDTH );
 }
 
 
@@ -99,7 +99,7 @@ QgsSymbol::QgsSymbol( QColor c )
     mRotationClassificationField( -1 ),
     mScaleClassificationField( -1 )
 {
-  mPen.setWidth( DEFAULT_LINE_WIDTH );
+  mPen.setWidthF( DEFAULT_LINE_WIDTH );
 }
 
 QgsSymbol::QgsSymbol( const QgsSymbol& s )
@@ -353,7 +353,7 @@ QImage QgsSymbol::getPointSymbolAsImage( double widthScale, bool selected, QColo
   QImage preRotateImage;
   QPen pen = mPen;
   double newWidth = mPen.widthF() * widthScale * rasterScaleFactor;
-  pen.setWidth( newWidth );
+  pen.setWidthF( newWidth );
 
   if ( selected )
   {