Changeset 54 for trunk/gui/scripts

Timestamp:

Sep 9, 2005 9:03:56 AM (19 years ago)

Author:

mmc

Message:

• Fixed Rappture ticket #17 (logscale plotting problem). The XYResult widget now excludes 0 values and treats all values as absolute when computing automatic scales.

• Fixed the molecule viewer to avoid extra rendering, to put up a busy cursor when rendering, and to remove an annoying enlargement the first time you click on the molecule to rotate it.

Location:

trunk/gui/scripts

Files:

• curve.tcl (modified) (2 diffs)
• moleculeViewer.tcl (modified) (12 diffs)
• xyresult.tcl (modified) (3 diffs)

trunk/gui/scripts/curve.tcl

@@ -108 +108 @@
 
 # ----------------------------------------------------------------------
-# USAGE: limits x|y
+# USAGE: limits x|xlog|y|ylog
 #
 # Returns the {min max} limits for the specified axis.
@@ -116 +116 @@
     set max ""
     switch -- $which {
-        x { set pos 0 }
-        y - v { set pos 1 }
+        x { set pos 0; set log 0 }
+        xlog { set pos 0; set log 1 }
+        y - v { set pos 1; set log 0 }
+        ylog - vlog { set pos 1; set log 1 }
         default {
-            error "bad option \"$which\": should be x or y"
-        }
-    }
+            error "bad option \"$which\": should be x, xlog, y, ylog, v, vlog"
+        }
+    }
+
+    blt::vector create tmp zero
     foreach comp [array names _comp2xy] {
         set vname [lindex $_comp2xy($comp) $pos]
         $vname variable vec
+
+        if {$log} {
+            # on a log scale, use abs value and ignore 0's
+            $vname dup tmp
+            $vname dup zero
+            zero expr {tmp == 0}            ;# find the 0's
+            tmp expr {abs(tmp)}             ;# get the abs value
+            tmp expr {tmp + zero*max(tmp)}  ;# replace 0's with abs max
+            set vmin [blt::vector expr min(tmp)]
+            set vmax [blt::vector expr max(tmp)]
+        } else {
+            set vmin $vec(min)
+            set vmax $vec(max)
+        }
+
         if {"" == $min} {
-            set min $vec(min)
-        } elseif {$vec(min) < $min} {
-            set min $vec(min)
+            set min $vmin
+        } elseif {$vmin < $min} {
+            set min $vmin
         }
         if {"" == $max} {
-            set max $vec(max)
-        } elseif {$vec(max) > $max} {
-            set max $vec(max)
-        }
-    }
+            set max $vmax
+        } elseif {$vmax > $max} {
+            set max $vmax
+        }
+    }
+    blt::vector destroy tmp zero
+
     return [list $min $max]
 }

trunk/gui/scripts/moleculeViewer.tcl

@@ -63 +63 @@
 
     protected method _clear {}
-    protected method _render {}
+    protected method _redraw {}
     protected method _zoom {option}
     protected method _move {option x y}
     protected method _3dView {theta phi}
     protected method _color2rgb {color}
+
+    private variable _dispatcher "" ;# dispatcher for !events
 
     private variable _tool ""    ;# tool containing this viewer
@@ -85 +87 @@
 itcl::body Rappture::MoleculeViewer::constructor {tool args} {
     set _tool $tool
+
+    Rappture::dispatcher _dispatcher
+    $_dispatcher register !redraw
+    $_dispatcher dispatch $this !redraw "[itcl::code $this _redraw]; list"
+    $_dispatcher register !render
+    $_dispatcher dispatch $this !render "$this-renWin Render; list"
+    $_dispatcher register !fixsize
+    $_dispatcher dispatch $this !fixsize \
+        "[itcl::code $this emblems fixPosition]; list"
 
     itk_option add hull.width hull.height
@@ -179 +190 @@
     pack $itk_component(area) -expand yes -fill both
     bind $itk_component(area) <Configure> \
-        [itcl::code $this emblems fixPosition]
+        [list $_dispatcher event -idle !fixsize]
 
     itk_component add renderer {
@@ -205 +216 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MoleculeViewer::destructor {} {
-    after cancel [itcl::code $this _render]
-
     rename $this-renWin ""
     rename $this-ren ""
@@ -233 +242 @@
 
     $this-ren ResetCamera
-    $this-renWin Render
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _render
+    $_dispatcher event -now !render
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _redraw
 #
 # Used internally to rebuild the scene whenever options within this
 # widget change.  Destroys all actors and rebuilds them from scratch.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MoleculeViewer::_render {} {
+itcl::body Rappture::MoleculeViewer::_redraw {} {
+    blt::busy hold $itk_component(hull); update
+
     _clear
 
@@ -307 +318 @@
             emblems on
         }
-        after cancel [list catch [itcl::code $this _zoom reset]]
-        after 200 [list catch [itcl::code $this _zoom reset]]
+        _zoom reset
     }
     $this-ren ResetCamera
-    $this-renWin Render
+    $_dispatcher event -idle !render
+
+    blt::busy release $itk_component(hull)
 }
 
@@ -326 +338 @@
         in {
             [$this-ren GetActiveCamera] Zoom 1.25
-            emblems fixPosition
-            $this-renWin Render
         }
         out {
             [$this-ren GetActiveCamera] Zoom 0.8
-            emblems fixPosition
-            $this-renWin Render
         }
         reset {
-            [$this-ren GetActiveCamera] SetViewAngle 30
             $this-ren ResetCamera
-            [$this-ren GetActiveCamera] Zoom 1.25
             _3dView 45 45
-            $this-renWin Render
-
-            after cancel [list catch [itcl::code $this emblems fixPosition]]
-            after 2000 [list catch [itcl::code $this emblems fixPosition]]
-        }
-    }
+        }
+    }
+    $_dispatcher event -later !fixsize
+    $_dispatcher event -idle !render
 }
 
