Changeset 1310 for trunk/packages/vizservers/nanovis

Timestamp:

Mar 11, 2009, 4:58:43 PM (15 years ago)

Author:

gah

Message:

Fixes for flow commands

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (5 diffs)
• Makefile.in (modified) (1 diff)
• nanovis.cpp (modified) (1 diff)
• nanovis.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1878 +1878 @@
 }
 
-static int
-FlowParticleVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc,
-             Tcl_Obj *const *objv)
-{
-    bool state;
-    if (GetBooleanFromObj(interp, objv[3], &state) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    NanoVis::particle_on = state;
-    return TCL_OK;
-}
-
-static int
-FlowParticleSliceOp(ClientData cdata, Tcl_Interp *interp, int objc,
+
+static int
+FlowSliceVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
@@ -1899 +1887 @@
         return TCL_ERROR;
     }
-    NanoVis::lic_axis = axis;
-    return TCL_OK;
-}
-
-static int
-FlowParticleSliceposOp(ClientData cdata, Tcl_Interp *interp, int objc,
-             Tcl_Obj *const *objv)
-{
+    int state;
+    if (Tcl_GetBooleanFromObj(interp, objv[4], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    switch (axis) {
+    case 0 :
+        NanoVis::lic_slice_x_visible = state;
+        break;
+    case 1 :
+        NanoVis::lic_slice_y_visible = state;
+        break;
+    case 2 :
+        NanoVis::lic_slice_z_visible = state;
+        break;
+    }
+    return TCL_OK;
+}
+
+static int
+FlowSlicePositionOp(ClientData cdata, Tcl_Interp *interp, int objc,
+                    Tcl_Obj *const *objv)
+{
+    int axis;
+    if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
+        return TCL_ERROR;
+    }
     float pos;
-    if (GetFloatFromObj(interp, objv[2], &pos) != TCL_OK) {
+    if (GetFloatFromObj(interp, objv[4], &pos) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1916 +1922 @@
         pos = 1.0f;
     }
-    switch (NanoVis::lic_axis) {
+    switch (axis) {
     case 0 :
         NanoVis::lic_slice_x = pos;
@@ -1930 +1936 @@
 }
 
+static Rappture::CmdSpec flowSliceOps[] = {
+    {"position",  1, FlowSlicePositionOp, 5, 5, "axis value",},
+    {"visible",   1, FlowSliceVisibleOp,  5, 5, "bool axis",},
+};
+static int nFlowSliceOps = NumCmdSpecs(flowSliceOps);
+
+static int
+FlowSliceOp(ClientData cdata, Tcl_Interp *interp, int objc,
+             Tcl_Obj *const *objv)
+{
+    Tcl_ObjCmdProc *proc;
+
+    proc = Rappture::GetOpFromObj(interp, nFlowSliceOps, flowSliceOps,
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    if (proc == NULL) {
+        return TCL_ERROR;
+    }
+    return (*proc) (cdata, interp, objc, objv);
+}
+
+static int
+FlowParticleVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc,
+             Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[3], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    NanoVis::particle_on = state;
+    return TCL_OK;
+}
+
 static Rappture::CmdSpec flowParticleOps[] = {
-    {"slice",      5, FlowParticleSliceOp,    4, 4, "index",},
-    {"slicepos",   6, FlowParticleSliceposOp, 4, 4, "value",},
     {"visible",    1, FlowParticleVisibleOp,  4, 4, "on|off",},
 };
@@ -2031 +2068 @@
     {"play",      2, FlowPlayOp,          2, 2, "",},
     {"reset",     1, FlowResetOp,         2, 2, "",},
+    {"slice",     1, FlowSliceOp,         3, 0, "oper ?args?",},
     {"vectorid",  1, FlowVectorIdOp,      3, 3, "index",},
 };

trunk/packages/vizservers/nanovis/Makefile.in

@@ -36 +36 @@
 DX_INC_SPEC     = -I$(DX_DIR)/include
 DX_LIB_SPEC     = -L$(DX_DIR)/lib_linux -lDXcallm
-FFMPEG_DIR      = @FFMPEG_DIR@
-FF_INC_SPEC     = -I$(FFMPEG_DIR)/include
-FF_LIB_SPEC     = -L$(FFMPEG_DIR)/lib -lavformat -lavcodec
+FF_LIB_SPEC     = -lavformat -lavcodec
 # might also need -lavutil
 GL_INC_SPEC     = -I/usr/include/GL

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -129 +129 @@
 bool NanoVis::config_pending = false;
 bool NanoVis::debug_flag = false;
+bool NanoVis::lic_slice_x_visible = false;
+bool NanoVis::lic_slice_y_visible = false;
+bool NanoVis::lic_slice_z_visible = false;
 
 Tcl_Interp *NanoVis::interp;

trunk/packages/vizservers/nanovis/nanovis.h

@@ -129 +129 @@
     static float lic_slice_y;
     static float lic_slice_z;
+    static bool lic_slice_x_visible;
+    static bool lic_slice_y_visible;
+    static bool lic_slice_z_visible;
     static int lic_axis;        /* 0:x, 1:y, 2:z */