Changeset 3793


Ignore:
Timestamp:
Jul 12, 2013 9:28:03 PM (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gui/scripts/vtkviewer.tcl

    r3783 r3793  
    13681368                if { $type == "polydata" } {
    13691369                    ChangeColormap $dataobj $comp $palette
     1370                    #SendCmd "polydata colormode scalar {} $dataset"
    13701371                }
    13711372            }
     
    22372238        -from 0.0 -to 2.0 -resolution 0.05 -label "" \
    22382239        -showvalue true -orient horizontal \
    2239         -command [itcl::code $this EventuallyAtomScale] \
     2240        -command [itcl::code $this EventuallySetAtomScale] \
    22402241        -variable [itcl::scope _settings(molecule-atomscale)]
    22412242    $inner.atomscale set $_settings(molecule-atomscale)
    22422243    Rappture::Tooltip::for $inner.atomscale \
    2243         "Adjust scale of atoms (spheres or balls). 1.0 is the full VDW radius."
     2244        "Adjust scale of atoms (spheres or balls). 1.0 is the default radius."
    22442245
    22452246    label $inner.bondscale_l -text "Bond Scale" -font "Arial 9"
     
    22472248        -from 0.0 -to 1.0 -resolution 0.025 -label "" \
    22482249        -showvalue true -orient horizontal \
    2249         -command [itcl::code $this EventuallyBondScale] \
     2250        -command [itcl::code $this EventuallySetBondScale] \
    22502251        -variable [itcl::scope _settings(molecule-bondscale)]
    22512252    Rappture::Tooltip::for $inner.bondscale \
     
    22582259        -width 15 -font "Arial 7" \
    22592260        -showvalue on \
    2260         -command [itcl::code $this EventuallyMoleculeOpacity]
     2261        -command [itcl::code $this EventuallySetMoleculeOpacity]
    22612262
    22622263    blt::table $inner \
     
    24182419        "molecule" {
    24192420            SendCmd "molecule add $tag"
    2420             SendCmd "molecule rscale van_der_waals $tag"
    24212421            set _haveMolecules 1
    24222422        }
    24232423        "polydata" {
    24242424            array set settings {
    2425                 -color \#6666FF
     2425                -color \#FFFFFF
    24262426                -edges 1
    24272427                -edgecolor black
Note: See TracChangeset for help on using the changeset viewer.