[GRASS-SVN] r51611 - in grass/trunk/gui/wxpython: core lmgr

svn_grass at osgeo.org svn_grass at osgeo.org
Wed May 9 09:53:27 EDT 2012


Author: martinl
Date: 2012-05-09 06:53:26 -0700 (Wed, 09 May 2012)
New Revision: 51611

Modified:
   grass/trunk/gui/wxpython/core/gcmd.py
   grass/trunk/gui/wxpython/lmgr/frame.py
Log:
wxGUI: fix broken r51610

Modified: grass/trunk/gui/wxpython/core/gcmd.py
===================================================================
--- grass/trunk/gui/wxpython/core/gcmd.py	2012-05-09 13:17:07 UTC (rev 51610)
+++ grass/trunk/gui/wxpython/core/gcmd.py	2012-05-09 13:53:26 UTC (rev 51611)
@@ -98,6 +98,13 @@
 
 class GError:
     def __init__(self, message, parent = None, caption = None, showTraceback = True):
+        """!Show error message window
+
+        @param message error message
+        @param parent centre window on parent if given
+        @param caption window caption (if not given "Error")
+        @showTraceback True to show also Python traceback
+        """
         if not caption:
             caption = _('Error')
         style = wx.OK | wx.ICON_ERROR | wx.CENTRE

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2012-05-09 13:17:07 UTC (rev 51610)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2012-05-09 13:53:26 UTC (rev 51611)
@@ -50,7 +50,6 @@
 from gui_core.goutput      import GMConsole
 from gui_core.dialogs      import GdalOutputDialog, DxfImportDialog, GdalImportDialog, MapLayersDialog
 from gui_core.dialogs      import LocationDialog, MapsetDialog, CreateNewVector, GroupDialog
-from modules.ogc_services  import WMSDialog
 from modules.colorrules    import RasterColorTable, VectorColorTable
 from gui_core.menu         import Menu
 from gmodeler.model        import Model
@@ -1271,6 +1270,7 @@
         
     def OnImportWMS(self, event):
         """!Import data from OGC WMS server"""
+        from ogc_services.wms import WMSDialog
         dlg = WMSDialog(parent = self, service = 'wms')
         dlg.CenterOnScreen()
         



More information about the grass-commit mailing list