浏览代码

wxGUI: fix broken https://trac.osgeo.org/grass/changeset/51610

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@51611 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 年之前
父节点
当前提交
88e2c60192
共有 2 个文件被更改,包括 8 次插入1 次删除
  1. 7 0
      gui/wxpython/core/gcmd.py
  2. 1 1
      gui/wxpython/lmgr/frame.py

+ 7 - 0
gui/wxpython/core/gcmd.py

@@ -98,6 +98,13 @@ def EncodeString(string):
 
 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

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

@@ -50,7 +50,6 @@ from core.workspace        import ProcessWorkspaceFile, ProcessGrcFile, WriteWor
 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 @@ class GMFrame(wx.Frame):
         
     def OnImportWMS(self, event):
         """!Import data from OGC WMS server"""
+        from ogc_services.wms import WMSDialog
         dlg = WMSDialog(parent = self, service = 'wms')
         dlg.CenterOnScreen()