Changeset 906 for trunk

Timestamp:

Feb 26, 2008, 1:13:19 PM (17 years ago)

Author:

kostmo

Message:

preliminary automation of movie generation

Location:

trunk

Files:

• gui/apps/nanovis-test (modified) (3 diffs)
• vizservers/karl_start_viz.sh.in (added)
• vizservers/nanovis/Command.cpp (modified) (6 diffs)
• vizservers/nanovis/nanovis.cpp (modified) (1 diff)

trunk/gui/apps/nanovis-test

@@ -134 +134 @@
 
 # ----------------------------------------------------------------------
+# USAGE: karl_send_command <cmd>
+#
+# Used internally in this script (not from command prompt)
+# ----------------------------------------------------------------------
+proc karl_send_command {cmd} {
+    global widgets
+
+    namespace eval Rappture::NanovisViewer [list $widgets(nanovis) _send_text $cmd]
+
+#    $widgets(command) delete 0 end
+}
+
+# ----------------------------------------------------------------------
 # USAGE: reset
 #
@@ -187 +200 @@
 proc karl_activate_flow {} {
 
-        puts "Activating flow..."
+        global img_storage_dir
+        puts "Preparing images..."
 
         # sequence of commands to initilize flow visualization go here
-        test
+        karl_send_command {test}
+        karl_send_command {flow vectorid 0}
+        karl_send_command {flow particle visible on}
+
+        set renderserver render05
+        set img_storage_dir [exec ssh $renderserver mktemp -d /tmp/animation.XXXXXX]
+        karl_send_command "flow capture 117 $img_storage_dir"
 }
 
@@ -199 +219 @@
 proc karl_flow_movie {} {
 
-        puts "Flow Movie"   
-        set img_storage_dir [exec mktemp -d /tmp/animation.XXXXXX]
-        puts $img_storage_dir
-
-        # flow animation command sequence goes here
-#       flow capture 100 $img_storage_dir
-        ## ??
-
-        cd $img_storage_dir
-
-        # get rid of this once the animation command sequence works
-        return
+        global img_storage_dir
+        set renderserver render05
+
 
         if {0} {
                 # create animated gif:
                 puts "creating animated gif..."
-                exec convert -delay 20 -loop 0 image*.bmp animated_flow.gif
+                exec ssh $renderserver convert -delay 20 -loop 0 $img_storage_dir/image*.bmp $img_storage_dir/animated_flow.gif
         } else {
                 # create mpeg movie:
-                puts "creating mpeg movie..."
-
-                exec mogrify -format jpg *.bmp
-                exec ffmpeg -i image%03.jpg cool.mpg
-                exec rm *.jpg
+                puts "creating mpeg movie in $img_storage_dir"
+                
+                exec ssh $renderserver "cd $img_storage_dir && mogrify -format jpg *.bmp && ffmpeg -i image%03d.jpg flow_movie.mpg 2>/dev/null && rm *.jpg"
         }
-        exec rm *.bmp
-
-        # Now present the .mpg or .gif file to the user for downloading
+
+        # Now present the .mpg or .gif file to the user to download
         ## ??
 
+        return
+
         # Finally, delete the temporary animation directory we have created
-        exec rmdir $img_storage_dir
+        exec ssh $renderserver rmdir $img_storage_dir
 }
 

trunk/vizservers/nanovis/Command.cpp

@@ -75 +75 @@
 #include "Test.h"
 #endif
+#include "Test.h"
 // EXTERN DECLARATIONS
 // in Nv.cpp
@@ -1241 +1242 @@
                     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
             
-//                  NanoVis::bmp_write_to_file(frame_num, directory_name);
-                    NanoVis::bmp_write_to_file(frame_num, NULL);
+                    if (argc < 5)
+                        NanoVis::bmp_write_to_file(frame_num, NULL);
+                    else
+                        NanoVis::bmp_write_to_file(frame_num, (char*) argv[4]);
                 }
             }
@@ -1330 +1333 @@
             }
             int state;
-            if (Tcl_GetBoolean(interp, argv[2], &state) != TCL_OK) {
+            if (Tcl_GetBoolean(interp, argv[3], &state) != TCL_OK) {
                 return TCL_ERROR;
             }
@@ -1380 +1383 @@
         NanoVis::initParticle();
     } else if ((c == 'c') && (strcmp(argv[1],"capture") == 0)) {
-        if (argc != 3) {
+        if (argc > 4 || argc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                " capture numframes\"", (char*)NULL);
+                " capture numframes [directory]\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1397 +1400 @@
         }
         // Karl
+        //
+        Trace("FLOW started\n");
         for (int frame_count = 0; frame_count < total_frame_count; 
              frame_count++) {
@@ -1416 +1421 @@
             NanoVis::read_screen();
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+            if (argc < 4)
+                NanoVis::bmp_write_to_file(frame_count, NULL);
+            else
+                NanoVis::bmp_write_to_file(frame_count, (char*) argv[3]);
             
-            NanoVis::bmp_write_to_file(frame_count, NULL);
-//            NanoVis::bmp_write_to_file(frame_count, directory_name);
-        }
+        }
+        Trace("FLOW end\n");
         // put your code... 
         if (NanoVis::licRenderer) {

trunk/vizservers/nanovis/nanovis.cpp

@@ -864 +864 @@
         printf("Writing %s\n", filename);
         f = fopen(filename, "wb");
+        if (f == 0)
+        {
+                Trace("cannot create file\n");
+        }
     }
     else {
         f = fopen("/tmp/image.bmp", "wb");
+        if (f == 0)
+        {
+                Trace("cannot create file\n");
+        }
     }
     fwrite((void*) header, sizeof(header), 1, f);