[GRASS-SVN] r49627 - in grass/branches/develbranch_6/gui/wxpython: . gmodeler psmap

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-08 12:10:09 -0800 (Thu, 08 Dec 2011)
New Revision: 49627

Modified:
   grass/branches/develbranch_6/gui/wxpython/gmodeler/frame.py
   grass/branches/develbranch_6/gui/wxpython/psmap/frame.py
   grass/branches/develbranch_6/gui/wxpython/psmap/toolbars.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: various mirror fixes


Modified: grass/branches/develbranch_6/gui/wxpython/gmodeler/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gmodeler/frame.py	2011-12-08 13:43:16 UTC (rev 49626)
+++ grass/branches/develbranch_6/gui/wxpython/gmodeler/frame.py	2011-12-08 20:10:09 UTC (rev 49627)
@@ -142,7 +142,7 @@
         
         self.SetMenuBar(self.menubar)
         
-        self.toolbar = toolbars.ModelToolbar(parent = self)
+        self.toolbar = ModelToolbar(parent = self)
         self.SetToolBar(self.toolbar)
         
         self.statusbar = self.CreateStatusBar(number = 1)

Modified: grass/branches/develbranch_6/gui/wxpython/psmap/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/psmap/frame.py	2011-12-08 13:43:16 UTC (rev 49626)
+++ grass/branches/develbranch_6/gui/wxpython/psmap/frame.py	2011-12-08 20:10:09 UTC (rev 49627)
@@ -164,7 +164,7 @@
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
         self.Bind(EVT_CMD_DONE, self.OnCmdDone)
         
-        if not haveImage:
+        if not havePILImage:
             wx.CallAfter(self._showErrMsg)
         
     def _showErrMsg(self):

Modified: grass/branches/develbranch_6/gui/wxpython/psmap/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/psmap/toolbars.py	2011-12-08 13:43:16 UTC (rev 49626)
+++ grass/branches/develbranch_6/gui/wxpython/psmap/toolbars.py	2011-12-08 20:10:09 UTC (rev 49627)
@@ -42,8 +42,8 @@
                                'bind' : self.parent.OnPointer }
         self.OnTool(None)
         
-        from psmap import haveImage
-        if not haveImage:
+        from psmap.frame import havePILImage
+        if not havePILImage:
             self.EnableTool(self.preview, False)
         
     def _toolbarData(self):

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2011-12-08 13:43:16 UTC (rev 49626)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2011-12-08 20:10:09 UTC (rev 49627)
@@ -75,6 +75,7 @@
 from lmgr.toolbars         import LMMiscToolbar, LMVectorToolbar, LMNvizToolbar
 from lmgr.pyshell          import PyShellWindow
 from gui_core.forms        import GUI
+from gcp.manager           import GCPWizard
 
 class GMFrame(wx.Frame):
     """!Layer Manager frame with notebook widget for controlling GRASS
@@ -315,8 +316,6 @@
         
     def OnLocationWizard(self, event):
         """!Launch location wizard"""
-        from gui_modules import location_wizard
-        
         gisdbase = grass.gisenv()['GISDBASE']
         gWizard = location_wizard.LocationWizard(parent = self,
                                                  grassdatabase = gisdbase)
@@ -349,8 +348,7 @@
     def OnGCPManager(self, event):
         """!Launch georectifier module
         """
-        from gui_modules import gcpmanager
-        gcpmanager.GCPWizard(self)
+        GCPWizard(self)
 
     def OnGModeler(self, event):
         """!Launch Graphical Modeler"""
@@ -362,14 +360,6 @@
     def OnPsMap(self, event):
         """!Launch Cartographic Composer
         """
-        try:
-            from gui_modules import psmap
-        except:
-            GError(parent = self.parent,
-                   message = _("Hardcopy Map Output Utility is not available. You can install it by %s") % \
-                       'g.extension.py -s svnurl=https://svn.osgeo.org/grass/grass-addons extension=wx.psmap')
-            return
-        
         win = PsMapFrame(parent = self)
         win.CentreOnScreen()
         
@@ -1315,19 +1305,6 @@
         """!Create new layer tree and map display instance"""
         self.NewDisplayWMS()
 
-    def NewDisplayWMS(self, show = True):
-        Debug.msg(1, "GMFrame.NewDisplay(): idx=%d" % self.disp_idx)
-        try:
-            from gui_modules.wms.wmsmenu import DisplayWMSMenu
-        except:
-            GError(parent = self.parent,
-                   message = _("Experimental WMS support for wxGUI not available. "
-                               "You can install it by '%s'") % \
-                       "g.extension -s extension=wx.wms")
-            return
-        
-        DisplayWMSMenu()
-    
     def OnNewDisplay(self, event = None):
         """!Create new layer tree and map display instance"""
         self.NewDisplay()