Changeset 95 for trunk/gui/scripts

Timestamp:

Oct 9, 2005 9:41:29 PM (19 years ago)

Author:

mmc

Message:

• Fixed an annoying bug in the scroller that would cause the device to jitter up and down in some cases. (1-barrier case of app-rtd)

• Fixed cloud/mesh objects to allow different units for each of the various axes.

• Fixed the install.tcl script to avoid popping up the notice about Rappture being installed when tclsh is running the script.

Location:

trunk/gui/scripts

Files:

• analyzer.tcl (modified) (1 diff)
• cloud.tcl (modified) (3 diffs)
• mesh.tcl (modified) (3 diffs)
• scroller.tcl (modified) (5 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -157 +157 @@
     pack $w.info -expand yes -fill both -padx 4 -pady 4
     itk_component add runinfo {
-        text $w.info.text -width 1 -height 1 -wrap word \
+        text $w.info.text -width 1 -height 1 -wrap none \
             -borderwidth 0 -highlightthickness 0 \
             -state disabled

trunk/gui/scripts/cloud.tcl

@@ -32 +32 @@
     private variable _cloud ""   ;# lib obj representing this cloud
 
-    private variable _units "m"  ;# system of units for this cloud
-    private variable _limits     ;# limits xmin, xmax, ymin, ymax, ...
+    private variable _units "m m m" ;# system of units for x, y, z
+    private variable _limits        ;# limits xmin, xmax, ymin, ymax, ...
 
     private common _xp2obj       ;# used for fetch/release ref counting
@@ -98 +98 @@
     set u [$_cloud get units]
     if {"" != $u} {
+        while {[llength $u] < 3} {
+            lappend u [lindex $u end]
+        }
         set _units $u
     }
@@ -120 +123 @@
         # extract each point and add it to the points list
         foreach {x y z} $line break
-        foreach dim {x y z} {
+        foreach dim {x y z} units $_units {
             set v [Rappture::Units::convert [set $dim] \
-                -context $_units -to $_units -units off]
+                -context $units -to $units -units off]
 
             set $dim $v  ;# save back to real x/y/z variable

trunk/gui/scripts/mesh.tcl

@@ -35 +35 @@
     private variable _mesh ""    ;# lib obj representing this mesh
 
-    private variable _units "m"  ;# system of units for this mesh
-    private variable _limits     ;# limits xmin, xmax, ymin, ymax, ...
+    private variable _units "m m m" ;# system of units for x, y, z
+    private variable _limits        ;# limits xmin, xmax, ymin, ymax, ...
 
     private common _xp2obj       ;# used for fetch/release ref counting
@@ -101 +101 @@
     set u [$_mesh get units]
     if {"" != $u} {
+        while {[llength $u] < 3} {
+            lappend u [lindex $u end]
+        }
         set _units $u
     }
@@ -126 +129 @@
         # extract each point and add it to the points list
         foreach {x y z} $xyz break
-        foreach dim {x y z} {
+        foreach dim {x y z} units $_units {
             set v [Rappture::Units::convert [set $dim] \
-                -context $_units -to $_units -units off]
+                -context $units -to $units -units off]
 
             set $dim $v  ;# save back to real x/y/z variable

trunk/gui/scripts/scroller.tcl

@@ -35 +35 @@
     protected method _fixframe {which}
     protected method _fixsize {}
-    protected method _lock {option}
+    protected method _lock {option which}
 
     private variable _dispatcher "" ;# dispatcher for !events
     private variable _contents ""   ;# widget being controlled
     private variable _frame ""      ;# for "contents frame" calls
-    private variable _lock 0        ;# for _lock on x-scrollbar
+    private variable _lock          ;# for _lock on x/y scrollbar
 }
                                                                                 
@@ -54 +54 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Scroller::constructor {args} {
+    array set _lock { x 0 y 0 }
+
     Rappture::dispatcher _dispatcher
 
@@ -196 +198 @@
         x {
             if {$state} {
-                grid $itk_component(xsbar) -row 1 -column 0 -sticky ew
-                _lock set
+                if {![_lock active x]} {
+                    grid $itk_component(xsbar) -row 1 -column 0 -sticky ew
+                }
             } else {
-                if {![_lock active]} {
-                    grid forget $itk_component(xsbar)
-                }
+                grid forget $itk_component(xsbar)
+                _lock set x
             }
         }
         y {
             if {$state} {
-                grid $itk_component(ysbar) -row 0 -column 1 -sticky ns
+                if {![_lock active y]} {
+                    grid $itk_component(ysbar) -row 0 -column 1 -sticky ns
+                }
             } else {
                 grid forget $itk_component(ysbar)
+                _lock set y
             }
         }
@@ -263 +268 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _lock set
-# USAGE: _lock reset
-# USAGE: _lock active
+# USAGE: _lock set <which>
+# USAGE: _lock reset <which>
+# USAGE: _lock active <which>
 #
 # Used internally to lock out vibrations when the x-scrollbar pops
@@ -275 +280 @@
 # up.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Scroller::_lock {option} {
+itcl::body Rappture::Scroller::_lock {option which} {
     switch -- $option {
         set {
-            set _lock 1
-            after cancel [itcl::code $this _lock reset]
-            after 50 [itcl::code $this _lock reset]
+            set _lock($which) 1
+            after cancel [itcl::code $this _lock reset $which]
+            after 50 [itcl::code $this _lock reset $which]
         }
         reset {
-            set _lock 0
+            set _lock($which) 0
         }
         active {
-            return $_lock
+            return $_lock($which)
         }
         default {