wxGUI/modeler: various updates

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41600 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/docs/wxGUI.Modeler.html

@@ -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>
 

gui/wxpython/gui_modules/gmodeler.py

@@ -55,6 +55,7 @@ class ModelFrame(wx.Frame):
         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 @@ class ModelFrame(wx.Frame):
         """!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

gui/wxpython/gui_modules/toolbars.py

@@ -1393,6 +1393,8 @@ class ModelToolbar(AbstractToolbar):
         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
@@ -1414,6 +1416,13 @@ class ModelToolbar(AbstractToolbar):
              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),

gui/wxpython/icons/grass2_icons.py

@@ -107,4 +107,7 @@ IconsGrass2 = {
     # modeler
     "modelActionAdd" : 'layer-add.png',
     "modelDataAdd"   : 'map-add.png',
+    "modelRun"       : 'redo.png',
+    "modelValidate"  : 'tools.png',
+    
     }

gui/wxpython/icons/grass_icons.py

@@ -109,4 +109,7 @@ IconsGrass = {
     # modeler
     "modelActionAdd" : wx.ART_ERROR,
     "modelDataAdd"   : wx.ART_ERROR,
+    "modelRun"       : wx.ART_ERROR,
+    "modelValidate"  : wx.ART_ERROR,
+
     }

gui/wxpython/icons/icon.py

@@ -347,6 +347,10 @@ Icons = {
                                  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 ...

gui/wxpython/icons/silk_icons.py

@@ -110,4 +110,6 @@ IconsSilk = {
     # modeler
     "modelActionAdd" : wx.ART_ERROR,
     "modelDataAdd"   : wx.ART_ERROR,
+    "modelRun"       : wx.ART_ERROR,
+    "modelValidate"  : wx.ART_ERROR,
     }

gui/wxpython/xml/menudata_modeler.xml

@@ -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>