Changeset 3793 for trunk/gui/scripts/vtkviewer.tcl

Timestamp:

Jul 12, 2013, 9:28:03 PM (11 years ago)

Author:

ldelgass

Message:

Fixes for VTK molecule viewer: sliders were calling nonexistant methods. Fix
tooltip for atom scale: 1.0 is the default radius, it is only the VDW radius if
the representation is set to space filling. Otherwise it is covalent, atomic,
or Angstroms (if scaling is 'none') depending on rscale setting. Leave default
rscale alone when setting object style, it will be changed by representation
setting anyway. Change default polydata color to white. Should be specified
by either a style or color scalars. Colormap and colormode settings for
polydata are still commented out until server support for colormapped polydata
is released.

File:

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

trunk/gui/scripts/vtkviewer.tcl

@@ -1368 +1368 @@
                 if { $type == "polydata" } {
                     ChangeColormap $dataobj $comp $palette
+                    #SendCmd "polydata colormode scalar {} $dataset"
                 }
             }
@@ -2237 +2238 @@
         -from 0.0 -to 2.0 -resolution 0.05 -label "" \
         -showvalue true -orient horizontal \
-        -command [itcl::code $this EventuallyAtomScale] \
+        -command [itcl::code $this EventuallySetAtomScale] \
         -variable [itcl::scope _settings(molecule-atomscale)]
     $inner.atomscale set $_settings(molecule-atomscale)
     Rappture::Tooltip::for $inner.atomscale \
-        "Adjust scale of atoms (spheres or balls). 1.0 is the full VDW radius."
+        "Adjust scale of atoms (spheres or balls). 1.0 is the default radius."
 
     label $inner.bondscale_l -text "Bond Scale" -font "Arial 9"
@@ -2247 +2248 @@
         -from 0.0 -to 1.0 -resolution 0.025 -label "" \
         -showvalue true -orient horizontal \
-        -command [itcl::code $this EventuallyBondScale] \
+        -command [itcl::code $this EventuallySetBondScale] \
         -variable [itcl::scope _settings(molecule-bondscale)]
     Rappture::Tooltip::for $inner.bondscale \
@@ -2258 +2259 @@
         -width 15 -font "Arial 7" \
         -showvalue on \
-        -command [itcl::code $this EventuallyMoleculeOpacity]
+        -command [itcl::code $this EventuallySetMoleculeOpacity]
 
     blt::table $inner \
@@ -2418 +2419 @@
         "molecule" {
             SendCmd "molecule add $tag"
-            SendCmd "molecule rscale van_der_waals $tag"
             set _haveMolecules 1
         }
         "polydata" {
             array set settings {
-                -color \#6666FF
+                -color \#FFFFFF
                 -edges 1
                 -edgecolor black