[QGIS Commit] r12598 - in trunk/qgis/python/plugins/osm: . map_tools
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Dec 23 10:54:58 EST 2009
Author: wonder
Date: 2009-12-23 10:54:57 -0500 (Wed, 23 Dec 2009)
New Revision: 12598
Modified:
trunk/qgis/python/plugins/osm/OsmFeatureDW.py
trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py
trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py
trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py
trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py
Log:
Use fixed 2px pen width for rubber bands and vertex markers. (The previous default 10px was just too much)
Modified: trunk/qgis/python/plugins/osm/OsmFeatureDW.py
===================================================================
--- trunk/qgis/python/plugins/osm/OsmFeatureDW.py 2009-12-23 15:36:11 UTC (rev 12597)
+++ trunk/qgis/python/plugins/osm/OsmFeatureDW.py 2009-12-23 15:54:57 UTC (rev 12598)
@@ -88,39 +88,39 @@
# 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 @@
# 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 @@
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)
Modified: trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py
===================================================================
--- trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py 2009-12-23 15:36:11 UTC (rev 12597)
+++ trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py 2009-12-23 15:54:57 UTC (rev 12598)
@@ -99,14 +99,14 @@
# 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 @@
# 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 @@
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
Modified: trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py
===================================================================
--- trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py 2009-12-23 15:36:11 UTC (rev 12597)
+++ trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py 2009-12-23 15:54:57 UTC (rev 12598)
@@ -96,7 +96,7 @@
# 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 @@
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
Modified: trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py
===================================================================
--- trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py 2009-12-23 15:36:11 UTC (rev 12597)
+++ trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py 2009-12-23 15:54:57 UTC (rev 12598)
@@ -99,14 +99,14 @@
# 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 @@
# 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 @@
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
Modified: trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py
===================================================================
--- trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py 2009-12-23 15:36:11 UTC (rev 12597)
+++ trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py 2009-12-23 15:54:57 UTC (rev 12598)
@@ -186,14 +186,14 @@
# 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 @@
# 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 @@
# 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 @@
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
More information about the QGIS-commit
mailing list