Changeset 5095


Ignore:
Timestamp:
Mar 8, 2015 1:39:54 AM (6 years ago)
Author:
ldelgass
Message:

merge r5090:r5094 from trunk

Location:
branches/1.4
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/1.4

  • branches/1.4/gui/scripts/cloud.tcl

    r4926 r5095  
    1 # -*- mode: tcl; indent-tabs-mode: nil -*- 
     1# -*- mode: tcl; indent-tabs-mode: nil -*-
    22# ----------------------------------------------------------------------
    33#  COMPONENT: cloud - represents the mesh for a cloud of points
    … …  
    2121    private variable _cloud "";         # lib obj representing this cloud
    2222    private variable _units "" ;        # system of units for x, y, z
    23     private variable _axis2label;       # 
    24     private variable _axis2units;       # 
     23    private variable _axis2label;       #
     24    private variable _axis2units;       #
    2525    private variable _limits;           # limits x, y, z
    2626    private common _xp2obj ;            # Used for fetch/release ref counting
    … …  
    3232    private variable _isValid 0;        # Indicates if the data is valid.
    3333
    34     constructor {xmlobj path} { 
    35         # defined below 
    36     }
    37     destructor { 
    38         # defined below 
     34    constructor {xmlobj path} {
     35        # defined below
     36    }
     37    destructor {
     38        # defined below
    3939    }
    4040    public method points {}
    … …  
    4848    public method hints {{key ""}}
    4949    public method numpoints {} {
    50         return $_numPoints
     50        return $_numPoints
    5151    }
    5252    public method isvalid {} {
    … …  
    119119    foreach u $_units axis { x y z } {
    120120        if { $u != "" } {
    121             set _axis2units($axis) $u 
     121            set _axis2units($axis) $u
    122122        } else {
    123             set _axis2units($axis) $first 
     123            set _axis2units($axis) $first
    124124        }
    125125        lappend list $_axis2units($axis)
    … …  
    156156            } else {
    157157                foreach { min max } $_limits($axis) break
    158                 if {$value < $min} { 
     158                if {$value < $min} {
    159159                    set min $value
    160160                }
    161                 if {$value > $max} { 
     161                if {$value > $max} {
    162162                    set max $value
    163163                }
    … …  
    166166        }
    167167        append _points "$x $y $z\n"
    168         incr _numPoints
     168        incr _numPoints
    169169    }
    170170    append out "DATASET POLYDATA\n"

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

    r5061 r5095  
    915915            }
    916916            if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } {
     917                unset contents
    917918                ReadVtkDataSet $cname $vtkdata
    918919                if 0 {
    … …  
    922923                }
    923924            } else {
    924                 puts stderr "Can't parse dx data: $vtkdata"
     925                unset contents
     926                puts stderr "Can't parse dx data"
    925927            }
    926928            if { $_alwaysConvertDX ||
    … …  
    932934                set _comp2dx($cname) $data
    933935            }
     936            unset data
     937            unset vtkdata
    934938            set _comp2style($cname) [$_field get $cname.style]
    935939            if {[$_field element $cname.flow] != ""} {
    … …  
    13891393    if {[$_xmlobj element $path] == ""} {
    13901394        # Unknown mesh designated.
     1395        puts stderr "ERROR: Unknown mesh \"$path\""
    13911396        return 0
    13921397    }
    … …  
    15911596        $v set [$_field get $cname.values]
    15921597        if { [$v length] == 0 } {
     1598            puts stderr "ERROR: No field values"
    15931599            return 0
    15941600        }

  • branches/1.4/gui/scripts/flowvisviewer.tcl

    r4772 r5095  
    554554    eval itk_initialize $args
    555555
     556    EnableWaitDialog 900
    556557    Connect
    557558}
    … …  
    11051106    set h [winfo height $itk_component(3dview)]
    11061107    if { $w < 2 || $h < 2 } {
     1108        update
    11071109        $_dispatcher event -idle !rebuild
    11081110        return

  • branches/1.4/gui/scripts/nanovisviewer.tcl

    r4988 r5095  
    415415    eval itk_initialize $args
    416416
     417    EnableWaitDialog 900
    417418    Connect
    418419}
    … …  
    888889    set h [winfo height $itk_component(3dview)]
    889890    if { $w < 2 || $h < 2 } {
     891        update
    890892        $_dispatcher event -idle !rebuild
    891893        return

  • branches/1.4/gui/scripts/vtkglyphviewer.tcl

    r4768 r5095  
    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.4/gui/scripts/vtkheightmapviewer.tcl

    r5010 r5095  
    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.4/gui/scripts/vtkimageviewer.tcl

    r5007 r5095  
    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.4/gui/scripts/vtkisosurfaceviewer.tcl

    r5079 r5095  
    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.4/gui/scripts/vtkmeshviewer.tcl

    r5007 r5095  
    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.4/gui/scripts/vtkstreamlinesviewer.tcl

    r5007 r5095  
    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.4/gui/scripts/vtksurfaceviewer.tcl

    r5007 r5095  
    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.4/gui/scripts/vtkviewer.tcl

    r5007 r5095  
    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.4/gui/scripts/vtkvolumeviewer.tcl

    r5039 r5095  
    956956    set w [winfo width $itk_component(view)]
    957957    set h [winfo height $itk_component(view)]
    958 
    959958    if { $w < 2 || $h < 2 } {
     959        update
    960960        $_dispatcher event -idle !rebuild
    961961        return
Note: See TracChangeset for help on using the changeset viewer.