Changeset 4818 for nanovis/branches/1.1/Command.cpp

Timestamp:

Dec 6, 2014, 8:16:37 PM (5 years ago)

Author:

ldelgass

Message:

Merge in 'cutplane visible' command

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (23 diffs)

nanovis/branches/1.1/Command.cpp

@@ -48 +48 @@
 #include "CmdProc.h"
 #include "FlowCmd.h"
-#include "Trace.h"
 #ifdef USE_POINTSET_RENDERER
 #include "PointSet.h"
@@ -61 +60 @@
 #include "Volume.h"
 #include "VolumeRenderer.h"
+#include "Trace.h"
 
 using namespace nv::graphics;
@@ -266 +266 @@
 }
 
-
 /**
  * Used internally to decode a series of volume index values and
@@ -672 +671 @@
 }
 
-/*
- * cutplane state $bool $axis vol,,,
- */
 static int
 CutplaneStateOp(ClientData clientData, Tcl_Interp *interp, int objc,
@@ -707 +703 @@
 }
 
+static int
+CutplaneVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                  Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    std::vector<Volume *> ivol;
+    if (GetVolumes(interp, objc - 3, objv + 3, &ivol) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    std::vector<Volume *>::iterator iter;
+    for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+        (*iter)->cutplanesVisible(state);
+    }
+    return TCL_OK;
+}
+
 static Rappture::CmdSpec cutplaneOps[] = {
     {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",},
     {"state",    1, CutplaneStateOp,    4, 0, "bool axis ?indices?",},
+    {"visible",  1, CutplaneVisibleOp,  3, 0, "bool ?indices?",},
 };
 static int nCutplaneOps = NumCmdSpecs(cutplaneOps);
@@ -858 +875 @@
     }
 
-    const char *name;
-    name = Tcl_GetString(objv[1]);
-    TransferFunction *tf = NanoVis::getTransferFunction(name);
+    const char *tfName = Tcl_GetString(objv[1]);
+    TransferFunction *tf = NanoVis::getTransferFunction(tfName);
     if (tf == NULL) {
-        Tcl_AppendResult(interp, "unknown transfer function \"", name, "\"",
+        Tcl_AppendResult(interp, "unknown transfer function \"", tfName, "\"",
                              (char*)NULL);
         return TCL_ERROR;
@@ -874 +890 @@
         NanoVis::setVolumeRanges();
     }
-    NanoVis::renderLegend(tf, Volume::valueMin, Volume::valueMax, w, h, name);
+    NanoVis::renderLegend(tf, Volume::valueMin, Volume::valueMax, w, h, tfName);
     return TCL_OK;
 }
@@ -965 +981 @@
 
         // decode the data and store in a series of fields
-        Rappture::Field1D rFunc, gFunc, bFunc, wFunc;
-        int cmapc, wmapc, i;
+        Rappture::Field1D rFunc, gFunc, bFunc, aFunc;
+        int cmapc, amapc, i;
         Tcl_Obj **cmapv;
-        Tcl_Obj **wmapv;
-
-        wmapv = cmapv = NULL;
+        Tcl_Obj **amapv;
+
+        amapv = cmapv = NULL;
         if (Tcl_ListObjGetElements(interp, objv[3], &cmapc, &cmapv) != TCL_OK) {
             return TCL_ERROR;
@@ -979 +995 @@
             return TCL_ERROR;
         }
