[GRASS-SVN] r41601 - in grass/branches/develbranch_6/gui:
icons/grass2 wxpython/docs wxpython/gui_modules
wxpython/icons wxpython/xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Mar 28 17:10:58 EDT 2010
Author: martinl
Date: 2010-03-28 17:10:57 -0400 (Sun, 28 Mar 2010)
New Revision: 41601
Added:
grass/branches/develbranch_6/gui/icons/grass2/redo.png
Modified:
grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html
grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
grass/branches/develbranch_6/gui/wxpython/icons/icon.py
grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml
Log:
wxGUI/modeler: various updates
(merge r41600 from trunk)
Copied: grass/branches/develbranch_6/gui/icons/grass2/redo.png (from rev 41600, grass/trunk/gui/icons/grass2/redo.png)
===================================================================
(Binary files differ)
Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html 2010-03-28 21:10:57 UTC (rev 41601)
@@ -1,7 +1,6 @@
<h2>DESCRIPTION</h2>
-<b>Note:</b> <em>wxGUI Modeler is currently under development. Not
-all functionality is implemented.</em>
+<b>Note:</b> <em>wxGUI Modeler is currently under development.</em>
<h2>AUTHORS</h2>
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py 2010-03-28 21:10:57 UTC (rev 41601)
@@ -55,6 +55,7 @@
self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
self.menubar = menu.Menu(parent = self, data = menudata.ModelerData())
+
self.SetMenuBar(self.menubar)
self.toolbar = toolbars.ModelToolbar(parent = self)
@@ -111,6 +112,19 @@
"""!Create model to file as"""
pass
+ def OnRunModel(self, event):
+ """!Run entire model"""
+ pass
+
+ def OnValidateModel(self, event):
+ """!Validate entire model"""
+ for s in self.actions:
+ print s
+
+ def OnRemoveItem(self, event):
+ """!Remove item from model"""
+ pass
+
def OnAddAction(self, event):
"""!Add action to model"""
debug = False
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py 2010-03-28 21:10:57 UTC (rev 41601)
@@ -1389,6 +1389,8 @@
self.save = wx.NewId()
self.action = wx.NewId()
self.data = wx.NewId()
+ self.run = wx.NewId()
+ self.validate = wx.NewId()
self.quit = wx.NewId()
# tool, label, bitmap, kind, shortHelp, longHelp, handler
@@ -1410,6 +1412,13 @@
wx.ITEM_NORMAL, Icons['modelActionAdd'].GetLabel(), Icons['modelActionAdd'].GetDesc(),
self.parent.OnAddAction),
('', '', '', '', '', '', ''),
+ (self.run, 'run', Icons['modelRun'].GetBitmap(),
+ wx.ITEM_NORMAL, Icons['modelRun'].GetLabel(), Icons['modelRun'].GetDesc(),
+ self.parent.OnRunModel),
+ (self.validate, 'validate', Icons['modelValidate'].GetBitmap(),
+ wx.ITEM_NORMAL, Icons['modelValidate'].GetLabel(), Icons['modelValidate'].GetDesc(),
+ self.parent.OnValidateModel),
+ ('', '', '', '', '', '', ''),
(self.quit, 'quit', Icons['quit'].GetBitmap(),
wx.ITEM_NORMAL, Icons['quit'].GetLabel(), Icons['quit'].GetDesc(),
self.parent.OnCloseWindow),
Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py 2010-03-28 21:10:57 UTC (rev 41601)
@@ -106,4 +106,7 @@
# modeler
"modelActionAdd" : 'layer-add.png',
"modelDataAdd" : 'map-add.png',
+ "modelRun" : 'redo.png',
+ "modelValidate" : 'tools.png',
+
}
Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py 2010-03-28 21:10:57 UTC (rev 41601)
@@ -108,4 +108,7 @@
# modeler
"modelActionAdd" : wx.ART_ERROR,
"modelDataAdd" : wx.ART_ERROR,
+ "modelRun" : wx.ART_ERROR,
+ "modelValidate" : wx.ART_ERROR,
+
}
Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py 2010-03-28 21:10:57 UTC (rev 41601)
@@ -345,6 +345,10 @@
label=_("Add action (GRASS module) to model")),
"modelDataAdd" : MetaIcon (img=Icons["modelDataAdd"],
label=_("Add data item to model")),
+ "modelRun" : MetaIcon (img=Icons["modelRun"],
+ label=_("Run entire model")),
+ "modelValidate" : MetaIcon (img=Icons["modelValidate"],
+ label=_("Validate entire model")),
}
# testing ...
Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py 2010-03-28 21:10:57 UTC (rev 41601)
@@ -109,4 +109,6 @@
# modeler
"modelActionAdd" : wx.ART_ERROR,
"modelDataAdd" : wx.ART_ERROR,
+ "modelRun" : wx.ART_ERROR,
+ "modelValidate" : wx.ART_ERROR,
}
Property changes on: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594
+ /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600
Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml 2010-03-28 20:54:24 UTC (rev 41600)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml 2010-03-28 21:10:57 UTC (rev 41601)
@@ -48,6 +48,22 @@
<help>Add action (GRASS module) to model</help>
<handler>OnAddAction</handler>
</menuitem>
+ <menuitem>
+ <label>Remove item</label>
+ <help>Remove action/data from model</help>
+ <handler>OnRemoveItem</handler>
+ </menuitem>
+ <separator />
+ <menuitem>
+ <label>Run model</label>
+ <help>Run entire model</help>
+ <handler>OnRunModel</handler>
+ </menuitem>
+ <menuitem>
+ <label>Validate model</label>
+ <help>Validate entire model</help>
+ <handler>OnValidateModel</handler>
+ </menuitem>
</items>
</menu>
<menu>
More information about the grass-commit
mailing list