[GRASS-SVN] r62758 - in grass/branches/releasebranch_7_0: . gui/wxpython/gmodeler gui/wxpython/lmgr

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-16 04:53:20 -0800 (Sun, 16 Nov 2014)
New Revision: 62758

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
   grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
Log:
wxGUI: fix 'File -> Run model'
       (merge r62757 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62723,62730,62739,62741,62743,62746,62750,62752
   + /grass/trunk:60817,61096,61141,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62723,62730,62739,62741,62743,62746,62750,62752,62757

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py	2014-11-16 12:51:02 UTC (rev 62757)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py	2014-11-16 12:53:20 UTC (rev 62758)
@@ -18,7 +18,7 @@
  - model::WritePythonFile
  - model::ModelParamDialog
 
-(C) 2010-2013 by the GRASS Development Team
+(C) 2010-2014 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.

Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py	2014-11-16 12:51:02 UTC (rev 62757)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py	2014-11-16 12:53:20 UTC (rev 62758)
@@ -510,7 +510,7 @@
         
         self.model = Model()
         self.model.LoadModel(filename)
-        self.model.Run(log = self._goutput, onDone = self.OnDone, parent = self)
+        self.model.Run(log = self.GetLogWindow(), onDone = self.OnDone, parent = self)
         
         dlg.Destroy()