Changeset 1636 for trunk

Timestamp:

Jan 11, 2010, 10:52:45 PM (15 years ago)

Author:

gah

Message:

fix to xyprint

Location:

trunk/gui/scripts

Files:

• combobox.tcl (modified) (1 diff)
• nanovisviewer.tcl (modified) (1 diff)
• xylegend.tcl (modified) (1 diff)
• xyprint.tcl (modified) (25 diffs)

trunk/gui/scripts/combobox.tcl

@@ -179 +179 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Combobox::current {} {
-    return [translate [$itk_component(entry) get]]
+    set raw [$itk_component(entry) get]
+    set value [translate $raw]
+    if { $value != "" } {
+        return $value
+    }
+    return $raw
 }
 

trunk/gui/scripts/nanovisviewer.tcl

@@ -665 +665 @@
             # here?
             continue
+        }
+        if { ![info exists _vol2style($vol)] } {
+            puts stderr "unknown volume $vol"
+            continue;                   # How does this happen?
         }
         set tf $_vol2style($vol)

trunk/gui/scripts/xylegend.tcl

@@ -293 +293 @@
     }
     foreach node $nodes {
-        set node [$itk_component(legend) index $node]
         set elem [$tree_ label $node]
         if { ![$graph_ element exists $elem] } {

trunk/gui/scripts/xyprint.tcl

@@ -23 +23 @@
 option add *XyPrint*Entry*background "white" widgetDefault
 
-array set Rappture::axistypes {
-    x x
-    y y 
-    x2 x
-    y2 y
-}
-
 itcl::class Rappture::XyPrint {
     inherit itk::Widget
@@ -41 +34 @@
     private variable _savedSettings;    # Array of settings.
 
-    private common _settingsFile "~/.rpsettings"
+    private common _oldSettingsFile "~/.rpsettings"
+    private common _settingsFile "~/.rp_settings"
 
     public method print { graph toolName plotName }
@@ -62 +56 @@
     private method InitClone {} 
     private method Pixels2Inches { pixels } 
-    private method Inches2Pixels { inches } 
+    private method Inches2Pixels { inches {defValue ""}} 
     private method Color2RGB { color } 
 
@@ -78 +72 @@
     private method GetOutput {}
     private method Done { state }
+    private method SetLayoutOption { option } 
+    private method GetAxisType { axis } 
     private method restore { toolName plotName data } 
     private common _settings
@@ -286 +282 @@
 itcl::body Rappture::XyPrint::CloneGraph { orig } {
     set top $itk_interior
+    if { [winfo exists $top.graph] } {
+        destroy $top.graph
+    }
     set clone [blt::graph $top.graph]
     CopyOptions "configure" $orig $clone
@@ -399 +398 @@
         puts stderr "$err: $errorInfo"
         set _settings($this-graph-$opt) $old
+        $_clone configure -$opt $old
     }
 }
@@ -411 +411 @@
         puts stderr "$err: $errorInfo"
         set _settings($this-$comp-$opt) $old
+        $_clone $comp configure -$opt $old
     }
 }
@@ -423 +424 @@
         puts stderr "$err: $errorInfo"
         set _settings($this-$comp-$opt) $old
+        $_clone $comp configure $name -$opt $old
     }
 }
@@ -429 +431 @@
     update 
     set img [image create photo]
-    set w [Inches2Pixels $_settings($this-layout-width)]
-    set h [Inches2Pixels $_settings($this-layout-height)]
+    set w [Inches2Pixels $_settings($this-layout-width) 3.4]
+    set h [Inches2Pixels $_settings($this-layout-height) 3.4]
     set pixelsPerInch [winfo pixels . 1i]
     set sx [expr 2.5*$pixelsPerInch/$w]
@@ -461 +463 @@
 }
 
-itcl::body Rappture::XyPrint::Inches2Pixels { inches } {
+itcl::body Rappture::XyPrint::Inches2Pixels { inches {defValue ""}} {
+    set n [scan $inches %g dummy]
+    if { n != 1  && $defValue != "" } {
+        set inches $defValue
+    }
     return  [winfo pixels . ${inches}i]
 }
@@ -474 +480 @@
 }
 
+itcl::body Rappture::XyPrint::GetAxisType { axis } {
+    foreach type { x y x2 y2 } {
+        set axes [$_clone ${type}axis use]
+        if { [lsearch $axes $axis] >= 0 } {
+            return [string range $type 0 0]
+        }
+    }
+    return ""
+}
 
 itcl::body Rappture::XyPrint::GetAxis {} {
@@ -480 +495 @@
         set _settings($this-axis-$option) [$_clone axis cget $axis -$option]
     }
