Explorar o código

wxGUI/mapcalc: fixed https://trac.osgeo.org/grass/ticket/1306

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52811 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová %!s(int64=12) %!d(string=hai) anos
pai
achega
a0b87bda8b
Modificáronse 1 ficheiros con 4 adicións e 1 borrados
  1. 4 1
      gui/wxpython/modules/mcalc_builder.py

+ 4 - 1
gui/wxpython/modules/mcalc_builder.py

@@ -474,6 +474,9 @@ class MapCalcFrame(wx.Frame):
                                "a new raster map to create."))
                                "a new raster map to create."))
             return
             return
         
         
+        if not (name[0] == '"' and name[-1] == '"') and any((char in name) for char in self.charactersToQuote):
+            name = '"' + name + '"'
+
         expr = self.text_mcalc.GetValue().strip().replace("\n", " ")
         expr = self.text_mcalc.GetValue().strip().replace("\n", " ")
         if not expr:
         if not expr:
             GError(parent = self,
             GError(parent = self,
@@ -500,7 +503,7 @@ class MapCalcFrame(wx.Frame):
         """!Add create map to the layer tree"""
         """!Add create map to the layer tree"""
         if not self.addbox.IsChecked():
         if not self.addbox.IsChecked():
             return
             return
-        name = self.newmaptxt.GetValue().strip() + '@' + grass.gisenv()['MAPSET']
+        name = self.newmaptxt.GetValue().strip(' "') + '@' + grass.gisenv()['MAPSET']
         mapTree = self.parent.GetLayerTree()
         mapTree = self.parent.GetLayerTree()
         if not mapTree.GetMap().GetListOfLayers(l_name = name):
         if not mapTree.GetMap().GetListOfLayers(l_name = name):
             mapTree.AddLayer(ltype = 'raster',
             mapTree.AddLayer(ltype = 'raster',