Changeset 5110


Ignore:
Timestamp:
Mar 9, 2015 3:10:38 PM (5 years ago)
Author:
ldelgass
Message:

merge r5092:r5097 from trunk (includes fix for viewer initial canvas size)

Location:
branches/1.3
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/gui/scripts/field.tcl

    r5011 r5110  
    924924            }
    925925            if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } {
     926                unset contents
    926927                ReadVtkDataSet $cname $vtkdata
    927928                if 0 {
     
    931932                }
    932933            } else {
    933                 puts stderr "Can't parse dx data: $vtkdata"
     934                unset contents
     935                puts stderr "Can't parse dx data"
    934936            }
    935937            if { $_alwaysConvertDX ||
     
    941943                set _comp2dx($cname) $data
    942944            }
     945            unset data
     946            unset vtkdata
    943947            set _comp2style($cname) [$_field get $cname.style]
    944948            if {[$_field element $cname.flow] != ""} {
     
    14021406    if {[$_xmlobj element $path] == ""} {
    14031407        # Unknown mesh designated.
     1408        puts stderr "ERROR: Unknown mesh \"$path\""
    14041409        return 0
    14051410    }
     
    16041609        $v set [$_field get $cname.values]
    16051610        if { [$v length] == 0 } {
     1611            puts stderr "ERROR: No field values"
    16061612            return 0
    16071613        }
  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r4848 r5110  
    553553    eval itk_initialize $args
    554554
     555    EnableWaitDialog 900
    555556    Connect
    556557}
     
    11791180    set h [winfo height $itk_component(3dview)]
    11801181    if { $w < 2 || $h < 2 } {
     1182        update
    11811183        $_dispatcher event -idle !rebuild
    11821184        return
  • branches/1.3/gui/scripts/nanovisviewer.tcl

    r4865 r5110  
    373373    eval itk_initialize $args
    374374
     375    EnableWaitDialog 900
    375376    Connect
    376377}
     
    865866    set h [winfo height $itk_component(3dview)]
    866867    if { $w < 2 || $h < 2 } {
     868        update
    867869        $_dispatcher event -idle !rebuild
    868870        return
  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r5108 r5110  
    442442
    443443    eval itk_initialize $args
     444
     445    EnableWaitDialog 900
    444446    Connect
    445447}
     
    933935    set h [winfo height $itk_component(view)]
    934936    if { $w < 2 || $h < 2 } {
     937        update
    935938        $_dispatcher event -idle !rebuild
    936939        return
  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r5013 r5110  
    916916    set h [winfo height $itk_component(view)]
    917917    if { $w < 2 || $h < 2 } {
     918        update
    918919        $_dispatcher event -idle !rebuild
    919920        return
  • branches/1.3/gui/scripts/vtkimageviewer.tcl

    r5011 r5110  
    171171    set _serverType "vtkvis"
    172172
    173     EnableWaitDialog 900
    174173    # Rebuild event
    175174    $_dispatcher register !rebuild
     
    395394
    396395    set _image(download) [image create photo]
     396
    397397    eval itk_initialize $args
     398
     399    EnableWaitDialog 900
    398400    Connect
    399401    set _beforeConnect 0
     
    904906    set h [winfo height $itk_component(view)]
    905907    if { $w < 2 || $h < 2 } {
     908        update
    906909        $_dispatcher event -idle !rebuild
    907910        return
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r5108 r5110  
    471471    eval itk_initialize $args
    472472
    473     EnableWaitDialog 500
     473    EnableWaitDialog 900
    474474    Connect
    475     # FIXME: Removing this update breaks wizard mode (see examples/3D)
    476     # However, it also allows an error in the initialization order
    477     # where FieldResult::add is called from ResultViewer before this
    478     # constructor is completed.
    479     #update
    480475}
    481476
     
    10541049    set h [winfo height $itk_component(view)]
    10551050    if { $w < 2 || $h < 2 } {
     1051        update
    10561052        $_dispatcher event -idle !rebuild
    10571053        return
  • branches/1.3/gui/scripts/vtkmeshviewer.tcl

    r5011 r5110  
    342342
    343343    eval itk_initialize $args
     344
     345    EnableWaitDialog 900
    344346    Connect
    345347}
     
    804806# ----------------------------------------------------------------------
    805807itcl::body Rappture::VtkMeshViewer::Rebuild {} {
    806 
    807808    set w [winfo width $itk_component(view)]
    808809    set h [winfo height $itk_component(view)]
    809810    if { $w < 2 || $h < 2 } {
     811        update
    810812        $_dispatcher event -idle !rebuild
    811813        return
  • branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

    r5108 r5110  
    952952    set h [winfo height $itk_component(view)]
    953953    if { $w < 2 || $h < 2 } {
     954        update
    954955        $_dispatcher event -idle !rebuild
    955956        return
  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r5108 r5110  
    400400    eval itk_initialize $args
    401401
    402     EnableWaitDialog 500
     402    EnableWaitDialog 900
    403403    Connect
    404404}
     
    884884    set h [winfo height $itk_component(view)]
    885885    if { $w < 2 || $h < 2 } {
     886        update
    886887        $_dispatcher event -idle !rebuild
    887888        return
  • branches/1.3/gui/scripts/vtkviewer.tcl

    r5009 r5110  
    443443
    444444    eval itk_initialize $args
     445
     446    EnableWaitDialog 900
    445447    Connect
    446448}
     
    10191021# ----------------------------------------------------------------------
    10201022itcl::body Rappture::VtkViewer::Rebuild {} {
    1021 
    10221023    set w [winfo width $itk_component(view)]
    10231024    set h [winfo height $itk_component(view)]
    10241025    if { $w < 2 || $h < 2 } {
     1026        update
    10251027        $_dispatcher event -idle !rebuild
    10261028        return
  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r5108 r5110  
    917917    set h [winfo height $itk_component(view)]
    918918    if { $w < 2 || $h < 2 } {
     919        update
    919920        $_dispatcher event -idle !rebuild
    920921        return
Note: See TracChangeset for help on using the changeset viewer.