Ignore:
Timestamp:
Mar 11, 2013 7:37:24 PM (11 years ago)
Author:
ldelgass
Message:

Add protocol to vtkvis for contour2d/3d num contours, contour list

Location:
trunk/packages/vizservers/vtkvis
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/vizservers/vtkvis/Doxyfile.in

    r3479 r3488  
    2626# by quotes) that should identify the project.
    2727
    28 PROJECT_NAME           = "Rappture VTK Render Server"
     28PROJECT_NAME           = "HUBzero VTK Render Server"
    2929
    3030# The PROJECT_NUMBER tag can be used to enter a project or revision number.

  • trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

    r3459 r3488  
    27862786
    27872787static int
     2788Contour2DContourListOp(ClientData clientData, Tcl_Interp *interp, int objc,
     2789                       Tcl_Obj *const *objv)
     2790{
     2791    std::vector<double> contourList;
     2792
     2793    int clistc;
     2794    Tcl_Obj **clistv;
     2795
     2796    if (Tcl_ListObjGetElements(interp, objv[2], &clistc, &clistv) != TCL_OK) {
     2797        return TCL_ERROR;
     2798    }
     2799
     2800    for (int i = 0; i < clistc; i++) {
     2801        double val;
     2802        if (Tcl_GetDoubleFromObj(interp, clistv[i], &val) != TCL_OK) {
     2803            return TCL_ERROR;
     2804        }
     2805        contourList.push_back(val);
     2806    }
     2807
     2808    if (objc == 4) {
     2809        const char *name = Tcl_GetString(objv[3]);
     2810        g_renderer->setContour2DContourList(name, contourList);
     2811    } else {
     2812        g_renderer->setContour2DContourList("all", contourList);
     2813    }
     2814    return TCL_OK;
     2815}
     2816
     2817static int
    27882818Contour2DLightingOp(ClientData clientData, Tcl_Interp *interp, int objc,
    27892819                    Tcl_Obj *const *objv)
    … …  
    28342864    } else {
    28352865        g_renderer->setGraphicsObjectEdgeWidth<Contour2D>("all", width);
     2866    }
     2867    return TCL_OK;
     2868}
     2869
     2870
     2871static int
     2872Contour2DNumContoursOp(ClientData clientData, Tcl_Interp *interp, int objc,
     2873                       Tcl_Obj *const *objv)
     2874{
     2875    int numContours;
     2876
     2877    if (Tcl_GetIntFromObj(interp, objv[2], &numContours) != TCL_OK) {
     2878        return TCL_ERROR;
     2879    }
     2880    if (objc == 4) {
     2881        const char *name = Tcl_GetString(objv[3]);
     2882        g_renderer->setContour2DContours(name, numContours);
     2883    } else {
     2884        g_renderer->setContour2DContours("all", numContours);
    28362885    }
    28372886    return TCL_OK;
    … …  
    29312980
    29322981static Rappture::CmdSpec contour2dOps[] = {
    2933     {"add",       1, Contour2DAddOp, 4, 5, "oper value ?dataSetName?"},
    2934     {"ccolor",    2, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
    2935     {"colormap",  7, Contour2DColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
    2936     {"colormode", 7, Contour2DColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
    2937     {"delete",    1, Contour2DDeleteOp, 2, 3, "?dataSetName?"},
    2938     {"lighting",  3, Contour2DLightingOp, 3, 4, "bool ?dataSetName?"},
    2939     {"linecolor", 5, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
    2940     {"linewidth", 5, Contour2DLineWidthOp, 3, 4, "width ?dataSetName?"},
    2941     {"opacity",   2, Contour2DOpacityOp, 3, 4, "value ?dataSetName?"},
    2942     {"orient",    2, Contour2DOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
    2943     {"pos",       1, Contour2DPositionOp, 5, 6, "x y z ?dataSetName?"},
    2944     {"scale",     1, Contour2DScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
    2945     {"visible",   1, Contour2DVisibleOp, 3, 4, "bool ?dataSetName?"}
     2982    {"add",          1, Contour2DAddOp, 4, 5, "oper value ?dataSetName?"},
     2983    {"ccolor",       2, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
     2984    {"colormap",     7, Contour2DColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
     2985    {"colormode",    7, Contour2DColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     2986    {"contourlist",  3, Contour2DContourListOp, 3, 4, "contourList ?dataSetName?"},
     2987    {"delete",       1, Contour2DDeleteOp, 2, 3, "?dataSetName?"},
     2988    {"lighting",     3, Contour2DLightingOp, 3, 4, "bool ?dataSetName?"},
     2989    {"linecolor",    5, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
     2990    {"linewidth",    5, Contour2DLineWidthOp, 3, 4, "width ?dataSetName?"},
     2991    {"numcontours",  1, Contour2DNumContoursOp, 3, 4, "numContours ?dataSetName?"},
     2992    {"opacity",      2, Contour2DOpacityOp, 3, 4, "value ?dataSetName?"},
     2993    {"orient",       2, Contour2DOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
     2994    {"pos",          1, Contour2DPositionOp, 5, 6, "x y z ?dataSetName?"},
     2995    {"scale",        1, Contour2DScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     2996    {"visible",      1, Contour2DVisibleOp, 3, 4, "bool ?dataSetName?"}
    29462997};
    29472998static int nContour2dOps = NumCmdSpecs(contour2dOps);
    … …  
    31103161
    31113162static int
     3163Contour3DContourListOp(ClientData clientData, Tcl_Interp *interp, int objc,
     3164                       Tcl_Obj *const *objv)
     3165{
     3166    std::vector<double> contourList;
     3167
     3168    int clistc;
     3169    Tcl_Obj **clistv;
     3170
     3171    if (Tcl_ListObjGetElements(interp, objv[2], &clistc, &clistv) != TCL_OK) {
     3172        return TCL_ERROR;
     3173    }
     3174
     3175    for (int i = 0; i < clistc; i++) {
     3176        double val;
     3177        if (Tcl_GetDoubleFromObj(interp, clistv[i], &val) != TCL_OK) {
     3178            return TCL_ERROR;
     3179        }
     3180        contourList.push_back(val);
     3181    }
     3182
     3183    if (objc == 4) {
     3184        const char *name = Tcl_GetString(objv[3]);
     3185        g_renderer->setContour3DContourList(name, contourList);
     3186    } else {
     3187        g_renderer->setContour3DContourList("all", contourList);
     3188    }
     3189    return TCL_OK;
     3190}
     3191
     3192static int
    31123193Contour3DDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
    31133194                  Tcl_Obj *const *objv)
    … …  
    31883269    } else {
    31893270        g_renderer->setGraphicsObjectEdgeWidth<Contour3D>("all", width);
     3271    }
     3272    return TCL_OK;
     3273}
     3274
     3275static int
     3276Contour3DNumContoursOp(ClientData clientData, Tcl_Interp *interp, int objc,
     3277                       Tcl_Obj *const *objv)
     3278{
     3279    int numContours;
     3280
     3281    if (Tcl_GetIntFromObj(interp, objv[2], &numContours) != TCL_OK) {
     3282        return TCL_ERROR;
     3283    }
     3284    if (objc == 4) {
     3285        const char *name = Tcl_GetString(objv[3]);
     3286        g_renderer->setContour3DContours(name, numContours);
     3287    } else {
     3288        g_renderer->setContour3DContours("all", numContours);
    31903289    }
    31913290    return TCL_OK;
    … …  
    33023401
    33033402static Rappture::CmdSpec contour3dOps[] = {
    3304     {"add",       1, Contour3DAddOp, 4, 5, "oper value ?dataSetName?"},
    3305     {"ccolor",    2, Contour3DColorOp, 5, 6, "r g b ?dataSetName?"},
    3306     {"colormap",  7, Contour3DColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
    3307     {"colormode", 7, Contour3DColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
    3308     {"delete",    1, Contour3DDeleteOp, 2, 3, "?dataSetName?"},
    3309     {"edges",     1, Contour3DEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
    3310     {"lighting",  3, Contour3DLightingOp, 3, 4, "bool ?dataSetName?"},
    3311     {"linecolor", 5, Contour3DLineColorOp, 5, 6, "r g b ?dataSetName?"},
    3312     {"linewidth", 5, Contour3DLineWidthOp, 3, 4, "width ?dataSetName?"},
    3313     {"opacity",   2, Contour3DOpacityOp, 3, 4, "value ?dataSetName?"},
    3314     {"orient",    2, Contour3DOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
    3315     {"pos",       1, Contour3DPositionOp, 5, 6, "x y z ?dataSetName?"},
    3316     {"scale",     1, Contour3DScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
    3317     {"visible",   1, Contour3DVisibleOp, 3, 4, "bool ?dataSetName?"},
    3318     {"wireframe", 1, Contour3DWireframeOp, 3, 4, "bool ?dataSetName?"}
     3403    {"add",          1, Contour3DAddOp, 4, 5, "oper value ?dataSetName?"},
     3404    {"ccolor",       2, Contour3DColorOp, 5, 6, "r g b ?dataSetName?"},
     3405    {"colormap",     7, Contour3DColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
     3406    {"colormode",    7, Contour3DColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     3407    {"contourlist",  3, Contour3DContourListOp, 3, 4, "contourList ?dataSetName?"},
     3408    {"delete",       1, Contour3DDeleteOp, 2, 3, "?dataSetName?"},
     3409    {"edges",        1, Contour3DEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
     3410    {"lighting",     3, Contour3DLightingOp, 3, 4, "bool ?dataSetName?"},
     3411    {"linecolor",    5, Contour3DLineColorOp, 5, 6, "r g b ?dataSetName?"},
     3412    {"linewidth",    5, Contour3DLineWidthOp, 3, 4, "width ?dataSetName?"},
     3413    {"numcontours",  1, Contour3DNumContoursOp, 3, 4, "numContours ?dataSetName?"},
     3414    {"opacity",      2, Contour3DOpacityOp, 3, 4, "value ?dataSetName?"},
     3415    {"orient",       2, Contour3DOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
     3416    {"pos",          1, Contour3DPositionOp, 5, 6, "x y z ?dataSetName?"},
     3417    {"scale",        1, Contour3DScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     3418    {"visible",      1, Contour3DVisibleOp, 3, 4, "bool ?dataSetName?"},
     3419    {"wireframe",    1, Contour3DWireframeOp, 3, 4, "bool ?dataSetName?"}
    33193420};
    33203421static int nContour3dOps = NumCmdSpecs(contour3dOps);

  • trunk/packages/vizservers/vtkvis/protocol.txt

    r3479 r3488  
    333333          vector field, and 'vx','vy','vz' use the corresponding component of
    334334          the active vector field.
     335contour2d contourlist <list> <?dataSetName?>
    335336contour2d delete <?datasetName?>
    336337contour2d lighting <bool> <?datasetName?>
    … …  
    338339          synonym for color
    339340contour2d linewidth <val> <?datasetName?>
     341contour2d numcontours <n> <?dataSetName?>
    340342contour2d opacity <val> <?datasetName?>
    341343contour2d orient <qw> <qx> <qy> <qz> <?dataSetName?>
    … …  
    357359          vector field, and 'vx','vy','vz' use the corresponding component of
    358360          the active vector field.
     361contour3d contourlist <list> <?dataSetName?>
    359362contour3d delete <?datasetName?>
    360363contour3d edges <bool> <?datasetName?>
    … …  
    362365contour3d linecolor <r> <g> <b> <?datasetName?>
    363366contour3d linewidth <val> <?datasetName?>
     367contour3d numcontours <n> <?dataSetName?>
    364368contour3d opacity <val> <?datasetName?>
    365369contour3d orient <qw> <qx> <qy> <qz> <?dataSetName?>
Note: See TracChangeset for help on using the changeset viewer.