Changeset 4487 for branches/1.3


Ignore:
Timestamp:
Jul 11, 2014 10:41:04 PM (6 years ago)
Author:
ldelgass
Message:

merge r4381 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4381
  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r4481 r4487  
    117117    private variable _currentColormap ""
    118118    private variable _currentNumContours -1
    119     private variable _currentOpacity ""
    120119
    121120    private variable _dataset2style    ;# maps dataobj-component to transfunc
     
    398397    EnableWaitDialog 500
    399398    Connect
    400     update
    401399}
    402400
     
    19061904
    19071905    if { $_changed(-surfaceopacity) } {
    1908         set style(-opacity) $_settings(-surfaceopacity)
     1906        set style(-opacity) [expr $_settings(-surfaceopacity) * 0.01]
    19091907    }
    19101908    if { $_changed(-numcontours) } {
     
    19181916        $itk_component(colormap) value $style(-color)
    19191917    }
    1920     set _currentOpacity $style(-opacity)
    19211918    if { $_currentNumContours != $style(-levels) } {
    19221919        set _currentNumContours $style(-levels)
     
    19441941    SendCmd "polydata linecolor [Color2RGB $style(-edgecolor)] $tag"
    19451942    SendCmd "polydata linewidth $style(-linewidth) $tag"
    1946     SendCmd "polydata opacity $_currentOpacity $tag"
    1947     set _settings(-surfaceopacity) $style(-opacity)
     1943    SendCmd "polydata opacity $style(-opacity) $tag"
     1944    set _settings(-surfaceopacity) [expr $style(-opacity) * 100.0]
    19481945    SetCurrentColormap $style(-color)
    19491946    SendCmd "polydata wireframe $style(-wireframe) $tag"
    19501947    set _settings(-surfacewireframe) $style(-wireframe)
    1951     set _settings(-surfaceopacity) [expr $style(-opacity) * 100.0]
    19521948}
    19531949
Note: See TracChangeset for help on using the changeset viewer.