@@ -370 +374 @@
                 set w [winfo width $itk_component(renderer)]
                 set h [winfo height $itk_component(renderer)]
+                if {$w <= 0 || $h <= 0} {
+                    return
+                }
                 set dx [expr {double($x-$_click(x))/$w}]
                 set dy [expr {double($y-$_click(y))/$h}]
@@ -383 +390 @@
                 _3dView $theta $phi
                 emblems fixPosition
-                $this-renWin Render
+                $_dispatcher event -idle !render
 
                 set _click(x) $x
@@ -488 +495 @@
         }
     }
-    $this-renWin Render
+    $_dispatcher event -idle !render
 }
 
@@ -510 +517 @@
 itcl::configbody Rappture::MoleculeViewer::backdrop {
     eval $this-ren SetBackground [_color2rgb $itk_option(-backdrop)]
-    $this-renWin Render
+    $_dispatcher event -idle !render
 }
 
@@ -531 +538 @@
         }
     }
-    after idle [itcl::code $this _render]
-}
+    $_dispatcher event -idle !redraw
+}

trunk/gui/scripts/xyresult.tcl

@@ -68 +68 @@
     private variable _elem2curve   ;# maps graph element => curve
     private variable _xmin ""      ;# autoscale min for x-axis
+    private variable _xlogmin ""   ;# autoscale min for x-axis (log scale)
     private variable _xmax ""      ;# autoscale max for x-axis
+    private variable _xlogmax ""   ;# autoscale max for x-axis (log scale)
     private variable _vmin ""      ;# autoscale min for y-axis
+    private variable _vlogmin ""   ;# autoscale min for y-axis (log scale)
     private variable _vmax ""      ;# autoscale max for y-axis
+    private variable _vlogmax ""   ;# autoscale max for y-axis (log scale)
     private variable _hilite       ;# info from last _hilite operation
     private variable _axis         ;# info for axis being edited
@@ -334 +338 @@
 itcl::body Rappture::XyResult::scale {args} {
     set _xmin ""
+    set _xlogmin ""
     set _xmax ""
+    set _xlogmax ""
     set _vmin ""
+    set _vlogmin ""
     set _vmax ""
+    set _vlogmax ""
     foreach obj $args {
-        foreach axis {x v} {
+        foreach axis {x xlog v vlog} {
             foreach {min max} [$obj limits $axis] break
             if {"" != $min && "" != $max} {
@@ -526 +534 @@
     #
     if {$_xmin != $_xmax} {
-        $g axis configure x -min $_xmin -max $_xmax
-    } else {
-        $g axis configure x -min "" -max ""
-    }
-
-    if {"" != $_vmin && "" != $_vmax} {
-        set min $_vmin
-        set max $_vmax
-        set log [$g axis cget y -logscale]
+        set log [$g axis cget x -logscale]
         if {$log} {
+            set min $_xlogmin
+            set max $_xlogmax
             if {$min == $max} {
                 set min [expr {0.9*$min}]
                 set max [expr {1.1*$max}]
             }
-            set min [expr {pow(10.0,floor(log10($min)))}]
-            set max [expr {pow(10.0,ceil(log10($max)))}]
+            set v [expr {floor(log10($min))}]
+            if {$v > 0} {
+                set min [expr {pow(10.0,$v)}]
+            }
+            set v [expr {floor(log10($max))}]
+            if {$v > 0} {
+                set max [expr {pow(10.0,$v)}]
+            }
         } else {
+            set min $_xmin
+            set max $_xmax
+            if {$min > 0} {
+                set min [expr {0.95*$min}]
+            } else {
+                set min [expr {1.05*$min}]
+            }
+            if {$max > 0} {
+                set max [expr {1.05*$max}]
+            } else {
+                set max [expr {0.95*$max}]
+            }
+        }
+        if {$min != $max} {
+            $g axis configure x -min $min -max $max
+        } else {
+            $g axis configure x -min "" -max ""
+        }
+    } else {
+        $g axis configure x -min "" -max ""
+    }
+
+    if {"" != $_vmin && "" != $_vmax} {
+        set log [$g axis cget y -logscale]
+        if {$log} {
+            set min $_vlogmin
+            set max $_vlogmax
+            if {$min == $max} {
+                set min [expr {0.9*$min}]
+                set max [expr {1.1*$max}]
+            }
+            set v [expr {floor(log10($min))}]
+            if {$v > 0} {
+                set min [expr {pow(10.0,$v)}]
+            }
+            set v [expr {floor(log10($max))}]
+            if {$v > 0} {
+                set max [expr {pow(10.0,$v)}]
+            }
+        } else {
+            set min $_vmin
+            set max $_vmax
             if {$min > 0} {
                 set min [expr {0.95*$min}]