Changeset 3137 for trunk

Timestamp:

Aug 3, 2012 11:04:39 AM (12 years ago)

Author:

ldelgass

Message:

Enable molecule label toggle, set default camera angle to match volume viewer,
fix initial opacity slider setting for molecule

File:

• trunk/gui/scripts/vtkviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -198 +198 @@
     # Initialize the view to some default parameters.
     array set _view {
-        qw              1
-        qx              0
-        qy              0
-        qz              0
+        qw              0.853553
+        qx              -0.353553
+        qy              0.353553
+        qz              0.146447
         zoom            1.0 
         xpan            0
@@ -237 +237 @@
         molecule-representation  "ball and stick"
         molecule-edges           0
+        molecule-labels          0
         molecule-lighting        1
-        molecule-opacity         40
+        molecule-opacity         100
         molecule-visible         1
         molecule-wireframe       0
@@ -1058 +1059 @@
         "reset" {
             array set _view {
-                qw      1
-                qx      0
-                qy      0
-                qz      0
+                qw      0.853553
+                qx      -0.353553
+                qy      0.353553
+                qz      0.146447
                 zoom    1.0
                 xpan   0
@@ -1386 +1387 @@
             }
         }
+        "molecule-labels" {
+            set bool $_settings(molecule-labels)
+            foreach dataset [CurrentDatasets -visible $_first] {
+               foreach { dataobj comp } [split $dataset -] break
+               set type [$dataobj type $comp]
+               if { $type == "molecule" } {
+                   SendCmd "molecule labels $bool $dataset"
+               }
+            }
+        }
         "axis-visible" {
             set bool $_axis(visible)
@@ -2186 +2197 @@
         -text "Show Atom Labels" \
         -variable [itcl::scope _settings(molecule-labels)] \
+        -command [itcl::code $this AdjustSetting molecule-labels] \
         -font "Arial 9"
 
@@ -2307 +2319 @@
     blt::table $inner \
         0,0 $inner.molecule -anchor w -pady {1 0} \
+        1,0 $inner.label -anchor w -pady {1 0} \
         2,0 $inner.wireframe -anchor w -pady {1 0} \
         4,0 $inner.edges -anchor w -pady {1 0} \