浏览代码

wxGUI: don't fail if not possible to determine GRASS version

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59288 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 11 年之前
父节点
当前提交
5e151be27c
共有 2 个文件被更改,包括 14 次插入2 次删除
  1. 7 1
      gui/wxpython/lmgr/frame.py
  2. 7 1
      gui/wxpython/mapdisp/frame.py

+ 7 - 1
gui/wxpython/lmgr/frame.py

@@ -89,7 +89,13 @@ class GMFrame(wx.Frame):
         if title:
             self.baseTitle = title
         else:
-            self.baseTitle = _("GRASS GIS %s Layer Manager") % grass.version()['version']
+            try:
+                grassVersion = grass.version()['version']
+            except KeyError:
+                sys.stderr.write(_("Unable to get GRASS version"))
+                grassVersion = "?"
+            self.baseTitle = _("GRASS GIS %s Layer Manager") % grassVersion
+
         self.iconsize  = (16, 16)
 
         self.displayIndex    = 0          # index value for map displays and layer trees

+ 7 - 1
gui/wxpython/mapdisp/frame.py

@@ -244,8 +244,14 @@ class MapFrame(SingleMapFrame):
 
     def SetTitle(self, displayId = 1):
         """!Set map display title"""
+        try:
+            grassVersion = grass.version()['version']
+        except KeyError:
+            sys.stderr.write(_("Unable to get GRASS version"))
+            grassVersion = "?"
+        
         title = _("GRASS GIS %(version)s Map Display: %(id)s  - Location: %(loc)s@%(mapset)s") % \
-            { 'version' : grass.version()['version'],
+            { 'version' : grassVersion,
               'id' : str(displayId),
               'loc' : grass.gisenv()["LOCATION_NAME"],
               'mapset' : grass.gisenv()["MAPSET"] }