Changeset 1295 for trunk/packages/vizservers

Timestamp:

Mar 6, 2009, 9:27:24 PM (16 years ago)

Author:

dkearney

Message:

adding flowvisviewer widget and flowvis-test program for exercising flow
commands. most stuff works in the flowvis-test gui, there are not transfer
functions or legends. play/pause, stop and record work, record download's or
saves the video file to users's desktop. adding iconc for pause, record and
stop.

added "flow play" command to nanovis. the goal of this command is to send back
the next frame to the client. the play functionality allows users to see
frames as if they were a movie, and also send command nanovis server. this
makes the experience more interactive than waiting for a movie to be made and
downloading it. also the play functionality can be used as a cheap preview to
get the best angle and settings before recording the movie.

added sendDataToClient function to nanovis server so i could send back movie
files. we create the movie on the render server and send back the mpeg binary
for the user to download. the function is pretty general so it can be used to
send any blob of data.

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (4 diffs)
• nanovis.cpp (modified) (1 diff)
• nanovis.h (modified) (4 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1848 +1848 @@
     }
     NanoVis::initParticle();
+
+    // send the movie back to the client
+    // FIXME: find a way to get the data from the movie object as a char*
+    Rappture::Buffer data;
+    data.load(fileName);
+    char command[512];
+    sprintf(command,"nv>file -bytes %lu\n",data.size());
+    NanoVis::sendDataToClient(command,data.bytes(),data.size());
+
     return TCL_OK;
 }
@@ -1936 +1945 @@
 
 static int
+FlowPlayOp(ClientData cdata, Tcl_Interp *interp, int objc,
+             Tcl_Obj *const *objv)
+{
+    if (NanoVis::licRenderer &&
+        !NanoVis::licRenderer->isActivated()) {
+        NanoVis::licRenderer->activate();
+    }
+    if (NanoVis::particleRenderer &&
+        !NanoVis::particleRenderer->isActivated()) {
+        NanoVis::particleRenderer->activate();
+    }
+
+    Trace("sending flow playback frame\n");
+
+    // Generate the latest frame and send it back to the client
+    if (NanoVis::licRenderer &&
+        NanoVis::licRenderer->isActivated()) {
+        NanoVis::licRenderer->convolve();
+    }
+    if (NanoVis::particleRenderer &&
+        NanoVis::particleRenderer->isActivated()) {
+        NanoVis::particleRenderer->advect();
+    }
+    NanoVis::offscreen_buffer_capture();  //enable offscreen render
+    NanoVis::display();
+
+    NanoVis::read_screen();
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+    // NanoVis::bmp_write_to_file(frame_count, fileName);
+
+    Trace("FLOW end\n");
+    return TCL_OK;
+}
+
+static int
 FlowResetOp(ClientData cdata, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
@@ -1973 +2018 @@
     {"data",      1, FlowDataOp,          3, 0, "oper ?args?",},
     {"lic",       1, FlowLicOp,           3, 3, "on|off",},
-    {"particle",  1, FlowParticleOp,      3, 0, "oper ?args?",},
+    {"particle",  2, FlowParticleOp,      3, 0, "oper ?args?",},
+    {"play",      2, FlowPlayOp,          2, 2, "",},
     {"reset",     1, FlowResetOp,         2, 2, "",},
     {"vectorid",  1, FlowVectorIdOp,      3, 3, "index",},
@@ -1983 +2029 @@
  * CLIENT COMMAND:
  *   flow data follows <value>
- *   flow capture
+ *   flow capture frames filename
  *   flow lic on|off
  *   flow particle visible on|off
  *   flow particle slice <volumeId>
  *   flow particle slicepos <value>
+ *   flow play
  *   flow reset
  *   flow vectorid <volumeId>

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -1243 +1243 @@
     stats.nFrames++;
     stats.nBytes += (bytesPerRow * win_height);
+}
+
+void
+NanoVis::sendDataToClient(const char *command, const char *data, size_t dlen)
+{
+/*
+    char header[200];
+
+    // Generate the PPM binary file header
+    sprintf(header, "P6 %d %d %d\n", win_width, win_height, PPM_MAXVAL);
+
+    size_t header_length = strlen(header);
+    size_t data_length = win_width * win_height * 3;
+
+    char command[200];
+    sprintf(command, "%s %lu\n", prefix, 
+            (unsigned long)header_length + data_length);
+*/
+
+//    size_t wordsPerRow = (win_width * 24 + 31) / 32;
+//    size_t bytesPerRow = wordsPerRow * 4;
+//    size_t rowLength = win_width * 3;
+    size_t nRecs = 2;
+
+    struct iovec *iov;
+    iov = (struct iovec *)malloc(sizeof(struct iovec) * nRecs);
+
+    // Write the nanovisviewer command, then the image header and data.
+    // Command
+// FIXME: shouldn't have to cast this
+    iov[0].iov_base = (char *)command;
+    iov[0].iov_len = strlen(command);
+    // Data
+// FIXME: shouldn't have to cast this
+    iov[1].iov_base = (char *)data;
+    iov[1].iov_len = dlen;
+    writev(0, iov, nRecs);
+    free(iov);
+    // stats.nFrames++;
+    // stats.nBytes += (bytesPerRow * win_height);
 }
 

trunk/packages/vizservers/nanovis/nanovis.h

@@ -147 +147 @@
     static TransferFunction* get_transfunc(const char *name);
     static TransferFunction* DefineTransferFunction(const char *name, 
-        size_t n, float *data);
+        size_t n, float *data);
     static void SetVolumeRanges(void);
     static void SetHeightmapRanges(void);
@@ -157 +157 @@
     static void resize_offscreen_buffer(int w, int h);
     static void ppm_write(const char *prefix);
+    static void sendDataToClient(const char *command, const char *data,
+        size_t dlen);
     static void bmp_write(const char *prefix);
     static void bmp_write_to_file(int frame_number, const char* directory_name);
@@ -164 +166 @@
     static void display_offscreen_buffer();
     static int render_legend(TransferFunction *tf, double min, double max, 
-        int width, int height, const char* volArg);
+        int width, int height, const char* volArg);
     static Volume *load_volume(int index, int width, int height, int depth, 
-        int n, float* data, double vmin, double vmax, double nzero_min);
+        int n, float* data, double vmin, double vmax, double nzero_min);
     static void xinetd_listen(void);
     static int render_2d_contour(HeightMap* heightmap, int width, int height);
@@ -182 +184 @@
 
     static void read_screen(void) {
-        glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, 
-                     screen_buffer);
+        glReadPixels(0, 0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE, 
+                screen_buffer);
     }
     static void offscreen_buffer_capture(void) {
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
     }
 };