Changeset 4735


Ignore:
Timestamp:
Nov 17, 2014, 4:56:13 AM (5 years ago)
Author:
ldelgass
Message:

Try to keep style names more consistent.

Location:
trunk/gui/scripts
Files:
3 edited

Legend:

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

    r4707 r4735  
    18561856        0,0 $inner.view_l -anchor e -pady 2 \
    18571857        0,1 $inner.view -anchor w -pady 2
     1858    blt::table configure $inner r0 -resize none
    18581859
    18591860    set labels { qx qy qz qw xpan ypan zoom }
     
    18811882    incr row
    18821883
    1883     blt::table configure $inner c* r* -resize none
     1884    blt::table configure $inner c* -resize none
    18841885    blt::table configure $inner c2 -resize expand
    18851886    blt::table configure $inner r$row -resize expand
  • trunk/gui/scripts/vtkisosurfaceviewer.tcl

    r4715 r4735  
    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"
  • trunk/gui/scripts/vtkvolumeviewer.tcl

    r4730 r4735  
    22322232    set tag $dataobj-$cname
    22332233    array set styles {
    2234         -color BCGYR
    2235         -volumelighting         1
    2236         -volumeoutline          0
    2237         -volumevisible          1
     2234        -color      BCGYR
     2235        -lighting   1
     2236        -outline    0
     2237        -visible    1
    22382238    }
    22392239    array set styles [$dataobj style $cname]
    2240     SendCmd "volume add $tag"
    2241     set _settings($cname-volumelighting)        $styles(-volumelighting)
    2242     set _settings($cname-volumeoutline)         $styles(-volumeoutline)
    2243     set _settings($cname-volumevisible)         $styles(-volumevisible)
     2240    set _settings($cname-volumelighting)        $styles(-lighting)
     2241    set _settings($cname-volumeoutline)         $styles(-outline)
     2242    set _settings($cname-volumevisible)         $styles(-visible)
    22442243
    22452244    $itk_component(colormap) value $styles(-color)
     2245
     2246    SendCmd "outline add $tag"
     2247    SendCmd "outline visible $styles(-outline) $tag"
    22462248
    22472249    SendCmd "$_cutplaneCmd add $tag"
    22482250    SendCmd "$_cutplaneCmd visible 0 $tag"
    2249     SendCmd "volume lighting $styles(-volumelighting) $tag"
     2251
     2252    SendCmd "volume add $tag"
     2253    SendCmd "volume lighting $styles(-lighting) $tag"
     2254    SendCmd "volume visible $styles(-visible) $tag"
     2255
    22502256    SetInitialTransferFunction $dataobj $cname
    22512257    SendCmd "volume colormap $cname $tag"
    22522258    SendCmd "$_cutplaneCmd colormap $cname-opaque $tag"
    2253     SendCmd "outline add $tag"
    2254     SendCmd "outline visible $styles(-volumeoutline) $tag"
    22552259}
    22562260
Note: See TracChangeset for help on using the changeset viewer.