[GRASS-SVN] r54010 - in grass/trunk/gui/wxpython: lmgr vdigit
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 24 04:40:23 PST 2012
Author: annakrat
Date: 2012-11-24 04:40:22 -0800 (Sat, 24 Nov 2012)
New Revision: 54010
Modified:
grass/trunk/gui/wxpython/lmgr/giface.py
grass/trunk/gui/wxpython/vdigit/toolbars.py
grass/trunk/gui/wxpython/vdigit/wxdigit.py
Log:
wxGUI/interface: temporary fix for progressbar
Modified: grass/trunk/gui/wxpython/lmgr/giface.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/giface.py 2012-11-24 12:26:57 UTC (rev 54009)
+++ grass/trunk/gui/wxpython/lmgr/giface.py 2012-11-24 12:40:22 UTC (rev 54010)
@@ -63,3 +63,6 @@
return self.lmgr.GetMapDisplay(onlyCurrent=True).GetMapWindow()
else:
return None
+
+ def GetProgress(self):
+ return self.lmgr.goutput.GetProgressBar()
Modified: grass/trunk/gui/wxpython/vdigit/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/toolbars.py 2012-11-24 12:26:57 UTC (rev 54009)
+++ grass/trunk/gui/wxpython/vdigit/toolbars.py 2012-11-24 12:40:22 UTC (rev 54010)
@@ -850,10 +850,11 @@
0)
self.digit.CloseMap()
+ # TODO: replace by giface
lmgr = self.parent.GetLayerManager()
if lmgr:
lmgr.toolbars['tools'].Enable('vdigit', enable = True)
- lmgr.GetLogWindow().GetProgressBar().SetValue(0)
+ lmgr._giface.GetProgress().SetValue(0)
lmgr.GetLogWindow().WriteCmdLog(_("Editing of vector map <%s> successfully finished") % \
self.mapLayer.GetName())
# re-active layer
Modified: grass/trunk/gui/wxpython/vdigit/wxdigit.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/wxdigit.py 2012-11-24 12:26:57 UTC (rev 54009)
+++ grass/trunk/gui/wxpython/vdigit/wxdigit.py 2012-11-24 12:40:22 UTC (rev 54010)
@@ -137,10 +137,11 @@
self.bgMapInfo = Map_info()
self.poBgMapInfo = self.popoBgMapInfo = None
+ # TODO: replace this by using giface
if not mapwindow.parent.IsStandalone():
goutput = mapwindow.parent.GetLayerManager().GetLogWindow()
log = goutput.GetLog(err = True)
- progress = goutput.GetProgressBar()
+ progress = mapwindow.parent._giface.GetProgress()
else:
log = sys.stderr
progress = None
More information about the grass-commit
mailing list