Changeset 87

Timestamp:

Oct 5, 2005 7:28:40 PM (18 years ago)

Author:

mmc

Message:

Fixed "copy/paste with desktop" to convert any \r's to \n's.
This was a problem when pasting from Windows or Mac environments,
when what looked like a clean text file would paste badly into
a text area.

Fixed the Rappture::exec to cleanly separate stdout/stderr
channels. We were getting an error in Spice when a stderr
statement appeared right in the middle of a stdout line of data.
The line was truncated, so the value at the end was interpreted
as a very different number, causing a spike on the graph.
(Example: Common Collector Amplifier, and ".print ac im(vs)")

Fixed Field objects to respect the length scale set by the
overall structure.

Location:

trunk/gui/scripts

Files:

• exec.tcl (modified) (3 diffs)
• field.tcl (modified) (2 diffs)
• mainwin.tcl (modified) (1 diff)

trunk/gui/scripts/exec.tcl

@@ -27 +27 @@
     variable execout
 
-    set execout ""
+    set execout(output) ""
+    set execout(channel) ""
+    set execout(extra) ""
+
     eval blt::bgexec control \
         -keepnewline yes \
@@ -34 +37 @@
         $args
 
-    return $execout
+    # add any extra stuff pending from the last stdout/stderr change
+    append execout(output) $execout(extra)
+
+    return $execout(output)
 }
 
@@ -54 +60 @@
     if {$channel == "stderr"} {
         set newmesg ""
-        if {[string length $execout] > 0
-              && [string index $execout end] != "\n"} {
-            set newmesg "\n"
-        }
         foreach line [split $message \n] {
             append newmesg "=RAPPTURE-ERROR=>$line\n"
         }
-        set message [string trimright $newmesg \n]
+        set message $newmesg
     }
 
-    puts -nonewline $message
-    append execout $message
+    #
+    # If this message is coming in on the same channel as the
+    # last, then fine, add it on.  But if it's coming in on a
+    # different channel, we must make sure that we're at a good
+    # breakpoint.  If there's not a line break at the end of the
+    # current output, then add the extra stuff onto a buffer
+    # that we will merge in later once we get to a good point.
+    #
+    if {$execout(channel) == ""} {
+        set execout(channel) $channel
+    }
+
+    set ready [expr {[string length $execout(output)] == 0
+        || [string index $execout(output) end] == "\n"}]
+
+    if {$channel != $execout(channel)} {
+        if {$ready} {
+            # changing channels...
+            if {[string length $execout(extra)] > 0} {
+                # any extra stuff on this new channel? put it out now
+                puts -nonewline $execout(extra)
+                append execout(output) $execout(extra)
+                set execout(extra) ""
+            }
+            puts -nonewline $message
+            append execout(output) $message
+            set execout(channel) $channel
+        } else {
+            # not ready to change channels -- keep this for later
+            append execout(extra) $message
+        }
+    } else {
+        # no need to change channels -- keep printing
+        puts -nonewline $message
+        append execout(output) $message
+    }
 }

trunk/gui/scripts/field.tcl

@@ -55 +55 @@
     set _units [$_field get units]
 
+    set xunits [$xmlobj get units]
+    if {"" == $xunits || "arbitrary" == $xunits} {
+        set xunits "um"
+    }
+
     # determine the overall size of the device
     set z0 [set z1 0]
@@ -65 +70 @@
                 set z0 [$_xmlobj get components.$elem.corner0]
                 set z0 [Rappture::Units::convert $z0 \
-                    -context um -to um -units off]
+                    -context $xunits -to $xunits -units off]
 
                 set z1 [$_xmlobj get components.$elem.corner1]
                 set z1 [Rappture::Units::convert $z1 \
-                    -context um -to um -units off]
+                    -context $xunits -to $xunits -units off]
 
                 set _limits($elem) [list $z0 $z1]

trunk/gui/scripts/mainwin.tcl

@@ -183 +183 @@
             set s [blt::cutbuffer get]
             if {"" != $s && ![string equal $s $_sync(cutbuffer)]} {
+                #
+                # Convert any \r's in the cutbuffer to \n's.
+                #
+                if {[string first "\r" $s] >= 0} {
+                    regsub -all "\r\n" $s "\n" s
+                    regsub -all "\r" $s "\n" s
+                    blt::cutbuffer set $s
+                }
+
                 set _sync(cutbuffer) $s