Ignore:
Timestamp:
Dec 20, 2014, 5:49:45 AM (5 years ago)
Author:
ldelgass
Message:

merge r4056 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/Command.cpp

    r4889 r4893  
    648648}
    649649
    650 static Rappture::CmdSpec cameraOps[] = {
     650static CmdSpec cameraOps[] = {
    651651    {"angle",   2, CameraAngleOp,    5, 5, "xAngle yAngle zAngle",},
    652652    {"orient",  1, CameraOrientOp,   6, 6, "qw qx qy qz",},
     
    664664    Tcl_ObjCmdProc *proc;
    665665
    666     proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,
    667                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     666    proc = GetOpFromObj(interp, nCameraOps, cameraOps,
     667                        CMDSPEC_ARG1, objc, objv, 0);
    668668    if (proc == NULL) {
    669669        return TCL_ERROR;
     
    778778}
    779779
    780 static Rappture::CmdSpec cutplaneOps[] = {
     780static CmdSpec cutplaneOps[] = {
    781781    {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",},
    782782    {"state",    1, CutplaneStateOp,    4, 0, "bool axis ?indices?",},
     
    806806    Tcl_ObjCmdProc *proc;
    807807
    808     proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
    809                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     808    proc = GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
     809                        CMDSPEC_ARG1, objc, objv, 0);
    810810    if (proc == NULL) {
    811811        return TCL_ERROR;
     
    985985}
    986986
    987 static Rappture::CmdSpec screenOps[] = {
     987static CmdSpec screenOps[] = {
    988988    {"bgcolor",  1, ScreenBgColorOp,  5, 5, "r g b",},
    989989    {"size",     1, ScreenSizeOp, 4, 4, "width height",},
     
    997997    Tcl_ObjCmdProc *proc;
    998998
    999     proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,
    1000                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     999    proc = GetOpFromObj(interp, nScreenOps, screenOps,
     1000                        CMDSPEC_ARG1, objc, objv, 0);
    10011001    if (proc == NULL) {
    10021002        return TCL_ERROR;
     
    12341234}
    12351235
    1236 static Rappture::CmdSpec volumeAnimationOps[] = {
     1236static CmdSpec volumeAnimationOps[] = {
    12371237    {"capture",   2, VolumeAnimationCaptureOp,  4, 5, "numframes ?filename?",},
    12381238    {"clear",     2, VolumeAnimationClearOp,    3, 3, "",},
     
    12501250    Tcl_ObjCmdProc *proc;
    12511251
    1252     proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps,
    1253                 volumeAnimationOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
     1252    proc = GetOpFromObj(interp, nVolumeAnimationOps,
     1253                        volumeAnimationOps, CMDSPEC_ARG2, objc, objv, 0);
    12541254    if (proc == NULL) {
    12551255        return TCL_ERROR;
     
    13841384}
    13851385
    1386 static Rappture::CmdSpec volumeDataOps[] = {
     1386static CmdSpec volumeDataOps[] = {
    13871387    {"follows",   1, VolumeDataFollowsOp, 5, 5, "nbytes tag",},
    13881388    {"state",     1, VolumeDataStateOp,   4, 0, "bool ?indices?",},
     
    13961396    Tcl_ObjCmdProc *proc;
    13971397
    1398     proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps,
    1399                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     1398    proc = GetOpFromObj(interp, nVolumeDataOps, volumeDataOps,
     1399                        CMDSPEC_ARG2, objc, objv, 0);
    14001400    if (proc == NULL) {
    14011401        return TCL_ERROR;
     
    14881488}
    14891489
    1490 static Rappture::CmdSpec volumeOutlineOps[] = {
     1490static CmdSpec volumeOutlineOps[] = {
    14911491    {"color",     1, VolumeOutlineColorOp,  6, 0, "r g b ?indices?",},
    14921492    {"state",     1, VolumeOutlineStateOp,  4, 0, "bool ?indices?",},
     
    15011501    Tcl_ObjCmdProc *proc;
    15021502
    1503     proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps,
    1504         Rappture::CMDSPEC_ARG2, objc, objv, 0);
     1503    proc = GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps,
     1504                        CMDSPEC_ARG2, objc, objv, 0);
    15051505    if (proc == NULL) {
    15061506        return TCL_ERROR;
     
    16801680}
    16811681
    1682 static Rappture::CmdSpec volumeShadingOps[] = {
     1682static CmdSpec volumeShadingOps[] = {
    16831683    {"ambient",       1, VolumeShadingAmbientOp,     4, 0, "value ?indices?",},
    16841684    {"diffuse",       1, VolumeShadingDiffuseOp,     4, 0, "value ?indices?",},
     
    16981698    Tcl_ObjCmdProc *proc;
    16991699
    1700     proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
    1701         Rappture::CMDSPEC_ARG2, objc, objv, 0);
     1700    proc = GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
     1701                        CMDSPEC_ARG2, objc, objv, 0);
    17021702    if (proc == NULL) {
    17031703        return TCL_ERROR;
     
    17251725}
    17261726
    1727 static Rappture::CmdSpec volumeOps[] = {
     1727static CmdSpec volumeOps[] = {
    17281728    {"animation", 2, VolumeAnimationOp,   3, 0, "oper ?args?",},
    17291729    {"data",      2, VolumeDataOp,        3, 0, "oper ?args?",},
     
    17431743    Tcl_ObjCmdProc *proc;
    17441744
    1745     proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps,
    1746         Rappture::CMDSPEC_ARG1, objc, objv, 0);
     1745    proc = GetOpFromObj(interp, nVolumeOps, volumeOps,
     1746                        CMDSPEC_ARG1, objc, objv, 0);
    17471747    if (proc == NULL) {
    17481748        return TCL_ERROR;
     
    17651765        return TCL_ERROR;
    17661766    }
    1767     Rappture::Unirect2d data(1);
     1767    Unirect2d data(1);
    17681768    if (data.parseBuffer(interp, buf) != TCL_OK) {
    17691769        return TCL_ERROR;
     
    18191819}
    18201820
    1821 static Rappture::CmdSpec heightMapDataOps[] = {
     1821static CmdSpec heightMapDataOps[] = {
    18221822    {"follows",  1, HeightMapDataFollowsOp, 5, 5, "size heightmapName",},
    18231823    {"visible",  1, HeightMapDataVisibleOp, 4, 0, "bool ?heightmapNames...?",},
     
    18311831    Tcl_ObjCmdProc *proc;
    18321832
    1833     proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps,
    1834                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     1833    proc = GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps,
     1834                        CMDSPEC_ARG2, objc, objv, 0);
    18351835    if (proc == NULL) {
    18361836        return TCL_ERROR;
     
    18791879}
    18801880
    1881 static Rappture::CmdSpec heightMapLineContourOps[] = {
     1881static CmdSpec heightMapLineContourOps[] = {
    18821882    {"color",   1, HeightMapLineContourColorOp,   6, 0, "r g b ?heightmapNames...?",},
    18831883    {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?heightmapNames...?",},
     
    18911891    Tcl_ObjCmdProc *proc;
    18921892
    1893     proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps,
    1894         heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
     1893    proc = GetOpFromObj(interp, nHeightMapLineContourOps,
     1894                        heightMapLineContourOps, CMDSPEC_ARG2, objc, objv, 0);
    18951895    if (proc == NULL) {
    18961896        return TCL_ERROR;
     
    20342034}
    20352035
    2036 static Rappture::CmdSpec heightMapOps[] = {
     2036static CmdSpec heightMapOps[] = {
    20372037    {"create",       2, HeightMapCreateOp,      10, 10, "heightmapName xmin ymin xmax ymax xnum ynum values",},
    20382038    {"cull",         2, HeightMapCullOp,        3, 3, "mode",},
     
    20532053    Tcl_ObjCmdProc *proc;
    20542054
    2055     proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps,
    2056                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     2055    proc = GetOpFromObj(interp, nHeightMapOps, heightMapOps,
     2056                        CMDSPEC_ARG1, objc, objv, 0);
    20572057    if (proc == NULL) {
    20582058        return TCL_ERROR;
     
    21362136}
    21372137
    2138 static Rappture::CmdSpec gridOps[] = {
     2138static CmdSpec gridOps[] = {
    21392139    {"axiscolor",  5, GridAxisColorOp,  5, 6, "r g b ?a?",},
    21402140    {"axisname",   5, GridAxisNameOp,   5, 5, "index title units",},
     
    21502150    Tcl_ObjCmdProc *proc;
    21512151
    2152     proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps,
    2153                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     2152    proc = GetOpFromObj(interp, nGridOps, gridOps,
     2153                        CMDSPEC_ARG1, objc, objv, 0);
    21542154    if (proc == NULL) {
    21552155        return TCL_ERROR;
Note: See TracChangeset for help on using the changeset viewer.