Changeset 1993 for branches/blt4

Timestamp:

Dec 9, 2010, 8:38:32 PM (14 years ago)

Author:

gah

Message:

Fixes for molvisviewer: opacity and setting representation

File:

• branches/blt4/gui/scripts/molvisviewer.tcl (modified) (11 diffs)

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -129 +129 @@
     }
     public method snap { w h }
-    private method Opacity {option {models "all"} }
+    private method Opacity {option}
     private method SphereScale {option {models "all"} }
     private method StickRadius {option {models "all"} }
@@ -526 +526 @@
         10,0 $inner.cell -anchor w -columnspan 4 -pady {1 0} \
         11,1 $inner.spherescale -fill x -columnspan 4 -pady {1 0} \
-        11,1 $inner.stickradius -fill x -columnspan 4 -pady {1 0} \
+        12,1 $inner.stickradius -fill x -columnspan 4 -pady {1 0} \
 
     blt::table configure $inner c0 -resize expand -width 2
@@ -758 +758 @@
         }
         if { ![info exists _dataobjs($model-$state)] } {
-            set data1      ""
+            set data1 ""
             set serial    1
 
@@ -789 +789 @@
                 # We know we're buffered here, so append the "loadpdb" command
                 # with the data payload immediately afterwards.
-                append _outbuf "loadpdb -defer follows $model $state $nBytes\n"
+                SendCmd "loadpdb -defer follows $model $state $nBytes"
                 append _outbuf $data1
                 set _dataobjs($model-$state)  1
@@ -802 +802 @@
                 # We know we're buffered here, so append the "loadpdb" command
                 # with the data payload immediately afterwards.
-                append _outbuf "loadpdb -defer follows $model $state $nBytes\n"
+                SendCmd "loadpdb -defer follows $model $state $nBytes"
                 append _outbuf $data2
                 set _dataobjs($model-$state)  1
@@ -851 +851 @@
                     # We know we're buffered here, so append the "loadpdb" 
                     # command with the data payload immediately afterwards.
-                    append _outbuf \
-                        "loadpdb -defer follows $model $state $nBytes\n"
+                    SendCmd "loadpdb -defer follows $model $state $nBytes"
                     append _outbuf $data3
                 }
@@ -959 +958 @@
         debug "rebuild: rotate $_view(mx) $_view(my) $_view(mz)"
 
+        SendCmd "raw -defer {zoom complete=1}"
+        set _restore 0
+    }
+    if { $changed } {
         # Default settings for all models.
         SphereScale update 
@@ -968 +971 @@
         OrthoProjection update 
         Representation update 
-        SendCmd "raw -defer {zoom complete=1}"
-        set _restore 0
     }
     set tab [$itk_component(main) panel "Settings"]
@@ -1837 +1838 @@
 # ----------------------------------------------------------------------
 
-itcl::body Rappture::MolvisViewer::Opacity { option {models "all"} } {
+itcl::body Rappture::MolvisViewer::Opacity { option } {
     if { $option == "update" } {
         set opacity $_settings($this-opacity)
@@ -1850 +1851 @@
     set _settings($this-opacity) $opacity
     set transparency [expr 1.0 - $opacity]
-    if { $models == "all" } {
+    set models [array names _active]
+    if { [llength $models] == 0 } {
         SendCmd "transparency -model all $transparency"
         return
@@ -1857 +1859 @@
     SendCmd "transparency -model all $overridetransparency"
     foreach model $models {
-        if { [info exists _active($model)] } {
-            SendCmd "transparency -model $model $transparency"
-        }
+        SendCmd "transparency -model $model $transparency"
     }
 }