Changeset 4728 for trunk


Ignore:
Timestamp:
Nov 14, 2014 2:15:55 AM (5 years ago)
Author:
ldelgass
Message:

Axis setting fixes for vtkvolumeviewer

Location:
trunk/gui/scripts
Files:
2 edited

Legend:

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

    r4725 r4728  
    23022302    # Transfer function should be normalized with [0,1] range
    23032303    # The volume shading opacity setting is used to scale opacity
    2304     # in the volume shader. 
     2304    # in the volume shader.
    23052305    set max 1.0
    23062306
  • trunk/gui/scripts/vtkvolumeviewer.tcl

    r4691 r4728  
    6363    public method updateTransferFunctions {}
    6464
    65     private method BuildViewTab {}
    6665    private method BuildVolumeComponents {}
    6766    private method ComputeAlphamap { cname }
     
    121120    private method BuildCutplaneTab {}
    122121    private method BuildDownloadPopup { widget command }
     122    private method BuildViewTab {}
    123123    private method BuildVolumeTab {}
    124124    private method DrawLegend {}
     
    268268        -xcutplaneposition              50
    269269        -xcutplanevisible               1
    270         -xgridvisible                   0
     270        -xgrid                          0
    271271        -ycutplaneposition              50
    272272        -ycutplanevisible               1
    273         -ygridvisible                   0
     273        -ygrid                          0
    274274        -zcutplaneposition              50
    275275        -zcutplanevisible               1
    276         -zgridvisible                   0
     276        -zgrid                          0
    277277    }
    278278
     
    514514
    515515itcl::body Rappture::VtkVolumeViewer::EventuallyRotate { q } {
    516     QuaternionToView $q 
     516    QuaternionToView $q
    517517    if { !$_rotatePending } {
    518518        set _rotatePending 1
     
    10191019        DoRotate
    10201020        InitSettings -volumeoutline -background \
    1021             -xgridvisible -ygridvisible -zgridvisible -axisflymode \
     1021            -xgrid -ygrid -zgrid -axisflymode \
    10221022            -axesvisible -axislabels -axisminorticks
    10231023        PanCamera
     
    15061506            SendCmd "axis minticks all $bool"
    15071507        }
    1508         "-xgridvisible" - "-ygridvisible" - "-zgridvisible" {
    1509             set axis [string tolower [string range $what 1 1 ]]
     1508        "-xgrid" - "-ygrid" - "-zgrid" {
     1509            set axis [string range $what 1 1]
    15101510            set bool $_settings($what)
    15111511            SendCmd "axis grid $axis $bool"
     
    15481548        }
    15491549        "-xcutplanevisible" - "-ycutplanevisible" - "-zcutplanevisible" {
    1550             set axis [string tolower [string range $what 1 1]]
     1550            set axis [string range $what 1 1]
    15511551            set bool $_settings($what)
    15521552            if { $bool } {
     
    15621562        }
    15631563        "-xcutplaneposition" - "-ycutplaneposition" - "-zcutplaneposition" {
    1564             set axis [string tolower [string range $what 1 1]]
     1564            set axis [string range $what 1 1]
    15651565            set pos [expr $_settings($what) * 0.01]
    15661566            foreach dataset [CurrentDatasets -visible] {
     
    16621662
    16631663itcl::body Rappture::VtkVolumeViewer::BuildViewTab {} {
    1664 
    16651664    set fg [option get $itk_component(hull) font Font]
    16661665    #set bfg [option get $itk_component(hull) boldFont Font]
     
    18771876
    18781877itcl::body Rappture::VtkVolumeViewer::BuildAxisTab {} {
    1879 
    18801878    set fg [option get $itk_component(hull) font Font]
    18811879    #set bfg [option get $itk_component(hull) boldFont Font]
     
    18971895        -command [itcl::code $this AdjustSetting -axislabels] \
    18981896        -font "Arial 9"
    1899 
     1897    label $inner.grid_l -text "Grid" -font "Arial 9"
    19001898    checkbutton $inner.xgrid \
    19011899        -text "X" \
    1902         -variable [itcl::scope _settings(-xgridvisible)] \
     1900        -variable [itcl::scope _settings(-xgrid)] \
    19031901        -command [itcl::code $this AdjustSetting -xgrid] \
    19041902        -font "Arial 9"
    19051903    checkbutton $inner.ygrid \
    19061904        -text "Y" \
    1907         -variable [itcl::scope _settings(-ygridvisible)] \
     1905        -variable [itcl::scope _settings(-ygrid)] \
    19081906        -command [itcl::code $this AdjustSetting -ygrid] \
    19091907        -font "Arial 9"
    19101908    checkbutton $inner.zgrid \
    19111909        -text "Z" \
    1912         -variable [itcl::scope _settings(-zgridvisible)] \
     1910        -variable [itcl::scope _settings(-zgrid)] \
    19131911        -command [itcl::code $this AdjustSetting -zgrid] \
     1912        -font "Arial 9"
     1913    checkbutton $inner.minorticks \
     1914        -text "Minor Ticks" \
     1915        -variable [itcl::scope _settings(-axisminorticks)] \
     1916        -command [itcl::code $this AdjustSetting -axisminorticks] \
    19141917        -font "Arial 9"
    19151918
     
    19421945    blt::table configure $inner r3 -height 0.125i
    19431946}
    1944 
    19451947
    19461948itcl::body Rappture::VtkVolumeViewer::BuildCameraTab {} {
     
    24712473}
    24722474
    2473 
    24742475# ----------------------------------------------------------------------
    24752476# USAGE: Slice move x|y|z <newval>
     
    25012502    }
    25022503}
    2503 
    25042504
    25052505# ----------------------------------------------------------------------
     
    28832883}
    28842884
    2885 
    28862885#
    28872886# GetDatasetsWithComponents --
Note: See TracChangeset for help on using the changeset viewer.