Changeset 4538 for branches/1.3


Ignore:
Timestamp:
Jul 17, 2014, 5:08:48 PM (5 years ago)
Author:
ldelgass
Message:

merge r4537 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

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

    r4487 r4538  
    215215        -surfacelighting                1
    216216        -surfaceopacity                 100
    217         -surfaceoutline                 0
     217        -outline                        0
    218218        -surfacevisible                 1
    219219        -surfacewireframe               0
     
    984984        $itk_component(field) value $_curFldLabel
    985985    }
    986     InitSettings -isolinesvisible -surfacevisible -surfaceoutline
     986    InitSettings -isolinesvisible -surfacevisible -outline
    987987    if { $_reset } {
    988988        # These are settings that rely on a dataset being loaded.
     
    13681368            SendCmd "polydata edges $bool"
    13691369        }
    1370         "-surfaceoutline" {
     1370        "-outline" {
    13711371            set bool $_settings($what)
    13721372            SendCmd "outline visible $bool"
     
    15511551    checkbutton $inner.outline \
    15521552        -text "Outline" \
    1553         -variable [itcl::scope _settings(-surfaceoutline)] \
    1554         -command [itcl::code $this AdjustSetting -surfaceoutline] \
     1553        -variable [itcl::scope _settings(-outline)] \
     1554        -command [itcl::code $this AdjustSetting -outline] \
    15551555        -font "Arial 9"
    15561556
     
    19261926    set _settings(-surfacevisible) $style(-surfacevisible)
    19271927 
    1928     SendCmd "polydata add $tag"
    1929     SendCmd "polydata edges $style(-edges) $tag"
    1930     SendCmd [list contour2d add contourlist $_contourList $tag]
    1931     SendCmd "contour2d colormode constant {} $tag"
    1932     SendCmd "contour2d color [Color2RGB $style(-isolinecolor)] $tag"
    19331928    SendCmd "outline add $tag"
    19341929    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
    19351930    SendCmd "outline visible $style(-outline) $tag"
    1936     set _settings(-surfaceoutline) $style(-outline)
     1931    set _settings(-outline) $style(-outline)
     1932
     1933    SendCmd "polydata add $tag"
     1934    SendCmd "polydata edges $style(-edges) $tag"
    19371935    set _settings(-surfaceedges) $style(-edges)
    19381936    #SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
     
    19461944    SendCmd "polydata wireframe $style(-wireframe) $tag"
    19471945    set _settings(-surfacewireframe) $style(-wireframe)
     1946
     1947    SendCmd [list contour2d add contourlist $_contourList $tag]
     1948    SendCmd "contour2d colormode constant {} $tag"
     1949    SendCmd "contour2d color [Color2RGB $style(-isolinecolor)] $tag"
    19481950}
    19491951
Note: See TracChangeset for help on using the changeset viewer.