Changeset 1593 for trunk/gui/scripts/xyprint.tcl

Timestamp:

Oct 26, 2009 11:20:33 AM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/xyprint.tcl (modified) (21 diffs)

trunk/gui/scripts/xyprint.tcl

@@ -13 +13 @@
 package require BLT
 
-#option add *XyResult.width 3i widgetDefault
-#option add *XyResult.height 3i widgetDefault
-option add *XyResult.gridColor #d9d9d9 widgetDefault
+#option add *XyPrint.width 3i widgetDefault
+#option add *XyPrint.height 3i widgetDefault
+option add *XyPrint.gridColor #d9d9d9 widgetDefault
 option add *XyPrint.activeColor blue widgetDefault
 option add *XyPrint.dimColor gray widgetDefault
@@ -46 +46 @@
     private method CloneGraph { orig }
 
-    private method BuildGraphTab {}
+    private method BuildGeneralTab {}
     private method BuildLayoutTab {}
     private method BuildLegendTab {}
@@ -60 +60 @@
     private method Inches2Pixels { inches } 
 
-    private method BuildLayoutTab {} 
-    private method BuildGeneralTab {} 
-    private method ApplyLegendSettings {} 
-    private method BuildLegendTab {}
-    private method BuildAxisTab {} 
-
     private method ApplyGeneralSettings {} 
     private method ApplyLegendSettings {} 
@@ -73 +67 @@
     private method InitializeSettings {} 
     private method RestoreSettings { file } 
+    private method ResetSettings { } 
     private method SaveSettings { file } 
+    private method GetOutput {}
     private method Done { state }
     private method DestroySettings {}
@@ -132 +128 @@
     blt::table configure $itk_interior r1 -resize both
 
-    BuildGraphTab
+    BuildGeneralTab
     BuildAxisTab
     BuildLegendTab
@@ -142 +138 @@
 # DESTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::XyResult::destructor {} {
+itcl::body Rappture::XyPrint::destructor {} {
     destroy $_clone
     image delete $_preview
@@ -148 +144 @@
 }
 
-itcl::body Rappture::XyResult::DestroySettings {} {
+itcl::body Rappture::XyPrint::DestroySettings {} {
     destroy $_clone
     array unset _settings $this-*
@@ -167 +163 @@
     set _wait($this) 0
     tkwait variable [itcl::scope _wait($this)]
-    if { _wait($this) } {
-        return [GetOutput]
-    }
-    SaveSettings
-    # DestroySettings
-    return ""
+    set output ""
+    if { $_wait($this) } {
+        set output [GetOutput]
+    }
+    SaveSettings dummy
+    DestroySettings
+    return $output
 }
 
@@ -228 +225 @@
         return ""
     }
-    set f [open "junk.$format" "w"] 
-    fconfigure $f -translation binary -encoding binary
-    puts -nonewline $f $output
-    close $f
+    if 0 {
+        set f [open "junk.$format" "w"] 
+        fconfigure $f -translation binary -encoding binary
+        puts -nonewline $f $output
+        close $f
+    }
     return [list .$format $output]
 }
@@ -344 +343 @@
     # Create markers representing lines at zero for the x and y axis.
     $_clone marker create line -name x-zero \
-        -coords "0 -Inf 0 Inf" -dashes dot -hide yes
+        -coords "0 -Inf 0 Inf" -dashes 1 -hide yes
     $_clone marker create line -name y-zero \
-        -coords "-Inf 0 Inf 0" -dashes dot -hide yes
+        -coords "-Inf 0 Inf 0" -dashes 1 -hide yes
 }
 
@@ -391 +390 @@
     set w [Inches2Pixels $_settings($this-layout-width)]
     set h [Inches2Pixels $_settings($this-layout-height)]
-puts stderr "w=$w h=$h"
     set pixelsPerInch [winfo pixels . 1i]
     set sx [expr 2.5*$pixelsPerInch/$w]
     set sy [expr 2.0*$pixelsPerInch/$h]
-puts stderr "sx=$sx sy=$sy"
     set s [expr min($sx,$sy)]
     $_clone snap $img -width $w -height $h
@@ -615 +612 @@
 
     label $page.slider_l -text "legend\nentry"  -font "Arial 10" -justify right
-    set names [$_clone element show]
     itk_component add element_slider {
-        ::scale $page.slider -from 1 -to [llength $names] \
+        ::scale $page.slider -from 1 -to 1 \
             -orient horizontal -width 12 \
             -command [itcl::code $this GetElement]
     } 
