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

Timestamp:

Mar 14, 2009, 4:20:03 PM (15 years ago)

Author:

gah

Message:

Clean up of warnings, outcomes

File:

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

trunk/packages/vizservers/nanovis/Command.cpp

@@ -97 +97 @@
 extern Texture2D* plane[10];
 
-extern Rappture::Outcome load_volume_stream(int index, std::iostream& fin);
-extern Rappture::Outcome load_volume_stream_odx(int index, const char *buf,
-                        int nBytes);
-extern Rappture::Outcome load_volume_stream2(int index, std::iostream& fin);
+bool load_volume_stream(Rappture::Outcome &status, int index, 
+                        std::iostream& fin);
+bool load_volume_stream_odx(Rappture::Outcome &status, int index, 
+        const char *buf, int nBytes);
+extern bool load_volume_stream2(Rappture::Outcome &status, int index, 
+        std::iostream& fin);
 extern void load_volume(int index, int width, int height, int depth,
             int n_component, float* data, double vmin, double vmax,
             double nzero_min);
-extern void load_vector_stream(int index, std::istream& fin);
-extern void load_vector_stream2(int index, std::istream& fin);
+extern bool load_vector_stream(Rappture::Outcome &result, int index, 
+        std::istream& fin);
+extern bool load_vector_stream2(Rappture::Outcome &result, int index, 
+        std::istream& fin);
 
 // Tcl interpreter for incoming messages
@@ -679 +683 @@
     }
     if (NanoVis::recfile != NULL) {
-        fwrite(buf.bytes(), sizeof(char), buf.size(), NanoVis::recfile);
+        ssize_t nWritten;
+
+        nWritten = fwrite(buf.bytes(), sizeof(char), buf.size(), 
+                          NanoVis::recfile);
+        assert(nWritten == (ssize_t)buf.size());
         fflush(NanoVis::recfile);
     }
@@ -689 +697 @@
             printf("ERROR -- DECODING\n");
             fflush(stdout);
-            Tcl_AppendResult(interp, err.remark().c_str(), (char*)NULL);
+            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
             return TCL_ERROR;
         }
@@ -1296 +1304 @@
         std::stringstream fdata;
         fdata.write(buf.bytes(),buf.size());
-        err = load_volume_stream3(n, fdata);
-        if (err) {
-            Tcl_AppendResult(interp, err.remark().c_str(), (char*)NULL);
+        if (!load_volume_stream3(err, n, fdata)) {
+            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
             return TCL_ERROR;
         }
@@ -1307 +1314 @@
         printf("Loading DX using OpenDX library...\n");
         fflush(stdout);
-        err = load_volume_stream_odx(n, buf.bytes()+5, buf.size()-5);
-        if (err) {
-            Tcl_AppendResult(interp, err.remark().c_str(), (char*)NULL);
+        if (!load_volume_stream_odx(err, n, buf.bytes()+5, buf.size()-5)) {
+            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
             return TCL_ERROR;
         }
@@ -1320 +1326 @@
         fdata.write(buf.bytes(),buf.size());
 
+        bool result;
 #if ISO_TEST
-        err = load_volume_stream2(n, fdata);
+        result = load_volume_stream2(err, n, fdata);
 #else
-        err = load_volume_stream(n, fdata);
+        result = load_volume_stream(err, n, fdata);
 #endif
-        if (err) {
-            Tcl_AppendResult(interp, err.remark().c_str(), (char*)NULL);
+        if (!result) {
+            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
             return TCL_ERROR;
         }
@@ -1351 +1358 @@
         Volume *volPtr;
         char info[1024];
+        ssize_t nWritten;
 
         if (Volume::update_pending) {
@@ -1360 +1368 @@
                 n, volPtr->wAxis.min(), volPtr->wAxis.max(),
                 Volume::valueMin, Volume::valueMax);
-        write(0, info, strlen(info));
+        nWritten  = write(0, info, strlen(info));
+        assert(nWritten == (ssize_t)strlen(info));
     }
     return TCL_OK;
@@ -1723 +1732 @@
                     Tcl_Obj *const *objv)
 {
+    Rappture::Outcome result;
+
     Trace("Flow Data Loading\n");
 
@@ -1737 +1748 @@
     std::stringstream fdata;
     fdata.write(buf.bytes(),buf.size());
-    // load_vector_stream(n, fdata);
-    load_vector_stream2(n, fdata);
+    // load_vector_stream(result, n, fdata);
+
+    if (!load_vector_stream2(result, n, fdata)) {
+        Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+        return TCL_ERROR;
+    }
     Volume *volPtr = NanoVis::volume[n];
 
@@ -1793 +1808 @@
              Tcl_Obj *const *objv)
 {
+    Rappture::Outcome result;
     int total_frame_count;
 
@@ -1806 +1822 @@
 
     char fileName[128];
-    sprintf(fileName,"/tmp/flow%d.mpeg",getpid());
+    sprintf(fileName,"/tmp/flow%d.mpeg", getpid());
 
 
     Trace("FLOW started\n");
 
-    Rappture::AVTranslate movie(NanoVis::win_width,NanoVis::win_height);
+    Rappture::AVTranslate movie(NanoVis::win_width, NanoVis::win_height);
 
     int pad = 0;
@@ -1818 +1834 @@
     }
 
-    movie.init(fileName);
+    movie.init(result, fileName);
 
     for (int frame_count = 0; frame_count < total_frame_count; frame_count++) {
@@ -1839 +1855 @@
         // this is done before bmp_write_to_file because bmp_write_to_file
         // turns rgb data to bgr
-        movie.append(NanoVis::screen_buffer,pad);
+        movie.append(result, NanoVis::screen_buffer,pad);
         // NanoVis::bmp_write_to_file(frame_count, fileName);
     }
 
-    movie.close();
+    movie.done(result);
     Trace("FLOW end\n");
 
@@ -1858 +1874 @@
     data.load(fileName);
     char command[512];
-    sprintf(command,"nv>file -bytes %lu\n",data.size());
-    NanoVis::sendDataToClient(command,data.bytes(),data.size());
+    sprintf(command,"nv>file -bytes %lu\n", (unsigned long)data.size());
+    NanoVis::sendDataToClient(command,data.bytes(), data.size());
     if (remove(fileName) != 0) {
         fprintf(stderr, "Error deleting flow movie file: %s\n", fileName);
@@ -2818 +2834 @@
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
         fprintf(NanoVis::logfile, "WARNING: bad default transfer function\n");
-        fprintf(NanoVis::logfile, Tcl_GetStringResult(interp));
+        fprintf(NanoVis::logfile, "%s\n", Tcl_GetStringResult(interp));
     }
     return interp;