Changeset 4568 for branches/1.3


Ignore:
Timestamp:
Jul 18, 2014, 10:56:54 AM (5 years ago)
Author:
ldelgass
Message:

minor fixes to sync with trunk

Location:
branches/1.3/gui/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/gui/scripts/nanovisviewer.tcl

    r4565 r4568  
    12311231            set bool $_settings($what)
    12321232            # We only set cutplanes on the first dataset.
    1233             set datasets [CurrentDatasets -cutplanes] 
     1233            set datasets [CurrentDatasets -cutplanes]
    12341234            set tag [lindex $datasets 0]
    12351235            if { $bool } {
  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r4553 r4568  
    11# -*- mode: tcl; indent-tabs-mode: nil -*-
    22# ----------------------------------------------------------------------
    3 #  COMPONENT: VtkVolumeViewer - Vtk volume viewer
     3#  COMPONENT: vtkvolumeviewer - Vtk volume viewer
    44#
    55#  It connects to the Vtk server running on a rendering farm,
     
    154154    set _serverType "vtkvis"
    155155
     156    EnableWaitDialog 900
     157
    156158    # Rebuild event
    157159    $_dispatcher register !rebuild
     
    485487# ----------------------------------------------------------------------
    486488itcl::body Rappture::VtkVolumeViewer::add {dataobj {settings ""}} {
     489    if { ![IsValidObject $dataobj] } {
     490        return;                         # Ignore invalid objects.
     491    }
    487492    array set params {
    488493        -color auto
     
    825830        }
    826831        $_image(plot) configure -data $bytes
    827         set time [clock seconds]
    828         set date [clock format $time]
    829         #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"       
     832        #puts stderr "[clock format [clock seconds]]: received image [image width $_image(plot)]x[image height $_image(plot)] image>"
    830833        if { $_start > 0 } {
    831834            set finish [clock clicks -milliseconds]
     
    892895# ----------------------------------------------------------------------
    893896itcl::body Rappture::VtkVolumeViewer::Rebuild {} {
    894     update
    895897    set w [winfo width $itk_component(view)]
    896898    set h [winfo height $itk_component(view)]
     
    907909    set _legendPending 1
    908910
    909     if { $_reset } {
     911    if { $_width != $w || $_height != $h || $_reset } {
    910912        set _width $w
    911913        set _height $h
    912914        $_arcball resize $w $h
    913915        DoResize
     916    }
     917    if { $_reset } {
    914918        #
    915919        # Reset the camera and other view parameters
     
    923927        }
    924928        DoRotate
    925         InitSettings outline background axis-xgrid axis-ygrid axis-zgrid axisFlyMode \
     929        InitSettings outline background \
     930            axis-xgrid axis-ygrid axis-zgrid axisFlyMode \
    926931            axesVisible axisLabels
    927932        PanCamera
    928933    }
    929     set _first ""
    930934
    931935    SendCmd "imgflush"
     
    15551559        set color $itk_option(-plotforeground)
    15561560        set rgb [Color2RGB $color]
    1557         SendCmd "axis color all $rgb"
     1561        SendCmd "axis color all $rgb"
    15581562        SendCmd "outline color $rgb"
    15591563        SendCmd "cutplane color $rgb"
     
    15641568
    15651569itcl::body Rappture::VtkVolumeViewer::BuildViewTab {} {
    1566     foreach { key value } {
    1567         grid            0
    1568         axes            1
    1569         outline         0
    1570         volume          1
    1571         legend          1
    1572         particles       1
    1573         lic             1
    1574     } {
    1575         set _settings($this-$key) $value
    1576     }
    1577 
    1578     set fg [option get $itk_component(hull) font Font]
    1579     #set bfg [option get $itk_component(hull) boldFont Font]
     1570    set font [option get $itk_component(hull) font Font]
     1571    #set bfont [option get $itk_component(hull) boldFont Font]
    15801572
    15811573    set inner [$itk_component(main) insert end \
     
    16181610
    16191611    $itk_component(background) value $_settings(background)
    1620     bind $inner.background <<Value>> [itcl::code $this AdjustSetting background]
     1612    bind $inner.background <<Value>> \
     1613        [itcl::code $this AdjustSetting background]
    16211614
    16221615    blt::table $inner \
     
    16331626
    16341627itcl::body Rappture::VtkVolumeViewer::BuildVolumeTab {} {
    1635 
    1636     set fg [option get $itk_component(hull) font Font]
    1637     #set bfg [option get $itk_component(hull) boldFont Font]
     1628    set font [option get $itk_component(hull) font Font]
     1629    #set bfont [option get $itk_component(hull) boldFont Font]
    16381630
    16391631    set inner [$itk_component(main) insert end \
     
    17131705
    17141706itcl::body Rappture::VtkVolumeViewer::BuildAxisTab {} {
    1715 
    1716     set fg [option get $itk_component(hull) font Font]
    1717     #set bfg [option get $itk_component(hull) boldFont Font]
     1707    set font [option get $itk_component(hull) font Font]
     1708    #set bfont [option get $itk_component(hull) boldFont Font]
    17181709
    17191710    set inner [$itk_component(main) insert end \
     
    17761767}
    17771768
    1778 
    17791769itcl::body Rappture::VtkVolumeViewer::BuildCameraTab {} {
    17801770    set inner [$itk_component(main) insert end \
     
    18131803
    18141804itcl::body Rappture::VtkVolumeViewer::BuildCutplaneTab {} {
    1815 
    1816     set fg [option get $itk_component(hull) font Font]
     1805    set font [option get $itk_component(hull) font Font]
    18171806   
    18181807    set inner [$itk_component(main) insert end \
Note: See TracChangeset for help on using the changeset viewer.