Bladeren bron

wxGUI/modeler: load model file from command line

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41630 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 jaren geleden
bovenliggende
commit
14a98d6917
2 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 5 4
      gui/wxpython/gui_modules/gmodeler.py
  2. 0 1
      gui/wxpython/gui_modules/menuform.py

+ 5 - 4
gui/wxpython/gui_modules/gmodeler.py

@@ -20,6 +20,7 @@ This program is free software under the GNU General Public License
 """
 
 import os
+import sys
 import shlex
 import time
 import traceback
@@ -433,10 +434,8 @@ class ModelAction(ogl.RectangleShape):
 
     def SetProperties(self, dcmd, params, propwin):
         """!Record properties dialog"""
-        if dcmd:
-            self.cmd = dcmd
-        if self.params:
-            self.params = params
+        self.cmd = dcmd
+        self.params = params
         self.propWin = propwin
 
     def GetPropDialog(self):
@@ -887,6 +886,8 @@ class WriteModelFile:
 def main():
     app = wx.PySimpleApp()
     frame = ModelFrame(parent = None)
+    if len(sys.argv) > 1:
+        frame.LoadModelFile(sys.argv[1])
     # frame.CentreOnScreen()
     frame.Show()
     

+ 0 - 1
gui/wxpython/gui_modules/menuform.py

@@ -994,7 +994,6 @@ class mainFrame(wx.Frame):
                 self.parent.Delete(self.layer)
                 self.Destroy()
         elif self.parent and self.parent.GetName() == 'Modeler':
-            self.get_dcmd(None, self.layer, None, None)
             self.Destroy()
         else:
             # cancel for non-display commands