Changeset 1165

Timestamp:

08/17/2011 06:01:06 PM (19 months ago)

Author:

toby

Message:

add path fix to expgui; improve liveplot pdf export speed, remove out-of-view markers

Location:

branches/sandbox

Files:

• expgui (modified) (1 diff)
• gnuplot.tcl (modified) (4 diffs)

branches/sandbox/expgui

@@ -123 +123 @@
     set expgui(script) [file join [pwd] $expgui(script)]
 }
+set expgui(script) [file normalize $expgui(script)]
 # save the package installation location; fix if possible, warn later (after 
 # routines are sourced)

branches/sandbox/gnuplot.tcl

@@ -16 +16 @@
 
     set heading "" 
-    catch {unset datalisting}
-#    set index [llength $element_list]
-#    while {[incr index -1] >= 0} 
-#        set element_name [lindex $element_list $index]
+    set num 0
+    catch {unset data_list}
+    set max 0
     foreach element_name $element_list {
         set element_cmd "$graph_name element cget $element_name"
+        # get xy data for this element
+        set data_list($num) [eval $element_cmd -data]
+        #if there is no data, skip this set
+        set pts [llength $data_list($num)]
+        if {$pts > $max} {set max $pts}
+        if {[llength $data_list($num)] == 0} continue
+        incr num
         if {$heading != ""} {append heading ","}
         append heading  [$graph_name axis cget x -title]
         append heading ","
         append heading $element_name
-        # get xy data for this element
-        set data_list [eval $element_cmd -data]
-
-        #if there is no data, skip this set
-        if {[llength $data_list] == 0} continue
-        set i 0
-        foreach {x y} $data_list {
-            incr i
-            if {[array names datalisting $i] == ""} {
-                # new element, append any missing commas
-                set datalisting($i) "${commas}$x,$y"
-            } else {
-                append datalisting($i) ,$x,$y
-            }
-        }
-        append commas {,,}
     }
     #For Gnuplot exports, the column labels need to be commented out
@@ -49 +39 @@
         puts $fp $heading
     }
-    set max [lindex [lsort -integer [array names datalisting]] end]
-    for {set i 1} {$i <= $max} {incr i} {
-        puts $fp $datalisting($i)
+    for {set i 0} {$i < $max} {incr i 2} {
+        set line ""
+        for {set n 0} {$n < $num} {incr n} {
+        # get xy data for this element
+            foreach {x y} [lrange $data_list($n) $i [expr {$i + 1}]] {}
+            append line "$x,$y,"
+        }
+        puts $fp $line
     }
     close $fp
@@ -212 +207 @@
                     }
                 }
+            if {$x1 < $xmin || $x1 > $xmax} {continue}
             # replace newlines
             regsub -all "\n" $txt {\n} txt
@@ -235 +231 @@
                     }
                 }
+            if {$x1 < $xmin || $x2 > $xmax} {continue}
             puts $gplotfp "set arrow from first $x1,$y1 to first $x2,$y2 nohead lc rgbcolor \"$str\"" 
         } else {