Skip to content

Commit c645d4d

Browse files
author
wonder
committed
Use fixed 2px pen width for rubber bands and vertex markers. (The previous default 10px was just too much)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12598 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6cc7da0 commit c645d4d

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎python/plugins/osm/OsmFeatureDW.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -88,39 +88,39 @@ def __init__(self, plugin):
8888

8989
# initializing rubberbands/vertexmarkers; getting qgis settings of line width and color for rubberbands
9090
settings=QSettings()
91-
qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt()
91+
qgsLineWidth=2 # use fixed width
9292
qgsLineRed=settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt()
9393
qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
9494
qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
9595

9696
self.rubBandPol=QgsRubberBand(plugin.canvas,True)
9797
self.rubBandPol.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
98-
self.rubBandPol.setWidth(qgsLineWidth[0])
98+
self.rubBandPol.setWidth(qgsLineWidth)
9999

100100
self.rubBand=QgsRubberBand(plugin.canvas,False)
101101
self.rubBand.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
102-
self.rubBand.setWidth(qgsLineWidth[0])
102+
self.rubBand.setWidth(qgsLineWidth)
103103

104104
self.verMarker=QgsVertexMarker(plugin.canvas)
105105
self.verMarker.setIconType(2)
106106
self.verMarker.setIconSize(13)
107107
self.verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
108-
self.verMarker.setPenWidth(qgsLineWidth[0])
108+
self.verMarker.setPenWidth(qgsLineWidth)
109109
self.verMarkers=[]
110110

111111
self.relRubBandPol=QgsRubberBand(plugin.canvas,True)
112112
self.relRubBandPol.setColor(QColor(qgsLineRed[0],50,50))
113-
self.relRubBandPol.setWidth(qgsLineWidth[0]+4)
113+
self.relRubBandPol.setWidth(qgsLineWidth+4)
114114

115115
self.relRubBand=QgsRubberBand(plugin.canvas,False)
116116
self.relRubBand.setColor(QColor(qgsLineRed[0],50,50))
117-
self.relRubBand.setWidth(qgsLineWidth[0]+4)
117+
self.relRubBand.setWidth(qgsLineWidth+4)
118118

119119
self.relVerMarker=QgsVertexMarker(plugin.canvas)
120120
self.relVerMarker.setIconType(2)
121121
self.relVerMarker.setIconSize(13)
122122
self.relVerMarker.setColor(QColor(qgsLineRed[0],50,50))
123-
self.relVerMarker.setPenWidth(qgsLineWidth[0])
123+
self.relVerMarker.setPenWidth(qgsLineWidth)
124124

125125
# initializing inner variables
126126
self.activeEditButton=self.dummyButton
@@ -1076,7 +1076,7 @@ def putMarkersOnMembers(self,feat,featType):
10761076

10771077
# get qgis settings of line width and color for rubberband
10781078
settings=QSettings()
1079-
qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt()
1079+
qgsLineWidth=2 # use fixed width
10801080
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
10811081
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
10821082
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
@@ -1086,7 +1086,7 @@ def putMarkersOnMembers(self,feat,featType):
10861086
verMarker.setIconType(3)
10871087
verMarker.setIconSize(6)
10881088
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
1089-
verMarker.setPenWidth(qgsLineWidth[0])
1089+
verMarker.setPenWidth(qgsLineWidth)
10901090
verMarker.setCenter(pline[i])
10911091
verMarker.show()
10921092
self.verMarkers.append(verMarker)

‎python/plugins/osm/map_tools/OsmCreateLineMT.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ def createLineRubberband(self):
9999

100100
# get qgis settings of line width and color for rubberband
101101
settings=QSettings()
102-
qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt()
102+
qgsLineWidth=2 # use fixed width
103103
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
104104
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
105105
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
106106

107107
rband=QgsRubberBand(self.canvas,False)
108108
rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
109-
rband.setWidth(qgsLineWidth[0])
109+
rband.setWidth(qgsLineWidth)
110110

111111
return rband
112112

@@ -120,7 +120,7 @@ def createSnapVertexMarker(self):
120120