-        if (Tcl_ListObjGetElements(interp, objv[4], &wmapc, &wmapv) != TCL_OK) {
+        if (Tcl_ListObjGetElements(interp, objv[4], &amapc, &amapv) != TCL_OK) {
             return TCL_ERROR;
         }
-        if ((wmapc % 2) != 0) {
+        if ((amapc % 2) != 0) {
             Tcl_AppendResult(interp, "wrong # elements in alphamap: should be ",
                 " { v w ... }", (char*)NULL);
@@ -1006 +1022 @@
             bFunc.define(q[0], q[3]);
         }
-        for (i=0; i < wmapc; i += 2) {
+        for (i=0; i < amapc; i += 2) {
             double q[2];
             int j;
 
             for (j=0; j < 2; j++) {
-                if (Tcl_GetDoubleFromObj(interp, wmapv[i+j], &q[j]) != TCL_OK) {
+                if (Tcl_GetDoubleFromObj(interp, amapv[i+j], &q[j]) != TCL_OK) {
                     return TCL_ERROR;
                 }
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
                     Tcl_AppendResult(interp, "bad alphamap value \"",
-                        Tcl_GetString(wmapv[i+j]),
+                        Tcl_GetString(amapv[i+j]),
                         "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
             }
-            wFunc.define(q[0], q[1]);
+            aFunc.define(q[0], q[1]);
         }
         // sample the given function into discrete slots
@@ -1031 +1047 @@
             data[4*i+1] = gFunc.value(x);
             data[4*i+2] = bFunc.value(x);
-            data[4*i+3] = wFunc.value(x);
+            data[4*i+3] = aFunc.value(x);
         }
         // find or create this transfer function
@@ -1078 +1094 @@
         return TCL_ERROR;
     }
-    VolumeInterpolator* interpolator;
-    interpolator = NanoVis::volRenderer->getVolumeInterpolator();
+    VolumeInterpolator *interpolator =
+        NanoVis::volRenderer->getVolumeInterpolator();
     interpolator->start();
     if (interpolator->isStarted()) {
-        const char *fileName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
-        for (int frame_num = 0; frame_num < total; ++frame_num) {
+        const char *dirName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
+        for (int frameNum = 0; frameNum < total; ++frameNum) {
             float fraction;
 
-            fraction = ((float)frame_num) / (total - 1);
+            fraction = ((float)frameNum) / (total - 1);
             TRACE("fraction : %f", fraction);
-            //interpolator->update(((float)frame_num) / (total - 1));
             interpolator->update(fraction);
 
@@ -1101 +1116 @@
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboOrig);
 
-            NanoVis::bmpWriteToFile(frame_num, fileName);
+            NanoVis::bmpWriteToFile(frameNum, dirName);
         }
     }
@@ -1242 +1257 @@
             bytes += 5;
             nBytes -= 5;
+        } else if ((nBytes > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
+            bytes += 4;
+            nBytes -= 4;
         }
         TRACE("DX loading...");
@@ -1302 +1320 @@
 
 static Rappture::CmdSpec volumeDataOps[] = {
-    {"follows",   1, VolumeDataFollowsOp, 5, 5, "size tag",},
+    {"follows",   1, VolumeDataFollowsOp, 5, 5, "nbytes tag",},
     {"state",     1, VolumeDataStateOp,   4, 0, "bool ?indices?",},
 };
@@ -1404 +1422 @@
     return TCL_OK;
 }
-
 
 static Rappture::CmdSpec volumeOutlineOps[] = {
@@ -1654 +1671 @@
     {"delete",    2, VolumeDeleteOp,      3, 0, "?name...?",},
     {"exists",    1, VolumeExistsOp,      3, 3, "name",},
-    {"names",     1, VolumeNamesOp,       2, 3, "?pattern?",},
+    {"names",     1, VolumeNamesOp,       2, 2, "",},
     {"outline",   1, VolumeOutlineOp,     3, 0, "oper ?args?",},
     {"shading",   2, VolumeShadingOp,     3, 0, "oper ?args?",},
@@ -1661 +1678 @@
 static int nVolumeOps = NumCmdSpecs(volumeOps);
 
-/*
- * ----------------------------------------------------------------------
- * CLIENT COMMAND:
- *   volume data state on|off ?<volumeId> ...?
- *   volume outline state on|off ?<volumeId> ...?
- *   volume outline color on|off ?<volumeId> ...?
- *   volume shading transfunc <name> ?<volumeId> ...?
- *   volume shading diffuse <value> ?<volumeId> ...?
- *   volume shading specular <value> ?<volumeId> ...?
- *   volume shading opacity <value> ?<volumeId> ...?
- *   volume state on|off ?<volumeId> ...?
- *
- * Clients send these commands to manipulate the volumes.
- * ----------------------------------------------------------------------
- */
 static int
 VolumeCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
@@ -1759 +1761 @@
 
 static Rappture::CmdSpec heightMapDataOps[] = {
-    {"follows",  1, HeightMapDataFollowsOp, 5, 5, "size tag",},
-    {"visible",  1, HeightMapDataVisibleOp, 4, 0, "bool ?indices?",},
+    {"follows",  1, HeightMapDataFollowsOp, 5, 5, "size heightmapName",},
+    {"visible",  1, HeightMapDataVisibleOp, 4, 0, "bool ?heightmapNames...?",},
 };
 static int nHeightMapDataOps = NumCmdSpecs(heightMapDataOps);
@@ -1778 +1780 @@
 }
 
-
 static int
 HeightMapLineContourColorOp(ClientData clientData, Tcl_Interp *interp, int objc,
@@ -1820 +1821 @@
 
 static Rappture::CmdSpec heightMapLineContourOps[] = {
-    {"color",   1, HeightMapLineContourColorOp,   4, 4, "length",},
-    {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?indices?",},
+    {"color",   1, HeightMapLineContourColorOp,   6, 0, "r g b ?heightmapNames...?",},
+    {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?heightmapNames...?",},
 };
 static int nHeightMapLineContourOps = NumCmdSpecs(heightMapLineContourOps);
@@ -1954 +1955 @@
 }
 
-
 static int
 HeightMapOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc,
@@ -1976 +1976 @@
 
 static Rappture::CmdSpec heightMapOps[] = {
-    {"create",       2, HeightMapCreateOp,      10, 10, "tag xmin ymin xmax ymax xnum ynum values",},
+    {"create",       2, HeightMapCreateOp,      10, 10, "heightmapName xmin ymin xmax ymax xnum ynum values",},
     {"cull",         2, HeightMapCullOp,        3, 3, "mode",},
     {"data",         1, HeightMapDataOp,        3, 0, "oper ?args?",},
-    {"legend",       2, HeightMapLegendOp,      5, 5, "index width height",},
+    {"legend",       2, HeightMapLegendOp,      5, 5, "heightmapName width height",},
     {"linecontour",  2, HeightMapLineContourOp, 2, 0, "oper ?args?",},
-    {"opacity",      1, HeightMapOpacityOp,     3, 0, "value ?heightmap...? ",},
+    {"opacity",      1, HeightMapOpacityOp,     3, 0, "value ?heightmapNames...? ",},
     {"polygon",      1, HeightMapPolygonOp,     3, 3, "mode",},
     {"shading",      1, HeightMapShadingOp,     3, 3, "model",},
-    {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?heightmap...?",},
+    {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?heightmapNames...?",},
 };
 static int nHeightMapOps = NumCmdSpecs(heightMapOps);