Get selection color from map canvas

qgis · Sep 15, 2017 · 9478036 · 9478036
1 parent a4e3a77
commit 9478036
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -269,6 +269,12 @@ Read property of QColor bgColor.
 .. versionadded:: 2.4
 %End
 
+    QColor selectionColor() const;
+%Docstring
+.. versionadded:: 3.0
+ :rtype: QColor
+%End
+
     void updateScale();
 %Docstring
 Emits signal scaleChanged to update scale in main window

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9907,16 +9907,11 @@ void QgisApp::new3DMapCanvas()
   QgsProject *prj = QgsProject::instance();
   QgsRectangle fullExtent = mMapCanvas->fullExtent();
 
-  int r = prj->readNumEntry( QStringLiteral( "Gui" ), QStringLiteral( "/SelectionColorRedPart" ), 255 );
-  int g = prj->readNumEntry( QStringLiteral( "Gui" ), QStringLiteral( "/SelectionColorGreenPart" ), 255 );
-  int b = prj->readNumEntry( QStringLiteral( "Gui" ), QStringLiteral( "/SelectionColorBluePart" ), 255 );
-  int a = prj->readNumEntry( QStringLiteral( "Gui" ), QStringLiteral( "/SelectionColorAlphaPart" ), 255 );
-
   Map3D *map = new Map3D;
   map->crs = prj->crs();
   map->originX = fullExtent.center().x();
   map->originY = fullExtent.center().y();
-  map->setSelectionColor( QColor( r, g, b, a ) );
+  map->setSelectionColor( mMapCanvas->selectionColor() );
   map->setBackgroundColor( mMapCanvas->canvasColor() );
   map->setLayers( mMapCanvas->layers() );
 

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1595,6 +1595,11 @@ void QgsMapCanvas::setSelectionColor( const QColor &color )
   mSettings.setSelectionColor( color );
 }
 
+QColor QgsMapCanvas::selectionColor() const
+{
+  return mSettings.selectionColor();
+}
+
 int QgsMapCanvas::layerCount() const
 {
   return mapSettings().layers().size();

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -259,6 +259,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     //! \since QGIS 2.4
     void setSelectionColor( const QColor &color );
 
+    //! Returns color for selected features
+    //! \since QGIS 3.0
+    QColor selectionColor() const;
+
     //! Emits signal scaleChanged to update scale in main window
     void updateScale();