Changeset 4431 for branches/1.3


Ignore:
Timestamp:
Jun 25, 2014 2:28:42 PM (6 years ago)
Author:
ldelgass
Message:

Merge trunk fixes

Location:
branches/1.3/gui/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r4340 r4431  
    119119    # heightmaps displayed.
    120120    private variable _currentColormap ""
    121     private variable _currentOpacity ""
    122121
    123122    private variable _dataset2style    ;# maps dataobj-component to transfunc
     
    20942093
    20952094    if { $_changed(glyphOpacity) } {
    2096         set style(-opacity) $_settings(glyphOpacity)
     2095        set style(-opacity) [expr $_settings(glyphOpacity) * 0.01]
    20972096    }
    20982097    if { $_changed(colormap) } {
     
    21022101        $itk_component(colormap) value $style(-color)
    21032102    }
    2104     set _currentOpacity $style(-opacity)
    21052103    SendCmd "glyphs add $style(-shape) $tag"
    21062104    SendCmd "glyphs edges $style(-edges) $tag"
     
    21292127    SendCmd "glyphs linewidth $style(-linewidth) $tag"
    21302128    SendCmd "glyphs ptsize $style(-ptsize) $tag"
    2131     SendCmd "glyphs opacity $_currentOpacity $tag"
    2132     set _settings(glyphOpacity) $style(-opacity)
     2129    SendCmd "glyphs opacity $style(-opacity) $tag"
     2130    set _settings(glyphOpacity) [expr $style(-opacity) * 100.0]
    21332131    SetCurrentColormap $style(-color)
    21342132    SendCmd "glyphs wireframe $style(-wireframe) $tag"
    21352133    set _settings(glyphWireframe) $style(-wireframe)
    2136     set _settings(glyphOpacity) [expr $style(-opacity) * 100.0]
    21372134}
    21382135
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4429 r4431  
    122122    private variable _currentColormap ""
    123123    private variable _currentNumContours -1
    124     private variable _currentOpacity ""
    125124
    126125    private variable _dataset2style    ;# maps dataobj-component to transfunc
     
    354353    $itk_component(contour) select
    355354    Rappture::Tooltip::for $itk_component(contour) \
    356         "Don't display the isosurface"
     355        "Hide the isosurface"
    357356    pack $itk_component(contour) -padx 2 -pady 2
    358357
     
    365364    }
    366365    Rappture::Tooltip::for $itk_component(cutplane) \
    367         "Show/Hide cutplanes"
     366        "Show the cutplanes"
    368367    pack $itk_component(cutplane) -padx 2 -pady 2
    369368
     
    17201719        -showvalue off \
    17211720        -command [itcl::code $this AdjustSetting -isosurfaceopacity]
    1722 
    1723     label $inner.scale_l -text "Scale" -font "Arial 9"
    1724     ::scale $inner.scale -from 1 -to 100 -orient horizontal \
    1725         -variable [itcl::scope _settings(-contourscale)] \
    1726         -width 10 \
    1727         -showvalue off \
    1728         -command [itcl::code $this AdjustSetting -contourscale]
    17291721
    17301722    itk_component add field_l {
     
    22102202
    22112203    if { $_changed(-isosurfaceopacity) } {
    2212         set style(-opacity) $_settings(-isosurfaceopacity)
     2204        set style(-opacity) [expr $_settings(-isosurfaceopacity) * 0.01]
    22132205    }
    22142206    if { $_changed(-numcontours) } {
     
    22222214        $itk_component(colormap) value $style(-color)
    22232215    }
    2224     set _currentOpacity $style(-opacity)
    22252216    if { $_contourList(numLevels) != $style(-levels) } {
    22262217        set _settings(-numcontours) $style(-levels)
     
    22522243    SendCmd "contour3d linecolor [Color2RGB $style(-edgecolor)] $tag"
    22532244    SendCmd "contour3d linewidth $style(-linewidth) $tag"
    2254     SendCmd "contour3d opacity $_currentOpacity $tag"
    2255     set _settings(-isosurfaceopacity) $style(-opacity)
     2245    SendCmd "contour3d opacity $style(-opacity) $tag"
     2246    set _settings(-isosurfaceopacity) [expr $style(-opacity) * 100.0]
    22562247    SetCurrentColormap $style(-color)
    22572248    SendCmd "contour3d wireframe $style(-wireframe) $tag"
    22582249    set _settings(-isosurfacewireframe) $style(-wireframe)
    2259     set _settings(-isosurfaceopacity) [expr $style(-opacity) * 100.0]
    22602250}
    22612251
Note: See TracChangeset for help on using the changeset viewer.