Changeset 4413 for branches/1.3


Ignore:
Timestamp:
Jun 23, 2014 12:46:31 AM (6 years ago)
Author:
ldelgass
Message:

Merge test app fixes from trunk

Location:
branches/1.3
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/gui/apps/nanovis-test

    r3177 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
     
    348343.mbar add cascade -label "Flow" -underline 0 -menu .mbar.flow
    349344
    350 
    351 
    352345. configure -menu .mbar
    353 
    354346
    355347Rappture::Panes .main -sashwidth 4 -sashrelief raised -sashpadding 4 \
     
    362354pack $f.viewer -expand yes -fill both
    363355set widgets(nanovis) $f.viewer
    364 
    365 puts stderr [winfo class $widgets(nanovis)]
    366356
    367357$f.viewer configure \
  • branches/1.3/gui/apps/vtkglyphs-test

    r3805 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
     
    249244
    250245# ----------------------------------------------------------------------
    251 # USAGE: activate_flow
    252 #
    253 # ----------------------------------------------------------------------
    254 proc activate_flow {} {
    255     global widgets
    256     # global img_storage_dir
    257     # "flow capture 117 $img_storage_dir"
    258 
    259     set info {flow vectorid 0
    260               flow particle visible on
    261               flow lic on
    262               flow capture 100}
    263 
    264     $widgets(command) insert 0 $info
    265     send_command
    266 
    267 }
    268 
    269 # ----------------------------------------------------------------------
    270246# TOPLEVEL FOR IMAGES
    271247# ----------------------------------------------------------------------
  • branches/1.3/gui/apps/vtkheightmap-test

    r3805 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
     
    247242
    248243# ----------------------------------------------------------------------
    249 # USAGE: activate_flow
    250 #
    251 # ----------------------------------------------------------------------
    252 proc activate_flow {} {
    253     global widgets
    254     # global img_storage_dir
    255     # "flow capture 117 $img_storage_dir"
    256 
    257     set info {flow vectorid 0
    258               flow particle visible on
    259               flow lic on
    260               flow capture 100}
    261 
    262     $widgets(command) insert 0 $info
    263     send_command
    264 
    265 }
    266 
    267 # ----------------------------------------------------------------------
    268244# TOPLEVEL FOR IMAGES
    269245# ----------------------------------------------------------------------
  • branches/1.3/gui/apps/vtkisosurface-test

    r3805 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
     
    247242
    248243# ----------------------------------------------------------------------
    249 # USAGE: activate_flow
    250 #
    251 # ----------------------------------------------------------------------
    252 proc activate_flow {} {
    253     global widgets
    254     # global img_storage_dir
    255     # "flow capture 117 $img_storage_dir"
    256 
    257     set info {flow vectorid 0
    258               flow particle visible on
    259               flow lic on
    260               flow capture 100}
    261 
    262     $widgets(command) insert 0 $info
    263     send_command
    264 
    265 }
    266 
    267 # ----------------------------------------------------------------------
    268244# TOPLEVEL FOR IMAGES
    269245# ----------------------------------------------------------------------
  • branches/1.3/gui/apps/vtkstreamlines-test

    r3805 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
     
    246241
    247242# ----------------------------------------------------------------------
    248 # USAGE: activate_flow
    249 #
    250 # ----------------------------------------------------------------------
    251 proc activate_flow {} {
    252     global widgets
    253     # global img_storage_dir
    254     # "flow capture 117 $img_storage_dir"
    255 
    256     set info {flow vectorid 0
    257               flow particle visible on
    258               flow lic on
    259               flow capture 100}
    260 
    261     $widgets(command) insert 0 $info
    262     send_command
    263 
    264 }
    265 
    266 # ----------------------------------------------------------------------
    267243# TOPLEVEL FOR IMAGES
    268244# ----------------------------------------------------------------------
  • branches/1.3/gui/apps/vtkviewer-test

    r3177 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
     
    287282
    288283# ----------------------------------------------------------------------
    289 # USAGE: activate_flow
    290 #
    291 # ----------------------------------------------------------------------
    292 proc activate_flow {} {
    293     global widgets
    294     # global img_storage_dir
    295     # "flow capture 117 $img_storage_dir"
    296 
    297     set info {flow vectorid 0
    298               flow particle visible on
    299               flow lic on
    300               flow capture 100}
    301 
    302     $widgets(command) insert 0 $info
    303     send_command
    304 
    305 }
    306 
    307 # ----------------------------------------------------------------------
    308284# TOPLEVEL FOR IMAGES
    309285# ----------------------------------------------------------------------
  • branches/1.3/gui/apps/vtkvolume-test

    r3805 r4413  
    1919#\
    2020bindir=`dirname $0` ; \
     21. $bindir/rappture.env ; \
    2122exec $bindir/wish "$0" "$@"
    2223# ----------------------------------------------------------------------
    2324# wish executes everything from here on...
    24 
    25 set installdir [file root $argv0]
    26 set libdir [file join $installdir "lib"]
    27 
    28 lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
    29 
    3025package require Itcl
    3126package require Rappture
    3227package require RapptureGUI
     28package require vtk
    3329
    3430option add *comm.font -*-courier-medium-r-normal-*-*-120-*
     
    148144          }] == 0} {
    149145        set obj [visData #auto $info "vtkvolume"]
    150         $widgets(vtkviewer) add $obj
    151         $widgets(vtkviewer) scale $obj
     146        $widgets(vtkvolumeviewer) add $obj
     147        $widgets(vtkvolumeviewer) scale $obj
    152148    }
    153149}
     
    193189        set cmd $last_command
    194190    }
    195     namespace eval Rappture::VtkVolumeViewer [list $widgets(vtkviewer) SendCmd $cmd]
     191    namespace eval Rappture::VtkVolumeViewer [list $widgets(vtkvolumeviewer) SendCmd $cmd]
    196192    $widgets(command) delete 0 end
    197193}
     
    205201proc reset {} {
    206202    global widgets
    207     $widgets(vtkviewer) delete
    208     $widgets(vtkviewer) disconnect
     203    $widgets(vtkvolumeviewer) delete
     204    $widgets(vtkvolumeviewer) disconnect
    209205    $widgets(comm) configure -state normal
    210206    $widgets(comm) delete 1.0 end
     
    246242
    247243# ----------------------------------------------------------------------
    248 # USAGE: activate_flow
    249 #
    250 # ----------------------------------------------------------------------
    251 proc activate_flow {} {
    252     global widgets
    253     # global img_storage_dir
    254     # "flow capture 117 $img_storage_dir"
    255 
    256     set info {flow vectorid 0
    257               flow particle visible on
    258               flow lic on
    259               flow capture 100}
    260 
    261     $widgets(command) insert 0 $info
    262     send_command
    263 
    264 }
    265 
    266 # ----------------------------------------------------------------------
    267244# TOPLEVEL FOR IMAGES
    268245# ----------------------------------------------------------------------
     
    276253    global widgets images
    277254
    278     set imh [$widgets(vtkviewer) get -image $images(which)]
     255    set imh [$widgets(vtkvolumeviewer) get -image $images(which)]
    279256
    280257    set file [tk_getSaveFile -title "Save Image File" \
     
    305282    set h [winfo height $c]
    306283
    307     set imh [$widgets(vtkviewer) get -image $images(which)]
     284    set imh [$widgets(vtkvolumeviewer) get -image $images(which)]
    308285    set iw [image width $imh]
    309286    set ih [image height $imh]
     
    316293
    317294toplevel .images
    318 wm title .images "Vtkviewer: Images"
     295wm title .images "Vtkvolumeviewer: Images"
    319296wm withdraw .images
    320297wm protocol .images WM_DELETE_WINDOW {wm withdraw .images}
     
    371348Rappture::VtkVolumeViewer $f.viewer $servers
    372349pack $f.viewer -expand yes -fill both
    373 set widgets(vtkviewer) $f.viewer
     350set widgets(vtkvolumeviewer) $f.viewer
    374351
    375352$f.viewer configure \
Note: See TracChangeset for help on using the changeset viewer.