[GRASS-SVN] r31453 - grass/branches/develbranch_6/lib/gtcltk

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2008-05-21 00:26:54 -0400 (Wed, 21 May 2008)
New Revision: 31453

Modified:
   grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl
Log:
This hopefully fixes issues created in my last fix for missing linefeed in WinGRASS. I still don't know if that is fixed or not. This restores the progress bar functionality and fixes some backspace removal issues. It seems to also prevent some (all?) modules from crashing the TclTk gui when they are run.

Modified: grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl
===================================================================
--- grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl	2008-05-20 22:30:09 UTC (rev 31452)
+++ grass/branches/develbranch_6/lib/gtcltk/gronsole.tcl	2008-05-21 04:26:54 UTC (rev 31453)
@@ -339,7 +339,7 @@
 
 	set tagbase cmd$ci
 	# Back out backspaces:
-	if {0} {
+
 	while {[set idx [string first "\b" $str]] != -1} {
 		set last [expr $idx - 1]
 		set str1 [string range $str 1 $last]
@@ -349,8 +349,17 @@
 		$outtext delete $pos
 		$outtext insert $mark $str1 $tags
 	}
-	}
-	if { [regexp -- {^GRASS_INFO_([^(]+)\(([0-9]+),([0-9]+)\): (.+)$} $str match key message_pid message_id val rest] } {
+	
+	if { [regexp -- {^GRASS_INFO_PERCENT: (.+)$} $str match val rest] } {
+		if { $val >= 0 && $val < 100} { 
+			set Gronsole::_data($path,$ci,progress) $val
+#			Gronsole::progress $path $ci $val
+		} else {
+#			Gronsole::progress $path $ci -1
+			set Gronsole::_data($path,$ci,progress) -1
+			$outtext insert $mark "\n" $tags
+		}
+	} elseif { [regexp -- {^GRASS_INFO_([^(]+)\(([0-9]+),([0-9]+)\): (.+)$} $str match key message_pid message_id val rest] } {
 		set lkey [string tolower $key]
 		Gronsole::add_tag $path $ci $lkey
 		set icon [icon status $lkey]
@@ -359,16 +368,8 @@
 			# $outtext tag add $tagbase "$mark -1 char"
 		}
 		$outtext insert $mark $val $tagbase
-	} elseif { [regexp -- {^GRASS_INFO_PERCENT: (.+)$} $str match val rest] } {
-		if { $val > 0 && $val < 100} { 
-			set Gronsole::_data($path,$ci,progress) $val
-#			Gronsole::progress $path $ci $val
-		} else {
-#			Gronsole::progress $path $ci -1
-			set Gronsole::_data($path,$ci,progress) -1
-			$outtext insert $mark "\n" $tags
-		}
 	} elseif { [regexp -- {^GRASS_INFO_END.+} $str match key rest] } {
+		$outtext insert $mark "\n" $tags
 		# nothing
 	} else {
 		$outtext insert $mark $str $tags
@@ -393,17 +394,25 @@
 proc Gronsole::readout {path ci mark fh} {
 
 	set lines {}
-	
+
 	while {[gets $fh line] >= 0} {
-		lappend lines $line
+		if {[string trim $line] != "" } {
+			append line "\n"
+			lappend lines $line
+		}
 	}
-	
+
 	if {[llength $lines] != 0} {
 		Gronsole::add_data_tag $path $ci out
 	}
+
+	#output any messages from running the command
 	foreach line $lines {
-		Gronsole::output_to_gronsole $path $mark $ci [list cmd$ci cmd$ci-out] "\n$line"
+		Gronsole::output_to_gronsole $path $mark $ci [list cmd$ci cmd$ci-out] "$line"
+		update
 	}
+	
+	
 	$path.text see $mark
 }
 
@@ -435,9 +444,9 @@
 }
 
 proc Gronsole::execwait {path ci mark fh} {
-	while {! [eof $fh]} {
+	if {! [eof $fh]} {
 		Gronsole::readout $path $ci $mark $fh
-		update
+		#update
 	}
 	Gronsole::readeof $path $ci $mark $fh
 	update