[GRASS-SVN] r63204 - in grass/trunk/gui/wxpython: mapdisp vdigit
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Nov 27 07:27:32 PST 2014
Author: annakrat
Date: 2014-11-27 07:27:32 -0800 (Thu, 27 Nov 2014)
New Revision: 63204
Modified:
grass/trunk/gui/wxpython/mapdisp/main.py
grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py
Log:
wxGUI/vdigit: fix closing digitizer window problem due to not implemented giface progressbar interface
Modified: grass/trunk/gui/wxpython/mapdisp/main.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/main.py 2014-11-27 15:22:50 UTC (rev 63203)
+++ grass/trunk/gui/wxpython/mapdisp/main.py 2014-11-27 15:27:32 UTC (rev 63204)
@@ -334,7 +334,10 @@
def GetMapWindow(self):
return self._mapframe.GetMapWindow()
+ def GetProgress(self):
+ return self._mapframe.GetProgressBar()
+
class DMonFrame(MapFrame):
def OnZoomToMap(self, event):
layers = self.MapWindow.GetMap().GetListOfLayers()
Modified: grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py 2014-11-27 15:22:50 UTC (rev 63203)
+++ grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py 2014-11-27 15:27:32 UTC (rev 63204)
@@ -43,7 +43,7 @@
from core.globalvar import CheckWxVersion
from core.utils import _, GuiModuleMain
from mapdisp.frame import MapFrame
-from core.giface import StandaloneGrassInterface
+from mapdisp.main import DMonGrassInterface
from core.settings import UserSettings
from vdigit.main import haveVDigit, errorMsg
from grass.exceptions import CalledModuleError
@@ -51,9 +51,10 @@
class VDigitMapFrame(MapFrame):
def __init__(self, vectorMap):
- MapFrame.__init__(self, parent = None, giface = StandaloneGrassInterface(),
+ MapFrame.__init__(self, parent = None, giface = DMonGrassInterface(None),
title = _("GRASS GIS Vector Digitizer"), size = (850, 600))
-
+ # this giface issue not solved yet, we must set mapframe aferwards
+ self._giface._mapframe = self
# load vector map
mapLayer = self.GetMap().AddLayer(ltype = 'vector',
command = ['d.vect', 'map=%s' % vectorMap],
More information about the grass-commit
mailing list