Changeset 1497 for trunk/packages/vizservers/nanovis/FlowCmd.cpp

Timestamp:

Jun 9, 2009 5:25:13 PM (15 years ago)

Author:

gah

Message:

added particle size option, movie token for flowvis

File:

• trunk/packages/vizservers/nanovis/FlowCmd.cpp (modified) (7 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -87 +87 @@
     {Rappture::SWITCH_CUSTOM, "-position", "number",
         offsetof(FlowParticlesValues, position), 0, 0, &positionSwitch},
+    {Rappture::SWITCH_FLOAT, "-size", "float",
+        offsetof(FlowParticlesValues, particleSize), 0},
     {Rappture::SWITCH_END}
 };
@@ -155 +157 @@
     _rendererPtr->setColor(Vector4(_sv.color.r, _sv.color.g, _sv.color.b, 
                 _sv.color.a));
+    _rendererPtr->particleSize(_sv.particleSize);
     _rendererPtr->setAxis(_sv.position.axis);
     _rendererPtr->active(!_sv.isHidden);
@@ -1908 +1911 @@
     Trace("FLOW started\n");
 
-    Rappture::Outcome result;
+    Rappture::Outcome context;
     Rappture::AVTranslate movie(width, height, frameRate, bitRate);
 
@@ -1916 +1919 @@
     }
 
-    movie.init(result, fileName);
+    movie.init(context, fileName);
 
     for (int i = 0; i < numFrames; i++) {
@@ -1931 +1934 @@
         // This is done before bmp_write_to_file because bmp_write_to_file
         // turns rgb data to bgr
-        movie.append(result, NanoVis::screen_buffer, pad);
+        movie.append(context, NanoVis::screen_buffer, pad);
         // NanoVis::bmp_write_to_file(frame_count, fileName);
     }
 
-    movie.done(result);
+    movie.done(context);
     Trace("FLOW end\n");
 
@@ -1947 +1950 @@
     // FIXME: find a way to get the data from the movie object as a void*
     Rappture::Buffer data;
-    if (!data.load(result, fileName)) {
+    if (!data.load(context, fileName)) {
         Tcl_AppendResult(interp, "can't load data from temporary movie file \"",
-                fileName, "\": ", result.remark(), (char *)NULL);
+                fileName, "\": ", context.remark(), (char *)NULL);
         return TCL_ERROR;
     }
     // Build the command string for the client.
     char command[200];
-    sprintf(command,"nv>image -bytes %lu -type movie -token token\n", 
-            (unsigned long)data.size());
+    sprintf(command,"nv>image -bytes %lu -type movie -token \"%s\"\n", 
+            (unsigned long)data.size(), Tcl_GetString(objv[7]));
 
     NanoVis::sendDataToClient(command, data.bytes(), data.size());
@@ -1982 +1985 @@
     {"next",     2, FlowNextOp,    2, 2, "",},
     {"reset",    1, FlowResetOp,   2, 2, "",},
-    {"video",    1, FlowVideoOp,   7, 7,        
-        "width height numFrames frameRate bitRate ",},
+    {"video",    1, FlowVideoOp,   8, 8,        
+        "width height numFrames frameRate bitRate token",},
 };
 static int nFlowCmdOps = NumCmdSpecs(flowCmdOps);