Mapcanvas background colour is now user configureable

timlinux · timlinux · commit 0b6ee773735b · 2006-01-12T22:35:26.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@4671 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -5156,12 +5156,12 @@ void QgisApp::projectProperties()
     {
       mMapCanvas->recalculateExtents();
     }
+  }
     int  myRedInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorRedPart",255);
     int  myGreenInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorGreenPart",255);
     int  myBlueInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorBluePart",255);
     QColor myColor = QColor(myRedInt,myGreenInt,myBlueInt);
     mMapCanvas->setCanvasColor(myColor);
-  }
   // Set the window title.
   setTitleBarText_( *this );
   // delete the property sheet object
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -563,10 +563,11 @@ void QgsMapCanvas::render(QPaintDevice * theQPaintDevice)
       if ( ! theQPaintDevice )  //painting to mapCanvas->pixmap
       {
         mCanvasProperties->pmCanvas->fill(mCanvasProperties->bgColor);
-        std::cout << (QString ("R: %i G: %i B: %i for canvas background").arg(
-              mCanvasProperties->bgColor.red(),
-              mCanvasProperties->bgColor.red(),
-              mCanvasProperties->bgColor.red())).toLocal8Bit().data() << std::endl;
+        QColor myColor = mCanvasProperties->bgColor;
+        std::cout << "Canvas background R: ";
+        std::cout <<  myColor.red() << " G: ";
+        std::cout << myColor.green() << " B: ";
+        std::cout << myColor.blue() << std::endl;
         paint->begin(mCanvasProperties->pmCanvas);
         if (mCanvasProperties->mAntiAliasFlag)
         {
@@ -2745,10 +2746,16 @@ void QgsMapCanvas::setMapTool(int tool)
 
 
 /** Write property of QColor bgColor. */
-void QgsMapCanvas::setCanvasColor(const QColor & _newVal)
+void QgsMapCanvas::setCanvasColor(const QColor & theColor)
 {
-  mCanvasProperties->bgColor = _newVal;
-  setEraseColor(_newVal);
+  mCanvasProperties->bgColor = theColor;
+  setEraseColor(theColor);
+  QColor myColor = mCanvasProperties->bgColor;
+  std::cout << "Setting Canvas background R: ";
+  std::cout << myColor.red() << " G: ";
+  std::cout << myColor.green() << " B: ";
+  std::cout << myColor.blue() << std::endl;
+
 } // setCanvasColor
 
 

Original file line number	Diff line number	Diff line change
`@@ -5156,12 +5156,12 @@ void QgisApp::projectProperties()`
`5156`	`5156`	`{`
`5157`	`5157`	`mMapCanvas->recalculateExtents();`
`5158`	`5158`	`}`
	`5159`	`+ }`
`5159`	`5160`	`int myRedInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorRedPart",255);`
`5160`	`5161`	`int myGreenInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorGreenPart",255);`
`5161`	`5162`	`int myBlueInt = QgsProject::instance()->readNumEntry("Gui","/CanvasColorBluePart",255);`
`5162`	`5163`	`QColor myColor = QColor(myRedInt,myGreenInt,myBlueInt);`
`5163`	`5164`	`mMapCanvas->setCanvasColor(myColor);`
`5164`		`- }`
`5165`	`5165`	`// Set the window title.`
`5166`	`5166`	`setTitleBarText_( *this );`
`5167`	`5167`	`// delete the property sheet object`