Browse Source

wxGUI/modeler: various minor fixes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42556 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 years ago
parent
commit
90fdbba8e0

+ 2 - 0
gui/wxpython/gui_modules/globalvar.py

@@ -18,6 +18,8 @@ import os
 import sys
 import sys
 import locale
 import locale
 
 
+if not os.getenv("GISBASE"):
+    sys.exit("GRASS is not running. Exiting...")
 ### i18N
 ### i18N
 import gettext
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)

+ 3 - 1
gui/wxpython/gui_modules/gmodeler.py

@@ -1047,7 +1047,7 @@ if __name__ == "__main__":
         
         
         # add action to canvas
         # add action to canvas
         width, height = self.canvas.GetSize()
         width, height = self.canvas.GetSize()
-        action = ModelAction(self, cmd = cmd, x = width/2, y = height/2,
+        action = ModelAction(self.model, cmd = cmd, x = width/2, y = height/2,
                              id = len(self.model.GetActions()) + 1)
                              id = len(self.model.GetActions()) + 1)
         overwrite = self.model.GetProperties().get('overwrite', None)
         overwrite = self.model.GetProperties().get('overwrite', None)
         if overwrite is not None:
         if overwrite is not None:
@@ -1914,6 +1914,7 @@ class ModelEvtHandler(ogl.ShapeEvtHandler):
         shape.InsertLineControlPoint(point = wx.RealPoint(self.x, self.y))
         shape.InsertLineControlPoint(point = wx.RealPoint(self.x, self.y))
         shape.ResetShapes()
         shape.ResetShapes()
         shape.Select(True)
         shape.Select(True)
+        self.frame.ModelChanged()
         self.frame.canvas.Refresh()
         self.frame.canvas.Refresh()
         
         
     def OnRemovePoint(self, event):
     def OnRemovePoint(self, event):
@@ -1922,6 +1923,7 @@ class ModelEvtHandler(ogl.ShapeEvtHandler):
         shape.DeleteLineControlPoint()
         shape.DeleteLineControlPoint()
         shape.Select(False)
         shape.Select(False)
         shape.Select(True)
         shape.Select(True)
+        self.frame.ModelChanged()
         self.frame.canvas.Refresh()
         self.frame.canvas.Refresh()
         
         
     def OnIntermediate(self, event):
     def OnIntermediate(self, event):

+ 2 - 2
gui/wxpython/xml/menudata_modeler.xml

@@ -82,8 +82,8 @@
 	  <handler>OnDefineRelation</handler>
 	  <handler>OnDefineRelation</handler>
 	</menuitem>
 	</menuitem>
 	<menuitem>
 	<menuitem>
-	  <label>Define loop</label>
-	  <help>Defines loop in the model</help>
+	  <label>Add loop</label>
+	  <help>Adds loop to model</help>
 	  <handler>OnDefineLoop</handler>
 	  <handler>OnDefineLoop</handler>
 	  <shortcut>Ctrl+L</shortcut>
 	  <shortcut>Ctrl+L</shortcut>
 	</menuitem>
 	</menuitem>