Changeset 1312 for trunk/packages/vizservers/nanovis/Command.cpp

Timestamp:

Mar 12, 2009 9:03:18 AM (15 years ago)

Author:

dkearney

Message:

fix up flow capture command to automatically create a file name and remove it after use.
updated nvscripts to not send filename for capture command.
added proper destructor to AVTranslate object.

File:

• trunk/packages/vizservers/nanovis/Command.cpp (modified) (10 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1737 +1737 @@
     std::stringstream fdata;
     fdata.write(buf.bytes(),buf.size());
-    //load_vector_stream(n, fdata);
+    // load_vector_stream(n, fdata);
     load_vector_stream2(n, fdata);
     Volume *volPtr = NanoVis::volume[n];
@@ -1751 +1751 @@
     if (volPtr != NULL) {
         volPtr->set_n_slice(256-n);
-        //volPtr->set_n_slice(512-n);
+        // volPtr->set_n_slice(512-n);
         volPtr->disable_cutplane(0);
         volPtr->disable_cutplane(1);
-
         volPtr->disable_cutplane(2);
 
@@ -1766 +1765 @@
         volPtr->move(Vector3(dx0, dy0, dz0));
 
-        // 
-        volPtr->disable();
     }
 
@@ -1808 +1805 @@
     }
 
-    const char *fileName = Tcl_GetString(objv[3]);
+    char fileName[128];
+    sprintf(fileName,"/tmp/flow%d.mpeg",getpid());
+
 
     Trace("FLOW started\n");
@@ -1855 +1854 @@
     NanoVis::initParticle();
 
-    // send the movie back to the client
-    // FIXME: find a way to get the data from the movie object as a char*
+    // FIXME: find a way to get the data from the movie object as a void*
     Rappture::Buffer data;
     data.load(fileName);
@@ -1862 +1860 @@
     sprintf(command,"nv>file -bytes %lu\n",data.size());
     NanoVis::sendDataToClient(command,data.bytes(),data.size());
+    if (remove(fileName) != 0) {
+        fprintf(stderr, "Error deleting flow movie file: %s\n", fileName);
+        fflush(stderr);
+    }
 
     return TCL_OK;
@@ -1877 +1879 @@
     return TCL_OK;
 }
-
 
 static int
@@ -1907 +1908 @@
 static int
 FlowSlicePositionOp(ClientData cdata, Tcl_Interp *interp, int objc,
-                    Tcl_Obj *const *objv)
+                    Tcl_Obj *const *objv)
 {
     int axis;
@@ -1955 +1956 @@
 
     proc = Rappture::GetOpFromObj(interp, nFlowSliceOps, flowSliceOps,
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2068 +2069 @@
 
 static Rappture::CmdSpec flowOps[] = {
-    {"capture",   1, FlowCaptureOp,       4, 4, "frames filename",},
+    {"capture",   1, FlowCaptureOp,       3, 3, "frames",},
     {"data",      1, FlowDataOp,          3, 0, "oper ?args?",},
     {"lic",       1, FlowLicOp,           3, 3, "on|off",},