Changeset 3656

Timestamp:

May 15, 2013, 2:02:59 PM (11 years ago)

Author:

gah

Message:

fix assorted automatic tickets: bad data in curve, more trim space, move image creation before errors in constructor

Location:

trunk/gui/scripts

Files:

• main.tcl (modified) (2 diffs)
• sequencedial.tcl (modified) (3 diffs)
• vtkheightmapviewer.tcl (modified) (6 diffs)
• xyprint.tcl (modified) (1 diff)

trunk/gui/scripts/main.tcl

@@ -124 +124 @@
     # examples/ and docs/ dirs from the install location
     foreach runobj $loadobjs {
-        set tdir [$runobj get tool.version.application.directory(tool)]
+        set tdir \
+            [string trim [$runobj get tool.version.application.directory(tool)]]
         if {[file isdirectory $tdir] && \
             [file exists $tdir/tool.xml]} {
@@ -221 +222 @@
 # Add a place for about/questions in the breadcrumbs area of this pager.
 #
-set app [$tool xml get tool.id]
+set app [string trim [$tool xml get tool.id]]
 set url [Rappture::Tool::resources -huburl]
 if {"" != $url && "" != $app} {

trunk/gui/scripts/sequencedial.tcl

@@ -78 +78 @@
     private method EventuallyRedraw {} 
     private variable _redrawPending 0
-
+    private variable _afterId -1
     private variable _values ""       ;# list of all values on the dial
     private variable _val2label       ;# maps value => string label(s)
@@ -121 +121 @@
 itcl::body Rappture::SequenceDial::destructor {} {
     configure -variable ""  ;# remove variable trace
-    EventuallyRedraw
+    after cancel $_afterId
 }
 
@@ -155 +155 @@
 itcl::body Rappture::SequenceDial::EventuallyRedraw {} {
     if { !$_redrawPending } {
-        after 150 [itcl::code $this _redraw]
+        set _afterId [after 150 [itcl::code $this _redraw]]
         event generate $itk_component(hull) <<Value>>
         set _resizePending 1

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -80 +80 @@
     protected method Rotate {option x y}
     protected method Zoom {option}
-    
+
     # The following methods are only used by this class.
     private method BuildAxisTab {}
@@ -193 +193 @@
     $_parser alias legend [itcl::code $this ReceiveLegend]
 
+    # Create image for legend colorbar.
+    set _image(legend) [image create photo]
+
     # Initialize the view to some default parameters.
     array set _view {
@@ -209 +212 @@
 
     array set _settings {
-        axisFlymode             "static"
-        axisMinorTicks          1
-        stretchToFit            0
+        axisFlymode             "static"
+        axisMinorTicks          1
+        stretchToFit            0
         axisLabels              1
         axisVisible             1
@@ -250 +253 @@
     itk_component add fieldmenu {
         menu $itk_component(plotarea).menu \
-            -relief flat \
+            -relief flat \
             -tearoff no 
     } {
@@ -332 +335 @@
         puts stderr "errs=$errs errorInfo=$errorInfo"
     }
-    set _image(legend) [image create photo]
 
     # Hack around the Tk panewindow.  The problem is that the requested 
@@ -1502 +1504 @@
                 $itk_component(outline) configure -state normal
                 SendCmd "camera mode image"
-            }
+            }
             if {$_settings(stretchToFit)} {
                 if {$scale == 0} {

trunk/gui/scripts/xyprint.tcl

@@ -1451 +1451 @@
         }
         set axis [list $axis]
-        append out "    if \{ [llength [preview axis names $axis]] == 1 \} \{\n"
+        append out "    if \{ \[llength \[preview axis names $axis\]\] == 1 \} \{\n"
         append out "        preview axis configure $axis"
         foreach opt { -hide -min -max -loose -title -stepsize -subdivisions } {