|
1
|
Index: src/app/qgsgraduatedsymboldialog.cpp
|
|
2
|
===================================================================
|
|
3
|
--- src/app/qgsgraduatedsymboldialog.cpp (revision 9896)
|
|
4
|
+++ src/app/qgsgraduatedsymboldialog.cpp (working copy)
|
|
5
|
@@ -332,7 +332,7 @@
|
|
6
|
pen.setColor( Qt::black );
|
|
7
|
}
|
|
8
|
|
|
9
|
- pen.setWidth( 0.1 );
|
|
10
|
+ pen.setWidthF( symbol->lineWidth() );
|
|
11
|
brush.setStyle( Qt::SolidPattern );
|
|
12
|
symbol->setPen( pen );
|
|
13
|
symbol->setBrush( brush );
|
|
14
|
Index: src/app/qgsuniquevaluedialog.cpp
|
|
15
|
===================================================================
|
|
16
|
--- src/app/qgsuniquevaluedialog.cpp (revision 9896)
|
|
17
|
+++ src/app/qgsuniquevaluedialog.cpp (working copy)
|
|
18
|
@@ -183,7 +183,7 @@
|
|
19
|
{
|
|
20
|
pen.setColor( thecolor );
|
|
21
|
pen.setStyle( Qt::SolidLine );
|
|
22
|
- pen.setWidthF( 0.1 );
|
|
23
|
+ pen.setWidthF( symbol->lineWidth() );
|
|
24
|
}
|
|
25
|
else
|
|
26
|
{
|
|
27
|
@@ -191,7 +191,7 @@
|
|
28
|
brush.setStyle( Qt::SolidPattern );
|
|
29
|
pen.setColor( Qt::black );
|
|
30
|
pen.setStyle( Qt::SolidLine );
|
|
31
|
- pen.setWidthF( 0.1 );
|
|
32
|
+ pen.setWidthF( symbol->lineWidth() );
|
|
33
|
}
|
|
34
|
symbol->setPen( pen );
|
|
35
|
symbol->setBrush( brush );
|
|
36
|
@@ -247,7 +247,7 @@
|
|
37
|
void QgsUniqueValueDialog::resetColors()
|
|
38
|
{
|
|
39
|
QColor white;
|
|
40
|
- white.setRgb( 255.0, 255.0, 255.0 );
|
|
41
|
+ white.setRgb( 255, 255, 255 );
|
|
42
|
|
|
43
|
QList<QListWidgetItem *> selection = mClassListWidget->selectedItems();
|
|
44
|
if ( selection.size() == 0 )
|
|
45
|
Index: src/core/renderer/qgssinglesymbolrenderer.cpp
|
|
46
|
===================================================================
|
|
47
|
--- src/core/renderer/qgssinglesymbolrenderer.cpp (revision 9896)
|
|
48
|
+++ src/core/renderer/qgssinglesymbolrenderer.cpp (working copy)
|
|
49
|
@@ -53,7 +53,6 @@
|
|
50
|
sy->setFillStyle( Qt::SolidPattern );
|
|
51
|
sy->setColor( QColor( 0, 0, 0 ) );
|
|
52
|
}
|
|
53
|
- sy->setLineWidth( DEFAULT_LINE_WIDTH ); //declared in qgis.h
|
|
54
|
mSymbol = sy;
|
|
55
|
updateSymbolAttributes();
|
|
56
|
}
|
|
57
|
Index: src/core/symbology/qgssymbol.cpp
|
|
58
|
===================================================================
|
|
59
|
--- src/core/symbology/qgssymbol.cpp (revision 9896)
|
|
60
|
+++ src/core/symbology/qgssymbol.cpp (working copy)
|
|
61
|
@@ -50,7 +50,7 @@
|
|
62
|
mRotationClassificationField( -1 ),
|
|
63
|
mScaleClassificationField( -1 )
|
|
64
|
{
|
|
65
|
- mPen.setWidth( DEFAULT_LINE_WIDTH );
|
|
66
|
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
|
|
67
|
}
|
|
68
|
|
|
69
|
|
|
70
|
@@ -70,7 +70,7 @@
|
|
71
|
mRotationClassificationField( -1 ),
|
|
72
|
mScaleClassificationField( -1 )
|
|
73
|
{
|
|
74
|
- mPen.setWidth( DEFAULT_LINE_WIDTH );
|
|
75
|
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
|
|
76
|
}
|
|
77
|
|
|
78
|
QgsSymbol::QgsSymbol()
|
|
79
|
@@ -83,7 +83,7 @@
|
|
80
|
mRotationClassificationField( -1 ),
|
|
81
|
mScaleClassificationField( -1 )
|
|
82
|
{
|
|
83
|
- mPen.setWidth( DEFAULT_LINE_WIDTH );
|
|
84
|
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
|
|
85
|
}
|
|
86
|
|
|
87
|
|
|
88
|
@@ -99,7 +99,7 @@
|
|
89
|
mRotationClassificationField( -1 ),
|
|
90
|
mScaleClassificationField( -1 )
|
|
91
|
{
|
|
92
|
- mPen.setWidth( DEFAULT_LINE_WIDTH );
|
|
93
|
+ mPen.setWidthF( DEFAULT_LINE_WIDTH );
|
|
94
|
}
|
|
95
|
|
|
96
|
QgsSymbol::QgsSymbol( const QgsSymbol& s )
|
|
97
|
@@ -353,7 +353,7 @@
|
|
98
|
QImage preRotateImage;
|
|
99
|
QPen pen = mPen;
|
|
100
|
double newWidth = mPen.widthF() * widthScale * rasterScaleFactor;
|
|
101
|
- pen.setWidth( newWidth );
|
|
102
|
+ pen.setWidthF( newWidth );
|
|
103
|
|
|
104
|
if ( selected )
|
|
105
|
{
|