[GRASS-SVN] r35289 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-01-08 11:15:25 -0500 (Thu, 08 Jan 2009)
New Revision: 35289

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: fix georectify tool


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py	2009-01-08 14:27:18 UTC (rev 35288)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py	2009-01-08 16:15:25 UTC (rev 35289)
@@ -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()
 
         #
@@ -821,6 +827,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/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2009-01-08 14:27:18 UTC (rev 35288)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2009-01-08 16:15:25 UTC (rev 35289)
@@ -420,7 +420,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/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2009-01-08 14:27:18 UTC (rev 35288)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2009-01-08 16:15:25 UTC (rev 35289)
@@ -831,8 +831,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