[GRASS-SVN] r51825 - grass/branches/develbranch_6/gui/wxpython/lmgr
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun May 27 07:47:08 PDT 2012
Author: annakrat
Date: 2012-05-27 07:47:08 -0700 (Sun, 27 May 2012)
New Revision: 51825
Modified:
grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
Log:
wxGUI: ask to constrain resolution with d.rast.num and d.rast.arrow (merge from trunk, r51824)
Modified: grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py 2012-05-27 14:41:52 UTC (rev 51824)
+++ grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py 2012-05-27 14:47:08 UTC (rev 51825)
@@ -1566,11 +1566,32 @@
def OnAddRasterArrow(self, event):
"""!Add flow arrows raster map to the current layer tree"""
self.notebook.SetSelectionByName('layers')
+ tree = self.curr_page.maptree
+ resolution = tree.GetMapDisplay().GetProperty('resolution')
+ if not resolution:
+ dlg = self.MsgDisplayResolution()
+ if dlg.ShowModal() == wx.ID_YES:
+ tree.GetMapDisplay().SetProperty('resolution', True)
+ dlg.Destroy()
+
self.curr_page.maptree.AddLayer('rastarrow')
def OnAddRasterNum(self, event):
"""!Add cell number raster map to the current layer tree"""
self.notebook.SetSelectionByName('layers')
+ tree = self.curr_page.maptree
+ resolution = tree.GetMapDisplay().GetProperty('resolution')
+ if not resolution:
+ limitText = _("Note that cell values can only be displayed for "
+ "regions of less than 10,000 cells.")
+ dlg = self.MsgDisplayResolution(limitText)
+ if dlg.ShowModal() == wx.ID_YES:
+ tree.GetMapDisplay().SetProperty('resolution', True)
+ dlg.Destroy()
+
+ # region = tree.GetMap().GetCurrentRegion()
+ # if region['cells'] > 10000:
+ # GMessage(message = "Cell values can only be displayed for regions of < 10,000 cells.", parent = self)
self.curr_page.maptree.AddLayer('rastnum')
def OnAddCommand(self, event):
@@ -1747,3 +1768,22 @@
message = _("No map layer selected. Operation canceled."),
caption = _("Message"),
style = wx.OK | wx.ICON_INFORMATION | wx.CENTRE)
+
+ def MsgDisplayResolution(self, limitText = None):
+ """!Returns dialog for d.rast.num, d.rast.arrow
+ when display resolution is not constrained
+
+ @param limitText adds a note about cell limit
+ """
+ message = _("Display resolution is currently not constrained to "
+ "computational settings. "
+ "It's suggested to constrain map to region geometry. "
+ "Do you want to constrain "
+ "the resolution?")
+ if limitText:
+ message += "\n\n%s" % _(limitText)
+ dlg = wx.MessageDialog(parent = self,
+ message = message,
+ caption = _("Constrain map to region geometry?"),
+ style = wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION | wx.CENTRE)
+ return dlg
More information about the grass-commit
mailing list