Improvements for setting the background colour of the canvas. It now …

…follows this logic: 1) set in qgis options to desired default bg colour 2) whenever you start new project / open qgis that colour will be used 3) overide canvas background on a project by project basis in project props git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4679 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 13, 2006 · 31494eb · 31494eb
1 parent a8e5f46
commit 31494eb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -270,8 +270,6 @@ static void setTitleBarText_( QWidget & qgisApp )
   mQgisInterface = new QgisIface(this);
   // set the legend control for the map canvas
   mMapCanvas->setLegend(mMapLegend);
-  QSettings mySettings;
-  mMapCanvas->enableAntiAliasing(mySettings.value("/qgis/enable_anti_aliasing").toBool());
 
 
   //
@@ -1059,7 +1057,17 @@ void QgisApp::createCanvas()
   // "theMapCanvas" used to find this canonical instance later
   mMapCanvas = new QgsMapCanvas(NULL, "theMapCanvas" );
   QWhatsThis::add(mMapCanvas, tr("Map canvas. This is where raster and vector layers are displayed when added to the map"));
-  mMapCanvas->setBackgroundColor(Qt::white); //QColor (220, 235, 255));
+  //set the canvas to the default background colour
+  //the default can be set in qgisoptions 
+  //use project properties to override the colour on a per project basis
+  QSettings mySettings;
+  int myRed = mySettings.value("/qgis/default_canvas_color_red",255).toInt();
+  int myGreen = mySettings.value("/qgis/default_canvas_color_green",255).toInt();
+  int myBlue = mySettings.value("/qgis/default_canvas_color_blue",255).toInt();
+  mMapCanvas->setCanvasColor(QColor(myRed,myGreen,myBlue));  // this is the fill co;our when rendering
+  mMapCanvas->setBackgroundColor(QColor(myRed,myGreen,myBlue)); // this is for the widget itself
+
+  mMapCanvas->enableAntiAliasing(mySettings.value("/qgis/enable_anti_aliasing",false).toBool());
   mMapCanvas->setMinimumWidth(400);
   QVBoxLayout *myCanvasLayout = new QVBoxLayout;
   myCanvasLayout->addWidget(mMapCanvas);
@@ -3008,8 +3016,8 @@ void QgisApp::openProject(int pathIndex)
     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);
-                        
+    mMapCanvas->setCanvasColor(myColor); //this is fill colour before rendering starts
+    mMapCanvas->setBackgroundColor(myColor); // this is for the widget itself
   }
   //set the projections enabled icon in the status bar
   int myProjectionEnabledFlag =
@@ -5161,7 +5169,8 @@ void QgisApp::projectProperties()
     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);
+    mMapCanvas->setCanvasColor(myColor); //this is fil colour before rendering onto canvas
+    mMapCanvas->setBackgroundColor(myColor); // this is for the widget itself
   // Set the window title.
   setTitleBarText_( *this );
   // delete the property sheet object

diff --git a/src/gui/qgsoptions.cpp b/src/gui/qgsoptions.cpp
@@ -94,9 +94,9 @@ QgsOptions::QgsOptions(QWidget *parent, const char *name, bool modal) :
   // set the theme combo
   cmbTheme->setCurrentText(settings.readEntry("/Themes","default"));
   //set teh state of the checkboxes
-  chkAntiAliasing->setChecked(settings.value("/qgis/enable_anti_aliasing").toBool());
-  chkAddedVisibility->setChecked(!settings.value("/qgis/new_layers_visible").toBool());
-  cbxHideSplash->setChecked(settings.value("/qgis/hideSplash").toBool());
+  chkAntiAliasing->setChecked(settings.value("/qgis/enable_anti_aliasing",false).toBool());
+  chkAddedVisibility->setChecked(!settings.value("/qgis/new_layers_visible",false).toBool());
+  cbxHideSplash->setChecked(settings.value("/qgis/hideSplash",false).toBool());
   //set the colour for selections
   int myRed = settings.value("/qgis/default_selection_color_red",255).toInt();
   int myGreen = settings.value("/qgis/default_selection_color_green",255).toInt();