[GRASS-SVN] r44123 - in
grass/branches/releasebranch_6_4/gui/wxpython: . gui_modules
support xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Oct 31 06:03:57 EDT 2010
Author: martinl
Date: 2010-10-31 03:03:56 -0700 (Sun, 31 Oct 2010)
New Revision: 44123
Removed:
grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/rules.py
Modified:
grass/branches/releasebranch_6_4/gui/wxpython/support/update_menudata.py
grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py
grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
Log:
wxGUI: interactive input for r.recode/r.reclass, etc. is managed by menuform.py no need for extra rules.py module
(merge r44118 from trunk)
Deleted: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/rules.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/rules.py 2010-10-31 10:03:08 UTC (rev 44122)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/rules.py 2010-10-31 10:03:56 UTC (rev 44123)
@@ -1,170 +0,0 @@
-"""
-MODULE: rules.py
-
-CLASSES:
- * RulesText
-
-PURPOSE: Dialog for interactive entry of rules for r.colors,
- r.reclass, r.recode, and v.reclass
-
-AUTHORS: The GRASS Development Team
- Michael Barton (Arizona State University)
-
-COPYRIGHT: (C) 2007 by the GRASS Development Team
- This program is free software under the GNU General Public
- License (>=v2). Read the file COPYING that comes with GRASS
- for details.
-
-"""
-
-import os
-import sys
-
-import wx
-
-import gcmd
-import gselect
-import globalvar
-
-class RulesText(wx.Dialog):
- def __init__(self, parent, id=wx.ID_ANY, title=_("Enter rules"),
- pos=wx.DefaultPosition, size=wx.DefaultSize,
- style=wx.DEFAULT_DIALOG_STYLE,
- cmd=None):
- wx.Dialog.__init__(self, parent, id, title, pos, size, style)
-
- """
- Dialog for interactively entering rules
- for map management commands
-
- @param cmd command (given as list)
- """
- self.parent = parent
- self.cmd = cmd # map management command
- self.inmap = '' # input map to change
- self.outmap = '' # output map for reclass/recode
- self.rules = '' # rules for changing
- self.overwrite = False
-
- if self.cmd[0] == 'r.colors':
- label1 = _('Create new color table using color rules')
- label2 = _('Raster map:')
- label3 = None
- label4 = _('Enter color rules')
- seltype = 'cell'
- elif self.cmd[0] == 'r.reclass':
- label1 = _('Reclassify raster map using rules')
- label2 = _('Raster map to reclassify:')
- label3 = _('Reclassified raster map:')
- label4 = _('Enter reclassification rules')
- seltype = 'cell'
- elif self.cmd[0] == 'r.recode':
- label1 = _('Recode raster map using rules')
- label2 = _('Raster map to recode:')
- label3 = _('Recoded raster map:')
- label4 = _('Enter recoding rules')
- seltype = 'cell'
- elif self.cmd[0] == 'v.reclass':
- label1 = _('Reclassify vector map using SQL rules')
- label2 = _('Vector map to reclassify:')
- label3 = _('Reclassified vector map:')
- label4 = _('Enter reclassification rules')
- seltype = 'vector'
-
- # set window frame title
- self.SetTitle(label1)
-
- sizer = wx.BoxSizer(wx.VERTICAL)
- boxSizer = wx.GridBagSizer(hgap=5, vgap=5)
- boxSizer.AddGrowableCol(0)
-
- row = 0
- boxSizer.Add(item=wx.StaticText(parent=self, id=wx.ID_ANY, label=label2),
- flag=wx.ALIGN_CENTER_VERTICAL,
- pos=(row,0))
-
- self.selectionInput = gselect.Select(parent=self, id=wx.ID_ANY, size=globalvar.DIALOG_GSELECT_SIZE,
- type=seltype)
- boxSizer.Add(item=self.selectionInput,
- pos=(row,1))
- row += 1
-
- if self.cmd[0] != 'r.colors':
- boxSizer.Add(item=wx.StaticText(parent=self, id=wx.ID_ANY, label=label3),
- flag=wx.ALIGN_CENTER_VERTICAL,
- pos=(row, 0))
- self.selectionOutput = gselect.Select(parent=self, id=wx.ID_ANY, size=(300,-1),
- type=seltype)
- self.selectionOutput.Bind(wx.EVT_TEXT, self.OnSelectionOutput)
- boxSizer.Add(item=self.selectionOutput,
- pos=(row,1))
- row += 1
- # TODO remove (see Preferences dialog)
- self.ovrwrtcheck = wx.CheckBox(parent=self, id=wx.ID_ANY, label=_('overwrite existing file'))
- self.ovrwrtcheck.SetValue(self.overwrite)
- boxSizer.Add(item=self.ovrwrtcheck,
- pos=(row, 1))
- self.Bind(wx.EVT_CHECKBOX, self.OnOverwrite, self.ovrwrtcheck)
- row += 1
-
- boxSizer.Add(item=wx.StaticText(parent=self, id=wx.ID_ANY, label=label4),
- flag=wx.ALIGN_CENTER_VERTICAL,
- pos=(row, 0))
- helpbtn = wx.Button(parent=self, id=wx.ID_HELP)
- boxSizer.Add(item=helpbtn, flag=wx.ALIGN_RIGHT, pos=(row, 1))
- row += 1
-
- self.rulestxt = wx.TextCtrl(parent=self, id=wx.ID_ANY, value='',
- pos=wx.DefaultPosition, size=(400,150),
- style=wx.TE_MULTILINE |
- wx.HSCROLL |
- wx.TE_NOHIDESEL)
- self.rulestxt.SetFont(wx.Font(10, wx.FONTFAMILY_MODERN, wx.NORMAL, wx.NORMAL, 0, ''))
- boxSizer.Add(item=self.rulestxt, pos=(row, 0), flag=wx.EXPAND, span=(1, 2))
-
- sizer.Add(item=boxSizer, proportion=1,
- flag=wx.ALL ,border=10)
-
- line = wx.StaticLine(parent=self, id=wx.ID_ANY, size=(20,-1), style=wx.LI_HORIZONTAL)
- sizer.Add(item=line, proportion=0,
- flag=wx.GROW | wx.ALIGN_CENTER_VERTICAL | wx.ALL, border=5)
-
- btnsizer = wx.StdDialogButtonSizer()
-
- btn = wx.Button(self, wx.ID_OK)
- btn.SetDefault()
- btnsizer.AddButton(btn)
-
- btn = wx.Button(self, wx.ID_CANCEL)
- btnsizer.AddButton(btn)
- btnsizer.Realize()
-
- sizer.Add(item=btnsizer, proportion=0,
- flag=wx.EXPAND | wx.ALL | wx.ALIGN_CENTER, border=5)
-
- self.SetSizer(sizer)
- sizer.Fit(self)
-
- # bindings
- self.Bind(wx.EVT_BUTTON, self.OnHelp, helpbtn)
- self.selectionInput.Bind(wx.EVT_TEXT, self.OnSelectionInput)
- self.Bind(wx.EVT_TEXT, self.OnRules, self.rulestxt)
-
- def OnSelectionInput(self, event):
- self.inmap = event.GetString()
-
- def OnSelectionOutput(self, event):
- self.outmap = event.GetString()
-
- def OnRules(self, event):
- self.rules = event.GetString().strip()
- if self.cmd[0] == 'r.recode':
- self.rules = self.rules + '%s' % os.linesep
-
- def OnHelp(self, event):
- gcmd.RunCommand('g.manual',
- quiet = True,
- entry = self.cmd[0])
-
- def OnOverwrite(self, event):
- self.overwrite = event.IsChecked()
Modified: grass/branches/releasebranch_6_4/gui/wxpython/support/update_menudata.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/support/update_menudata.py 2010-10-31 10:03:08 UTC (rev 44122)
+++ grass/branches/releasebranch_6_4/gui/wxpython/support/update_menudata.py 2010-10-31 10:03:56 UTC (rev 44123)
@@ -92,7 +92,8 @@
desc = modules[module]['label']
else:
desc = modules[module]['desc']
- node.find('help').text = desc
+ if node.find('handler').text == 'OnMenuCmd':
+ node.find('help').text = desc
if not modules[module].has_key('keywords'):
grass.warning('%s: keywords missing' % module)
Modified: grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py 2010-10-31 10:03:08 UTC (rev 44122)
+++ grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py 2010-10-31 10:03:56 UTC (rev 44123)
@@ -68,7 +68,6 @@
import gui_modules.menuform as menuform
import gui_modules.histogram as histogram
import gui_modules.profile as profile
-import gui_modules.rules as rules
import gui_modules.mcalc_builder as mapcalculator
import gui_modules.gcmd as gcmd
import gui_modules.georect as georect
@@ -886,40 +885,19 @@
self.disp_idx = 0
self.curr_page = None
- def RulesCmd(self, event, cmd = ''):
+ def RulesCmd(self, event):
+ """!Launches dialog for commands that need rules input and
+ processes rules
"""
- Launches dialog for commands that need rules
- input and processes rules
- """
- if event:
- cmd = self.GetMenuCmd(event)
-
- if cmd[0] == 'r.colors' or cmd[0] == 'vcolors':
- ctable = colorrules.ColorTable(self, cmd=cmd[0])
- ctable.Show()
+ cmd = self.GetMenuCmd(event)
+
+ if cmd[0] == 'r.colors':
+ ctable = colorrules.ColorTable(self, raster = True)
else:
- dlg = rules.RulesText(self, cmd=cmd)
- dlg.CenterOnScreen()
- if dlg.ShowModal() == wx.ID_OK:
- gtemp = utils.GetTempfile()
- output = open(gtemp, "w")
- try:
- output.write(dlg.rules)
- finally:
- output.close()
-
- cmdlist = [cmd[0],
- 'input=%s' % dlg.inmap,
- 'output=%s' % dlg.outmap,
- 'rules=%s' % gtemp]
-
- if dlg.overwrite == True:
- cmdlist.append('--o')
-
- dlg.Destroy()
-
- self.goutput.RunCmd(cmdlist)
-
+ ctable = colorrules.ColorTable(self, raster = False)
+ ctable.CentreOnScreen()
+ ctable.Show()
+
def OnXTermNoXMon(self, event):
"""!
Run commands that need xterm
Modified: grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml 2010-10-31 10:03:08 UTC (rev 44122)
+++ grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml 2010-10-31 10:03:56 UTC (rev 44123)
@@ -356,8 +356,8 @@
<separator />
<menuitem>
<label>MPEG-1 export</label>
- <help>Raster File Series to MPEG Conversion Program.</help>
- <keywords>raster</keywords>
+ <help>Raster File Series to MPEG Conversion.</help>
+ <keywords>raster,animation</keywords>
<handler>OnMenuCmd</handler>
<command>r.out.mpeg</command>
</menuitem>
@@ -583,7 +583,7 @@
<separator />
<menuitem>
<label>Vector to raster</label>
- <help>Converts a binary GRASS vector map into a GRASS raster map .</help>
+ <help>Converts (rasterize) a vector map into a raster map.</help>
<keywords>vector,raster,conversion</keywords>
<handler>OnMenuCmd</handler>
<command>v.to.rast</command>
@@ -651,7 +651,7 @@
</menuitem>
<menuitem>
<label>NVIZ (non-interactive)</label>
- <help>Experimental NVIZ CLI prototype.</help>
+ <help>Allows rendering GIS data is a 3D space.</help>
<keywords>visualization,raster,vector,raster3d</keywords>
<handler>OnMenuCmd</handler>
<command>nviz_cmd</command>
@@ -727,7 +727,7 @@
<separator />
<menuitem>
<label>Change working environment</label>
- <help>Change current mapset.</help>
+ <help>Changes current mapset.</help>
<keywords>general,settings</keywords>
<handler>OnMenuCmd</handler>
<command>g.mapset</command>
@@ -869,8 +869,8 @@
</menuitem>
<menuitem>
<label>Timestamp</label>
- <help>Print/add/remove a timestamp for a raster map.</help>
- <keywords>raster</keywords>
+ <help>Modifies a timestamp for a raster map.</help>
+ <keywords>raster,metadata,timestamp</keywords>
<handler>OnMenuCmd</handler>
<command>r.timestamp</command>
</menuitem>
@@ -954,7 +954,7 @@
</menuitem>
<menuitem>
<label>Color rules</label>
- <help>Creates/modifies the color table associated with a raster map layer.</help>
+ <help>Interactive management of raster color tables.</help>
<keywords>raster,color table</keywords>
<handler>RulesCmd</handler>
<command>r.colors</command>
@@ -1496,34 +1496,20 @@
<command>r.reclass.area</command>
</menuitem>
<menuitem>
- <label>Reclassify interactively</label>
- <help>Creates a new map layer whose category values are based upon a reclassification of the categories in an existing raster map layer.</help>
- <keywords>raster</keywords>
- <handler>RulesCmd</handler>
- <command>r.reclass</command>
- </menuitem>
- <menuitem>
- <label>Reclassify using rules file</label>
- <help>Creates a new map layer whose category values are based upon a reclassification of the categories in an existing raster map layer.</help>
- <keywords>raster</keywords>
+ <label>Reclassify</label>
+ <help>Reclassify raster map based on category values.</help>
+ <keywords>raster,reclassification</keywords>
<handler>OnMenuCmd</handler>
<command>r.reclass</command>
</menuitem>
<separator />
<menuitem>
- <label>Recode interactively</label>
+ <label>Recode</label>
<help>Recodes categorical raster maps.</help>
<keywords>raster,recode category</keywords>
- <handler>RulesCmd</handler>
+ <handler>OnMenuCmd</handler>
<command>r.recode</command>
</menuitem>
- <menuitem>
- <label>Recode using rules file</label>
- <help>r.recode.file - Use ascii rules file to recode categories in raster map</help>
- <keywords>raster,recode</keywords>
- <handler>OnMenuCmd</handler>
- <command>r.recode.file</command>
- </menuitem>
<separator />
<menuitem>
<label>Rescale</label>
@@ -1604,8 +1590,8 @@
<separator />
<menuitem>
<label>Random deviates surface</label>
- <help>Produces a raster map layer of uniform random deviates whose range can be expressed by the user.</help>
- <keywords>raster</keywords>
+ <help>Produces a raster map of uniform random deviates whose range can be expressed by the user.</help>
+ <keywords>raster,random</keywords>
<handler>OnMenuCmd</handler>
<command>r.surf.random</command>
</menuitem>
@@ -1690,7 +1676,7 @@
<separator />
<menuitem>
<label>Fill NULL cells</label>
- <help>Fills no-data areas in raster maps using v.surf.rst splines interpolation</help>
+ <help>Fills no-data areas in raster maps using splines interpolation.</help>
<keywords>raster,elevation,interpolation</keywords>
<handler>OnMenuCmd</handler>
<command>r.fillnulls</command>
@@ -1848,8 +1834,8 @@
</menuitem>
<menuitem>
<label>Rebuild topology on all vector maps</label>
- <help>Rebuilds topology on all vector maps in the current mapset..</help>
- <keywords>vector,topology</keywords>
+ <help>Rebuilds topology on all vector maps in the current mapset.</help>
+ <keywords>vector</keywords>
<handler>OnMenuCmd</handler>
<command>v.build.all</command>
</menuitem>
@@ -1987,10 +1973,10 @@
</menuitem>
<menuitem>
<label>Color rules</label>
- <help>Set colors interactively by entering color rules</help>
+ <help>Interacrive management of vector color tables.</help>
<handler>RulesCmd</handler>
- <keywords>vector, colors</keywords>
- <command>vcolors</command>
+ <keywords>vector,color table</keywords>
+ <command>v.colors</command>
</menuitem>
</items>
</menu>
@@ -2242,16 +2228,9 @@
<command>v.category</command>
</menuitem>
<menuitem>
- <label>Reclassify objects interactively</label>
+ <label>Reclassify</label>
<help>Changes vector category values for an existing vector map according to results of SQL queries or a value in attribute table column.</help>
<keywords>vector,reclass,attributes</keywords>
- <handler>RulesCmd</handler>
- <command>v.reclass</command>
- </menuitem>
- <menuitem>
- <label>Reclassify objects using rules file</label>
- <help>Changes vector category values for an existing vector map according to results of SQL queries or a value in attribute table column.</help>
- <keywords>vector,reclass,attributes</keywords>
<handler>OnMenuCmd</handler>
<command>v.reclass</command>
</menuitem>
More information about the grass-commit
mailing list