Changeset 1786 for branches/blt4/gui/scripts

Timestamp:

Jul 2, 2010, 3:40:08 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• curve.tcl (modified) (1 diff)
• xylegend.tcl (modified) (1 diff)
• xyprint.tcl (modified) (10 diffs)

branches/blt4/gui/scripts/curve.tcl

@@ -307 +307 @@
         set styles [$_curve get "yaxis.$cname.style"]
         set data [list $at $label $styles]
-        lappend _xmarkers $data
+        lappend _ymarkers $data
     }
 }

branches/blt4/gui/scripts/xylegend.tcl

@@ -97 +97 @@
 }
 
+itk::usual ComboEntry {
+}
+itk::usual ComboMenu {
+}
 itk::usual TreeView {
     keep -foreground -cursor 

branches/blt4/gui/scripts/xyprint.tcl

@@ -46 +46 @@
     private common _oldSettingsFile "~/.rpsettings"
     private common _settingsFile "~/.rp_settings"
+
     public method print { graph toolName plotName }
     public method reset {}
 
-    private method CopyOptions { cmd orig clone } 
+    private method CopyOptions { cmd orig clone {exclude {}}} 
     private method CloneGraph { orig }
 
@@ -132 +133 @@
         0,0 $itk_component(preview) -cspan 2 -fill both \
         1,0 $itk_component(tabs) -fill both -cspan 2 \
-        2,1 $itk_component(cancel) -padx 2 -pady 2 -width .9i  \
-        2,0 $itk_component(ok) -padx 2 -pady 2 -width .9i  
+        2,1 $itk_component(cancel) -padx 2 -pady 2 -width .9i -fill y \
+        2,0 $itk_component(ok) -padx 2 -pady 2 -width .9i -fill y 
     blt::table configure $itk_interior r1 -resize none
     blt::table configure $itk_interior r1 -resize both
@@ -268 +269 @@
 }
 
-itcl::body Rappture::XyPrint::CopyOptions { cmd orig clone } {
+itcl::body Rappture::XyPrint::CopyOptions { cmd orig clone {exclude {}} } {
     set all [eval $orig $cmd]
     set configLine $clone
+    foreach name $exclude {
+        set ignore($name) 1
+    }
     foreach arg $cmd {
         lappend configLine $arg
@@ -281 +285 @@
         set initial [lindex $option 3]
         set current [lindex $option 4]
-        if { $switch == "-data" } {
+        if { [info exists ignore($switch)] } {
             continue
         }
@@ -322 +326 @@
     foreach marker [$orig marker names] {
         $_clone marker create [$orig marker type $marker] -name $marker
-        CopyOptions [list marker configure $marker] $orig $_clone
+        CopyOptions [list marker configure $marker] $orig $_clone -name
     }
     # Element component
     foreach elem [$orig element names] {
         $_clone element create $elem
-        CopyOptions [list element configure $elem] $orig $_clone
+        CopyOptions [list element configure $elem] $orig $_clone -data 
         if { [$_clone element cget $elem -hide] } {
             $_clone element configure $elem -label "" 
@@ -340 +344 @@
     # Crosshairs component
     CopyOptions {crosshairs configure} $orig $_clone
+
+    # 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 1 -hide yes
+    $_clone marker create line -name y-zero \
+        -coords "-Inf 0 Inf 0" -dashes 1 -hide yes
 }
 
@@ -386 +396 @@
             -titlefont $_fonts($axis-title)
     }
-    #$_clone yaxis configure -rotate 90
-    #$_clone y2axis configure -rotate 270
     foreach elem [$_clone element names] {
-        $_clone element configure $elem -linewidth 1 \
-            -pixels 3 
-    }
-    # 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 1 -hide yes
-    $_clone marker create line -name y-zero \
-        -coords "-Inf 0 Inf 0" -dashes 1 -hide yes
+        if { [$_clone element cget $elem -linewidth] > 1 } {
+            $_clone element configure $elem -linewidth 1 -pixels 3 
+        }
+    }
 }
 
@@ -496 +500 @@
 itcl::body Rappture::XyPrint::GetAxis {} {
     set axis $_settings($this-axis-selected)
-    foreach option { grid min max loose title stepsize subdivisions } {
-        set _settings($this-axis-$option) [$_clone axis cget $axis -$option]
+    foreach option { -grid -min -max -loose -title -stepsize -subdivisions } {
+        set _settings($this-axis$option) [$_clone axis cget $axis $option]
     }
     set type [GetAxisType $axis]
@@ -1260 +1264 @@
 
 itcl::body Rappture::XyPrint::SetLayoutOption { opt } {
-    set new [Inches2Pixels $_settings($this-layout-$opt)]
-    $_clone configure -$opt $new
+    set new [Inches2Pixels $_settings($this-layout$opt)]
+    $_clone configure $opt $new
 }
 
 itcl::body Rappture::XyPrint::ApplyLayoutSettings {} {
-    foreach opt { width height leftmargin rightmargin topmargin bottommargin } {
-        set old [$_clone cget -$opt]
+    foreach opt { -width -height -leftmargin -rightmargin -topmargin 
+        -bottommargin } {
+        set old [$_clone cget $opt]
         set code [catch { SetLayoutOption $opt } err]
         if { $code != 0 } {
@@ -1272 +1277 @@
             global errorInfo
             puts stderr "$err: $errorInfo"
-            set _settings($this-layout-$opt) [Pixels2Inches $old]
-            $_clone configure -$opt [Pixels2Inches $old]
+            set _settings($this-layout$opt) [Pixels2Inches $old]
+            $_clone configure $opt [Pixels2Inches $old]
         }
     }