[GRASS-SVN] r42973 - grass/branches/develbranch_6/gui/wxpython/gui_modules

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Aug 2 18:02:13 EDT 2010


Author: martinl
Date: 2010-08-02 22:02:13 +0000 (Mon, 02 Aug 2010)
New Revision: 42973

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
Log:
wxGUI: fix calling gcmd.GError
(merge r42972 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2010-08-02 21:14:01 UTC (rev 42972)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2010-08-02 22:02:13 UTC (rev 42973)
@@ -41,7 +41,6 @@
 import globalvar
 import utils
 import gcmd
-from gcmd import GException
 from debug import Debug as Debug
 from preferences import globalSettings as UserSettings
 
@@ -641,7 +640,7 @@
                 message = _("Unable to get current geographic extent. "
                             "Force quiting wxGUI. Please run manually g.region to "
                             "fix the problem.")
-            GError(message)
+            gcmd.GError(message)
             return self.region
         
         for reg in ret.splitlines():
@@ -1050,8 +1049,8 @@
             layer.SetOpacity(kargs['opacity'])
         
         if render and not layer.Render():
-            raise GException(_("Unable to render map layer <%s>.") % 
-                             (name))
+            raise gcmd.GException(_("Unable to render map layer <%s>.") % 
+                                  (name))
         
         return layer
 
@@ -1159,8 +1158,8 @@
         self.overlays.append(overlay)
         
         if l_render and command != '' and not overlay.Render():
-            raise GException(_("Unable render overlay <%s>.") % 
-                             (name))
+            raise gcmd.GException(_("Unable render overlay <%s>.") % 
+                                  (name))
         
         return self.overlays[-1]
 
@@ -1198,8 +1197,8 @@
             overlay.SetOpacity(kargs['opacity'])
         
         if render and command != [] and not overlay.Render():
-            raise GException(_("Unable render overlay <%s>") % 
-                             (name))
+            raise gcmd.GException(_("Unable render overlay <%s>") % 
+                                  (name))
         
         return overlay
 



More information about the grass-commit mailing list