Changeset 872

Timestamp:

Feb 8, 2008 2:01:38 PM (15 years ago)

Author:

dkearney

Message:

mainly code cleanups that i've made and stored in my repository over time.

Location:

trunk

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (1 diff)
• examples/c-example/compress.c (modified) (2 diffs)
• examples/c-example/compress.cc (modified) (1 diff)
• examples/c-example/plot.cc (modified) (3 diffs)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/field2dresult.tcl (modified) (1 diff)
• perl/Makefile.PL.in (modified) (4 diffs)
• perl/Rappture.xs (modified) (1 diff)
• src/core/RpLibrary.cc (modified) (1 diff)
• tcl/scripts/result.tcl (modified) (1 diff, 1 prop)

trunk/configure

@@ -1750 +1750 @@
 
 if test "${libdir}" != "${prefix}/lib"; then
-    LIB_SEARCH_DIRS="-L ${prefix}/lib -L ${libdir}"
-else
-    LIB_SEARCH_DIRS="-L ${libdir}"
+    LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
+else
+    LIB_SEARCH_DIRS="-L${libdir}"
 fi
 
@@ -5198 +5198 @@
 echo "${ECHO_T}${MEXEXT}" >&6; }
         else
-            echo "can't find the matlab compiler \"mex\""
+                                    echo "can't find the matlab compiler \"mex\""
             echo "use --with-matlab=DIR to specify the location of a matlab installation"
-            exit 1
-        fi
+                    fi
     fi
 fi
@@ -5227 +5226 @@
         if test -x "$with_octave/bin/mkoctfile"
         then
-            echo Found octave in $with_octave/bin/mkoctfile
-            MKOCTFILE="$with_octave/bin/mkoctfile"
+                        MKOCTFILE="$with_octave/bin/mkoctfile"
         else
             if test -x "$with_octave"
@@ -5275 +5273 @@
 
 
+                if test "x$MKOCTFILE" == "x" ; then
+                                                            echo "can't find the matlab compiler \"mkoctfile\""
+                    echo "use --with-octave=DIR to specify the location of a mkoctfile installation"
+                                    fi
             fi
         fi

trunk/configure.in

@@ -16 +16 @@
 
 if test "${libdir}" != "${prefix}/lib"; then
-    LIB_SEARCH_DIRS="-L ${prefix}/lib -L ${libdir}"
+    LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
 else
-    LIB_SEARCH_DIRS="-L ${libdir}"
+    LIB_SEARCH_DIRS="-L${libdir}"
 fi
 

trunk/examples/c-example/compress.c

@@ -13 +13 @@
 
     RpLibrary* lib = NULL;
+    RapptureBuffer buf;
 
     const char* xmlFilePath = NULL;
@@ -39 +40 @@
         dxFilePath,RPLIB_COMPRESS,RPLIB_OVERWRITE);
 
+    RapptureBufferInit(&buf);
+    rpGetData(lib,"output.field(dxFile1).component.dx",&buf);
+    RapptureBufferDecode(&buf,1,1);
+    RapptureBufferDump(&buf,"bufferDump.txt");
+    RapptureBufferFree(&buf);
+
     // write output to run file and signal
     rpResult(lib);
 
+    rpFreeLibrary(&lib);
+
     return 0;
 }

trunk/examples/c-example/compress.cc

@@ -43 +43 @@
     // write output to run file and signal
     lib->result();
+    delete lib;
 
     return 0;

trunk/examples/c-example/plot.cc

@@ -58 +58 @@
     else {
         printf("lib->xml() failed\n");
+        delete lib;
         exit(1);
     }
@@ -66 +67 @@
     if ( xmltext.empty() ) {
         std::cout << "lib->getString(input.number(xmin).current) returns null" << std::endl;
+        delete lib;
         exit(1);
     }
@@ -109 +111 @@
     lib->result();
 
+    delete lib;
+
     return 0;
 }

trunk/gui/scripts/field.tcl

