Add better default colour and width for measure tools. Fix #10029

NathanW2 · NathanW2 · commit 3a726b608584 · 2014-04-23T23:08:36.000+10:00
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
@@ -133,7 +133,8 @@ void QgsMapToolMeasureAngle::createRubberBand()
   int myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
   int myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();
   int myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();
-  mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 65 ) );
+  mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 100 ) );
+  mRubberBand->setWidth( 3 );
 }
 
 QgsPoint QgsMapToolMeasureAngle::snapPoint( const QPoint& p )
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -117,10 +117,11 @@ void QgsMeasureTool::updateSettings()
 {
   QSettings settings;
 
-  int myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
-  int myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();
-  int myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();
-  mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 65 ) );
+  int myRed = settings.value( "/qgis/default_measure_color_red", 222 ).toInt();
+  int myGreen = settings.value( "/qgis/default_measure_color_green", 155 ).toInt();
+  int myBlue = settings.value( "/qgis/default_measure_color_blue", 67 ).toInt();
+  mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 100 ) );
+  mRubberBand->setWidth( 3 );
   mDialog->updateSettings();
 }
 
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -623,9 +623,9 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
   pbnCanvasColor->setColor( QColor( myRed, myGreen, myBlue ) );
 
   // set the default color for the measure tool
-  myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
-  myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();
-  myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();
+  myRed = settings.value( "/qgis/default_measure_color_red", 222 ).toInt();
+  myGreen = settings.value( "/qgis/default_measure_color_green", 155 ).toInt();
+  myBlue = settings.value( "/qgis/default_measure_color_blue", 67 ).toInt();
   pbnMeasureColor->setColor( QColor( myRed, myGreen, myBlue ) );
 
   capitaliseCheckBox->setChecked( settings.value( "/qgis/capitaliseLayerName", QVariant( false ) ).toBool() );

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ void QgsMapToolMeasureAngle::createRubberBand()`
`133`	`133`	`int myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();`
`134`	`134`	`int myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();`
`135`	`135`	`int myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();`
`136`		`- mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 65 ) );`
	`136`	`+ mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 100 ) );`
	`137`	`+ mRubberBand->setWidth( 3 );`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`QgsPoint QgsMapToolMeasureAngle::snapPoint( const QPoint& p )`
Original file line number	Diff line number	Diff line change
`@@ -117,10 +117,11 @@ void QgsMeasureTool::updateSettings()`
`117`	`117`	`{`
`118`	`118`	`QSettings settings;`
`119`	`119`
`120`		`- int myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();`
`121`		`- int myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();`
`122`		`- int myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();`
`123`		`- mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 65 ) );`
	`120`	`+ int myRed = settings.value( "/qgis/default_measure_color_red", 222 ).toInt();`
	`121`	`+ int myGreen = settings.value( "/qgis/default_measure_color_green", 155 ).toInt();`
	`122`	`+ int myBlue = settings.value( "/qgis/default_measure_color_blue", 67 ).toInt();`
	`123`	`+ mRubberBand->setColor( QColor( myRed, myGreen, myBlue, 100 ) );`
	`124`	`+ mRubberBand->setWidth( 3 );`
`124`	`125`	`mDialog->updateSettings();`
`125`	`126`	`}`
`126`	`127`