From bacd4feceba8ba79b5c743862e501fc017a2563d Mon Sep 17 00:00:00 2001 From: wonder Date: Wed, 23 Dec 2009 15:54:57 +0000 Subject: [PATCH] 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@12598 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/plugins/osm/OsmFeatureDW.py | 18 +++++++++--------- .../plugins/osm/map_tools/OsmCreateLineMT.py | 8 ++++---- .../plugins/osm/map_tools/OsmCreatePointMT.py | 4 ++-- .../osm/map_tools/OsmCreatePolygonMT.py | 8 ++++---- python/plugins/osm/map_tools/OsmMoveMT.py | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/python/plugins/osm/OsmFeatureDW.py b/python/plugins/osm/OsmFeatureDW.py index 32be21a4254..b2b5f6cfa20 100644 --- a/python/plugins/osm/OsmFeatureDW.py +++ b/python/plugins/osm/OsmFeatureDW.py @@ -88,39 +88,39 @@ class OsmFeatureDW(QDockWidget, Ui_OsmFeatureDW, object): # initializing rubberbands/vertexmarkers; getting qgis settings of line width and color for rubberbands settings=QSettings() - qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt() qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt() qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt() self.rubBandPol=QgsRubberBand(plugin.canvas,True) self.rubBandPol.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - self.rubBandPol.setWidth(qgsLineWidth[0]) + self.rubBandPol.setWidth(qgsLineWidth) self.rubBand=QgsRubberBand(plugin.canvas,False) self.rubBand.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - self.rubBand.setWidth(qgsLineWidth[0]) + self.rubBand.setWidth(qgsLineWidth) self.verMarker=QgsVertexMarker(plugin.canvas) self.verMarker.setIconType(2) self.verMarker.setIconSize(13) self.verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - self.verMarker.setPenWidth(qgsLineWidth[0]) + self.verMarker.setPenWidth(qgsLineWidth) self.verMarkers=[] self.relRubBandPol=QgsRubberBand(plugin.canvas,True) self.relRubBandPol.setColor(QColor(qgsLineRed[0],50,50)) - self.relRubBandPol.setWidth(qgsLineWidth[0]+4) + self.relRubBandPol.setWidth(qgsLineWidth+4) self.relRubBand=QgsRubberBand(plugin.canvas,False) self.relRubBand.setColor(QColor(qgsLineRed[0],50,50)) - self.relRubBand.setWidth(qgsLineWidth[0]+4) + self.relRubBand.setWidth(qgsLineWidth+4) self.relVerMarker=QgsVertexMarker(plugin.canvas) self.relVerMarker.setIconType(2) self.relVerMarker.setIconSize(13) self.relVerMarker.setColor(QColor(qgsLineRed[0],50,50)) - self.relVerMarker.setPenWidth(qgsLineWidth[0]) + self.relVerMarker.setPenWidth(qgsLineWidth) # initializing inner variables self.activeEditButton=self.dummyButton @@ -1076,7 +1076,7 @@ class OsmFeatureDW(QDockWidget, Ui_OsmFeatureDW, object): # get qgis settings of line width and color for rubberband settings=QSettings() - qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt() qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt() qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt() @@ -1086,7 +1086,7 @@ class OsmFeatureDW(QDockWidget, Ui_OsmFeatureDW, object): verMarker.setIconType(3) verMarker.setIconSize(6) verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - verMarker.setPenWidth(qgsLineWidth[0]) + verMarker.setPenWidth(qgsLineWidth) verMarker.setCenter(pline[i]) verMarker.show() self.verMarkers.append(verMarker) diff --git a/python/plugins/osm/map_tools/OsmCreateLineMT.py b/python/plugins/osm/map_tools/OsmCreateLineMT.py index 8eee416b049..33909a78562 100644 --- a/python/plugins/osm/map_tools/OsmCreateLineMT.py +++ b/python/plugins/osm/map_tools/OsmCreateLineMT.py @@ -99,14 +99,14 @@ class OsmCreateLineMT(QgsMapTool): # get qgis settings of line width and color for rubberband settings=QSettings() - qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt() qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt() qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt() rband=QgsRubberBand(self.canvas,False) rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - rband.setWidth(qgsLineWidth[0]) + rband.setWidth(qgsLineWidth) return rband @@ -120,7 +120,7 @@ class OsmCreateLineMT(QgsMapTool): # get qgis settings settings=QSettings() - qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt() qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt() qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt() @@ -129,7 +129,7 @@ class OsmCreateLineMT(QgsMapTool): verMarker.setIconType(2) verMarker.setIconSize(13) verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - verMarker.setPenWidth(qgsLineWidth[0]) + verMarker.setPenWidth(qgsLineWidth) verMarker.setCenter(QgsPoint(-1000,-1000)) return verMarker diff --git a/python/plugins/osm/map_tools/OsmCreatePointMT.py b/python/plugins/osm/map_tools/OsmCreatePointMT.py index b09c9742a4b..a4f13055723 100644 --- a/python/plugins/osm/map_tools/OsmCreatePointMT.py +++ b/python/plugins/osm/map_tools/OsmCreatePointMT.py @@ -96,7 +96,7 @@ class OsmCreatePointMT(QgsMapTool): # get qgis settings settings=QSettings() - qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt() qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt() qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt() @@ -105,7 +105,7 @@ class OsmCreatePointMT(QgsMapTool): verMarker.setIconType(2) verMarker.setIconSize(13) verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - verMarker.setPenWidth(qgsLineWidth[0]) + verMarker.setPenWidth(qgsLineWidth) verMarker.setCenter(QgsPoint(-1000,-1000)) return verMarker diff --git a/python/plugins/osm/map_tools/OsmCreatePolygonMT.py b/python/plugins/osm/map_tools/OsmCreatePolygonMT.py index 30c1aae8a7d..6cc5057923a 100644 --- a/python/plugins/osm/map_tools/OsmCreatePolygonMT.py +++ b/python/plugins/osm/map_tools/OsmCreatePolygonMT.py @@ -99,14 +99,14 @@ class OsmCreatePolygonMT(QgsMapTool): # get qgis settings of line width and color for rubberband settings = QSettings() - qgsLineWidth = settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt() + qgsLineWidth = 2 # use fixed width qgsLineRed = settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt() qgsLineGreen = settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt() qgsLineBlue = settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt() rband=QgsRubberBand(self.canvas,True) rband.setColor( QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]) ) - rband.setWidth( qgsLineWidth[0] ) + rband.setWidth( qgsLineWidth ) return rband @@ -120,7 +120,7 @@ class OsmCreatePolygonMT(QgsMapTool): # get qgis settings settings=QSettings() - qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt() qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt() qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt() @@ -129,7 +129,7 @@ class OsmCreatePolygonMT(QgsMapTool): verMarker.setIconType(2) verMarker.setIconSize(13) verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - verMarker.setPenWidth(qgsLineWidth[0]) + verMarker.setPenWidth(qgsLineWidth) verMarker.setCenter(QgsPoint(-1000,-1000)) return verMarker diff --git a/python/plugins/osm/map_tools/OsmMoveMT.py b/python/plugins/osm/map_tools/OsmMoveMT.py index 7c48aeeaa5b..f326c0095ac 100644 --- a/python/plugins/osm/map_tools/OsmMoveMT.py +++ b/python/plugins/osm/map_tools/OsmMoveMT.py @@ -186,14 +186,14 @@ class OsmMoveMT(QgsMapTool): # get qgis settings of line width and color for rubberband settings=QSettings() - qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt() qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt() qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt() rband=QgsRubberBand(self.canvas,isPolygon) rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - rband.setWidth( qgsLineWidth[0] ) + rband.setWidth( qgsLineWidth ) return rband @@ -207,11 +207,11 @@ class OsmMoveMT(QgsMapTool): # get qgis settings of line width and color for rubberband settings=QSettings() - qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt() + qgsLineWidth=2 # use fixed width rband=QgsRubberBand(self.canvas,False) rband.setColor(QColor(255,0,0)) - rband.setWidth(qgsLineWidth[0]) + rband.setWidth(qgsLineWidth) return rband @@ -224,7 +224,7 @@ class OsmMoveMT(QgsMapTool): # get qgis settings settings=QSettings() - qgsLineWidth=settings.value("/qgis/digitizing/line_width",QVariant(10)).toInt() + qgsLineWidth=2 # use fixed width qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt() qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt() qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt() @@ -233,7 +233,7 @@ class OsmMoveMT(QgsMapTool): verMarker.setIconType(2) verMarker.setIconSize(13) verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0])) - verMarker.setPenWidth(qgsLineWidth[0]) + verMarker.setPenWidth(qgsLineWidth) verMarker.setCenter(QgsPoint(-1000,-1000)) return verMarker