[GRASS-SVN] r36104 - in grass/branches/releasebranch_6_4/gui/tcltk: d.m gis.m

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-02-26 00:18:48 -0500 (Thu, 26 Feb 2009)
New Revision: 36104

Modified:
   grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl
   grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl
Log:
guarantee xmon fixes (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl	2009-02-26 05:15:05 UTC (rev 36103)
+++ grass/branches/releasebranch_6_4/gui/tcltk/d.m/menu.tcl	2009-02-26 05:18:48 UTC (rev 36104)
@@ -491,7 +491,7 @@
 		{command {[G_msg "Set ground control points (GCP's) from vector map or keyboard entry"]} {} "i.vpoints" {} \
 		-command {guarantee_xmon; term i.vpoints }}
 		{command {[G_msg "Affine and Polynomial rectification (rubber sheet)"]} {} "i.rectify" {} -command {execute i.rectify }}
-		{command {[G_msg "Ortho photo rectification"]} {} "i.ortho.photo" {} -command {term i.ortho.photo }}
+		{command {[G_msg "Ortho photo rectification"]} {} "i.ortho.photo" {} -command {guarantee_xmon; term i.ortho.photo }}
 	}}
 	{separator}
 	{command {[G_msg "Brovey transformation and pan sharpening"]} {} "i.fusion.brovey" {} -command {execute i.fusion.brovey }}
@@ -501,7 +501,7 @@
 		{command {[G_msg "Maximum likelihood classification (MLC)"]} {} "i.maxlik" {} -command {execute i.maxlik }}
 		{command {[G_msg "Sequential maximum a posteriory classification (SMAP)"]} {} "i.smap" {} -command {execute i.smap }}
 		{separator}
-		{command {[G_msg "Interactive input for supervised classification"]} {} "i.class" {} -command {term i.class }}
+		{command {[G_msg "Interactive input for supervised classification"]} {} "i.class" {} -command {guarantee_xmon; term i.class }}
 		{command {[G_msg "Non-interactive input for supervised classification (MLC)"]} {} "i.gensig" {} -command {execute i.gensig }}
 		{command {[G_msg "Non-interactive input for supervised classification (SMAP)"]} {} "i.gensigset" {} -command {execute i.gensigset }}
 	}}

Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl	2009-02-26 05:15:05 UTC (rev 36103)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gmmenu.tcl	2009-02-26 05:18:48 UTC (rev 36104)
@@ -563,7 +563,11 @@
 		{command {[G_msg "Maximum likelihood classification (MLC)"]} {} "i.maxlik: Maximum likelihood classification" {} -command {execute i.maxlik }}
 		{command {[G_msg "Sequential maximum a posteriory classification (SMAP)"]} {} "i.smap: Sequential maximum a posteriory classification" {} -command {execute i.smap }}
 		{separator}
-		{command {[G_msg "Interactive input for supervised classification"]} {} "i.class: Interactive input for supervised classification" {} -command {term i.class }}
+		{command {[G_msg "Interactive input for supervised classification"]} {} "i.class: Interactive input for supervised classification" {} -command {
+		    unset env(GRASS_RENDER_IMMEDIATE)
+		    guarantee_xmon
+		    term i.class
+		    set env(GRASS_RENDER_IMMEDIATE) "TRUE" }}
 		{command {[G_msg "Input for supervised MLC"]} {} "i.gensig: Non-interactive input for supervised classification (MLC)" {} -command {execute i.gensig }}
 		{command {[G_msg "Input for supervised SMAP"]} {} "i.gensigset: Non-interactive input for supervised classification (SMAP)" {} -command {execute i.gensigset }}
 	}}