Changeset 6045 for trunk/gui


Ignore:
Timestamp:
Feb 23, 2016, 1:20:37 PM (9 years ago)
Author:
ldelgass
Message:

Don't change default style settings for "background" dataobjs in 3D viewers.
Also, fix opacity style setting for isosurface viewer.

Location:
trunk/gui/scripts
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/scripts/vtkglyphviewer.tcl

    r5769 r6045  
    21912191        array unset style -scaleMode
    21922192    }
    2193     if { $dataobj != $_first } {
    2194         set style(-opacity) 1
    2195     }
    21962193    if 0 {
    21972194    SendCmd "cutplane add $tag"

  • trunk/gui/scripts/vtkisosurfaceviewer.tcl

    r6043 r6045  
    22692269
    22702270itcl::body Rappture::VtkIsosurfaceViewer::SetObjectStyle { dataobj comp } {
     2271    DebugTrace "Enter"
    22712272    # Parse style string.
    22722273    set tag $dataobj-$comp
    … …  
    22952296        -zcutplanevisible       1
    22962297    }
     2298    if { $style(-levels) == 1 } {
     2299        set style(-opacity) 1.0
     2300    }
    22972301    array set style [$dataobj style $comp]
    2298     if { $dataobj != $_first || $style(-levels) == 1 } {
    2299         set style(-opacity) 1.0
    2300     }
     2302    #DebugTrace [array get style]
    23012303
    23022304    # This is too complicated.  We want to set the colormap, number of
    … …  
    23662368    SendCmd "cutplane lighting $style(-cutplanelighting) $tag"
    23672369    SendCmd "cutplane opacity $style(-cutplaneopacity) $tag"
     2370    set _widget(-cutplaneopacity) [expr $style(-cutplaneopacity) * 100]
    23682371    SendCmd "cutplane preinterp $style(-cutplanepreinterp) $tag"
    23692372    SendCmd "cutplane wireframe $style(-cutplanewireframe) $tag"
    … …  
    23862389    SendCmd "contour3d opacity $style(-opacity) $tag"
    23872390    set _settings(-isosurfaceopacity) $style(-opacity)
     2391    set _widget(-isosurfaceopacity) [expr $style(-opacity) * 100]
    23882392    SetCurrentColormap $style(-color)
    23892393    SendCmd "contour3d wireframe $style(-wireframe) $tag"

  • trunk/gui/scripts/vtkmeshviewer.tcl

    r5772 r6045  
    15251525        -wireframe 0
    15261526    }
    1527     if { $dataobj != $_first } {
    1528         set style(-wireframe) 1
    1529     }
    15301527    if {$type == "cloud"} {
    15311528        set style(-cloudstyle) points

  • trunk/gui/scripts/vtkstreamlinesviewer.tcl

    r5772 r6045  
    21172117    }
    21182118    array set style [$dataobj style $comp]
    2119     if { $dataobj != $_first } {
    2120         set style(-opacity) 1.0
    2121     }
     2119
    21222120    StartBufferingCommands
    21232121    SendCmd "streamlines add $tag"

  • trunk/gui/scripts/vtksurfaceviewer.tcl

    r5818 r6045  
    18941894    }
    18951895    array set style [$dataobj style $comp]
    1896     if { $dataobj != $_first || $style(-levels) == 1 } {
    1897         set style(-opacity) 1.0
    1898     }
    18991896
    19001897    # This is too complicated.  We want to set the colormap, number of

  • trunk/gui/scripts/vtkviewer.tcl

    r5772 r6045  
    26342634    set type [$dataobj type $comp]
    26352635    set style [$dataobj style $comp]
    2636     if { $dataobj != $_first } {
    2637         set settings(-wireframe) 1
    2638     }
    26392636    switch -- $type {
    26402637        "glyphs" {
Note: See TracChangeset for help on using the changeset viewer.