Changeset 3609

Timestamp:

Apr 2, 2013, 2:34:04 PM (12 years ago)

Author:

gah

Message:

fix: xygraph print not handling labels like "Cooling [K] #23" because of square brackets

File:

• branches/1.2/gui/scripts/xyprint.tcl (modified) (5 diffs)

branches/1.2/gui/scripts/xyprint.tcl

@@ -1411 +1411 @@
     foreach opt { -width -height -leftmargin -rightmargin -topmargin 
         -bottommargin -plotpadx -plotpady } {
-        set value [list [$_clone cget $opt]]
-        append out " $opt $value"
+        set value [$_clone cget $opt]
+        append out " $opt [list $value]"
     }
     append out "\n"
@@ -1419 +1419 @@
     append out "    preview legend configure" 
     foreach opt { -position -anchor -borderwidth -hide } { 
-        set value [list [$_clone legend cget $opt]]
-        append out " $opt $value"
-    }
-    append out " -font \"$legendfont\"\n"
+        set value [$_clone legend cget $opt]
+        append out " $opt [list $value]"
+    }
+    append out " -font [list $legendfont]\n"
 
     # Element settings
@@ -1430 +1430 @@
             continue
         }
-        append out "    if \{ \[preview element exists \"$label\"\] \} \{\n"
-        append out "        preview element configure \"$label\""
+        set label [list $label]
+        append out "    if \{ \[preview element exists $label] \} \{\n"
+        append out "        preview element configure $label"
         if { [$_clone element type $elem] != "bar" } {
             set options { -symbol -color -dashes -label } 
@@ -1438 +1439 @@
         }
         foreach opt $options { 
-            set value [list [$_clone element cget $elem $opt]]
-            append out " $opt $value"
+            set value [$_clone element cget $elem $opt]
+            append out " $opt [list $value]"
         }
         append out "    \}\n"
@@ -1449 +1450 @@
             continue
         }
-        append out "    if \{ \[preview axis names \"$axis\"\] == \"$axis\" \} \{\n"
-        append out "        preview axis configure \"$axis\""
+        set axis [list $axis]
+        append out "    if \{ \[preview axis names $axis] == $axis \} \{\n"
+        append out "        preview axis configure $axis"
         foreach opt { -hide -min -max -loose -title -stepsize -subdivisions } {
-            set value [list [$_clone axis cget $axis $opt]]
-            append out " $opt $value"
-        }
-        append out " -tickfont \"$axistickfont\""
-        append out " -titlefont \"$axistitlefont\"\n"
+            set value [$_clone axis cget $axis $opt]
+            append out " $opt [list $value]"
+        }
+        append out " -tickfont [list $axistickfont]"
+        append out " -titlefont [list $axistitlefont]\n"
         set hide [$_clone marker cget ${axis}-zero -hide]
-        append out "        preview marker configure \"${axis}-zero\" -hide $hide\n"
+        append out "        preview marker configure ${axis}-zero -hide $hide\n"
         append out "    \}\n"
     }