Changeset 4552 for branches/1.3


Ignore:
Timestamp:
Jul 18, 2014, 12:20:41 AM (5 years ago)
Author:
ldelgass
Message:

merge r4123 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4123
  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r4550 r4552  
    225225        cutplaneWireframe       0
    226226        cutplane-opacity        100
     227        legendVisible           1
     228        outline                 0
    227229        volumeLighting          1
    228230        volume-material         80
     
    921923        }
    922924        DoRotate
    923         InitSettings background axis-xgrid axis-ygrid axis-zgrid axisFlyMode \
     925        InitSettings outline background axis-xgrid axis-ygrid axis-zgrid axisFlyMode \
    924926            axesVisible axisLabels
    925927        PanCamera
     
    12741276            DrawLegend
    12751277        }
     1278        "outline" {
     1279            set bool $_settings($what)
     1280            SendCmd "outline visible 0"
     1281            foreach tag [CurrentDatasets -visible] {
     1282                SendCmd "outline visible $bool $tag"
     1283            }
     1284        }
     1285        "legendVisible" {
     1286            set bool $_settings($what)
     1287            set _settings($_current-$what) $bool
     1288        }
    12761289        "volumeVisible" {
    12771290            set bool $_settings($what)
     
    20712084    set _settings(volumeLighting) $settings(-lighting)
    20722085    SetColormap $dataobj $comp
     2086    SendCmd "outline add $tag"
     2087    SendCmd "outline visible 0 $tag"
    20732088}
    20742089
Note: See TracChangeset for help on using the changeset viewer.