mirror of
https://github.com/qgis/QGIS.git
synced 2025-12-05 00:04:40 -05:00
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
This commit is contained in:
parent
7d175fb97b
commit
bacd4feceb
@ -88,39 +88,39 @@ class OsmFeatureDW(QDockWidget, Ui_OsmFeatureDW, object):
|
|||||||
|
|
||||||
# initializing rubberbands/vertexmarkers; getting qgis settings of line width and color for rubberbands
|
# initializing rubberbands/vertexmarkers; getting qgis settings of line width and color for rubberbands
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt()
|
||||||
qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
|
qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
|
||||||
qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
|
qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
|
||||||
|
|
||||||
self.rubBandPol=QgsRubberBand(plugin.canvas,True)
|
self.rubBandPol=QgsRubberBand(plugin.canvas,True)
|
||||||
self.rubBandPol.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
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=QgsRubberBand(plugin.canvas,False)
|
||||||
self.rubBand.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
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=QgsVertexMarker(plugin.canvas)
|
||||||
self.verMarker.setIconType(2)
|
self.verMarker.setIconType(2)
|
||||||
self.verMarker.setIconSize(13)
|
self.verMarker.setIconSize(13)
|
||||||
self.verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
self.verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
self.verMarker.setPenWidth(qgsLineWidth[0])
|
self.verMarker.setPenWidth(qgsLineWidth)
|
||||||
self.verMarkers=[]
|
self.verMarkers=[]
|
||||||
|
|
||||||
self.relRubBandPol=QgsRubberBand(plugin.canvas,True)
|
self.relRubBandPol=QgsRubberBand(plugin.canvas,True)
|
||||||
self.relRubBandPol.setColor(QColor(qgsLineRed[0],50,50))
|
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=QgsRubberBand(plugin.canvas,False)
|
||||||
self.relRubBand.setColor(QColor(qgsLineRed[0],50,50))
|
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=QgsVertexMarker(plugin.canvas)
|
||||||
self.relVerMarker.setIconType(2)
|
self.relVerMarker.setIconType(2)
|
||||||
self.relVerMarker.setIconSize(13)
|
self.relVerMarker.setIconSize(13)
|
||||||
self.relVerMarker.setColor(QColor(qgsLineRed[0],50,50))
|
self.relVerMarker.setColor(QColor(qgsLineRed[0],50,50))
|
||||||
self.relVerMarker.setPenWidth(qgsLineWidth[0])
|
self.relVerMarker.setPenWidth(qgsLineWidth)
|
||||||
|
|
||||||
# initializing inner variables
|
# initializing inner variables
|
||||||
self.activeEditButton=self.dummyButton
|
self.activeEditButton=self.dummyButton
|
||||||
@ -1076,7 +1076,7 @@ class OsmFeatureDW(QDockWidget, Ui_OsmFeatureDW, object):
|
|||||||
|
|
||||||
# get qgis settings of line width and color for rubberband
|
# get qgis settings of line width and color for rubberband
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
|
||||||
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
||||||
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",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.setIconType(3)
|
||||||
verMarker.setIconSize(6)
|
verMarker.setIconSize(6)
|
||||||
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
verMarker.setPenWidth(qgsLineWidth[0])
|
verMarker.setPenWidth(qgsLineWidth)
|
||||||
verMarker.setCenter(pline[i])
|
verMarker.setCenter(pline[i])
|
||||||
verMarker.show()
|
verMarker.show()
|
||||||
self.verMarkers.append(verMarker)
|
self.verMarkers.append(verMarker)
|
||||||
|
|||||||
@ -99,14 +99,14 @@ class OsmCreateLineMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings of line width and color for rubberband
|
# get qgis settings of line width and color for rubberband
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
|
||||||
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
||||||
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
|
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",QVariant(0)).toInt()
|
||||||
|
|
||||||
rband=QgsRubberBand(self.canvas,False)
|
rband=QgsRubberBand(self.canvas,False)
|
||||||
rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
rband.setWidth(qgsLineWidth[0])
|
rband.setWidth(qgsLineWidth)
|
||||||
|
|
||||||
return rband
|
return rband
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ class OsmCreateLineMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings
|
# get qgis settings
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
|
||||||
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
||||||
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",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.setIconType(2)
|
||||||
verMarker.setIconSize(13)
|
verMarker.setIconSize(13)
|
||||||
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
verMarker.setPenWidth(qgsLineWidth[0])
|
verMarker.setPenWidth(qgsLineWidth)
|
||||||
verMarker.setCenter(QgsPoint(-1000,-1000))
|
verMarker.setCenter(QgsPoint(-1000,-1000))
|
||||||
|
|
||||||
return verMarker
|
return verMarker
|
||||||
|
|||||||
@ -96,7 +96,7 @@ class OsmCreatePointMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings
|
# get qgis settings
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
|
||||||
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
||||||
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",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.setIconType(2)
|
||||||
verMarker.setIconSize(13)
|
verMarker.setIconSize(13)
|
||||||
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
verMarker.setPenWidth(qgsLineWidth[0])
|
verMarker.setPenWidth(qgsLineWidth)
|
||||||
verMarker.setCenter(QgsPoint(-1000,-1000))
|
verMarker.setCenter(QgsPoint(-1000,-1000))
|
||||||
|
|
||||||
return verMarker
|
return verMarker
|
||||||
|
|||||||
@ -99,14 +99,14 @@ class OsmCreatePolygonMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings of line width and color for rubberband
|
# get qgis settings of line width and color for rubberband
|
||||||
settings = QSettings()
|
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()
|
qgsLineRed = settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt()
|
||||||
qgsLineGreen = settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
|
qgsLineGreen = settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
|
||||||
qgsLineBlue = settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
|
qgsLineBlue = settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
|
||||||
|
|
||||||
rband=QgsRubberBand(self.canvas,True)
|
rband=QgsRubberBand(self.canvas,True)
|
||||||
rband.setColor( QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]) )
|
rband.setColor( QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]) )
|
||||||
rband.setWidth( qgsLineWidth[0] )
|
rband.setWidth( qgsLineWidth )
|
||||||
|
|
||||||
return rband
|
return rband
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ class OsmCreatePolygonMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings
|
# get qgis settings
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
|
||||||
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
||||||
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",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.setIconType(2)
|
||||||
verMarker.setIconSize(13)
|
verMarker.setIconSize(13)
|
||||||
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
verMarker.setPenWidth(qgsLineWidth[0])
|
verMarker.setPenWidth(qgsLineWidth)
|
||||||
verMarker.setCenter(QgsPoint(-1000,-1000))
|
verMarker.setCenter(QgsPoint(-1000,-1000))
|
||||||
|
|
||||||
return verMarker
|
return verMarker
|
||||||
|
|||||||
@ -186,14 +186,14 @@ class OsmMoveMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings of line width and color for rubberband
|
# get qgis settings of line width and color for rubberband
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value( "/qgis/digitizing/line_color_red", QVariant(255) ).toInt()
|
||||||
qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
|
qgsLineGreen=settings.value( "/qgis/digitizing/line_color_green", QVariant(0) ).toInt()
|
||||||
qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
|
qgsLineBlue=settings.value( "/qgis/digitizing/line_color_blue", QVariant(0) ).toInt()
|
||||||
|
|
||||||
rband=QgsRubberBand(self.canvas,isPolygon)
|
rband=QgsRubberBand(self.canvas,isPolygon)
|
||||||
rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
rband.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
rband.setWidth( qgsLineWidth[0] )
|
rband.setWidth( qgsLineWidth )
|
||||||
|
|
||||||
return rband
|
return rband
|
||||||
|
|
||||||
@ -207,11 +207,11 @@ class OsmMoveMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings of line width and color for rubberband
|
# get qgis settings of line width and color for rubberband
|
||||||
settings=QSettings()
|
settings=QSettings()
|
||||||
qgsLineWidth=settings.value( "/qgis/digitizing/line_width", QVariant(10) ).toInt()
|
qgsLineWidth=2 # use fixed width
|
||||||
|
|
||||||
rband=QgsRubberBand(self.canvas,False)
|
rband=QgsRubberBand(self.canvas,False)
|
||||||
rband.setColor(QColor(255,0,0))
|
rband.setColor(QColor(255,0,0))
|
||||||
rband.setWidth(qgsLineWidth[0])
|
rband.setWidth(qgsLineWidth)
|
||||||
|
|
||||||
return rband
|
return rband
|
||||||
|
|
||||||
@ -224,7 +224,7 @@ class OsmMoveMT(QgsMapTool):
|
|||||||
|
|
||||||
# get qgis settings
|
# get qgis settings
|
||||||
settings=QSettings()
|
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()
|
qgsLineRed=settings.value("/qgis/digitizing/line_color_red",QVariant(255)).toInt()
|
||||||
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
qgsLineGreen=settings.value("/qgis/digitizing/line_color_green",QVariant(0)).toInt()
|
||||||
qgsLineBlue=settings.value("/qgis/digitizing/line_color_blue",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.setIconType(2)
|
||||||
verMarker.setIconSize(13)
|
verMarker.setIconSize(13)
|
||||||
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
verMarker.setColor(QColor(qgsLineRed[0],qgsLineGreen[0],qgsLineBlue[0]))
|
||||||
verMarker.setPenWidth(qgsLineWidth[0])
|
verMarker.setPenWidth(qgsLineWidth)
|
||||||
verMarker.setCenter(QgsPoint(-1000,-1000))
|
verMarker.setCenter(QgsPoint(-1000,-1000))
|
||||||
|
|
||||||
return verMarker
|
return verMarker
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user