Changeset 4510 for branches/1.3


Ignore:
Timestamp:
Jul 16, 2014 2:11:08 PM (6 years ago)
Author:
ldelgass
Message:

merge r4059 from trunk

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4059
  • branches/1.3/packages/vizservers/vtkvis/CmdProc.cpp

    r3712 r4510  
    1111#include "CmdProc.h"
    1212
    13 using namespace Rappture;
     13using namespace VtkVis;
    1414
    1515/**
     
    116116 */
    117117Tcl_ObjCmdProc *
    118 Rappture::GetOpFromObj(Tcl_Interp *interp,      /* Interpreter to report errors to */
    119                        int nSpecs,              /* Number of specifications in array */
    120                        CmdSpec *specs,          /* Op specification array */
    121                        int operPos,             /* Position of operation in argument
     118VtkVis::GetOpFromObj(Tcl_Interp *interp,        /* Interpreter to report errors to */
     119                     int nSpecs,                /* Number of specifications in array */
     120                     CmdSpec *specs,            /* Op specification array */
     121                     int operPos,               /* Position of operation in argument
    122122                                                 * list. */
    123                        int objc,                /* Number of arguments in the argument
     123                     int objc,                  /* Number of arguments in the argument
    124124                                                 * vector.  This includes any prefixed
    125125                                                 * arguments */
    126                        Tcl_Obj *const *objv,    /* Argument vector */
    127                        int flags)
     126                     Tcl_Obj *const *objv,      /* Argument vector */
     127                     int flags)
    128128{
    129129    CmdSpec *specPtr;
  • branches/1.3/packages/vizservers/vtkvis/CmdProc.h

    r3615 r4510  
    66 */
    77
    8 #ifndef RAPPTURE_CMDPROC_H
    9 #define RAPPTURE_CMDPROC_H
     8#ifndef VTKVIS_CMDPROC_H
     9#define VTKVIS_CMDPROC_H
    1010
    1111#include <tcl.h>
    1212
    13 namespace Rappture {
     13namespace VtkVis {
    1414
    1515/**
     
    4343             CmdSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, int flags);
    4444
    45 #define NumCmdSpecs(s) (sizeof(s) / sizeof(Rappture::CmdSpec))
     45#define NumCmdSpecs(s) (sizeof(s) / sizeof(VtkVis::CmdSpec))
    4646
    4747}
  • branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp

    r4498 r4510  
    330330}
    331331
    332 static Rappture::CmdSpec arcOps[] = {
     332static CmdSpec arcOps[] = {
    333333    {"add",       1, ArcAddOp, 13, 13, "centerX centerY centerZ startX startY startZ normX normY normZ angle name"},
    334334    {"color",     1, ArcColorOp, 5, 6, "r g b ?name?"},
     
    352352    Tcl_ObjCmdProc *proc;
    353353
    354     proc = Rappture::GetOpFromObj(interp, nArcOps, arcOps,
    355                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     354    proc = GetOpFromObj(interp, nArcOps, arcOps,
     355                        CMDSPEC_ARG1, objc, objv, 0);
    356356    if (proc == NULL) {
    357357        return TCL_ERROR;
     
    709709}
    710710
    711 static Rappture::CmdSpec arrowOps[] = {
     711static CmdSpec arrowOps[] = {
    712712    {"add",       1, ArrowAddOp, 6, 6, "tipRadius shaftRadius tipLength name"},
    713713    {"color",     2, ArrowColorOp, 5, 6, "r g b ?name?"},
     
    738738    Tcl_ObjCmdProc *proc;
    739739
    740     proc = Rappture::GetOpFromObj(interp, nArrowOps, arrowOps,
    741                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     740    proc = GetOpFromObj(interp, nArrowOps, arrowOps,
     741                        CMDSPEC_ARG1, objc, objv, 0);
    742742    if (proc == NULL) {
    743743        return TCL_ERROR;
     
    16521652}
    16531653
    1654 static Rappture::CmdSpec axisOps[] = {
     1654static CmdSpec axisOps[] = {
    16551655    {"autobounds", 5, AxisAutoBoundsOp, 4, 4, "axis bool"},
    16561656    {"autorange",  5, AxisAutoRangeOp, 4, 4, "axis bool"},
     
    16961696    Tcl_ObjCmdProc *proc;
    16971697
    1698     proc = Rappture::GetOpFromObj(interp, nAxisOps, axisOps,
    1699                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     1698    proc = GetOpFromObj(interp, nAxisOps, axisOps,
     1699                        CMDSPEC_ARG1, objc, objv, 0);
    17001700    if (proc == NULL) {
    17011701        return TCL_ERROR;
     
    20352035}
    20362036
    2037 static Rappture::CmdSpec boxOps[] = {
     2037static CmdSpec boxOps[] = {
    20382038    {"add",       1, BoxAddOp, 6, 6, "xLen yLen zLen name"},
    20392039    {"color",     2, BoxColorOp, 5, 6, "r g b ?name?"},
     
    20632063    Tcl_ObjCmdProc *proc;
    20642064
    2065     proc = Rappture::GetOpFromObj(interp, nBoxOps, boxOps,
    2066                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     2065    proc = GetOpFromObj(interp, nBoxOps, boxOps,
     2066                        CMDSPEC_ARG1, objc, objv, 0);
    20672067    if (proc == NULL) {
    20682068        return TCL_ERROR;
     
    22822282}
    22832283
    2284 static Rappture::CmdSpec cameraOps[] = {
     2284static CmdSpec cameraOps[] = {
    22852285    {"aspect", 1, CameraAspectOp, 3, 3, "aspect"},
    22862286    {"get",    1, CameraGetOp, 2, 2, ""},
     
    23022302    Tcl_ObjCmdProc *proc;
    23032303
    2304     proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,
    2305                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     2304    proc = GetOpFromObj(interp, nCameraOps, cameraOps,
     2305                        CMDSPEC_ARG1, objc, objv, 0);
    23062306    if (proc == NULL) {
    23072307        return TCL_ERROR;
     
    25072507}
    25082508
    2509 static Rappture::CmdSpec colorMapOps[] = {
     2509static CmdSpec colorMapOps[] = {
    25102510    {"add",    1, ColorMapAddOp,             5, 5, "colorMapName colormap alphamap"},
    25112511    {"define", 3, ColorMapAddOp,             5, 5, "colorMapName colormap alphamap"},
     
    25212521    Tcl_ObjCmdProc *proc;
    25222522
    2523     proc = Rappture::GetOpFromObj(interp, nColorMapOps, colorMapOps,
    2524                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     2523    proc = GetOpFromObj(interp, nColorMapOps, colorMapOps,
     2524                        CMDSPEC_ARG1, objc, objv, 0);
    25252525    if (proc == NULL) {
    25262526        return TCL_ERROR;
     
    28782878}
    28792879
    2880 static Rappture::CmdSpec coneOps[] = {
     2880static CmdSpec coneOps[] = {
    28812881    {"add",       1, ConeAddOp, 6, 6, "radius height cap name"},
    28822882    {"color",     2, ConeColorOp, 5, 6, "r g b ?name?"},
     
    29072907    Tcl_ObjCmdProc *proc;
    29082908
    2909     proc = Rappture::GetOpFromObj(interp, nConeOps, coneOps,
    2910                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     2909    proc = GetOpFromObj(interp, nConeOps, coneOps,
     2910                        CMDSPEC_ARG1, objc, objv, 0);
    29112911    if (proc == NULL) {
    29122912        return TCL_ERROR;
     
    29742974}
    29752975
    2976 static Rappture::CmdSpec contour2dAddOps[] = {
     2976static CmdSpec contour2dAddOps[] = {
    29772977    {"contourlist", 1, Contour2DAddContourListOp, 4, 5, "contourList ?dataSetName?"},
    29782978    {"numcontours", 1, Contour2DAddNumContoursOp, 4, 5, "numContours ?dataSetName?"}
     
    29862986    Tcl_ObjCmdProc *proc;
    29872987
    2988     proc = Rappture::GetOpFromObj(interp, nContour2dAddOps, contour2dAddOps,
    2989                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     2988    proc = GetOpFromObj(interp, nContour2dAddOps, contour2dAddOps,
     2989                        CMDSPEC_ARG2, objc, objv, 0);
    29902990    if (proc == NULL) {
    29912991        return TCL_ERROR;
     
    32523252}
    32533253
    3254 static Rappture::CmdSpec contour2dOps[] = {
     3254static CmdSpec contour2dOps[] = {
    32553255    {"add",          1, Contour2DAddOp, 4, 5, "oper value ?dataSetName?"},
    32563256    {"ccolor",       2, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
     
    32783278    Tcl_ObjCmdProc *proc;
    32793279
    3280     proc = Rappture::GetOpFromObj(interp, nContour2dOps, contour2dOps,
    3281                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     3280    proc = GetOpFromObj(interp, nContour2dOps, contour2dOps,
     3281                        CMDSPEC_ARG1, objc, objv, 0);
    32823282    if (proc == NULL) {
    32833283        return TCL_ERROR;
     
    33453345}
    33463346
    3347 static Rappture::CmdSpec contour3dAddOps[] = {
     3347static CmdSpec contour3dAddOps[] = {
    33483348    {"contourlist", 1, Contour3DAddContourListOp, 4, 5, "contourList ?dataSetName?"},
    33493349    {"numcontours", 1, Contour3DAddNumContoursOp, 4, 5, "numContours ?dataSetName?"}
     
    33573357    Tcl_ObjCmdProc *proc;
    33583358
    3359     proc = Rappture::GetOpFromObj(interp, nContour3dAddOps, contour3dAddOps,
    3360                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     3359    proc = GetOpFromObj(interp, nContour3dAddOps, contour3dAddOps,
     3360                        CMDSPEC_ARG2, objc, objv, 0);
    33613361    if (proc == NULL) {
    33623362        return TCL_ERROR;
     
    36893689}
    36903690
    3691 static Rappture::CmdSpec contour3dOps[] = {
     3691static CmdSpec contour3dOps[] = {
    36923692    {"add",          1, Contour3DAddOp, 4, 5, "oper value ?dataSetName?"},
    36933693    {"ccolor",       2, Contour3DColorOp, 5, 6, "r g b ?dataSetName?"},
     
    37183718    Tcl_ObjCmdProc *proc;
    37193719
    3720     proc = Rappture::GetOpFromObj(interp, nContour3dOps, contour3dOps,
    3721                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     3720    proc = GetOpFromObj(interp, nContour3dOps, contour3dOps,
     3721                        CMDSPEC_ARG1, objc, objv, 0);
    37223722    if (proc == NULL) {
    37233723        return TCL_ERROR;
     
    41224122}
    41234123
    4124 static Rappture::CmdSpec cutplaneOps[] = {
     4124static CmdSpec cutplaneOps[] = {
    41254125    {"add",          2, CutplaneAddOp, 2, 3, "oper value ?dataSetName?"},
    41264126    {"axis",         2, CutplaneSliceVisibilityOp, 4, 5, "axis bool ?dataSetName?"},
     
    41534153    Tcl_ObjCmdProc *proc;
    41544154
    4155     proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
    4156                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     4155    proc = GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
     4156                        CMDSPEC_ARG1, objc, objv, 0);
    41574157    if (proc == NULL) {
    41584158        return TCL_ERROR;
     
    45104510}
    45114511
    4512 static Rappture::CmdSpec cylinderOps[] = {
     4512static CmdSpec cylinderOps[] = {
    45134513    {"add",       1, CylinderAddOp, 6, 6, "radius height cap name"},
    45144514    {"color",     2, CylinderColorOp, 5, 6, "r g b ?name?"},
     
    45394539    Tcl_ObjCmdProc *proc;
    45404540
    4541     proc = Rappture::GetOpFromObj(interp, nCylinderOps, cylinderOps,
    4542                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     4541    proc = GetOpFromObj(interp, nCylinderOps, cylinderOps,
     4542                        CMDSPEC_ARG1, objc, objv, 0);
    45434543    if (proc == NULL) {
    45444544        return TCL_ERROR;
     
    47154715}
    47164716
    4717 static Rappture::CmdSpec dataSetGetScalarOps[] = {
     4717static CmdSpec dataSetGetScalarOps[] = {
    47184718    {"pixel", 1, DataSetGetScalarPixelOp, 6, 6, "x y dataSetName"},
    47194719    {"world", 1, DataSetGetScalarWorldOp, 7, 7, "x y z dataSetName"}
     
    47274727    Tcl_ObjCmdProc *proc;
    47284728
    4729     proc = Rappture::GetOpFromObj(interp, nDataSetGetScalarOps, dataSetGetScalarOps,
    4730                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     4729    proc = GetOpFromObj(interp, nDataSetGetScalarOps, dataSetGetScalarOps,
     4730                        CMDSPEC_ARG2, objc, objv, 0);
    47314731    if (proc == NULL) {
    47324732        return TCL_ERROR;
     
    48054805}
    48064806
    4807 static Rappture::CmdSpec dataSetGetVectorOps[] = {
     4807static CmdSpec dataSetGetVectorOps[] = {
    48084808    {"pixel", 1, DataSetGetVectorPixelOp, 6, 6, "x y dataSetName"},
    48094809    {"world", 1, DataSetGetVectorWorldOp, 7, 7, "x y z dataSetName"}
     
    48174817    Tcl_ObjCmdProc *proc;
    48184818
    4819     proc = Rappture::GetOpFromObj(interp, nDataSetGetVectorOps, dataSetGetVectorOps,
    4820                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     4819    proc = GetOpFromObj(interp, nDataSetGetVectorOps, dataSetGetVectorOps,
     4820                        CMDSPEC_ARG2, objc, objv, 0);
    48214821    if (proc == NULL) {
    48224822        return TCL_ERROR;
     
    49504950}
    49514951
    4952 static Rappture::CmdSpec dataSetOps[] = {
     4952static CmdSpec dataSetOps[] = {
    49534953    {"add",       1, DataSetAddOp, 6, 6, "name data follows nBytes"},
    49544954    {"delete",    1, DataSetDeleteOp, 2, 3, "?name?"},
     
    49704970    Tcl_ObjCmdProc *proc;
    49714971
    4972     proc = Rappture::GetOpFromObj(interp, nDataSetOps, dataSetOps,
    4973                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     4972    proc = GetOpFromObj(interp, nDataSetOps, dataSetOps,
     4973                        CMDSPEC_ARG1, objc, objv, 0);
    49744974    if (proc == NULL) {
    49754975        return TCL_ERROR;
     
    53265326}
    53275327
    5328 static Rappture::CmdSpec diskOps[] = {
     5328static CmdSpec diskOps[] = {
    53295329    {"add",       1, DiskAddOp, 5, 5, "innerRadius outerRadius name"},
    53305330    {"color",     2, DiskColorOp, 5, 6, "r g b ?name?"},
     
    53555355    Tcl_ObjCmdProc *proc;
    53565356
    5357     proc = Rappture::GetOpFromObj(interp, nDiskOps, diskOps,
    5358                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     5357    proc = GetOpFromObj(interp, nDiskOps, diskOps,
     5358                        CMDSPEC_ARG1, objc, objv, 0);
    53595359    if (proc == NULL) {
    53605360        return TCL_ERROR;
     
    58655865}
    58665866
    5867 static Rappture::CmdSpec glyphsOps[] = {
     5867static CmdSpec glyphsOps[] = {
    58685868    {"add",          1, GlyphsAddOp, 3, 4, "shape ?dataSetName?"},
    58695869    {"ccolor",       2, GlyphsColorOp, 5, 6, "r g b ?dataSetName?"},
     
    58995899    Tcl_ObjCmdProc *proc;
    59005900
    5901     proc = Rappture::GetOpFromObj(interp, nGlyphsOps, glyphsOps,
    5902                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     5901    proc = GetOpFromObj(interp, nGlyphsOps, glyphsOps,
     5902                        CMDSPEC_ARG1, objc, objv, 0);
    59035903    if (proc == NULL) {
    59045904        return TCL_ERROR;
     
    60576057}
    60586058
    6059 static Rappture::CmdSpec groupOps[] = {
     6059static CmdSpec groupOps[] = {
    60606060    {"add",       1, GroupAddOp, 4, 4, "nodeList groupName"},
    60616061    {"delete",    1, GroupDeleteOp, 2, 3, "?name?"},
     
    60756075    Tcl_ObjCmdProc *proc;
    60766076
    6077     proc = Rappture::GetOpFromObj(interp, nGroupOps, groupOps,
    6078                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     6077    proc = GetOpFromObj(interp, nGroupOps, groupOps,
     6078                        CMDSPEC_ARG1, objc, objv, 0);
    60796079    if (proc == NULL) {
    60806080        return TCL_ERROR;
     
    61516151}
    61526152
    6153 static Rappture::CmdSpec heightmapAddOps[] = {
     6153static CmdSpec heightmapAddOps[] = {
    61546154    {"contourlist", 1, HeightMapAddContourListOp, 5, 6, "contourList heightscale ?dataSetName?"},
    61556155    {"numcontours", 1, HeightMapAddNumContoursOp, 5, 6, "numContours heightscale ?dataSetName?"}
     
    61636163    Tcl_ObjCmdProc *proc;
    61646164
    6165     proc = Rappture::GetOpFromObj(interp, nHeightmapAddOps, heightmapAddOps,
    6166                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     6165    proc = GetOpFromObj(interp, nHeightmapAddOps, heightmapAddOps,
     6166                        CMDSPEC_ARG2, objc, objv, 0);
    61676167    if (proc == NULL) {
    61686168        return TCL_ERROR;
     
    67506750}
    67516751
    6752 static Rappture::CmdSpec heightmapOps[] = {
     6752static CmdSpec heightmapOps[] = {
    67536753    {"add",          2, HeightMapAddOp, 5, 6, "oper value heightscale ?dataSetName?"},
    67546754    {"aspect",       2, HeightMapAspectOp, 3, 4, "aspect ?dataSetName?"},
     
    67896789    Tcl_ObjCmdProc *proc;
    67906790
    6791     proc = Rappture::GetOpFromObj(interp, nHeightmapOps, heightmapOps,
    6792                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     6791    proc = GetOpFromObj(interp, nHeightmapOps, heightmapOps,
     6792                        CMDSPEC_ARG1, objc, objv, 0);
    67936793    if (proc == NULL) {
    67946794        return TCL_ERROR;
     
    70787078}
    70797079
    7080 static Rappture::CmdSpec imageOps[] = {
     7080static CmdSpec imageOps[] = {
    70817081    {"add",          1, ImageAddOp, 2, 3, "?dataSetName?"},
    70827082    {"backing",      2, ImageBackingOp, 3, 4, "bool ?dataSetName?"},
     
    71047104    Tcl_ObjCmdProc *proc;
    71057105
    7106     proc = Rappture::GetOpFromObj(interp, nImageOps, imageOps,
    7107                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     7106    proc = GetOpFromObj(interp, nImageOps, imageOps,
     7107                        CMDSPEC_ARG1, objc, objv, 0);
    71087108    if (proc == NULL) {
    71097109        return TCL_ERROR;
     
    75387538}
    75397539
    7540 static Rappture::CmdSpec licOps[] = {
     7540static CmdSpec licOps[] = {
    75417541    {"add",          1, LICAddOp, 2, 3, "?dataSetName?"},
    75427542    {"colormap",     1, LICColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
     
    75627562    Tcl_ObjCmdProc *proc;
    75637563
    7564     proc = Rappture::GetOpFromObj(interp, nLICOps, licOps,
    7565                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     7564    proc = GetOpFromObj(interp, nLICOps, licOps,
     7565                        CMDSPEC_ARG1, objc, objv, 0);
    75667566    if (proc == NULL) {
    75677567        return TCL_ERROR;
     
    77597759}
    77607760
    7761 static Rappture::CmdSpec lineOps[] = {
     7761static CmdSpec lineOps[] = {
    77627762    {"add",       1, LineAddOp, 4, 4, "points name"},
    77637763    {"color",     1, LineColorOp, 5, 6, "r g b ?name?"},
     
    77807780    Tcl_ObjCmdProc *proc;
    77817781
    7782     proc = Rappture::GetOpFromObj(interp, nLineOps, lineOps,
    7783                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     7782    proc = GetOpFromObj(interp, nLineOps, lineOps,
     7783                        CMDSPEC_ARG1, objc, objv, 0);
    77847784    if (proc == NULL) {
    77857785        return TCL_ERROR;
     
    83298329}
    83308330
    8331 static Rappture::CmdSpec moleculeOps[] = {
     8331static CmdSpec moleculeOps[] = {
    83328332    {"add",          2, MoleculeAddOp, 2, 3, "?dataSetName?"},
    83338333    {"aquality",     2, MoleculeAtomQualityOp, 3, 4, "value ?dataSetName?"},
     
    83688368    Tcl_ObjCmdProc *proc;
    83698369
    8370     proc = Rappture::GetOpFromObj(interp, nMoleculeOps, moleculeOps,
    8371                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     8370    proc = GetOpFromObj(interp, nMoleculeOps, moleculeOps,
     8371                        CMDSPEC_ARG1, objc, objv, 0);
    83728372    if (proc == NULL) {
    83738373        return TCL_ERROR;
     
    85368536}
    85378537
    8538 static Rappture::CmdSpec outlineOps[] = {
     8538static CmdSpec outlineOps[] = {
    85398539    {"add",       1, OutlineAddOp, 2, 3, "?dataSetName?"},
    85408540    {"color",     1, OutlineColorOp, 5, 6, "r g b ?dataSetName?"},
     
    85568556    Tcl_ObjCmdProc *proc;
    85578557
    8558     proc = Rappture::GetOpFromObj(interp, nOutlineOps, outlineOps,
    8559                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     8558    proc = GetOpFromObj(interp, nOutlineOps, outlineOps,
     8559                        CMDSPEC_ARG1, objc, objv, 0);
    85608560    if (proc == NULL) {
    85618561        return TCL_ERROR;
     
    89018901}
    89028902
    8903 static Rappture::CmdSpec parallelepipedOps[] = {
     8903static CmdSpec parallelepipedOps[] = {
    89048904    {"add",       1, ParallelepipedAddOp, 12, 12, "v0x v0y v0z v1x v1y v1z v2x v2y v2z name"},
    89058905    {"color",     2, ParallelepipedColorOp, 5, 6, "r g b ?name?"},
     
    89298929    Tcl_ObjCmdProc *proc;
    89308930
    8931     proc = Rappture::GetOpFromObj(interp, nParallelepipedOps, parallelepipedOps,
    8932                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     8931    proc = GetOpFromObj(interp, nParallelepipedOps, parallelepipedOps,
     8932                        CMDSPEC_ARG1, objc, objv, 0);
    89338933    if (proc == NULL) {
    89348934        return TCL_ERROR;
     
    93629362}
    93639363
    9364 static Rappture::CmdSpec polyDataOps[] = {
     9364static CmdSpec polyDataOps[] = {
    93659365    {"add",       1, PolyDataAddOp, 2, 3, "?dataSetName?"},
    93669366    {"ccolor",    2, PolyDataColorOp, 5, 6, "r g b ?dataSetName?"},
     
    93959395    Tcl_ObjCmdProc *proc;
    93969396
    9397     proc = Rappture::GetOpFromObj(interp, nPolyDataOps, polyDataOps,
    9398                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     9397    proc = GetOpFromObj(interp, nPolyDataOps, polyDataOps,
     9398                        CMDSPEC_ARG1, objc, objv, 0);
    93999399    if (proc == NULL) {
    94009400        return TCL_ERROR;
     
    97409740}
    97419741
    9742 static Rappture::CmdSpec polygonOps[] = {
     9742static CmdSpec polygonOps[] = {
    97439743    {"add",       1, PolygonAddOp, 11, 11, "numSides centerX centerY centerZ normalX normalY normalZ radius name"},
    97449744    {"color",     1, PolygonColorOp, 5, 6, "r g b ?name?"},
     
    97689768    Tcl_ObjCmdProc *proc;
    97699769
    9770     proc = Rappture::GetOpFromObj(interp, nPolygonOps, polygonOps,
    9771                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     9770    proc = GetOpFromObj(interp, nPolygonOps, polygonOps,
     9771                        CMDSPEC_ARG1, objc, objv, 0);
    97729772    if (proc == NULL) {
    97739773        return TCL_ERROR;
     
    1011810118}
    1011910119
    10120 static Rappture::CmdSpec pseudoColorOps[] = {
     10120static CmdSpec pseudoColorOps[] = {
    1012110121    {"add",          1, PseudoColorAddOp, 2, 3, "?dataSetName?"},
    1012210122    {"ccolor",       2, PseudoColorColorOp, 5, 6, "r g b ?dataSetName?"},
     
    1014710147    Tcl_ObjCmdProc *proc;
    1014810148
    10149     proc = Rappture::GetOpFromObj(interp, nPseudoColorOps, pseudoColorOps,
    10150                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     10149    proc = GetOpFromObj(interp, nPseudoColorOps, pseudoColorOps,
     10150                        CMDSPEC_ARG1, objc, objv, 0);
    1015110151    if (proc == NULL) {
    1015210152        return TCL_ERROR;
     
    1025910259}
    1026010260
    10261 static Rappture::CmdSpec rendererOps[] = {
     10261static CmdSpec rendererOps[] = {
    1026210262    {"clipplane",  1, RendererClipPlaneOp, 5, 5, "axis ratio direction"},
    1026310263    {"depthpeel",  1, RendererDepthPeelingOp, 3, 5, "bool ?occlusionRatio maxPeels?"},
     
    1027410274    Tcl_ObjCmdProc *proc;
    1027510275
    10276     proc = Rappture::GetOpFromObj(interp, nRendererOps, rendererOps,
    10277                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     10276    proc = GetOpFromObj(interp, nRendererOps, rendererOps,
     10277                        CMDSPEC_ARG1, objc, objv, 0);
    1027810278    if (proc == NULL) {
    1027910279        return TCL_ERROR;
     
    1031310313}
    1031410314
    10315 static Rappture::CmdSpec screenOps[] = {
     10315static CmdSpec screenOps[] = {
    1031610316    {"bgcolor", 1, ScreenBgColorOp, 5, 5, "r g b"},
    1031710317    {"size", 1, ScreenSizeOp, 4, 4, "width height"}
     
    1032510325    Tcl_ObjCmdProc *proc;
    1032610326
    10327     proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,
    10328                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     10327    proc = GetOpFromObj(interp, nScreenOps, screenOps,
     10328                        CMDSPEC_ARG1, objc, objv, 0);
    1032910329    if (proc == NULL) {
    1033010330        return TCL_ERROR;
     
    1070310703}
    1070410704
    10705 static Rappture::CmdSpec sphereOps[] = {
     10705static CmdSpec sphereOps[] = {
    1070610706    {"add",       1, SphereAddOp, 7, 7, "centerX centerY centerZ radius name"},
    1070710707    {"color",     2, SphereColorOp, 5, 6, "r g b ?name?"},
     
    1073310733    Tcl_ObjCmdProc *proc;
    1073410734
    10735     proc = Rappture::GetOpFromObj(interp, nSphereOps, sphereOps,
    10736                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     10735    proc = GetOpFromObj(interp, nSphereOps, sphereOps,
     10736                        CMDSPEC_ARG1, objc, objv, 0);
    1073710737    if (proc == NULL) {
    1073810738        return TCL_ERROR;
     
    1137211372}
    1137311373
    11374 static Rappture::CmdSpec streamlinesSeedOps[] = {
     11374static CmdSpec streamlinesSeedOps[] = {
    1137511375    {"color",   1, StreamlinesSeedColorOp,         6, 7, "r g b ?dataSetName?"},
    1137611376    {"disk",    1, StreamlinesSeedDiskOp,          12, 13, "centerX centerY centerZ normalX normalY normalZ radius innerRadius numPoints ?dataSetName?"},
     
    1139411394    Tcl_ObjCmdProc *proc;
    1139511395
    11396     proc = Rappture::GetOpFromObj(interp, nStreamlinesSeedOps, streamlinesSeedOps,
    11397                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     11396    proc = GetOpFromObj(interp, nStreamlinesSeedOps, streamlinesSeedOps,
     11397                        CMDSPEC_ARG2, objc, objv, 0);
    1139811398    if (proc == NULL) {
    1139911399        return TCL_ERROR;
     
    1145711457}
    1145811458
    11459 static Rappture::CmdSpec streamlinesOps[] = {
     11459static CmdSpec streamlinesOps[] = {
    1146011460    {"add",          1, StreamlinesAddOp,            2, 3, "?dataSetName?"},
    1146111461    {"ccolor",       2, StreamlinesColorOp,          5, 6, "r g b ?dataSetName?"},
     
    1148811488    Tcl_ObjCmdProc *proc;
    1148911489
    11490     proc = Rappture::GetOpFromObj(interp, nStreamlinesOps, streamlinesOps,
    11491                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     11490    proc = GetOpFromObj(interp, nStreamlinesOps, streamlinesOps,
     11491                        CMDSPEC_ARG1, objc, objv, 0);
    1149211492    if (proc == NULL) {
    1149311493        return TCL_ERROR;
     
    1177011770}
    1177111771
    11772 static Rappture::CmdSpec text3DOps[] = {
     11772static CmdSpec text3DOps[] = {
    1177311773    {"add",       1, Text3DAddOp, 6, 6, "font size text name"},
    1177411774    {"bold",      1, Text3DBoldOp, 3, 4, "bool ?name?"},
     
    1179611796    Tcl_ObjCmdProc *proc;
    1179711797
    11798     proc = Rappture::GetOpFromObj(interp, nText3DOps, text3DOps,
    11799                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     11798    proc = GetOpFromObj(interp, nText3DOps, text3DOps,
     11799                        CMDSPEC_ARG1, objc, objv, 0);
    1180011800    if (proc == NULL) {
    1180111801        return TCL_ERROR;
     
    1206012060}
    1206112061
    12062 static Rappture::CmdSpec volumeShadingOps[] = {
     12062static CmdSpec volumeShadingOps[] = {
    1206312063    {"ambient",  1, VolumeShadingAmbientOp,  4, 5, "coeff ?dataSetName?"},
    1206412064    {"diffuse",  1, VolumeShadingDiffuseOp,  4, 5, "coeff ?dataSetName?"},
     
    1207312073    Tcl_ObjCmdProc *proc;
    1207412074
    12075     proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
    12076                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     12075    proc = GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
     12076                        CMDSPEC_ARG2, objc, objv, 0);
    1207712077    if (proc == NULL) {
    1207812078        return TCL_ERROR;
     
    1209812098}
    1209912099
    12100 static Rappture::CmdSpec volumeOps[] = {
     12100static CmdSpec volumeOps[] = {
    1210112101    {"add",          1, VolumeAddOp,        2, 3, "?dataSetName?"},
    1210212102    {"blendmode",    1, VolumeBlendModeOp,  3, 4, "blendMode ?dataSetName?"},
     
    1212012120    Tcl_ObjCmdProc *proc;
    1212112121
    12122     proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps,
    12123                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     12122    proc = GetOpFromObj(interp, nVolumeOps, volumeOps,
     12123                        CMDSPEC_ARG1, objc, objv, 0);
    1212412124    if (proc == NULL) {
    1212512125        return TCL_ERROR;
     
    1248512485}
    1248612486
    12487 static Rappture::CmdSpec warpOps[] = {
     12487static CmdSpec warpOps[] = {
    1248812488    {"add",          1, WarpAddOp, 2, 3, "?dataSetName?"},
    1248912489    {"ccolor",       2, WarpColorOp, 5, 6, "r g b ?dataSetName?"},
     
    1251512515    Tcl_ObjCmdProc *proc;
    1251612516
    12517     proc = Rappture::GetOpFromObj(interp, nWarpOps, warpOps,
    12518                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     12517    proc = GetOpFromObj(interp, nWarpOps, warpOps,
     12518                        CMDSPEC_ARG1, objc, objv, 0);
    1251912519    if (proc == NULL) {
    1252012520        return TCL_ERROR;
Note: See TracChangeset for help on using the changeset viewer.