Changeset 64 for trunk/gui/scripts/moleculeViewer.tcl

Timestamp:

Sep 25, 2005 12:40:17 PM (19 years ago)

Author:

mmc

Message:

Lots of fixes for app-pntoy and other tools:

• Fixed plotting to recognize "-color name" in the style section, and to use auto colors for overlayed plots.
• Fixed x-y plotting to keep axes instead of resetting when flipping back and forth between plots.
• Fixed 1D fields to support new lin/log limits queries, so it plots properly.
• Added support for <string> output values.
• Fixed molecular viewer so that 3D rotation is unconstrained and more intuitive.
• Fixed Rappture::exec to handle newlines properly. Sometimes output would get all mixed together without newlines. Works better now.

File:

• trunk/gui/scripts/moleculeViewer.tcl (modified) (9 diffs)

trunk/gui/scripts/moleculeViewer.tcl

@@ -66 +66 @@
     protected method _zoom {option}
     protected method _move {option x y}
-    protected method _3dView {theta phi}
+    protected method _3dView {theta phi psi}
     protected method _color2rgb {color}
 
@@ -120 +120 @@
     set _view(theta) 0
     set _view(phi) 0
+    set _view(psi) 0
 
     itk_component add controls {
@@ -344 +345 @@
         reset {
             $this-ren ResetCamera
-            _3dView 45 45
+            _3dView 45 45 0
         }
     }
@@ -367 +368 @@
             set _click(theta) $_view(theta)
             set _click(phi) $_view(phi)
+            set _click(psi) $_view(psi)
         }
         drag {
@@ -377 +379 @@
                     return
                 }
-                set dx [expr {double($x-$_click(x))/$w}]
-                set dy [expr {double($y-$_click(y))/$h}]
+
+                if {[catch {
+                    # this fails sometimes for no apparent reason
+                    set dx [expr {double($x-$_click(x))/$w}]
+                    set dy [expr {double($y-$_click(y))/$h}]
+                }]} {
+                    return
+                }
 
                 #
                 # Rotate the camera in 3D
                 #
+                if {$_view(psi) > 90 || $_view(psi) < -90} {
+                    # when psi is flipped around, theta moves backwards
+                    set dy [expr {-$dy}]
+                }
                 set theta [expr {$_view(theta) - $dy*180}]
-                if {$theta < 2} { set theta 2 }
-                if {$theta > 178} { set theta 178 }
-                set phi [expr {$_view(phi) - $dx*360}]
-
-                _3dView $theta $phi
+                while {$theta < 0} { set theta [expr {$theta+180}] }
+                while {$theta > 180} { set theta [expr {$theta-180}] }
+                #if {$theta < 2} { set theta 2 }
+                #if {$theta > 178} { set theta 178 }
+
+                if {$theta > 45 && $theta < 135} {
+                    set phi [expr {$_view(phi) - $dx*360}]
+                    while {$phi < 0} { set phi [expr {$phi+360}] }
+                    while {$phi > 360} { set phi [expr {$phi-360}] }
+                    set psi $_view(psi)
+                } else {
+                    set phi $_view(phi)
+                    set psi [expr {$_view(psi) - $dx*360}]
+                    while {$psi < -180} { set psi [expr {$psi+360}] }
+                    while {$psi > 180} { set psi [expr {$psi-360}] }
+                }
+
+                _3dView $theta $phi $psi
                 emblems fixPosition
                 $_dispatcher event -idle !render
@@ -408 +433 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _3dView <theta> <phi>
+# USAGE: _3dView <theta> <phi> <psi>
 #
 # Used internally to change the position of the camera for 3D data
@@ -415 +440 @@
 # Both angles are in degrees.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MoleculeViewer::_3dView {theta phi} {
+itcl::body Rappture::MoleculeViewer::_3dView {theta phi psi} {
     set deg2rad 0.0174532927778
-    set xn [expr {sin($theta*$deg2rad)*cos($phi*$deg2rad)}]
-    set yn [expr {sin($theta*$deg2rad)*sin($phi*$deg2rad)}]
-    set zn [expr {cos($theta*$deg2rad)}]
+    set xp [expr {sin($theta*$deg2rad)*cos($phi*$deg2rad)}]
+    set yp [expr {sin($theta*$deg2rad)*sin($phi*$deg2rad)}]
+    set zp [expr {cos($theta*$deg2rad)}]
 
     set xm [expr {0.5*($_limits(xmax)+$_limits(xmin))}]
@@ -430 +455 @@
 
     $cam SetFocalPoint $xm $ym $zm
-    $cam SetPosition [expr {$xm-$xn}] [expr {$ym-$yn}] [expr {$zm+$zn}]
+    $cam SetPosition [expr {$xm-$xp}] [expr {$ym-$yp}] [expr {$zm+$zp}]
     $cam ComputeViewPlaneNormal
     $cam SetViewUp 0 0 1  ;# z-dir is up
     $cam OrthogonalizeViewUp
+    $cam Azimuth $psi
     $this-ren ResetCamera
     $cam SetViewAngle $zoom
@@ -442 +468 @@
     set _view(theta) $theta
     set _view(phi) $phi
+    set _view(psi) $psi
 }