Changeset 4746 for branches/1.3


Ignore:
Timestamp:
Nov 17, 2014, 9:54:47 AM (5 years ago)
Author:
ldelgass
Message:

merge r4745 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4745
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4736 r4746  
    990990        # Reset the camera and other view parameters
    991991        $_arcball quaternion [ViewToQuaternion]
     992        InitSettings -ortho
    992993        DoRotate
    993994        PanCamera
    994995        set _first ""
    995         InitSettings -xgrid -ygrid -zgrid -axismode \
    996             -axesvisible -axislabels -axisminorticks -ortho
     996        InitSettings -background \
     997            -xgrid -ygrid -zgrid -axismode \
     998            -axesvisible -axislabels -axisminorticks
    997999        #SendCmd "axis lformat all %g"
    9981000        StopBufferingCommands
     
    21902192 
    21912193    SendCmd "cutplane add $tag"
     2194    SendCmd "cutplane color [Color2RGB $itk_option(-plotforeground)] $tag"
    21922195    SendCmd "cutplane visible $style(-cutplanesvisible) $tag"
    21932196
  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r4743 r4746  
    954954        }
    955955        DoRotate
    956         InitSettings -volumeoutline -background \
     956        PanCamera
     957        set _first ""
     958        InitSettings -background \
    957959            -xgrid -ygrid -zgrid -axisflymode \
    958960            -axesvisible -axislabels -axisminorticks
    959         PanCamera
    960     }
    961 
    962     SendCmd "imgflush"
     961        StopBufferingCommands
     962        SendCmd "imgflush"
     963        StartBufferingCommands
     964     }
    963965    set _first ""
    964966
     
    10471049    InitSettings -volumepalette \
    10481050        -volumematerial \
    1049         -volumeopacity -volumequality -volumevisible \
     1051        -volumelighting -volumeopacity -volumequality -volumeoutline -volumevisible \
    10501052        -cutplanesvisible \
    10511053        -xcutplaneposition -ycutplaneposition -zcutplaneposition \
     
    10531055
    10541056    if { $_reset } {
    1055         InitSettings -volumelighting
    10561057        Zoom reset
    10571058        set _reset 0
     
    20952096    array set styles [$dataobj style $cname]
    20962097    set _settings(-volumelighting) $styles(-lighting)
     2098    set _settings(-volumeopacity) [expr $styles(-opacity) * 100.0]
    20972099    set _settings(-volumeoutline) $styles(-outline)
    2098     set _settings(-volumeopacity) [expr $styles(-opacity) * 100.0]
    20992100    set _settings(-volumevisible) $styles(-visible)
    21002101
    21012102    SendCmd "outline add $tag"
     2103    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
    21022104    SendCmd "outline visible $styles(-outline) $tag"
    21032105
    21042106    SendCmd "$_cutplaneCmd add $tag"
     2107    SendCmd "$_cutplaneCmd color [Color2RGB $itk_option(-plotforeground)] $tag"
    21052108    SendCmd "$_cutplaneCmd visible 0 $tag"
    21062109
Note: See TracChangeset for help on using the changeset viewer.