-    if { [llength $names] < 2 } {
-        $page.slider configure -state disabled
-        $page.slider_l configure -state disabled
-    }
     checkbutton $page.hide -text "hide" \
         -font "Arial 10"  \
@@ -715 +707 @@
         Rappture::Combobox $page.axis -width 20 -editable no
     } 
-    set names [lsort [$_clone axis names]] 
-    foreach axis $names {
-        if { ![$_clone axis cget $axis -hide] } {
-            $itk_component(axis_combo) choices insert end $axis $axis
-        }
-    }
     bind $itk_component(axis_combo) <<Value>> [itcl::code $this GetAxis]
 
@@ -756 +742 @@
     label $page.plotpadx_l -text "pad x-axis"  
     entry $page.plotpadx -width 6 \
-        -textvariable [itcl::scope _settings($this-axis-plotpadx)]
+        -textvariable [itcl::scope _settings($this-graph-plotpadx)]
     bind  $page.plotpadx <KeyPress-Return> [itcl::code $this ApplyAxisSettings]
 
     label $page.plotpady_l -text "pad y-axis" 
     entry $page.plotpady -width 6 \
-        -textvariable [itcl::scope _settings($this-axis-plotpady)]
+        -textvariable [itcl::scope _settings($this-graph-plotpady)]
     bind  $page.plotpady <KeyPress-Return> [itcl::code $this ApplyAxisSettings]
 
@@ -812 +798 @@
 
 itcl::body Rappture::XyPrint::ApplyAxisSettings {} {
-    set plotpadx [Inches2Pixels $_settings($this-axis-plotpadx)]
-    set plotpady [Inches2Pixels $_settings($this-axis-plotpady)]
+    set plotpadx [Inches2Pixels $_settings($this-graph-plotpadx)]
+    set plotpady [Inches2Pixels $_settings($this-graph-plotpady)]
     SetOption plotpadx
     SetOption plotpady
@@ -827 +813 @@
     }
     $_clone marker configure ${type}-zero -hide $_settings($this-axis-zero)
-    puts stderr "$axis: [$_clone axis configure $axis]"
     GetAxis
     RegeneratePreview
@@ -889 +874 @@
     set names [$_clone element show]
     $itk_component(element_slider) configure -from 1 -to [llength $names] 
-    if { [llength $names] < 2 } {
-        $page.slider configure -state disabled
-        $page.slider_l configure -state disabled
-    }
+    set state [expr  { ([llength $names] < 2) ? "disabled" : "normal" } ]
+    $page.slider configure -state $state
+    $page.slider_l configure -state $state
     # Always initialize the slider to the first entry in the element list.
     $itk_component(element_slider) set 1
@@ -923 +907 @@
     blt::table configure $page r* -resize none
     blt::table configure $page r9 -resize both
-    set _settings($this-axis-plotpadx) [Pixels2Inches [$_clone cget -plotpadx]]
-    set _settings($this-axis-plotpady) [Pixels2Inches [$_clone cget -plotpady]]
+    set _settings($this-graph-plotpadx) [Pixels2Inches [$_clone cget -plotpadx]]
+    set _settings($this-graph-plotpady) [Pixels2Inches [$_clone cget -plotpady]]
     GetAxis 
 }
@@ -933 +917 @@
 n}
 
-itcl::body Rappture::XyPrint::ResetSettings { file } {
+itcl::body Rappture::XyPrint::ResetSettings {} {
     # Revert the widget back to the original graph's settings
     destroy $_clone
@@ -984 +968 @@
     
     foreach axis [$_clone axis names] {
+        if { [$_clone axis cget $axis -hide] } {
+            continue
+        }
         append out "if \{ \[\$graph axis names \"$axis\"\] == \"$axis\" \} \{\n"
         set cmd {}
         lappend cmd {$graph} "axis" "configure" $axis
-        foreach opt {-hide -min -max -dashes -title -stepsize -subdivisions} {
+        foreach opt {-hide -min -max -title -stepsize -loose -subdivisions} {
             lappend cmd $opt [$_clone axis cget $axis $opt]
         }
         append out "$cmd\n"
-        append out "\}\n"
         set hide [$_clone marker cget ${axis}-zero -hide]
         append out "\$graph marker configure ${axis}-zero -hide $hide\n"
+        append out "\}\n"
     }   
     set cmd {}
@@ -1003 +990 @@
     append out "\}\n"
     # Write the settings out
-    puts stderr $out
-}
+    puts stderr "savesettings=$out"
+}