Skip to content

Commit

Permalink
apply patch #1447 from smizuno (thanks!)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9908 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 29, 2008
1 parent 22da0e0 commit 37fd463
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsgraduatedsymboldialog.cpp
Expand Up @@ -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 );
Expand Down
6 changes: 3 additions & 3 deletions src/app/qgsuniquevaluedialog.cpp
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 )
Expand Down
1 change: 0 additions & 1 deletion src/core/renderer/qgssinglesymbolrenderer.cpp
Expand Up @@ -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();
}
Expand Down
10 changes: 5 additions & 5 deletions src/core/symbology/qgssymbol.cpp
Expand Up @@ -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 );
}


Expand All @@ -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()
Expand All @@ -83,7 +83,7 @@ QgsSymbol::QgsSymbol()
mRotationClassificationField( -1 ),
mScaleClassificationField( -1 )
{
mPen.setWidth( DEFAULT_LINE_WIDTH );
mPen.setWidthF( DEFAULT_LINE_WIDTH );
}


Expand All @@ -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 )
Expand Down Expand Up @@ -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 )
{
Expand Down

0 comments on commit 37fd463

Please sign in to comment.