[GRASS-SVN] r35290 -
grass/branches/develbranch_6/gui/wxpython/gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 8 11:20:29 EST 2009
Author: martinl
Date: 2009-01-08 11:20:28 -0500 (Thu, 08 Jan 2009)
New Revision: 35290
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: fix georectify tool
(merge relbr64, r35289)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py 2009-01-08 16:15:25 UTC (rev 35289)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py 2009-01-08 16:20:28 UTC (rev 35290)
@@ -136,10 +136,16 @@
if self.wizard.RunWizard(self.startpage):
success = self.OnWizFinished()
if success == False:
- wx.MessageBox(_("Georectifying setup canceled."))
+ wx.MessageBox(parent=self.parent,
+ message=_("Georectifying setup canceled."),
+ caption=_("Georectify"),
+ style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
self.Cleanup()
else:
- wx.MessageBox(_("Georectifying setup canceled."))
+ wx.MessageBox(parent=self.parent,
+ message=_("Georectifying setup canceled."),
+ caption=_("Georectify"),
+ style=wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
self.Cleanup()
#
@@ -822,6 +828,7 @@
coord = mapWin.Cell2Pixel((gcp[coordtype][0], gcp[coordtype][1]))
mapWin.DrawCross(pdc=mapWin.pdcTmp, coords=coord,
size=5, text={ 'text' : '%s' % str(idx + 1),
+ 'active' : True,
'font' : font,
'color': wxCol,
'coords': [coord[0] + 5,
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py 2009-01-08 16:15:25 UTC (rev 35289)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py 2009-01-08 16:20:28 UTC (rev 35290)
@@ -318,7 +318,8 @@
# self.ovlcoords[drawid] = coords
elif pdctype == 'text': # draw text on top of map
- if not img['active']: return #only draw active text
+ if not img['active']:
+ return #only draw active text
if img.has_key('rotation'):
rotation = float(img['rotation'])
else:
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py 2009-01-08 16:15:25 UTC (rev 35289)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py 2009-01-08 16:20:28 UTC (rev 35290)
@@ -832,8 +832,7 @@
if self.get_dcmd and \
self.parent and \
- self.parent.GetName() in ('LayerManager',
- 'LayerTree',
+ self.parent.GetName() in ('LayerTree',
'MapWindow'):
# display decorations and
# pressing OK or cancel after setting layer properties
More information about the grass-commit
mailing list