Changeset 6127


Ignore:
Timestamp:
Mar 15, 2016, 2:56:40 PM (8 years ago)
Author:
ldelgass
Message:

Merge r6052:6053,r6066:6069,r6080 from trunk

Location:
branches/1.5
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • branches/1.5

  • branches/1.5/gui/apps/flowvis-test

    r5679 r6127  
    257257# USAGE: images_refresh
    258258#
    259 # Invoked automatically whenever there is a change in the 3dview/legend
     259# Invoked automatically whenever there is a change in the view/legend
    260260# controls on the images panel.  Updates the image being shown based
    261261# on the current selection.
    … …  
    287287button .images.cntls.save -text "Save As..." -command images_save
    288288pack .images.cntls.save -side right -padx 4
    289 radiobutton .images.cntls.3dview -text "3D View" -variable images(which) \
    290     -value "3dview" -command images_refresh
    291 pack .images.cntls.3dview -side top -anchor w
     289radiobutton .images.cntls.view -text "3D View" -variable images(which) \
     290    -value "view" -command images_refresh
     291pack .images.cntls.view -side top -anchor w
    292292radiobutton .images.cntls.legend -text "Legend" -variable images(which) \
    293293    -value "legend" -command images_refresh
    294294pack .images.cntls.legend -side top -anchor w
    295 set images(which) "3dview"
     295set images(which) "view"
    296296
    297297canvas .images.viewer -background black -width 500 -height 700
    … …  
    337337
    338338set f [.main pane 0]
    339 set servers [Rappture::VisViewer::GetServerList "nanovis"]
    340 Rappture::FlowvisViewer $f.viewer $servers
     339Rappture::FlowvisViewer $f.viewer
    341340pack $f.viewer -expand yes -fill both
    342341set widgets(flowvis) $f.viewer

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

    r4413 r6127  
    272272# USAGE: images_refresh
    273273#
    274 # Invoked automatically whenever there is a change in the 3dview/legend
     274# Invoked automatically whenever there is a change in the view/legend
    275275# controls on the images panel.  Updates the image being shown based
    276276# on the current selection.
    … …  
    302302button .images.cntls.save -text "Save As..." -command images_save
    303303pack .images.cntls.save -side right -padx 4
    304 radiobutton .images.cntls.3dview -text "3D View" -variable images(which) \
    305     -value "3dview" -command images_refresh
    306 pack .images.cntls.3dview -side top -anchor w
     304radiobutton .images.cntls.view -text "3D View" -variable images(which) \
     305    -value "view" -command images_refresh
     306pack .images.cntls.view -side top -anchor w
    307307radiobutton .images.cntls.legend -text "Legend" -variable images(which) \
    308308    -value "legend" -command images_refresh
    309309pack .images.cntls.legend -side top -anchor w
    310 set images(which) "3dview"
     310set images(which) "view"
    311311
    312312canvas .images.viewer -background black -width 500 -height 500
    … …  
    350350
    351351set f [.main pane 0]
    352 set servers [Rappture::VisViewer::GetServerList "nanovis"]
    353 Rappture::NanovisViewer $f.viewer $servers
     352Rappture::NanovisViewer $f.viewer
    354353pack $f.viewer -expand yes -fill both
    355354set widgets(nanovis) $f.viewer

  • branches/1.5/gui/apps/vtkglyphs-test

    r5679 r6127  
    347347
    348348set f [.main pane 0]
    349 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    350 Rappture::VtkGlyphViewer $f.viewer $servers
     349Rappture::VtkGlyphViewer $f.viewer
    351350pack $f.viewer -expand yes -fill both
    352351set widgets(vtkglyphviewer) $f.viewer

  • branches/1.5/gui/apps/vtkheightmap-test

    r5679 r6127  
    344344
    345345set f [.main pane 0]
    346 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    347 Rappture::VtkHeightmapViewer $f.viewer $servers
     346Rappture::VtkHeightmapViewer $f.viewer
    348347pack $f.viewer -expand yes -fill both
    349348set widgets(vtkheightmapviewer) $f.viewer

  • branches/1.5/gui/apps/vtkisosurface-test

    r5679 r6127  
    344344
    345345set f [.main pane 0]
    346 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    347 Rappture::VtkIsosurfaceViewer $f.viewer $servers
     346Rappture::VtkIsosurfaceViewer $f.viewer
    348347pack $f.viewer -expand yes -fill both
    349348set widgets(vtkisosurfaceviewer) $f.viewer

  • branches/1.5/gui/apps/vtkstreamlines-test

    r4413 r6127  
    344344
    345345set f [.main pane 0]
    346 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    347 Rappture::VtkStreamlinesViewer $f.viewer $servers
     346Rappture::VtkStreamlinesViewer $f.viewer
    348347pack $f.viewer -expand yes -fill both
    349348set widgets(vtkviewer) $f.viewer

  • branches/1.5/gui/apps/vtkviewer-test

    r5679 r6127  
    388388
    389389set f [.main pane 0]
    390 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    391 Rappture::VtkViewer $f.viewer $servers
     390Rappture::VtkViewer $f.viewer
    392391pack $f.viewer -expand yes -fill both
    393392set widgets(vtkviewer) $f.viewer

  • branches/1.5/gui/apps/vtkvolume-test

    r5679 r6127  
    344344
    345345set f [.main pane 0]
    346 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    347 Rappture::VtkVolumeViewer $f.viewer $servers
     346Rappture::VtkVolumeViewer $f.viewer
    348347pack $f.viewer -expand yes -fill both
    349348set widgets(vtkvolumeviewer) $f.viewer

  • branches/1.5/gui/configure

    r6058 r6127  
    587587ac_subst_vars='LTLIBOBJS
    588588LIBOBJS
    589 TCL_SHLIB_SUFFIX
    590 TCL_SHLIB_LDFLAGS
    591 TCL_SHLIB_CFLAGS
    592 TCL_SHLIB_LD
    593 TCL_STLIB_LD
    594 TCL_CFLAGS_OPTIMIZE
    595 TCL_CFLAGS_DEBUG
    596589TK_VERSION
    597590TK_XLIBSW
    … …  
    599592TK_INC_SPEC
    600593TCL_VERSION
     594TCL_STLIB_LD
     595TCL_SHLIB_SUFFIX
     596TCL_SHLIB_LDFLAGS
     597TCL_SHLIB_LD
     598TCL_SHLIB_CFLAGS
    601599TCL_LIB_SPEC
    602600TCL_INC_SPEC
     601TCL_CFLAGS_OPTIMIZE
     602TCL_CFLAGS_DEBUG
     603SVN_VERSION
     604SVN_URL
     605INSTALL_PREFIX
    603606TCLSH
    604607ENABLE_GUI
    … …  
    18231826fi
    18241827
     1828INSTALL_PREFIX=$prefix
     1829
    18251830if test "${libdir}" != "${prefix}/lib"; then
    18261831    LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
    … …  
    30033008#SC_ENABLE_SHARED
    30043009
     3010SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
     3011SVN_URL=`readlink -e $srcdir | xargs svn info | sed -ne 's/^URL: //p'`
     3012
    30053013gui_with_tcl=""
    30063014
    … …  
    31253133  . ${exec_prefix}/lib/tkConfig.sh
    31263134fi
     3135
     3136
     3137
     3138
    31273139
    31283140

  • branches/1.5/gui/configure.in

    r6058 r6127  
    1212    exec_prefix=$prefix
    1313fi
     14
     15INSTALL_PREFIX=$prefix
    1416
    1517if test "${libdir}" != "${prefix}/lib"; then
    … …  
    3133#SC_CONFIG_CFLAGS
    3234#SC_ENABLE_SHARED
     35
     36SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
     37SVN_URL=`readlink -e $srcdir | xargs svn info | sed -ne 's/^URL: //p'`
    3338
    3439gui_with_tcl=""
    … …  
    146151  . ${exec_prefix}/lib/tkConfig.sh     
    147152fi
     153
     154AC_SUBST(INSTALL_PREFIX)
     155AC_SUBST(SVN_URL)
     156AC_SUBST(SVN_VERSION)
     157AC_SUBST(TCL_CFLAGS_DEBUG)
     158AC_SUBST(TCL_CFLAGS_OPTIMIZE)
    148159AC_SUBST(TCL_INC_SPEC)
    149160AC_SUBST(TCL_LIB_SPEC)
     161AC_SUBST(TCL_SHLIB_CFLAGS)
     162AC_SUBST(TCL_SHLIB_LD)
     163AC_SUBST(TCL_SHLIB_LDFLAGS)
     164AC_SUBST(TCL_SHLIB_SUFFIX)
     165AC_SUBST(TCL_STLIB_LD)
    150166AC_SUBST(TCL_VERSION)
    151167AC_SUBST(TK_INC_SPEC)
    … …  
    153169AC_SUBST(TK_XLIBSW)
    154170AC_SUBST(TK_VERSION)
    155 AC_SUBST(TCL_CFLAGS_DEBUG)
    156 AC_SUBST(TCL_CFLAGS_OPTIMIZE)
    157 AC_SUBST(TCL_STLIB_LD)
    158 AC_SUBST(TCL_SHLIB_LD)
    159 AC_SUBST(TCL_SHLIB_CFLAGS)
    160 AC_SUBST(TCL_SHLIB_LDFLAGS)
    161 AC_SUBST(TCL_SHLIB_SUFFIX)
    162171
    163172

  • branches/1.5/gui/pkgIndex.tcl.in

    r5121 r6127  
    88    namespace eval RapptureGUI {
    99        variable version $version
     10        variable build "@SVN_VERSION@"
     11        variable svnurl "@SVN_URL@"
     12        variable installdir $dir
    1013        variable library $dir
    1114    }

  • branches/1.5/gui/scripts/deviceEditor.tcl

    r5679 r6127  
    182182                    destroy $itk_component(hull).dev
    183183                }
    184                 set servers [Rappture::VisViewer::GetServerList "pymol"]
    185                 Rappture::MolvisViewer $itk_component(hull).mol $servers
     184                Rappture::MolvisViewer $itk_component(hull).mol
    186185                pack $itk_component(hull).mol -expand yes -fill both
    187186            }

  • branches/1.5/gui/scripts/fieldresult.tcl

    r5679 r6127  
    5656    }
    5757    array set flags $args
    58     set servers ""
    5958    switch -- $flags(-mode) {
    60         "nanovis" - "flowvis" {
    61             set servers [Rappture::VisViewer::GetServerList "nanovis"]
    62         }
    63         "contour" - "glyphs" - "heightmap" - "isosurface" - "streamlines" - "surface" - "vtkimage" - "vtkviewer" - "vtkvolume" {
    64             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
     59        "nanovis" {
     60            itk_component add renderer {
     61                Rappture::NanovisViewer $itk_interior.ren
     62            }
     63        }
     64        "flowvis" {
     65            itk_component add renderer {
     66                Rappture::FlowvisViewer $itk_interior.ren
     67            }
     68        }
     69        "glyphs" {
     70            itk_component add renderer {
     71                Rappture::VtkGlyphViewer $itk_interior.ren
     72            }
     73        }
     74        "contour" - "heightmap" {
     75            itk_component add renderer {
     76                Rappture::VtkHeightmapViewer $itk_interior.ren \
     77                    -mode $flags(-mode)
     78            }
     79        }
     80        "isosurface" {
     81            itk_component add renderer {
     82                Rappture::VtkIsosurfaceViewer $itk_interior.ren
     83            }
     84        }
     85        "streamlines" {
     86            itk_component add renderer {
     87                Rappture::VtkStreamlinesViewer $itk_interior.ren
     88            }
     89        }
     90        "surface" {
     91            itk_component add renderer {
     92                Rappture::VtkSurfaceViewer $itk_interior.ren
     93            }
     94        }
     95        "vtkimage" {
     96            itk_component add renderer {
     97                Rappture::VtkImageViewer $itk_interior.ren
     98            }
     99        }
     100        "vtkviewer" {
     101            itk_component add renderer {
     102                Rappture::VtkViewer $itk_interior.ren
     103            }
     104        }
     105        "vtkvolume" {
     106            itk_component add renderer {
     107                Rappture::VtkVolumeViewer $itk_interior.ren
     108            }
    65109        }
    66110        default {
    … …  
    68112        }
    69113    }
    70     if {"" != $servers} {
    71         switch -- $flags(-mode) {
    72             "nanovis" {
    73                 itk_component add renderer {
    74                     Rappture::NanovisViewer $itk_interior.ren $servers
    75                 }
    76             }
    77             "flowvis" {
    78                 itk_component add renderer {
    79                     Rappture::FlowvisViewer $itk_interior.ren $servers
    80                 }
    81             }
    82             "glyphs" {
    83                 itk_component add renderer {
    84                     Rappture::VtkGlyphViewer $itk_interior.ren $servers
    85                 }
    86             }
    87             "contour" - "heightmap" {
    88                 itk_component add renderer {
    89                     Rappture::VtkHeightmapViewer $itk_interior.ren $servers \
    90                         -mode $flags(-mode)
    91                 }
    92             }
    93             "isosurface" {
    94                 itk_component add renderer {
    95                     Rappture::VtkIsosurfaceViewer $itk_interior.ren $servers
    96                 }
    97             }
    98             "streamlines" {
    99                 itk_component add renderer {
    100                     Rappture::VtkStreamlinesViewer $itk_interior.ren $servers
    101                 }
    102             }
    103             "surface" {
    104                 itk_component add renderer {
    105                     Rappture::VtkSurfaceViewer $itk_interior.ren $servers
    106                 }
    107             }
    108             "vtkimage" {
    109                 itk_component add renderer {
    110                     Rappture::VtkImageViewer $itk_interior.ren $servers
    111                 }
    112             }
    113             "vtkviewer" {
    114                 itk_component add renderer {
    115                     Rappture::VtkViewer $itk_interior.ren $servers
    116                 }
    117             }
    118             "vtkvolume" {
    119                 itk_component add renderer {
    120                     Rappture::VtkVolumeViewer $itk_interior.ren $servers
    121                 }
    122             }
    123             default {
    124                 puts stderr "unknown render mode \"$flags(-mode)\""
    125             }
    126         }
    127         pack $itk_component(renderer) -expand yes -fill both
    128 
    129         # can't connect to rendering farm?
    130         if {![$itk_component(renderer) isconnected]} {
    131             # Should show a message here
    132             #destroy $itk_component(renderer)
    133         }
     114    pack $itk_component(renderer) -expand yes -fill both
     115
     116    # can't connect to rendering farm?
     117    if {![$itk_component(renderer) isconnected]} {
     118        # Should show a message here
     119        #destroy $itk_component(renderer)
    134120    }
    135121

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

    r5850 r6127  
    4242    itk_option define -plotoutline plotOutline PlotOutline ""
    4343
    44     constructor { hostlist args } {
    45         Rappture::VisViewer::constructor $hostlist
     44    constructor { args } {
     45        Rappture::VisViewer::constructor
    4646    } {
    4747        # defined below
    … …  
    169169# CONSTRUCTOR
    170170# ----------------------------------------------------------------------
    171 itcl::body Rappture::FlowvisViewer::constructor {hostlist args} {
     171itcl::body Rappture::FlowvisViewer::constructor {args} {
    172172    set _serverType "nanovis"
    173173

  • branches/1.5/gui/scripts/molvisviewer.tcl

    r5850 r6127  
    3333    itk_option define -device device Device ""
    3434
    35     constructor { servers args } {
    36         Rappture::VisViewer::constructor $servers
     35    constructor { args } {
     36        Rappture::VisViewer::constructor
    3737    } {
    3838        # defined below
    … …  
    149149# CONSTRUCTOR
    150150# ----------------------------------------------------------------------
    151 itcl::body Rappture::MolvisViewer::constructor {servers args} {
     151itcl::body Rappture::MolvisViewer::constructor {args} {
    152152    set _serverType "pymol"
    153153

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

    r5850 r6127  
    4242    itk_option define -plotoutline plotOutline PlotOutline ""
    4343
    44     constructor { hostlist args } {
    45         Rappture::VisViewer::constructor $hostlist
     44    constructor { args } {
     45        Rappture::VisViewer::constructor
    4646    } {
    4747        # defined below
    … …  
    150150# CONSTRUCTOR
    151151# ----------------------------------------------------------------------
    152 itcl::body Rappture::NanovisViewer::constructor {hostlist args} {
     152itcl::body Rappture::NanovisViewer::constructor {args} {
    153153    set _serverType "nanovis"
    154154

  • branches/1.5/gui/scripts/resultviewer.tcl

    r5885 r6127  
    280280            set mode "vtkviewer"
    281281            if {![info exists _mode2widget($mode)]} {
    282                 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    283282                set w $itk_interior.vtkviewer
    284                 Rappture::VtkViewer $w $servers
     283                Rappture::VtkViewer $w
    285284                set _mode2widget($mode) $w
    286285            }
    … …  
    343342            set mode "vtkmeshviewer"
    344343            if {![info exists _mode2widget($mode)]} {
    345                 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    346344                set w $itk_interior.$mode
    347                 Rappture::VtkMeshViewer $w $servers
     345                Rappture::VtkMeshViewer $w
    348346                set _mode2widget($mode) $w
    349347            }

  • branches/1.5/gui/scripts/sequenceresult.tcl

    r5679 r6127  
    453453        switch -- $type {
    454454            ::Rappture::Drawing {
    455                 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    456                 Rappture::VtkViewer $w $servers
     455                Rappture::VtkViewer $w
    457456                pack $w -expand yes -fill both
    458457            }

  • branches/1.5/gui/scripts/visviewer.tcl

    r5850 r6127  
    6161    protected variable _waitTimeout 0
    6262
    63     constructor { servers args } {
     63    constructor { args } {
    6464        # defined below
    6565    }
    … …  
    163163# CONSTRUCTOR
    164164# ----------------------------------------------------------------------
    165 itcl::body Rappture::VisViewer::constructor { servers args } {
     165itcl::body Rappture::VisViewer::constructor { args } {
    166166
    167167    Rappture::dispatcher _dispatcher
    … …  
    173173    $_dispatcher register !waiting
    174174
    175     CheckNameList $servers
    176175    set _buffer(in) ""
    177176    set _buffer(out) ""

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

    r6046 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    156156# CONSTRUCTOR
    157157# ----------------------------------------------------------------------
    158 itcl::body Rappture::VtkGlyphViewer::constructor {hostlist args} {
     158itcl::body Rappture::VtkGlyphViewer::constructor {args} {
    159159    set _serverType "vtkvis"
    160160

  • branches/1.5/gui/scripts/vtkheightmapviewer.tcl

    r5921 r6127  
    4040    itk_option define -mode mode Mode "contour"
    4141
    42     constructor { hostlist args } {
    43         Rappture::VisViewer::constructor $hostlist
     42    constructor { args } {
     43        Rappture::VisViewer::constructor
    4444    } {
    4545        # defined below
    … …  
    167167# CONSTRUCTOR
    168168# ----------------------------------------------------------------------
    169 itcl::body Rappture::VtkHeightmapViewer::constructor {hostlist args} {
     169itcl::body Rappture::VtkHeightmapViewer::constructor {args} {
    170170    set _serverType "vtkvis"
    171171

  • branches/1.5/gui/scripts/vtkimageviewer.tcl

    r5850 r6127  
    4040    itk_option define -mode mode Mode "vtkimage"
    4141
    42     constructor { hostlist args } {
    43         Rappture::VisViewer::constructor $hostlist
     42    constructor { args } {
     43        Rappture::VisViewer::constructor
    4444    } {
    4545        # defined below
    … …  
    162162# CONSTRUCTOR
    163163# ----------------------------------------------------------------------
    164 itcl::body Rappture::VtkImageViewer::constructor {hostlist args} {
     164itcl::body Rappture::VtkImageViewer::constructor {args} {
    165165    set _serverType "vtkvis"
    166166

  • branches/1.5/gui/scripts/vtkisosurfaceviewer.tcl

    r6046 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    179179# CONSTRUCTOR
    180180# ----------------------------------------------------------------------
    181 itcl::body Rappture::VtkIsosurfaceViewer::constructor {hostlist args} {
     181itcl::body Rappture::VtkIsosurfaceViewer::constructor {args} {
    182182    set _serverType "vtkvis"
    183183    #DebugOn

  • branches/1.5/gui/scripts/vtkmeshviewer.tcl

    r6046 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    133133# CONSTRUCTOR
    134134# ----------------------------------------------------------------------
    135 itcl::body Rappture::VtkMeshViewer::constructor {hostlist args} {
     135itcl::body Rappture::VtkMeshViewer::constructor {args} {
    136136    set _serverType "vtkvis"
    137137

  • branches/1.5/gui/scripts/vtkstreamlinesviewer.tcl

    r6046 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    158158# CONSTRUCTOR
    159159# ----------------------------------------------------------------------
    160 itcl::body Rappture::VtkStreamlinesViewer::constructor {hostlist args} {
     160itcl::body Rappture::VtkStreamlinesViewer::constructor {args} {
    161161    set _serverType "vtkvis"
    162162

  • branches/1.5/gui/scripts/vtksurfaceviewer.tcl

    r6046 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    157157# CONSTRUCTOR
    158158# ----------------------------------------------------------------------
    159 itcl::body Rappture::VtkSurfaceViewer::constructor {hostlist args} {
     159itcl::body Rappture::VtkSurfaceViewer::constructor {args} {
    160160    set _serverType "vtkvis"
    161161

  • branches/1.5/gui/scripts/vtkviewer.tcl

    r6046 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    172172# CONSTRUCTOR
    173173# ----------------------------------------------------------------------
    174 itcl::body Rappture::VtkViewer::constructor {hostlist args} {
     174itcl::body Rappture::VtkViewer::constructor {args} {
    175175    package require vtk
    176176    set _serverType "vtkvis"

  • branches/1.5/gui/scripts/vtkvolumeviewer.tcl

    r5850 r6127  
    3939    itk_option define -plotbackground plotBackground Background ""
    4040
    41     constructor { hostlist args } {
    42         Rappture::VisViewer::constructor $hostlist
     41    constructor { args } {
     42        Rappture::VisViewer::constructor
    4343    } {
    4444        # defined below
    … …  
    163163# CONSTRUCTOR
    164164# ----------------------------------------------------------------------
    165 itcl::body Rappture::VtkVolumeViewer::constructor {hostlist args} {
     165itcl::body Rappture::VtkVolumeViewer::constructor {args} {
    166166    set _serverType "vtkvis"
    167167

  • branches/1.5/gui/test/gauge.test

    r5167 r6127  
    6161} -result {4}
    6262
    63 test gauge.value.4 {value command, just -check flag, value is returned} \
     63test gauge.value.4 {value command, just -check flag, error is returned} \
    6464-setup {
    6565    set w [Rappture::Gauge .#auto]
    … …  
    6969    destroy $w
    7070    catch {unset w}
    71 } -result {0}
     71} -returnCodes {
     72    error
     73} -result {wrong # args: should be "value ?-check? ?newval?"}
    7274
    73 test gauge.value.5 {value command, invalid flag, return error} \
     75test gauge.value.5 {value command, -check flag, orig value is unchanged} \
     76-setup {
     77    set w [Rappture::Gauge .#auto]
     78    $w value 2
     79} -body  {
     80    $w value -check 4
     81    $w value
     82} -cleanup {
     83    destroy $w
     84    catch {unset w}
     85} -result {2}
     86
     87test gauge.value.6 {value command, invalid flag, return error} \
    7488-setup {
    7589    set w [Rappture::Gauge .#auto]
    7690} -body  {
    77     list [catch {$w value -chcek} msg] $msg
     91    $w value -chcek
    7892} -cleanup {
    7993    destroy $w
    8094    catch {unset w}
    81 } -result {1 {bad value "-chcek": should be a real number}}
     95} -returnCodes {
     96    error
     97} -result {bad value "-chcek": should be a real number}
    8298
    8399::tcltest::cleanupTests

  • branches/1.5/gui/test/vtkisosurfaceviewer.test

    r5167 r6127  
    11# Commands covered:
    2 # Rappture::Gauge
    3 # Rappture::Gauge::value
     2# Rappture::VtkIsosurfaceViewer
    43#
    54# This file contains a collection of tests for one of the Rappture Tcl
    … …  
    87#
    98# ======================================================================
    10 # AUTHOR:  Derrick Kearney, Purdue University
    11 # Copyright (c) 2004-2012  HUBzero Foundation, LLC
     9# AUTHORS:
     10#   Derrick Kearney, Purdue University
     11#   Leif Delgass, Purdue University
     12# Copyright (c) 2004-2016  HUBzero Foundation, LLC
    1213#
    1314# See the file "license.terms" for information on usage and redistribution
    … …  
    1718if {[lsearch [namespace children] ::tcltest] == -1} {
    1819    package require tcltest
     20    package require Rappture
    1921    package require RapptureGUI
    2022    namespace import -force ::tcltest::*
    2123}
    2224
    23 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
    24 
    25 Rappture::VtkIsosurfaceViewer .#auto $servers
     25Rappture::resources::load
    2626
    2727#----------------------------------------------------------
    … …  
    3131# Rappture::VtkIsosurfaceViewer <name> <servers>
    3232#----------------------------------------------------------
    33 test vtkisosurfaceviewer.constructor.1 {
    34     value command, 0 args, missing server list error
     33test vtkisosurfaceviewer.constructor.0 {
     34    constructor, 0 args, auto named
    3535} -setup {
    3636} -body  {
    37     list [catch {Rappture::VtkIsosurfaceViewer .#auto} msg] $msg
     37    Rappture::VtkIsosurfaceViewer .#auto
    3838} -cleanup {
    39 } -result {1 {wrong # args: should be "::Rappture::VtkIsosurfaceViewer .vtkIsosurfaceViewer1 hostlist ?arg arg ...?"}}
     39} -match glob \
     40-result {.vtkIsosurfaceViewer*} \
     41-errorOutput {connecting to *:2010...
     42Render server is VtkVis * (build *)
     43}
     44
     45test vtkisosurfaceviewer.constructor.1 {
     46    constructor, 0 args, explicit name
     47} -setup {
     48} -body  {
     49    Rappture::VtkIsosurfaceViewer .foo
     50} -cleanup {
     51} -match glob \
     52-result {.foo} \
     53-errorOutput {connecting to *:2010...
     54Render server is VtkVis * (build *)
     55}
    4056
    4157test vtkisosurfaceviewer.constructor.2 {
    42     value command, 1 args empty hostlist, empty hostlist uses visviewer defaults
     58    value command, auto name, -plotbackground option
    4359} -setup {
    4460} -body  {
    45     catch {Rappture::VtkIsosurfaceViewer .#auto {}} msg
     61    Rappture::VtkIsosurfaceViewer .#auto -plotbackground red
    4662} -cleanup {
    47 } -result {0}
     63} -match glob \
     64-result {.vtkIsosurfaceViewer*} \
     65-errorOutput {connecting to *:2010...
     66Render server is VtkVis * (build *)
     67}
    4868
    4969test vtkisosurfaceviewer.constructor.3 {
    50     value command, 1 args valid hostlist
     70    value command, bad option
    5171} -setup {
    5272} -body  {
    53     catch {Rappture::VtkIsosurfaceViewer .#auto $servers} msg
     73    Rappture::VtkIsosurfaceViewer .#auto -nonexistent foo
    5474} -cleanup {
    55 } -result {0}
    56 
    57 #test vtkisosurfaceviewer.constructor.5 {
    58 #    value command, 1 args valid hostlist
    59 #} -setup {
    60 #} -body  {
    61 #    set w [Rappture::VtkIsosurfaceViewer .#auto $servers]
    62 #} -cleanup {
    63 #    destroy $w
    64 #    catch {unset w}
    65 #} -result {}
     75} -returnCodes {
     76    error
     77} -result {unknown option "-nonexistent"}
    6678
    6779::tcltest::cleanupTests
Note: See TracChangeset for help on using the changeset viewer.