121121
# get qgis settings
122122
settings=QSettings()
123-
qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt()
123+
qgsLineWidth=2 # use fixed width
124124
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
125125
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
126126
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
@@ -129,7 +129,7 @@ def createSnapVertexMarker(self):
129129
verMarker.setIconType(2)
130130
verMarker.setIconSize(13)
131131
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
132-
verMarker.setPenWidth(qgsLineWidth[0])
132+
verMarker.setPenWidth(qgsLineWidth)
133133
verMarker.setCenter(QgsPoint(-1000,-1000))
134134

135135
return verMarker

‎python/plugins/osm/map_tools/OsmCreatePointMT.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def createVertexMarker(self):
9696

9797
# get qgis settings
9898
settings=QSettings()
99-
qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt()
99+
qgsLineWidth=2 # use fixed width
100100
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
101101
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
102102
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
@@ -105,7 +105,7 @@ def createVertexMarker(self):
105105
verMarker.setIconType(2)
106106
verMarker.setIconSize(13)
107107
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
108-
verMarker.setPenWidth(qgsLineWidth[0])
108+
verMarker.setPenWidth(qgsLineWidth)
109109
verMarker.setCenter(QgsPoint(-1000,-1000))
110110

111111
return verMarker

‎python/plugins/osm/map_tools/OsmCreatePolygonMT.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ def createPolygonRubberband(self):
9999

100100
# get qgis settings of line width and color for rubberband
101101
settings = QSettings()
102-
qgsLineWidth = settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt()
102+
qgsLineWidth = 2 # use fixed width
103103
qgsLineRed = settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt()
104104
qgsLineGreen = settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
105105
qgsLineBlue = settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
106106

107107
rband=QgsRubberBand(self.canvas,True)
108108
rband.setColor( QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]) )
109-
rband.setWidth( qgsLineWidth[0] )
109+
rband.setWidth( qgsLineWidth )
110110

111111
return rband
112112

@@ -120,7 +120,7 @@ def createSnapVertexMarker(self):
120120

121121
# get qgis settings
122122
settings=QSettings()
123-
qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt()
123+
qgsLineWidth=2 # use fixed width
124124
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
125125
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
126126
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
@@ -129,7 +129,7 @@ def createSnapVertexMarker(self):
129129
verMarker.setIconType(2)
130130
verMarker.setIconSize(13)
131131
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
132-
verMarker.setPenWidth(qgsLineWidth[0])
132+
verMarker.setPenWidth(qgsLineWidth)
133133
verMarker.setCenter(QgsPoint(-1000,-1000))
134134

135135
return verMarker

‎python/plugins/osm/map_tools/OsmMoveMT.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,14 @@ def __createFeatRubberband(self,isPolygon):
186186

187187
# get qgis settings of line width and color for rubberband
188188
settings=QSettings()
189-
qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt()
189+
qgsLineWidth=2 # use fixed width
190190
qgsLineRed=settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt()
191191
qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
192192
qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
193193

194194
rband=QgsRubberBand(self.canvas,isPolygon)
195195
rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
196-
rband.setWidth( qgsLineWidth[0] )
196+
rband.setWidth( qgsLineWidth )
197197

198198
return rband
199199

@@ -207,11 +207,11 @@ def __createSnapRubberband(self):
207207

208208
# get qgis settings of line width and color for rubberband
209209
settings=QSettings()
210-
qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt()
210+
qgsLineWidth=2 # use fixed width
211211

212212
rband=QgsRubberBand(self.canvas,False)
213213
rband.setColor(QColor(255,0,0))
214-
rband.setWidth(qgsLineWidth[0])
214+
rband.setWidth(qgsLineWidth)
215215

216216
return rband
217217

@@ -224,7 +224,7 @@ def __createVertexMarker(self):
224224

225225
# get qgis settings
226226
settings=QSettings()
227-
qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt()
227+
qgsLineWidth=2 # use fixed width
228228
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
229229
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
230230
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
@@ -233,7 +233,7 @@ def __createVertexMarker(self):
233233
verMarker.setIconType(2)
234234
verMarker.setIconSize(13)
235235
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
236-
verMarker.setPenWidth(qgsLineWidth[0])
236+
verMarker.setPenWidth(qgsLineWidth)
237237
verMarker.setCenter(QgsPoint(-1000,-1000))
238238

239239
return verMarker

0 commit comments

Comments
 (0)