Bläddra i källkod

wxgui: use fully-qualified name when querying vector maps (causes failure when adding vector map not in search path)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74450 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 6 år sedan
förälder
incheckning
0bc81f53c0
2 ändrade filer med 12 tillägg och 11 borttagningar
  1. 3 1
      gui/wxpython/gui_core/vselect.py
  2. 9 10
      gui/wxpython/mapdisp/frame.py

+ 3 - 1
gui/wxpython/gui_core/vselect.py

@@ -244,7 +244,9 @@ class VectorSelectBase():
         self.updateLayer.emit()
         self.updateLayer.emit()
         if len(self.selectedFeatures) > 0:
         if len(self.selectedFeatures) > 0:
             self.painter.SetLayer(self.selectedFeatures[0]['Layer'])
             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()
             tmp = list()
             for i in self.selectedFeatures:
             for i in self.selectedFeatures:
                 tmp.append(i['Category'])
                 tmp.append(i['Category'])

+ 9 - 10
gui/wxpython/mapdisp/frame.py

@@ -999,7 +999,9 @@ class MapFrame(SingleMapFrame):
         """Highlight category from query."""
         """Highlight category from query."""
         if len(vectQuery) > 0:
         if len(vectQuery) > 0:
             self._highlighter_layer.SetLayer(vectQuery[0]['Layer'])
             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()
             tmp = list()
             for i in vectQuery:
             for i in vectQuery:
                 tmp.append(i['Category'])
                 tmp.append(i['Category'])
@@ -1061,17 +1063,14 @@ class MapFrame(SingleMapFrame):
 
 
         pattern = [
         pattern = [
             "d.vect",
             "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',
                 group='atm',
                 key='highlight',
                 key='highlight',
-                subkey='width')]
+                subkey='width')
+        ]
         if icon != '':
         if icon != '':
             pattern.append('icon=%s' % icon)
             pattern.append('icon=%s' % icon)
         if size > 0:
         if size > 0: