[GRASS-SVN] r74451 - in grass/branches/releasebranch_7_6/gui/wxpython: gui_core mapdisp

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-05-02 02:16:18 -0700 (Thu, 02 May 2019)
New Revision: 74451

Modified:
   grass/branches/releasebranch_7_6/gui/wxpython/gui_core/vselect.py
   grass/branches/releasebranch_7_6/gui/wxpython/mapdisp/frame.py
Log:
wxgui: use fully-qualified name when querying vector maps (causes failure when adding vector map not in search path) (merge r74450 from trunk)

Modified: grass/branches/releasebranch_7_6/gui/wxpython/gui_core/vselect.py
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/gui_core/vselect.py	2019-05-02 09:13:50 UTC (rev 74450)
+++ grass/branches/releasebranch_7_6/gui/wxpython/gui_core/vselect.py	2019-05-02 09:16:18 UTC (rev 74451)
@@ -244,7 +244,9 @@
         self.updateLayer.emit()
         if len(self.selectedFeatures) > 0:
             self.painter.SetLayer(self.selectedFeatures[0]['Layer'])
-            self.painter.SetMap(self.selectedFeatures[0]['Map'])
+            self.painter.SetMap(
+                self.selectedFeatures[0]['Map'] + '@' + self.selectedFeatures[0]['Mapset']
+            )
             tmp = list()
             for i in self.selectedFeatures:
                 tmp.append(i['Category'])

Modified: grass/branches/releasebranch_7_6/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/mapdisp/frame.py	2019-05-02 09:13:50 UTC (rev 74450)
+++ grass/branches/releasebranch_7_6/gui/wxpython/mapdisp/frame.py	2019-05-02 09:16:18 UTC (rev 74451)
@@ -998,7 +998,9 @@
         """Highlight category from query."""
         if len(vectQuery) > 0:
             self._highlighter_layer.SetLayer(vectQuery[0]['Layer'])
-            self._highlighter_layer.SetMap(vectQuery[0]['Map'])
+            self._highlighter_layer.SetMap(
+                vectQuery[0]['Map'] + '@' + vectQuery[0]['Mapset']
+            )
             tmp = list()
             for i in vectQuery:
                 tmp.append(i['Category'])
@@ -1060,17 +1062,14 @@
 
         pattern = [
             "d.vect",
-            "map=%s" %
-            name,
-            "color=%s" %
-            colorStr,
-            "fill_color=%s" %
-            colorStr,
-            "width=%d" %
-            UserSettings.Get(
+            "map=%s" % name,
+            "color=%s" % colorStr,
+            "fill_color=%s" % colorStr,
+            "width=%d" % UserSettings.Get(
                 group='atm',
                 key='highlight',
-                subkey='width')]
+                subkey='width')
+        ]
         if icon != '':
             pattern.append('icon=%s' % icon)
         if size > 0: