[QGIS Commit] r9908 - in trunk/qgis/src: app core/renderer
core/symbology
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Dec 29 07:05:05 EST 2008
Author: jef
Date: 2008-12-29 07:05:05 -0500 (Mon, 29 Dec 2008)
New Revision: 9908
Modified:
trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp
trunk/qgis/src/app/qgsuniquevaluedialog.cpp
trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp
trunk/qgis/src/core/symbology/qgssymbol.cpp
Log:
apply patch #1447 from smizuno (thanks!)
Modified: trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp 2008-12-28 21:00:28 UTC (rev 9907)
+++ trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp 2008-12-29 12:05:05 UTC (rev 9908)
@@ -332,7 +332,7 @@
pen.setColor( Qt::black );
}
- pen.setWidth( 0.1 );
+ pen.setWidthF( symbol->lineWidth() );
brush.setStyle( Qt::SolidPattern );
symbol->setPen( pen );
symbol->setBrush( brush );
Modified: trunk/qgis/src/app/qgsuniquevaluedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsuniquevaluedialog.cpp 2008-12-28 21:00:28 UTC (rev 9907)
+++ trunk/qgis/src/app/qgsuniquevaluedialog.cpp 2008-12-29 12:05:05 UTC (rev 9908)
@@ -183,7 +183,7 @@
{
pen.setColor( thecolor );
pen.setStyle( Qt::SolidLine );
- pen.setWidthF( 0.1 );
+ pen.setWidthF( symbol->lineWidth() );
}
else
{
@@ -191,7 +191,7 @@
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::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 )
Modified: trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp 2008-12-28 21:00:28 UTC (rev 9907)
+++ trunk/qgis/src/core/renderer/qgssinglesymbolrenderer.cpp 2008-12-29 12:05:05 UTC (rev 9908)
@@ -53,7 +53,6 @@
sy->setFillStyle( Qt::SolidPattern );
sy->setColor( QColor( 0, 0, 0 ) );
}
- 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-12-28 21:00:28 UTC (rev 9907)
+++ trunk/qgis/src/core/symbology/qgssymbol.cpp 2008-12-29 12:05:05 UTC (rev 9908)
@@ -50,7 +50,7 @@
mRotationClassificationField( -1 ),
mScaleClassificationField( -1 )
{
- mPen.setWidth( DEFAULT_LINE_WIDTH );
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
}
@@ -70,7 +70,7 @@
mRotationClassificationField( -1 ),
mScaleClassificationField( -1 )
{
- mPen.setWidth( DEFAULT_LINE_WIDTH );
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
}
QgsSymbol::QgsSymbol()
@@ -83,7 +83,7 @@
mRotationClassificationField( -1 ),
mScaleClassificationField( -1 )
{
- mPen.setWidth( DEFAULT_LINE_WIDTH );
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
}
@@ -99,7 +99,7 @@
mRotationClassificationField( -1 ),
mScaleClassificationField( -1 )
{
- mPen.setWidth( DEFAULT_LINE_WIDTH );
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
}
QgsSymbol::QgsSymbol( const QgsSymbol& s )
@@ -353,7 +353,7 @@
QImage preRotateImage;
QPen pen = mPen;
double newWidth = mPen.widthF() * widthScale * rasterScaleFactor;
- pen.setWidth( newWidth );
+ pen.setWidthF( newWidth );
if ( selected )
{
More information about the QGIS-commit
mailing list