Changeset 3733

Timestamp:

Jul 1, 2013, 3:44:49 PM (11 years ago)

Author:

gah

Message:

add octave/MATLAB version of example

Location:

trunk

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (3 diffs)
• examples/zoo/mesh/mesh.m (modified) (1 diff)
• examples/zoo/mesh/mesh.tcl (modified) (3 diffs)
• gui/scripts/gauge.tcl (modified) (1 diff)
• gui/scripts/vtkheightmapviewer.tcl (modified) (1 diff)
• lang/tcl/pkgIndex.tcl.in (modified) (2 diffs)
• lang/tcl/src/Rappture_Init.c (modified) (1 diff)
• lang/tcl/src/RpLibraryTclInterface.cc (modified) (1 diff)

trunk/configure

@@ -671 +671 @@
 OCTAVE_VERSION_MAJOR
 OCTAVE_VERSION
+SVN_VERSION
 MKOCTFILE3
 MKOCTFILE2
@@ -7287 +7288 @@
 
 
+SVN_VERSION=`svnversion $srcdir`
+
 make_command=""
 for m in "$MAKE" make gmake gnumake ; do
@@ -10150 +10153 @@
 
 
+
 ac_configure_args="--disable-threads --enable-shared"
 
@@ -10156 +10160 @@
 
 
-ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
+ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -10895 +10899 @@
     "lang/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/Makefile" ;;
     "lang/tcl/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES lang/tcl/pkgIndex.tcl" ;;
+    "lang/tcl/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/scripts/Makefile" ;;
     "lang/tcl/src/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/src/Makefile" ;;
-    "lang/tcl/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/scripts/Makefile" ;;
     "lang/tcl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/tests/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;

trunk/configure.in

@@ -106 +106 @@
 
 SC_CONFIG_CFLAGS
+
+SVN_VERSION=`svnversion $srcdir`
 
 make_command=""
@@ -360 +362 @@
 AC_SUBST(MKOCTFILE2)
 AC_SUBST(MKOCTFILE3)
+AC_SUBST(SVN_VERSION)
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_VERSION_MAJOR)
@@ -471 +474 @@
     lang/tcl/Makefile
     lang/tcl/pkgIndex.tcl
+    lang/tcl/scripts/Makefile
     lang/tcl/src/Makefile
-    lang/tcl/scripts/Makefile
     lang/tcl/tests/Makefile
     lib/Makefile

trunk/examples/zoo/mesh/mesh.m

@@ -238 +238 @@
 rpLibResult(lib);
 quit;
-

trunk/examples/zoo/mesh/mesh.tcl

@@ -11 +11 @@
 
 set meshtype [$driver get input.choice.current]
+set contour [$driver get input.boolean.current]
+if { $contour  == "yes" } {
+    set view contour
+} else {
+    set view heightmap
+}
 
 set xv [blt::vector create \#auto]
@@ -222 +228 @@
 
 $driver put output.field(substrate).about.label "Substrate Surface"
-#$driver put output.field(substrate).about.type "contour"
+$driver put output.field(substrate).about.view $view
 $driver put output.field(substrate).component.mesh $mesh
 $driver put -type file -compress no output.field(substrate).component.values \
@@ -228 +234 @@
 
 $driver put output.field(particle).about.label "Particle Surface"
-#$driver put output.field(particle).about.type "contour"
+$driver put output.field(particle).about.view $view
 $driver put output.field(particle).component.mesh $mesh
 $driver put -type file -compress no output.field(particle).component.values \

trunk/gui/scripts/gauge.tcl

@@ -462 +462 @@
 
     if {$state} {
-        $itk_component($comp) configure -relief solid
+        $itk_component($comp) configure -relief flat
     } else {
         if {$comp eq "presets"} {

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -389 +389 @@
 
     set _image(download) [image create photo]
-
+    puts stderr "args=$args"
     eval itk_initialize $args
     Connect

trunk/lang/tcl/pkgIndex.tcl.in

@@ -5 +5 @@
     namespace eval Rappture {
         variable version $version
+        variable build "@SVN_VERSION@"
         variable installdir [file normalize $dir]
     }
@@ -14 +15 @@
     package provide Rappture $version
 } $dir]
+

trunk/lang/tcl/src/Rappture_Init.c

@@ -44 +44 @@
 Rappture_Init( Tcl_Interp * interp)
 {
+    fprintf(stderr, "Rappture_init\n");
 #ifdef _WIN32
     rpWinInitJob();

trunk/lang/tcl/src/RpLibraryTclInterface.cc

@@ -185 +185 @@
     std::string libName = rpLib2command(interp,rpptr);
 
+    if (Tcl_SetVar(interp, "::Rappture::version", RAPPTURE_VERSION,
+                   TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) != NULL) {
+        return TCL_ERROR;
+    }
+    if (Tcl_SetVar(interp, "::Rappture::build", SVN_VERSION,
+                   TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) != NULL) {
+        return TCL_ERROR;
+    }
     Tcl_AppendResult(interp, libName.c_str(), (char*)NULL);
     return TCL_OK;