Text archives Help

---

Author: abe
Date: Sun Oct 30 17:19:02 2005
New Revision: 682

Added:
   branches/itanium2/StandAlone/v3c1_tools.cc
      - copied unchanged from r681, 
branches/itanium2/Readers/DoubleEagle/vn2v3c1.cc
Removed:
   branches/itanium2/Readers/DoubleEagle/
Modified:
   branches/itanium2/Readers/CMakeLists.txt
   branches/itanium2/StandAlone/CMakeLists.txt
   branches/itanium2/StandAlone/manta_path_plot.pl
   branches/itanium2/fox/FMantaKdExplorer.cc
Log:

Moved the vn2v3c1 program to StandAlone/v3c1_tools. The program was added to 
preprocess the Double Eagle tanker but evolved into a 
more general purpose tool for working with .v3c1 input files (and the 
associated files as well).

Note enable BUILD_V3C1_TOOLS in ccmake to use.

D    Readers/DoubleEagle
M    Readers/CMakeLists.txt
A    StandAlone/v3c1_tools.cc
M    StandAlone/CMakeLists.txt

Fixed compile warning.
M    fox/FMantaKdExplorer.cc

M    StandAlone/manta_path_plot.pl



Modified: branches/itanium2/Readers/CMakeLists.txt
==============================================================================
--- branches/itanium2/Readers/CMakeLists.txt    (original)
+++ branches/itanium2/Readers/CMakeLists.txt    Sun Oct 30 17:19:02 2005
@@ -1,13 +1,5 @@
 
-SET (READERS_DOUBLE_EAGLE 0 CACHE BOOL "Include Double Eagle Tanker 
Conversion Program")
-IF (READERS_DOUBLE_EAGLE) 
-   ADD_EXECUTABLE(vn2v3c1 DoubleEagle/vn2v3c1.cc)
-   TARGET_LINK_LIBRARIES(vn2v3c1 SCIRun_Core Manta_Core Manta_Model)
-   TARGET_LINK_LIBRARIES(vn2v3c1 ${CMAKE_THREAD_LIBS_INIT}                   
                
-                                 ${OPENGL_LIBRARIES}                         
                 
-                                 ${X11_LIBRARIES}                            
                 
-                                 -lm)  
-ENDIF(READERS_DOUBLE_EAGLE)
+
 
 
 SET (READERS_SOURCES)

Modified: branches/itanium2/StandAlone/CMakeLists.txt
==============================================================================
--- branches/itanium2/StandAlone/CMakeLists.txt (original)
+++ branches/itanium2/StandAlone/CMakeLists.txt Sun Oct 30 17:19:02 2005
@@ -29,6 +29,16 @@
                                  ${CMAKE_THREAD_LIBS_INIT}
                                  )
 
+SET (BUILD_V3C1_TOOLS 0 CACHE BOOL "Include .v3c1 tools")
+IF (BUILD_V3C1_TOOLS) 
+   ADD_EXECUTABLE(v3c1_tools v3c1_tools.cc)
+   TARGET_LINK_LIBRARIES(v3c1_tools SCIRun_Core Manta_Core Manta_Model)
+   TARGET_LINK_LIBRARIES(v3c1_tools ${CMAKE_THREAD_LIBS_INIT}                
                   
+                                    ${OPENGL_LIBRARIES}                      
                    
+                                    ${X11_LIBRARIES}                         
                    
+                                    -lm)  
+ENDIF(BUILD_V3C1_TOOLS)
+
 IF(SGI_LINUX)
   ADD_EXECUTABLE(mf_stream_test mf_stream_test.cc)
   TARGET_LINK_LIBRARIES(mf_stream_test Manta_Engine

Modified: branches/itanium2/StandAlone/manta_path_plot.pl
==============================================================================
--- branches/itanium2/StandAlone/manta_path_plot.pl     (original)
+++ branches/itanium2/StandAlone/manta_path_plot.pl     Sun Oct 30 17:19:02 
2005
@@ -18,7 +18,7 @@
 $path_last     = 0;
 $path_warmup   = 10;
 $title         = "Manta Camera Path Benchmark";
-$plot_x        = 1;
+$plot_x        = 2;
 $plot_y        = 5;
 $plot_columns  = 5;
 $keep          = 1;
@@ -87,7 +87,7 @@
     print "-interval   <m> <n>\n";
     print "-warmup     <n>\n";
     print "-title      <title>\n";
-    print "-plot       <x> <y> (default column 1 and 5)\n";
+    print "-plot       <x> <y> (default column $plot_x and $plot_y)\n";
     print "-columns    <n> (number of columns in manta output, default 5)\n";
     print "            Column info is passed to gnuplot, first column is 1 
not 0.\n";
     print "-[no]keep   (keep temporary files, default on)\n";
@@ -197,6 +197,8 @@
             exit(1);
         }
 
+        print "RUNNING COMMAND: $command\n";
+
         # Open a pipe to manta.
         if (!open( MANTA, "-|", $command )) {
             print "Could not execute line $line: $command\n";
@@ -350,7 +352,7 @@
 $plot = "plot ";
 for ($i=0; $i<@out_array; ++$i) {
 
-    print HTML "subtitle_array[$i]: $command_array[$i]\n";
+    print HTML "$subtitle_array[$i]: $command_array[$i]\n";
 
     $plot = $plot . "\"$out_array[$i]\" using 
$plot_x_array[$i]:$plot_y_array[$i] title \"$subtitle_array[$i]\" ";
     if ($i < (@out_array)-1) {

Modified: branches/itanium2/fox/FMantaKdExplorer.cc
==============================================================================
--- branches/itanium2/fox/FMantaKdExplorer.cc   (original)
+++ branches/itanium2/fox/FMantaKdExplorer.cc   Sun Oct 30 17:19:02 2005
@@ -100,7 +100,7 @@
 
   // Depth label.
   FXString depth_string;
-  depth_string.format( "Current depth: %d", node_stack.size() );
+  depth_string.format( "Current depth: %d", (int)node_stack.size() );
   depth_label->setText( depth_string );
 
   // Node label.

---

• [MANTA] r682 - in branches/itanium2: Readers Readers/DoubleEagle StandAlone fox, abe, 10/30/2005

---

Archive powered by MHonArc 2.6.16.