@@ -287 +287 @@
             }
             2D - 3D {
-                if {[info exists _comp2unirect2d($comp)]} {
-                    set limits [$_comp2unirect2d($comp) limits $which]
-                    foreach {vmin vmax} $limits break
-                    set axis vaxis
+                if {[info exists _comp2unirect2d($comp)]} {
+                    set limits [$_comp2unirect2d($comp) limits $which]
+                    foreach {vmin vmax} $limits break
+                    set axis vaxis
                 } elseif {[info exists _comp2vtk($comp)]} {
                     foreach {xv yv} $_comp2vtk($comp) break

trunk/gui/scripts/field2dresult.tcl

@@ -62 +62 @@
     array set flags $args
     if { $flags(-mode) == "heightmap" } {
-        set servers [Rappture::NanovisServer::getServer]
-        if { $servers == "" } {
-            error "No nanovis servers available"
-        }
+        set servers [Rappture::NanovisServer::getServer]
+        if { $servers == "" } {
+            error "No nanovis servers available"
+        }
         itk_component add renderer {
             Rappture::HeightmapViewer $itk_interior.ren $servers

trunk/perl/Makefile.PL.in

@@ -22 +22 @@
                      );
     }
+    @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
+        "../include", "/usr/local/include", "/opt/include");
+    $RAPPTURE_INC = "rappture.h";
     @EXPAT_INC_SEARCHPATH = ( "@prefix@/include",
         "/usr/local/include", "/opt/include", "../../expat-2.0.0/lib",
@@ -27 +30 @@
         "/opt/expat-2.0.0/lib", "/opt/expat/lib" );
     $EXPAT_INC="expat.h";
-    @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
-        "../include", "/usr/local/include", "/opt/include");
-    $RAPPTURE_INC = "rappture.h";
+    @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
+        "@libdir@",
+        "../src", "/usr/local/lib", "/opt/lib" );
+    @RAPPTURE_LIBS=("librappture.so","librappture.a");
     @EXPAT_LIB_SEARCHPATH = ( "@prefix@/lib",
         "@libdir@",
@@ -36 +40 @@
         "/opt/expat-2.0.0/lib", "/opt/expat/lib" );
     @EXPAT_LIBS=("libexpat.so", "libexpat.a");
-    @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
-        "@libdir@",
-        "../src", "/usr/local/lib", "/opt/lib" );
-    @RAPPTURE_LIBS=("librappture.so","librappture.a");
 }
 else {
@@ -115 +115 @@
 }
 
+find_include(\@RAPPTURE_INC_SEARCHPATH, $RAPPTURE_INC, \@INCLUDES);
 find_include(\@EXPAT_INC_SEARCHPATH, $EXPAT_INC, \@INCLUDES);
-find_include(\@RAPPTURE_INC_SEARCHPATH, $RAPPTURE_INC, \@INCLUDES);
+find_lib(\@RAPPTURE_LIB_SEARCHPATH, \@RAPPTURE_LIBS, \@LIBS);
 find_lib(\@EXPAT_LIB_SEARCHPATH, \@EXPAT_LIBS, \@LIBS);
-find_lib(\@RAPPTURE_LIB_SEARCHPATH, \@RAPPTURE_LIBS, \@LIBS);
 
 WriteMakefile(

trunk/perl/Rappture.xs

@@ -67 +67 @@
 void
 RpLibrary::result()
+        CODE:
+                THIS->put("tool.version.rappture.language", "perl");
+                THIS->result();
 
 MODULE = Rappture               PACKAGE = Rappture::RpUnits

trunk/src/core/RpLibrary.cc

@@ -2242 +2242 @@
         if (user != NULL) {
             username = std::string(user);
-        }
-        host = getenv("HOST");
-        if (host != NULL) {
-            hostname = std::string(host);
+        } else {
+            user = getenv("LOGNAME");
+            if (user != NULL) {
+                username = std::string(user);
+            }
         }
 #endif

trunk/tcl/scripts/result.tcl

@@ -40 +40 @@
     }
 
+    $libobj put tool.version.rappture.revision "$LastChangedRevision$"
+    $libobj put tool.version.rappture.modified "$LastChangedDate$"
+    $libobj put tool.version.rappture.language "tcl"
+
     if {[info exists tcl_platform(user)]} {
         $libobj put output.user $tcl_platform(user)