Changeset 4736 for branches/1.3


Ignore:
Timestamp:
Nov 17, 2014, 5:27:24 AM (5 years ago)
Author:
ldelgass
Message:

merge r4735 from trunk

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4735
  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r4714 r4736  
    17501750        0,0 $inner.view_l -anchor e -pady 2 \
    17511751        0,1 $inner.view -anchor w -pady 2
     1752    blt::table configure $inner r0 -resize none
    17521753
    17531754    set labels { qx qy qz qw xpan ypan zoom }
     
    17751776    incr row
    17761777
    1777     blt::table configure $inner c* r* -resize none
     1778    blt::table configure $inner c* -resize none
    17781779    blt::table configure $inner c2 -resize expand
    17791780    blt::table configure $inner r$row -resize expand
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4714 r4736  
    18291829        0,0 $inner.view_l -anchor e -pady 2 \
    18301830        0,1 $inner.view -anchor w -pady 2
     1831    blt::table configure $inner r0 -resize none
    18311832
    18321833    set labels { qx qy qz qw xpan ypan zoom }
     
    18541855    incr row
    18551856
    1856     blt::table configure $inner c* r* -resize none
     1857    blt::table configure $inner c* -resize none
    18571858    blt::table configure $inner c2 -resize expand
    18581859    blt::table configure $inner r$row -resize expand
     
    21282129        -edgecolor              black
    21292130        -edges                  0
    2130         -isosurfaceopacity      0.6
    21312131        -isosurfacevisible      1
    21322132        -levels                 10
    21332133        -lighting               1
    21342134        -linewidth              1.0
     2135        -opacity                0.6
    21352136        -outline                0
    21362137        -wireframe              0
     
    21442145    array set style [$dataobj style $comp]
    21452146    if { $dataobj != $_first || $style(-levels) == 1 } {
    2146         set style(-isosurfaceopacity) 1.0
     2147        set style(-opacity) 1.0
    21472148    }
    21482149
     
    21572158
    21582159    if { $_changed(-isosurfaceopacity) } {
    2159         set style(-isosurfaceopacity) $_settings(-isosurfaceopacity)
     2160        set style(-opacity) $_settings(-isosurfaceopacity)
    21602161    }
    21612162    if { $_changed(-numcontours) } {
     
    22062207    SendCmd "contour3d linecolor [Color2RGB $style(-edgecolor)] $tag"
    22072208    SendCmd "contour3d linewidth $style(-linewidth) $tag"
    2208     SendCmd "contour3d opacity $style(-isosurfaceopacity) $tag"
    2209     set _settings(-isosurfaceopacity) $style(-isosurfaceopacity)
     2209    SendCmd "contour3d opacity $style(-opacity) $tag"
     2210    set _settings(-isosurfaceopacity) $style(-opacity)
    22102211    SetCurrentColormap $style(-color)
    22112212    SendCmd "contour3d wireframe $style(-wireframe) $tag"
  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r4729 r4736  
    15181518        -color BCGYR
    15191519        -levels 6
    1520         -opacity 1.0
    15211520    }
    15221521    set tag $dataobj-$comp
     
    15351534    array set style $_style($tag)
    15361535
    1537     set name "$style(-color):$style(-levels):$style(-opacity)"
     1536    set name "$style(-color):$style(-levels)"
    15381537    if { ![info exists _colormaps($name)] } {
    15391538        BuildColormap $name [array get style]
     
    15571556        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    15581557    }
    1559     if { ![info exists _settings(-volumeopacity)] } {
    1560         set _settings(-volumeopacity) $style(-opacity)
    1561     }
    1562     set max $_settings(-volumeopacity)
     1558    set max 1.0
    15631559
    15641560    set opaqueWmap "0.0 1.0 1.0 1.0"
     
    20942090}
    20952091
    2096 itcl::body Rappture::VtkVolumeViewer::SetObjectStyle { dataobj comp } {
     2092itcl::body Rappture::VtkVolumeViewer::SetObjectStyle { dataobj cname } {
    20972093    # Parse style string.
    2098     set tag $dataobj-$comp
    2099     set style [$dataobj style $comp]
    2100     array set settings {
    2101         -color \#808080
    2102         -edges 0
    2103         -edgecolor black
    2104         -linewidth 1.0
    2105         -opacity 0.4
    2106         -wireframe 0
    2107         -lighting 1
    2108         -seeds 1
    2109         -seedcolor white
    2110         -visible 1
    2111     }
    2112     if { $dataobj != $_first } {
    2113         set settings(-opacity) 1
    2114     }
    2115     array set settings $style
    2116     SendCmd "volume add $tag"
     2094    set tag $dataobj-$cname
     2095    set style [$dataobj style $cname]
     2096    array set styles {
     2097        -lighting   1
     2098        -opacity    0.5
     2099        -outline    0
     2100        -visible    1
     2101    }
     2102    array set styles [$dataobj style $cname]
     2103    set _settings(-volumelighting) $styles(-lighting)
     2104    set _settings(-volumeoutline) $styles(-outline)
     2105    set _settings(-volumeopacity) [expr $styles(-opacity) * 100.0]
     2106    set _settings(-volumevisible) $styles(-visible)
     2107
     2108    SendCmd "outline add $tag"
     2109    SendCmd "outline visible $styles(-outline) $tag"
     2110
     2111    SendCmd "outline add $tag"
     2112    SendCmd "outline visible $styles(-outline) $tag"
     2113
    21172114    SendCmd "$_cutplaneCmd add $tag"
    21182115    SendCmd "$_cutplaneCmd visible 0 $tag"
    21192116
    2120     SendCmd "volume lighting $settings(-lighting) $tag"
    2121     set _settings(-volumelighting) $settings(-lighting)
    2122     SetColormap $dataobj $comp
    2123     SendCmd "outline add $tag"
    2124     SendCmd "outline visible 0 $tag"
     2117    SendCmd "volume add $tag"
     2118    SendCmd "volume lighting $styles(-lighting) $tag"
     2119    SendCmd "volume opacity $styles(-opacity) $tag"
     2120    SendCmd "volume visible $styles(-visible) $tag"
     2121    SetColormap $dataobj $cname
    21252122}
    21262123
Note: See TracChangeset for help on using the changeset viewer.