[GRASS-SVN] r41072 - in grass/branches/releasebranch_6_4/gui: scripts tcltk/gis.m wxpython/xml

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-02-18 00:44:10 -0500 (Thu, 18 Feb 2010)
New Revision: 41072

Modified:
   grass/branches/releasebranch_6_4/gui/scripts/d.path.sh
   grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl
   grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
Log:
allow d.path wrapper to run from wxGUI

Modified: grass/branches/releasebranch_6_4/gui/scripts/d.path.sh
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/d.path.sh	2010-02-18 05:30:22 UTC (rev 41071)
+++ grass/branches/releasebranch_6_4/gui/scripts/d.path.sh	2010-02-18 05:44:10 UTC (rev 41072)
@@ -28,7 +28,7 @@
 #%End
 #%Flag
 #% key: b
-#% description: Render bold lines
+#% description: Do not render bold lines
 #% guisection: Rendering
 #%End
 #%Option
@@ -133,6 +133,8 @@
     exit 1
 fi
 
+unset GRASS_UI_TERM
+
 if [ "$1" != "@ARGS_PARSED@" ] ; then
     exec g.parser "$0" "$@"
 fi
@@ -145,7 +147,7 @@
 else
     flag_g=""
 fi
-if [ "$GIS_FLAG_B" -eq 1 ] ; then
+if [ "$GIS_FLAG_B" -eq 0 ] ; then
     flag_b="-b"
 else
     flag_b=""

Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl	2010-02-18 05:30:22 UTC (rev 41071)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl	2010-02-18 05:44:10 UTC (rev 41072)
@@ -485,7 +485,7 @@
 		{command {[G_msg "Display shortest route"]} {} "d.path: Display shortest route along network between 2 nodes (visualization only)" {} -command {
 			unset env(GRASS_RENDER_IMMEDIATE)
 			guarantee_xmon
-			spawn d.path.sh -b --ui
+			spawn d.path.sh
 			set env(GRASS_RENDER_IMMEDIATE) "TRUE"}}
 		{command {[G_msg "Split net"]} {} "v.net.iso: Split net into bands between cost isolines" {} -command {execute v.net.iso }}
 		{command {[G_msg "Steiner tree"]} {} "v.net.steiner: Create Steiner tree for network and given terminals" {} -command {execute v.net.steiner }}

Modified: grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml	2010-02-18 05:30:22 UTC (rev 41071)
+++ grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml	2010-02-18 05:44:10 UTC (rev 41072)
@@ -1808,7 +1808,7 @@
 	      <label>Display shortest route (requires XTerm)</label>
 	      <help>Finds shortest path for selected starting and ending node.</help>
 	      <handler>self.OnXTerm</handler>
-	      <command>d.path</command>
+	      <command>d.path.sh</command>
 	    </menuitem>
 	    <menuitem>
 	      <label>Split net</label>