[GRASS-SVN] r59026 - in grass/trunk/gui/wxpython: lmgr xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Feb 13 08:01:33 PST 2014
Author: annakrat
Date: 2014-02-13 08:01:32 -0800 (Thu, 13 Feb 2014)
New Revision: 59026
Modified:
grass/trunk/gui/wxpython/lmgr/frame.py
grass/trunk/gui/wxpython/xml/module_tree.xml
grass/trunk/gui/wxpython/xml/toolboxes.xml
Log:
wxGUI/toolboxes: add export, import, link and other tools to search module tree
Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py 2014-02-13 13:36:09 UTC (rev 59025)
+++ grass/trunk/gui/wxpython/lmgr/frame.py 2014-02-13 16:01:32 UTC (rev 59026)
@@ -429,28 +429,28 @@
### self._createMenuBar() # bug when menu is re-created on the fly
self._setCopyingOfSelectedText()
- def OnGCPManager(self, event):
- """!Launch georectifier module
+ def OnGCPManager(self, event=None, cmd=None):
+ """!Launch georectifier module. See OnIClass documentation.
"""
GCPWizard(self, self._giface)
- def OnGModeler(self, event):
- """!Launch Graphical Modeler"""
+ def OnGModeler(self, event=None, cmd=None):
+ """!Launch Graphical Modeler. See OnIClass documentation."""
win = ModelFrame(parent = self, giface = self._giface)
win.CentreOnScreen()
win.Show()
- def OnPsMap(self, event):
- """!Launch Cartographic Composer
+ def OnPsMap(self, event=None, cmd=None):
+ """!Launch Cartographic Composer. See OnIClass documentation.
"""
win = PsMapFrame(parent = self)
win.CentreOnScreen()
win.Show()
- def OnMapSwipe(self, event):
- """!Launch Map Swipe"""
+ def OnMapSwipe(self, event=None, cmd=None):
+ """!Launch Map Swipe. See OnIClass documentation."""
win = SwipeMapFrame(parent=self, giface=self._giface)
rasters = []
@@ -470,8 +470,8 @@
win.CentreOnScreen()
win.Show()
- def OnRLiSetup(self, event):
- """!Launch r.li Setup"""
+ def OnRLiSetup(self, event=None, cmd=None):
+ """!Launch r.li Setup. See OnIClass documentation."""
win = RLiSetupFrame(parent = self)
win.CentreOnScreen()
@@ -1465,8 +1465,8 @@
win.Show()
- def OnAnimationTool(self, event):
- """!Launch Animation tool
+ def OnAnimationTool(self, event=None, cmd=None):
+ """!Launch Animation tool. See OnIClass documentation.
"""
from animation.frame import AnimationFrame
Modified: grass/trunk/gui/wxpython/xml/module_tree.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/module_tree.xml 2014-02-13 13:36:09 UTC (rev 59025)
+++ grass/trunk/gui/wxpython/xml/module_tree.xml 2014-02-13 16:01:32 UTC (rev 59026)
@@ -3,12 +3,15 @@
<toolbox name="DefaultModuleTree">
<label>Default GRASS GIS module tree</label>
<items>
+ <subtoolbox name="ImportExportLink"/>
+ <subtoolbox name="ManageMaps"/>
<subtoolbox name="Raster"/>
<subtoolbox name="Vector"/>
<subtoolbox name="Imagery"/>
<subtoolbox name="Volumes"/>
<subtoolbox name="Database"/>
<subtoolbox name="Temporal"/>
+ <subtoolbox name="GuiTools"/>
<user-toolboxes-list/>
<addons/>
</items>
Modified: grass/trunk/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/toolboxes.xml 2014-02-13 13:36:09 UTC (rev 59025)
+++ grass/trunk/gui/wxpython/xml/toolboxes.xml 2014-02-13 16:01:32 UTC (rev 59026)
@@ -17,9 +17,9 @@
<subtoolbox name="Export3DRasterMaps"/>
<subtoolbox name="ExportDatabaseTable"/>
<separator/>
- <subtoolbox name="ExternalFormats"/>
+ <subtoolbox name="LinkExternalData"/>
<separator/>
- <subtoolbox name="ManageMapsAndVolumes"/>
+ <subtoolbox name="ManageMaps"/>
<subtoolbox name="MapTypeConversions"/>
<separator/>
<wxgui-item name="Georectify"/>
@@ -237,6 +237,22 @@
<wxgui-item name="CloseAllOpenMapDisplayWindows"/>
</items>
</toolbox>
+ <toolbox name="ImportExportLink">
+ <label>Import, export and link data</label>
+ <items>
+ <subtoolbox name="ImportRasterData"/>
+ <subtoolbox name="ImportVectorData"/>
+ <subtoolbox name="Import3DRasterData"/>
+ <subtoolbox name="ImportDatabaseTable"/>
+ <separator/>
+ <subtoolbox name="ExportRasterMap"/>
+ <subtoolbox name="ExportVectorMap"/>
+ <subtoolbox name="Export3DRasterMaps"/>
+ <subtoolbox name="ExportDatabaseTable"/>
+ <separator/>
+ <subtoolbox name="LinkExternalData"/>
+ </items>
+ </toolbox>
<toolbox name="ImportRasterData">
<label>Import raster data</label>
<items>
@@ -283,6 +299,10 @@
<module-item name="r.unpack">
<label>Unpack raster map</label>
</module-item>
+ <separator/>
+ <module-item name="r.proj">
+ <label>Reproject raster map from different GRASS location</label>
+ </module-item>
</items>
</toolbox>
<toolbox name="ImportVectorData">
@@ -331,6 +351,10 @@
<module-item name="v.unpack">
<label>Unpack vector map</label>
</module-item>
+ <separator/>
+ <module-item name="v.proj">
+ <label>Reproject vector map from different GRASS location</label>
+ </module-item>
</items>
</toolbox>
<toolbox name="Import3DRasterData">
@@ -472,8 +496,8 @@
</module-item>
</items>
</toolbox>
- <toolbox name="ExternalFormats">
- <label>External formats</label>
+ <toolbox name="LinkExternalData">
+ <label>Link external data</label>
<items>
<wxgui-item name="LinkExternalRasterData"/>
<wxgui-item name="LinkExternalVectorData"/>
@@ -484,8 +508,8 @@
<wxgui-item name="OutputFormatForVectorData"/>
</items>
</toolbox>
- <toolbox name="ManageMapsAndVolumes">
- <label>Manage maps and volumes</label>
+ <toolbox name="ManageMaps">
+ <label>Manage maps</label>
<items>
<module-item name="g.copy">
<label>Copy</label>
@@ -643,7 +667,7 @@
</module-item>
<separator/>
<module-item name="r.proj">
- <label>Reproject raster map from different location</label>
+ <label>Reproject raster map from different GRASS location</label>
</module-item>
<module-item name="r.tileset">
<label>Tiling</label>
@@ -1132,7 +1156,7 @@
<label>Rectify vector map</label>
</module-item>
<module-item name="v.proj">
- <label>Reproject vector map from different location</label>
+ <label>Reproject vector map from different GRASS location</label>
</module-item>
<separator/>
<module-item name="v.support">
@@ -1773,6 +1797,7 @@
<subtoolbox name="TemporalAggregation"/>
<subtoolbox name="TemporalSampling"/>
<subtoolbox name="TemporalReportsAndStatistics"/>
+ <subtoolbox name="TemporalGuiTools"/>
</items>
</toolbox>
<toolbox name="TemporalManageDatasets">
@@ -1921,5 +1946,28 @@
</module-item>
</items>
</toolbox>
+ <toolbox name="TemporalGuiTools">
+ <label>GUI tools</label>
+ <items>
+ <wxgui-item name="AnimationTool"/>
+ <module-item name="g.gui.timeline">
+ <label>Plot temporal extents</label>
+ </module-item>
+ </items>
+ </toolbox>
+ <toolbox name="GuiTools">
+ <label>GUI tools</label>
+ <items>
+ <wxgui-item name="AnimationTool"/>
+ <module-item name="g.gui.dbmgr">
+ <label>Attribute table manager</label>
+ </module-item>
+ <wxgui-item name="Georectify"/>
+ <wxgui-item name="GraphicalModeler"/>
+ <wxgui-item name="InteractiveInputForSupervisedClassification"/>
+ <wxgui-item name="MapSwipe"/>
+ <wxgui-item name="CartographicComposer"/>
+ </items>
+ </toolbox>
</toolboxes>
More information about the grass-commit
mailing list