-    set type $Rappture::axistypes($axis)
+    set type [GetAxisType $axis]
     if { [$_clone grid cget -map${type}] == $axis } {
         set _settings($this-axis-grid) 1
@@ -493 +508 @@
 itcl::body Rappture::XyPrint::GetElement { args } {
     set index 1
+    array unset _settings $this-element-*
     foreach elem [$_clone element show] {
         set _settings($this-element-$index) $elem
@@ -1071 +1087 @@
 itcl::body Rappture::XyPrint::ApplyAxisSettings {} {
     set axis [$itk_component(axis_combo) current]
-    set type $Rappture::axistypes($axis)
+    set type [GetAxisType $axis]
     set page $itk_component(axis_page)
     if { $_settings($this-axis-grid) } {
@@ -1111 +1127 @@
 }
 
+itcl::body Rappture::XyPrint::SetLayoutOption { opt } {
+    set new [Inches2Pixels $_settings($this-layout-$opt)]
+    $_clone configure -$opt $new
+}
+
 itcl::body Rappture::XyPrint::ApplyLayoutSettings {} {
     foreach opt { leftmargin rightmargin topmargin bottommargin } {
-        set new [Inches2Pixels $_settings($this-layout-$opt)]
         set old [$_clone cget -$opt]
-        set code [catch [list $_clone configure -$opt $new] err]
+        set code [catch { SetLayoutOption $opt } err]
         if { $code != 0 } {
             bell
@@ -1121 +1141 @@
             puts stderr "$err: $errorInfo"
             set _settings($this-layout-$opt) [Pixels2Inches $old]
+            $_clone configure -$opt [Pixels2Inches $old]
         }
     }
@@ -1133 +1154 @@
     set _settings($this-general-format) ps
     set _settings($this-general-style) ieee
-    set _settings($this-general-remember) 1
+    set _settings($this-general-remember) 0
     set page $itk_component(graph_page)
     $page.format value [$page.format label $_settings($this-general-format)]
@@ -1222 +1243 @@
     if { ![file readable $_settingsFile] } {
         return;                         # No file or not readable
+    } 
+    if { [file exists $_oldSettingsFile] } {
+        file delete $_oldSettingsFile
     }
     # Read the file by sourcing it into a safe interpreter The only commands
@@ -1271 +1295 @@
         set plot [lindex $key 1]
         puts $f "xyprint \"$tool\" \"$plot\" \{"
-        puts $f "$_savedSettings($key)"
+        set settings [string trim $_savedSettings($key) \n]
+        puts $f "$settings"
         puts $f "\}\n"
     }
@@ -1288 +1313 @@
         array set info [font configure $font]
         foreach opt { -family -size -weight -slant } {
-            append out " $opt \"$info($opt)\""
+            set value [list $info($opt)]
+            append out " $opt $value"
         }
         append out "\n"
@@ -1298 +1324 @@
     foreach opt { -width -height -leftmargin -rightmargin -topmargin 
         -bottommargin -plotpadx -plotpady } {
-        append out " $opt \"[$_clone cget $opt]\""
+        set value [list [$_clone cget $opt]]
+        append out " $opt $value"
     }
     append out "\n"
@@ -1305 +1332 @@
     append out "    preview legend configure" 
     foreach opt { -position -anchor -borderwidth -hide } { 
-        append out " $opt \"[$_clone legend cget $opt]\""
+        set value [list [$_clone legend cget $opt]]
+        append out " $opt $value"
     }
     append out " -font legend\n"
@@ -1314 +1342 @@
         append out "        preview element configure \"$elem\""
         foreach opt { -symbol -color -dashes -hide -label } { 
-            append out " $opt \"[$_clone element cget $elem $opt]\""
+            set value [list [$_clone element cget $elem $opt]]
+            append out " $opt $value"
         }
         append out "    \}\n"
@@ -1327 +1356 @@
         append out "        preview axis configure \"$axis\""
         foreach opt { -hide -min -max -loose -title -stepsize -subdivisions } {
-            append out " $opt \"[$_clone axis cget $axis $opt]\""
+            set value [list [$_clone axis cget $axis $opt]]
+            append out " $opt $value"
         }
         append out " -tickfont \"$axis-ticks\""
@@ -1342 +1372 @@
     return $out
 }
-