Changeset 1897

Timestamp:

Aug 31, 2010 8:25:36 PM (14 years ago)

Author:

gah

Message:

re-merge with latest trunk changes

Location:

branches/blt4

Files:

• configure.in (modified) (18 diffs)
• examples/app-fermi/wrapper/perl/Makefile.in (modified) (2 diffs)
• examples/app-fermi/wrapper/perl/test/defaults.xml (modified) (4 diffs)
• examples/app-fermi/wrapper/perl/tool.xml (modified) (1 diff)
• examples/demo.bash.in (modified) (1 diff)
• gui/apps/Makefile.in (modified) (1 diff)
• gui/apps/about.in (modified) (1 diff)
• gui/apps/encodedata.in (modified) (1 diff)
• gui/apps/flowvis-test (modified) (1 diff)
• gui/apps/nanovis-test (modified) (2 diffs)
• gui/apps/rappture-csh.env.in (modified) (3 diffs)
• gui/apps/rappture.env.in (modified) (3 diffs)
• gui/apps/rappture.use.in (modified) (2 diffs)
• gui/apps/rerun.in (modified) (1 diff)
• gui/apps/simsim.in (modified) (2 diffs)
• gui/apps/table (modified) (1 diff)
• gui/apps/xmldiff.in (modified) (1 diff)
• gui/scripts/Makefile.in (modified) (2 diffs)
• gui/scripts/analyzer.tcl (modified) (1 diff)
• gui/scripts/balloon.tcl (modified) (1 diff)
• gui/scripts/bugreport.tcl (modified) (11 diffs)
• gui/scripts/combobox.tcl (modified) (1 diff)
• gui/scripts/filexfer.tcl (modified) (1 diff)
• gui/scripts/grab.tcl (modified) (1 diff)
• gui/scripts/moleculeViewer.tcl (modified) (1 diff)
• gui/scripts/sidebarframe.tcl (modified) (1 diff)
• gui/scripts/textentry.tcl (modified) (1 diff)
• gui/scripts/utils.tcl (modified) (5 diffs)
• gui/scripts/xyresult.tcl (modified) (1 diff)
• lang/perl/Makefile.in (modified) (1 diff)
• lang/tcl/src/Makefile.in (modified) (3 diffs)
• lang/tcl/src/Rappture_Init.c (modified) (3 diffs)
• src/core/Makefile.in (modified) (3 diffs)
• src/core/RpSimpleBuffer.h (modified) (1 diff)
• src/core/config.h.in (modified) (8 diffs)
• src/core2/Makefile.in (modified) (1 diff)
• src/objects/Makefile.in (modified) (3 diffs)
• src/objects/RpObject.cc (modified) (1 diff)

branches/blt4/configure.in

@@ -130 +130 @@
         TCLSH="$with_tclsh/bin/tclsh"
     else
-        if test -x "$with_tclsh"
+       if test -x "$with_tclsh"
         then
             echo Found tclsh in $with_tclsh
             TCLSH="$with_tclsh"
         else
-            AC_PATH_PROG(TCLSH, tclsh)
+            if test -x "${exec_prefix}/bin/tclsh"
+            then
+                echo Found tclsh in ${exec_prefix}/bin/tclsh
+                TCLSH="${exec_prefix}/bin/tclsh"
+            else
+                for v in 8.4 8.5 8.6 ; do
+                    if test -x "${exec_prefix}/bin/tclsh${v}"
+                    then
+                        echo Found tclsh in ${exec_prefix}/bin/tclsh${v}
+                        TCLSH="${exec_prefix}/bin/tclsh${v}"
+                        break
+                    fi
+                done
+            fi
         fi
     fi
-fi
+    if ! test -x ${TCLSH}
+    then
+        AC_PATH_PROG(TCLSH, tclsh)
+    fi
+fi
+
 AC_MSG_RESULT([${TCLSH}])
 AC_SUBST(TCLSH)
@@ -187 +205 @@
     do
       for vtk in $path/vtk-* ; do 
-        if test -d "${vtk}" ; then
-          VTKDIR=${vtk}
-        fi
+        if test -d "${vtk}" ; then
+          VTKDIR=${vtk}
+        fi
       done
       if test "x${VTKDIR}" != "x" ; then
-        break
+        break
       fi
     done
@@ -271 +289 @@
     AC_PATH_PROG(MKOCTFILE, mkoctfile)
   else
-    AC_PATH_PROG(OCTAVE, octave, [], [${with_octave}/bin:${with_octave}])
-    AC_PATH_PROG(MKOCTFILE, mkoctfile, [],
-        [${with_octave}/bin:${with_octave}])
-  fi
-  if test "x${OCTAVE}" != "x" ; then 
-    OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
-    OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
-    if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
-      OCTAVE3=$OCTAVE
-      MKOCTFILE3=$MKOCTFILE
-    fi
-    if test "${OCTAVE_VERSION_MAJOR}" == "2" ; then
-      OCTAVE2=$OCTAVE
-      MKOCTFILE2=$MKOCTFILE
-    fi
+    MKOCTFILE=$with_octave
+    OCTAVE=$with_octave
+  fi
+fi
+if test "x${OCTAVE}" != "x" ; then 
+  OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
+  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+  if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
+    OCTAVE3=$OCTAVE
+    MKOCTFILE3=$MKOCTFILE
+  fi
+  if test "${OCTAVE_VERSION_MAJOR}" == "2" ; then
+    OCTAVE2=$OCTAVE
+    MKOCTFILE2=$MKOCTFILE
   fi
 fi
@@ -298 +315 @@
 
 if test "$with_octave2" != "no" ; then
-  AC_MSG_CHECKING([for octave and mkoctfile])
-  AC_PATH_PROG(octave2, octave, [], [${with_octave2}/bin:${with_octave2}])
-  AC_PATH_PROG(mkoctfile2, mkoctfile, [],
-        [${with_octave2}/bin:${with_octave2}])
-  if test "x${octave2}" != "x" ; then
-    version=`${octave2} -v | grep version | cut -d' ' -f4`
-    version_major=`echo ${version} | cut -d'.' -f1`
-    if test "$version_major" = "2" ; then
-      OCTAVE2=$octave2
-      MKOCTFILE2=$mkoctfile2
-    fi
-  fi
-fi
+  if test "$with_octave2" = "yes" ; then
+    AC_MSG_CHECKING([for octave and mkoctfile])
+    AC_PATH_PROG(octave2, octave)
+    AC_PATH_PROG(mkoctfile2, mkoctfile)
+  else 
+    octave2=$with_octave2
+    mkoctfile2=`dirname $with_octave2`/mkoctfile
+  fi
+fi
+if test "x${octave2}" != "x" ; then
+  version=`${octave2} -v | grep version | cut -d' ' -f4`
+  version_major=`echo ${version} | cut -d'.' -f1`
+  if test "$version_major" = "2" ; then
+    OCTAVE2=$octave2
+    MKOCTFILE2=$mkoctfile2
+  fi
+fi
+
 # Check if octave3 was designated *in addition* to the installed version.
+
 AC_ARG_WITH(
     [octave3],
@@ -318 +341 @@
     [with_octave3=$withval],
     [with_octave3=no])
+
+echo with_octave3=$with_octave3
 if test "$with_octave3" != "no" ; then
-  AC_MSG_CHECKING([for octave and mkoctfile])
-  AC_PATH_PROG(octave3, octave, [], [${with_octave3}/bin:${with_octave3}])
-  AC_PATH_PROG(mkoctfile3, mkoctfile, [],
-        [${with_octave3}/bin:${with_octave3}])
-  if test "x${octave3}" != "x" ; then
-    version=`${octave3} -v | grep version | cut -d' ' -f4`
-    version_major=`echo ${version} | cut -d'.' -f1`
-    if test "$version_major" = "3" ; then
-      OCTAVE3=$with_octave3
-      MKOCTFILE3=$mkoctfile3
-    fi
+  if test "$with_octave3" = "yes" ; then
+    AC_MSG_CHECKING([for octave and mkoctfile])
+    AC_PATH_PROG(octave3, octave)
+    AC_PATH_PROG(mkoctfile3, mkoctfile)
+  else 
+    octave3=$with_octave3
+    mkoctfile3=`dirname $with_octave3`/mkoctfile
+  fi
+fi
+
+echo octave3=$octave3
+if test "x${octave3}" != "x" ; then
+  echo version="${octave3} -v | grep version | cut -d' ' -f4"
+  version=`${octave3} -v | grep version | cut -d' ' -f4`
+  echo version=$version
+  version_major=`echo ${version} | cut -d'.' -f1`
+  echo version_major=$version_major
+  if test "$version_major" = "3" ; then
+    OCTAVE3=$with_octave3
+    MKOCTFILE3=$mkoctfile3
   fi
 fi
@@ -341 +375 @@
 AC_SUBST(MKOCTFILE2)
 AC_SUBST(MKOCTFILE3)
+
+AC_ARG_WITH(
+    [perl],
+    [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])],
+    [],
+    [with_perl=yes])
 
 PERL=
@@ -498 +538 @@
 AC_SUBST(HAVE_PYTHON_DISTUTILS)
 
-with_ruby="yes"
+rappture_with_ruby="yes"
 
 RUBY=""
@@ -505 +545 @@
 AC_ARG_WITH(ruby,
   AS_HELP_STRING([--with-ruby=PATH], [absolute path to ruby executable]),
-  [with_ruby=$with_val])
-if test "${with_ruby}" != "no" ; then
-  if test "${with_ruby}" = "yes" ; then
+  [rappture_with_ruby=$with_val])
+if test "${rappture_with_ruby}" != "no" ; then
+  if test "${rappture_with_ruby}" = "yes" ; then
     AC_PATH_PROG(RUBY, ruby)
   else
     AC_PATH_PROG(RUBY, ruby, [],
-      [${with_ruby}/bin/ruby:${with_ruby}])
+      [${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}])
   fi
 fi
@@ -532 +572 @@
 AC_SUBST(RUBY_PLATFORM)
 
-with_java="yes"
+rappture_with_java="yes"
 JAVA=""
 JAVAH=""
@@ -538 +578 @@
 JAVA_DEV_PKG="no"
 
+AC_ARG_WITH(java,
+  AS_HELP_STRING([--with-java=PATH], [absolute path to java executable]),
+  [rappture_with_java=$with_val])
+if test "${rappture_with_java}" != "no" ; then
+  if test "${rappture_with_java}" = "yes" ; then
+    AC_PATH_PROG(JAVA, java)
+    AC_PATH_PROG(JAVAC, javac)
+    AC_PATH_PROG(JAVAH, javah)
+  else
+    AC_PATH_PROG(JAVA, java, [],
+      [${rappture_with_java}/bin/java:${rappture_with_java}])
+    AC_PATH_PROG(JAVAC, javac, [],
+      [${rappture_with_java}/bin/java:${rappture_with_java}])
+    AC_PATH_PROG(JAVAH, javah, [],
+      [${rappture_with_java}/bin/java:${rappture_with_java}])
+  fi
+fi
 JDK=
 JAVA_HOME=
@@ -546 +603 @@
 if test "x${JAVA}" != "x" ; then
   for d in \
-   ${with_java} \
-   /usr/lib/jvm/java-6-sun \
    /apps/java/jdk1.6.0_01 \
+   /usr/lib/jvm/*sun-1.6* \
+   /opt/sun-jdk-1.6* \
    /opt/icedtea6-* \
-   /opt/sun-jdk-1.6* \
-   /opt/sun-jdk-1.5* 
-  do 
+   /opt/sun-jdk-1.5* \
+   /usr/lib/jvm/*sun-1.5*
+  do
     if test -r "${d}/include/jni.h" ; then
       JDK=${d}
@@ -563 +620 @@
 fi
 
-AC_ARG_WITH(java,
-  AS_HELP_STRING([--with-java=PATH], [absolute path to java executable]),
-  [with_java=$with_val])
-if test "${with_java}" != "no" ; then
-  if test "${with_java}" = "yes" ; then
-    AC_PATH_PROG(JAVA, java)
-    AC_PATH_PROG(JAVAC, javac)
-    AC_PATH_PROG(JAVAH, javah)
-  else
-    AC_PATH_PROG(JAVA, java, [],
-      [${with_java}/bin:${with_java}])
-    AC_PATH_PROG(JAVAC, javac, [],
-      [${with_java}/bin:${with_java}])
-    AC_PATH_PROG(JAVAH, javah, [],
-      [${with_java}/bin:${with_java}])
-  fi
-fi
-
 AC_SUBST(JAVA)
 AC_SUBST(JAVAC)
@@ -587 +626 @@
 AC_SUBST(JAVA_INC_DIR)
 AC_SUBST(JAVA_INC_SPEC)
-
-AC_MSG_CHECKING([for OpenDX headers])
-DX_INC_DIR=""
-for dir in \
- /apps/rappture/include \
- /usr/dx/include \
- /usr/include
-do
-  if test -r "${dir}/dx/dx.h" ; then
-    DX_INC_DIR="$dir"
-    break
-  fi
-done
-
-if test "${DX_INC_DIR}" = "/usr/include" ; then
-  DX_INC_SPEC=""
-else 
-  DX_INC_SPEC="-I{DX_INC_DIR}"
-fi
-AC_SUBST(DX_INC_SPEC)
-AC_MSG_RESULT([${DX_INC_DIR}])
-
-AC_MSG_CHECKING([for OpenDX libraries])
-DX_LIB_DIR=""
-for dir in \
- /apps/rappture/lib \
- /usr/lib/dx/lib_linux \
- /usr/dx/lib_linux \
- /usr/lib
-do
-  if test -r "${dir}/libDXcallm.a" ; then
-    DX_LIB_DIR="$dir"
-    break
-  fi
-done
-
-if test "${DX_LIB_DIR}" = "/usr" ; then
-  DX_LIB_SPEC=""
-else
-  DX_LIB_SPEC="-L${DX_LIB_DIR}"
-fi
-
-AC_SUBST(DX_LIB_SPEC)
-AC_MSG_RESULT([${DX_LIB_DIR}])
 
 RP_BASE=`pwd`
@@ -651 +646 @@
 AC_SUBST(SHLIB_SUFFIX)
 
-if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 
+if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
   . ${exec_prefix}/lib/tclConfig.sh
 fi
-if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 
-  . ${exec_prefix}/lib/tkConfig.sh      
+if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
+  . ${exec_prefix}/lib/tkConfig.sh
 fi
 AC_SUBST(TCL_VERSION)
@@ -684 +679 @@
 
 #--------------------------------------------------------------------
-# Set the default compiler switches based on the --enable-symbols 
+# Set the default compiler switches based on the --enable-symbols
 # option.
 #--------------------------------------------------------------------
 
 SC_ENABLE_SYMBOLS
+
+
+#--------------------------------------------------------------------
+# search for ffmpeg libraries libavcodec, libavformat, libswscale
+#--------------------------------------------------------------------
+
+AC_CHECK_HEADERS(ffmpeg/avcodec.h,[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_AVCODEC_H
+  # include <ffmpeg/avcodec.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS(libavcodec/avcodec.h,[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBAVCODEC_AVCODEC_H
+  # include <libavcodec/avcodec.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS([ffmpeg/avformat.h],[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_AVFORMAT_H
+  # include <ffmpeg/avformat.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS([libavformat/avformat.h],[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+  # include <libavformat/avformat.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS([ffmpeg/avutil.h],[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_AVUTIL_H
+  # include <ffmpeg/avutil.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS([libavutil/avutil.h],[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBAVUTIL_AVUTIL_H
+  # include <libavutil/avutil.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS([ffmpeg/swscale.h],[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_FFMPEG_SWSCALE_H
+  # include <ffmpeg/swscale.h>
+  #endif
+]])
+
+AC_CHECK_HEADERS([libswscale/swscale.h],[],[],
+[[#define __STDC_CONSTANT_MACROS 1
+  #ifdef HAVE_LIBSWSCALE_SWSCALE_H
+  # include <libswscale/swscale.h>
+  #endif
+]])
+
+HAVE_FFMPEG_LIBS=""
+if [[ \( "${ac_cv_header_ffmpeg_avcodec_h}" = "yes" -o \
+        "${ac_cv_header_libavcodec_avcodec_h}" = "yes" \) -a \
+     \( "${ac_cv_header_ffmpeg_avformat_h}" = "yes" -o \
+        "${ac_cv_header_libavformat_avformat_h}" = "yes" \) -a \
+     \( "${ac_cv_header_ffmpeg_avutil_h}" = "yes" -o \
+        "${ac_cv_header_libavutil_avutil_h}" = "yes" \) -a \
+     \( "${ac_cv_header_ffmpeg_swscale_h}" = "yes" -o \
+        "${ac_cv_header_libswscale_swscale_h}" = "yes" \) ]] ; then
+  HAVE_FFMPEG_LIBS="yes"
+  AC_DEFINE(BUILD_with_ffmpeg, 1, [Build rappture with ffmpeg widgets])
+else
+  HAVE_FFMPEG_LIBS=""
+fi
+
+AC_CHECK_FUNCS(img_convert)
+AC_CHECK_FUNCS(sws_scale)
+AC_SUBST(HAVE_FFMPEG_LIBS)
 
 ac_configure_args="--disable-threads --enable-shared"
@@ -726 +801 @@
     lang/matlab/Makefile
     lang/octave/Makefile
-    lang/octave/RpOctaveInterface.h
+    lang/octave/octave2/Makefile
+    lang/octave/octave3/Makefile
     lang/ruby/Makefile
     lang/ruby/build.rb
@@ -754 +830 @@
     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
@@ -788 +865 @@
     examples/zoo/enable/Makefile
     examples/zoo/field/Makefile
-    examples/zoo/filechoice/Makefile
+    examples/zoo/filelist/Makefile
     examples/zoo/group/Makefile
     examples/zoo/image/Makefile

branches/blt4/examples/app-fermi/wrapper/perl/Makefile.in

@@ -1 +1 @@
 
 bindir          = @bindir@
-datadir         = @datadir@
-datarootdir     = @datarootdir@
+datadir         = @datadir@
+datarootdir     = @datarootdir@
 exec_prefix     = @exec_prefix@
 includedir      = @includedir@
@@ -8 +8 @@
 mandir          = @mandir@
 prefix          = @prefix@
-srcdir          = @srcdir@
+srcdir          = @srcdir@
 
-destdir         = $(prefix)/examples/app-fermi/wrapper/python
+destdir         = $(prefix)/examples/app-fermi/wrapper/perl
 
-INSTALL         = @INSTALL@
-MKDIR_P         = @MKDIR_P@
+INSTALL         = @INSTALL@
+MKDIR_P         = @MKDIR_P@
 
-FILES           = \
-                $(srcdir)/fermi.py \
+FILES = \
+                $(srcdir)/fermi.pl \
                 $(srcdir)/fermi.m \
                 $(srcdir)/tool.xml
 all: 
 
-install: 
+install:
         $(MKDIR_P) $(destdir)
         for i in $(FILES) ; do \

branches/blt4/examples/app-fermi/wrapper/perl/test/defaults.xml

@@ -3 +3 @@
     <tool>
         <about>Press Simulate to view results.</about>
-        <command>python @tool/fermi.py @driver</command>
+        <command>perl @tool/fermi.pl @driver</command>
         <name>Workspace (800x600)</name>
         <version>
             <rappture>
-                <language>python</language>
+                <revision>$LastChangedRevision: 1018 $</revision>
+                <modified>$LastChangedDate: 2008-06-08 21:24:34 -0400 (Sun, 08 Jun 2008) $</modified>
+                <language>tcl</language>
             </rappture>
         </version>
@@ -49 +51 @@
     <output>
         <log>Enter the Fermi level (eV):
- Ef = 0.0
+ Ef = 0
 Enter the temperature (K):
- T = 300.0
-warning: fopen: default open mode is now binary</log>
+ T = 300
+=RAPPTURE-ERROR=&gt;warning: fopen: default open mode is now binary
+=RAPPTURE-ERROR=&gt;
+</log>
         <curve id="f12">
             <about>
@@ -65 +69 @@
             </yaxis>
             <component>
-                <xy>0.999944 -0.253324
+                <xy>0.99995 -0.255922
+0.999944 -0.253324
 0.999939 -0.250726
 0.999932 -0.248127
@@ -266 +271 @@
             </component>
         </curve>
+        <time>Wed Dec 10 03:01:10 EST 2008</time>
+        <status>ok</status>
+        <user>dkearney</user>
     </output>
 </run>
+

branches/blt4/examples/app-fermi/wrapper/perl/tool.xml

@@ -3 +3 @@
     <tool>
         <about>Press Simulate to view results.</about>
-        <command>python @tool/fermi.py @driver</command>
+        <command>perl @tool/fermi.pl @driver</command>
     </tool>
     <input>

branches/blt4/examples/demo.bash.in

@@ -47 +47 @@
   ./app-fermi/cee \
   ./app-fermi/tcl \
+  ./app-fermi/java \
   ./app-fermi/perl \
   ./app-fermi/ruby \

branches/blt4/gui/apps/Makefile.in

@@ -1 +1 @@
 
 SHELL           = @SHELL@
-
+TCLSH           = @TCLSH@
 srcdir          = @srcdir@
 prefix          = @prefix@

branches/blt4/gui/apps/about.in

@@ -19 +19 @@
 # ======================================================================
 #\
+. rappture.env \
 exec wish "$0" $*
 # ----------------------------------------------------------------------

branches/blt4/gui/apps/encodedata.in

@@ -8 +8 @@
 # ======================================================================
 #\
-RAPPTURE_INSTALL_DIR=@prefix@ ; \
-. $RAPPTURE_INSTALL_DIR/bin/rappture.env ; \
 exec wish "$0" $*
 

branches/blt4/gui/apps/flowvis-test

@@ -16 +16 @@
 # ======================================================================
 #\
+bindir=`basename $0` ; \
+. $bindir/rappture.env ; \
 exec wish "$0" $*
 # ----------------------------------------------------------------------
 # wish executes everything from here on...
 
-lappend auto_path /usr/local/rappture/lib /usr/local/rappture/lib/vtk /usr/local/rappture/lib/vtk/tcl
+set installdir [file root $argv0]
+set libdir [file join $installdir "lib"]
+
+lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
 
 package require Itcl

branches/blt4/gui/apps/nanovis-test

@@ -17 +17 @@
 # ======================================================================
 #\
-exec wish "$0" $*
+bindir=`dirname $0` ; \
+exec $bindir/wish "$0" $*
 # ----------------------------------------------------------------------
 # wish executes everything from here on...
 
-lappend auto_path /usr/local/rappture/lib /usr/local/rappture/lib/vtk /usr/local/rappture/lib/vtk/tcl
+set installdir [file root $argv0]
+set libdir [file join $installdir "lib"]
+
+lappend auto_path $libdir $libdir/vtk $libdir/vtk/tcl
 
 package require Itcl
@@ -171 +175 @@
         set cmd $last_command
     }
-    namespace eval Rappture::NanovisViewer [list $widgets(nanovis) _send $cmd]
+    namespace eval Rappture::NanovisViewer [list $widgets(nanovis) SendCmd $cmd]
     $widgets(command) delete 0 end
 }

branches/blt4/gui/apps/rappture-csh.env.in

@@ -24 +24 @@
 set python_version=@PYTHON_VERSION@
 set tcl_version=@TCL_VERSION@
+set octave_version=@OCTAVE_VERSION@
 
 set path = ( $bindir $path )
@@ -52 +53 @@
 
 if ( $?OCTAVE_LOADPATH ) then
-  setenv OCTAVE_LOADPATH "${libdir}/octave:$OCTAVE_LOADPATH"
+  setenv OCTAVE_LOADPATH "${libdir}/octave${octave_version}:$OCTAVE_LOADPATH"
 else
-  setenv OCTAVE_LOADPATH "${libdir}/octave"
+  setenv OCTAVE_LOADPATH "${libdir}/octave${octave_version}"
 endif
 
@@ -93 +94 @@
 endif
 
-# Can we do this without putting dot in the path?
 if ( $?CLASSPATH ) then
-  setenv CLASSPATH  ".:${libdir}/java:$CLASSPATH"
-else 
-  setenv CLASSPATH ".:${libdir}/java"
+  setenv CLASSPATH "${libdir}/java:$CLASSPATH"
+else
+  setenv CLASSPATH "${libdir}/java"
 endif
+  
+

branches/blt4/gui/apps/rappture.env.in

@@ -23 +23 @@
 python_version=@PYTHON_VERSION@
 tcl_version=@TCL_VERSION@
+octave_version=@OCTAVE_VERSION_MAJOR@
 
 # No need to edit anything else
@@ -35 +36 @@
 
 MATLABPATH=${libdir}/matlab:$MATLABPATH
-OCTAVE_LOADPATH=:${libdir}/octave:$OCTAVE_LOADPATH
-OCTAVE_PATH=:${libdir}/octave:$OCTAVE_PATH
+OCTAVE_LOADPATH=:${libdir}/octave${octave_version}:$OCTAVE_LOADPATH
+OCTAVE_PATH=:${libdir}/octave${octave_version}:$OCTAVE_PATH
 
 export MATLABPATH OCTAVE_PATH OCTAVE_LOADPATH
@@ -52 +53 @@
 export TCL_LIBRARY TK_LIBRARY TCLLIBPATH
 
-# Can we do this without putting dot in the path?
 CLASSPATH=.:${libdir}/java:$CLASSPATH
-export CLASSPATH 
+
+export CLASSPATH
+

branches/blt4/gui/apps/rappture.use.in

@@ -15 +15 @@
 tcl_version=@TCL_VERSION@
 
-prepend PATH ${bindir}/bin
+prepend PATH ${bindir}
 
 prepend LD_LIBRARY_PATH ${vtkdir}
@@ -34 +34 @@
 prepend TK_LIBRARY ${libdir}/tk${tcl_version}
 
-prepend CLASSPATH .:${libdir}/java
+tags DEVEL

branches/blt4/gui/apps/rerun.in

@@ -30 +30 @@
 #
 #
-
-RAPPTURE_INSTALL_DIR=@prefix@
-
-. $RAPPTURE_INSTALL_DIR/bin/rappture.env
-exec $RAPPTURE_INSTALL_DIR/bin/driver -nosim true -load $*
+exec rappture -nosim true -load $*

branches/blt4/gui/apps/simsim.in

@@ -8 +8 @@
 # ======================================================================
 #\
-RAPPTURE_INSTALL_DIR=@prefix@ ; \
-. $RAPPTURE_INSTALL_DIR/bin/rappture.env ; \
+. rappture.env \
 exec wish "$0" $*
 
@@ -204 +203 @@
     } else {
         set optList [$child children -as object -type option]
+        set optLib ""
         set value ""
-        if {"random" == $valType} {
-            set optIdx [expr {int(rand()*[llength $optList])}]
-            set optLib [lindex $optList $optIdx]
-            set value [$optLib get value]
-        } elseif {"default" == $valType} {
-            set defaultVal [$child get default]
-            foreach optLib $optList {
-                set label [$optLib get about.label]
-                set valTag [$optLib get value]
-                if {($defaultVal == $label) || ($defaultVal == $valTag)} {
-                    set value $valTag
-                    break
+        if {[llength $optList] > 0} {
+            if {"random" == $valType} {
+                set optIdx [expr {int(rand()*[llength $optList])}]
+                set optLib [lindex $optList $optIdx]
+                set value [$optLib get value]
+            } elseif {"default" == $valType} {
+                set defaultVal [$child get default]
+                foreach optLib $optList {
+                    set label [$optLib get about.label]
+                    set valTag [$optLib get value]
+                    if {($defaultVal == $label) || ($defaultVal == $valTag)} {
+                        set value $valTag
+                        break
+                    }
                 }
             }
-        }
-
-        if {"" == $value} {
-            set value [$optLib get about.label]
+
+            if {"" == $value} {
+                set optLib [lindex $optList 0]
+                set value [$optLib get value]
+                if {"" == $value} {
+                    set value [$optLib get about.label]
+                }
+            }
         }
         $child put "current" $value

branches/blt4/gui/apps/table

@@ +1 @@
+
 package require Rappture
 package require RapptureGUI

branches/blt4/gui/apps/xmldiff.in

@@ -13 +13 @@
 # ======================================================================
 
-RAPPTURE_INSTALL_DIR=@prefix@
-
-. $RAPPTURE_INSTALL_DIR/bin/rappture.env
-exec $RAPPTURE_INSTALL_DIR/bin/simsim --nosim --tool $1 --compare $2
+exec simsim --nosim --tool $1 --compare $2

branches/blt4/gui/scripts/Makefile.in

@@ -14 +14 @@
 INSTALL         = @INSTALL@
 MKDIR_P         = @MKDIR_P@
-TCL_VERSION     = @TCL_VERSION@
-TCLSH           = $(bindir)/tclsh$(TCL_VERSION)
+TCLSH           = @TCLSH@
 VPATH           = $(srcdir)
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -115 +114 @@
                 $(srcdir)/utils.tcl \
                 $(srcdir)/valueresult.tcl \
+                $(srcdir)/videoviewer.tcl \
                 $(srcdir)/visviewer.tcl \
                 $(srcdir)/vtkviewer.tcl \

branches/blt4/gui/scripts/analyzer.tcl

@@ -433 +433 @@
 
     if {$status != 0} {
-        $itk_component(runinfo) configure -state normal
-        $itk_component(runinfo) delete 1.0 end
-        $itk_component(runinfo) insert end "Problem launching job:\n\n" text
-        _simOutput $result
-        $itk_component(runinfo) configure -state disabled
-        $itk_component(runinfo) see 1.0
-
-        # Try to create a support ticket for this error.
-        # It may be a real problem.
-        if {[Rappture::bugreport::shouldReport for jobs]} {
-            Rappture::bugreport::register "Problem launching job:\n\n$result\n== RAPPTURE INPUT ==\n[$_tool xml xml]"
-        }
+        $itk_component(runinfo) configure -state normal
+        $itk_component(runinfo) delete 1.0 end
+        $itk_component(runinfo) insert end "Problem launching job:\n\n" text
+        _simOutput $result
+        $itk_component(runinfo) configure -state disabled
+        $itk_component(runinfo) see 1.0
+
+        # Try to create a support ticket for this error.
+        # It may be a real problem.
+        if {[Rappture::bugreport::shouldReport for jobs]} {
+            set ::errorInfo "== RAPPTURE INPUT ==\n[$_tool xml xml]"
+            Rappture::bugreport::register "Problem launching job:\n$result"
+            Rappture::bugreport::send
+        }
     } else {
         $itk_component(notebook) current analyze

branches/blt4/gui/scripts/balloon.tcl

@@ -217 +217 @@
         # window). So for now, better to place the balloon window somewhere
         # than to fail with a bad geometry.
-        #
-        # Update: This answer could be that the root window (deskop) is 
-        #         resized but XHeightOfScreen XWidthOfScreen still 
-        #         report the initial size.
-        #
-        #         Fixed in new BLT.
-        #
         wm geometry $p +$px+$py
     } else {

branches/blt4/gui/scripts/bugreport.tcl

@@ -11 +11 @@
 #  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
+option add *BugReport*Label.font {Helvetica -12} startupFile
 option add *BugReport*banner*foreground white startupFile
 option add *BugReport*banner*background #a9a9a9 startupFile
 option add *BugReport*banner*highlightBackground #a9a9a9 startupFile
-option add *BugReport*banner*font \
-    -*-helvetica-bold-r-normal-*-18-* startupFile
-option add *BugReport*Label.font \
-    -*-helvetica-medium-r-normal-*-12-* startupFile
+option add *BugReport*banner.title.font {Helvetica -18 bold} startupFile
 option add *BugReport*xmit*wrapLength 3i startupFile
 option add *BugReport*expl.width 50 startupFile
-option add *BugReport*expl.font \
-    -*-helvetica-medium-r-normal-*-12-* startupFile
-option add *BugReport*expl.boldFont \
-    -*-helvetica-bold-r-normal-*-12-* startupFile
+option add *BugReport*expl.font {Helvetica -12} startupFile
+option add *BugReport*expl.boldFont {Helvetica -12 bold} startupFile
+option add *BugReport*comments.l.font {Helvetica -12 italic} startupFile
+option add *BugReport*comments.info.text.font {Helvetica -12} startupFile
+option add *BugReport*details*font {Courier -12} startupFile
 
 namespace eval Rappture::bugreport {
+    # details from the current trouble report
+    variable details
+
     # assume that if there's a problem launching a job, we should know it
     variable reportJobFailures 1
@@ -50 +52 @@
 proc Rappture::bugreport::activate {err} {
     global env errorInfo
+    variable details
 
     if {"@SHOWDETAILS" == $err} {
+        pack propagate .bugreport yes
+        pack forget .bugreport.expl
         pack forget .bugreport.xmit
-        pack forget .bugreport.ok
+        pack forget .bugreport.done
+        pack forget .bugreport.cntls.show
+        pack .bugreport.cntls -after .bugreport.banner -side bottom -fill x
         pack .bugreport.details -after .bugreport.banner \
             -expand yes -fill both -padx 8 -pady 8
-        focus .bugreport.details.cntls.ok
+        pack .bugreport.comments -after .bugreport.details \
+            -expand yes -fill both -padx 8 -pady {0 8}
         return
     }
 
-    # always fill in details so we can submit trouble reports later
+    # gather details so we can submit trouble reports later
+    # do this now, before we do anything with "catch" down below
+    # that might mask the errorInfo
+    register $err
+
+    pack propagate .bugreport yes
+    pack forget .bugreport.details
+    pack forget .bugreport.xmit
+    pack forget .bugreport.done
+    pack .bugreport.cntls.show -side right
+    pack .bugreport.cntls -after .bugreport.banner -side bottom -fill x
+    pack .bugreport.expl -after .bugreport.banner \
+        -expand yes -fill both -padx 8 -pady 8
+    pack .bugreport.comments -after .bugreport.expl \
+        -expand yes -fill both -padx 8 -pady {0 8}
+
+    .bugreport.expl configure -state normal
+    .bugreport.expl delete 1.0 end
+
+    set url [Rappture::Tool::resources -huburl]
+    if {"" != $url} {
+        .bugreport.expl insert end "Something went wrong with this tool.  Help us understand what happened by submitting a trouble report, so we can fix the problem.  If you continue having trouble with this tool, please close it and restart."
+        .bugreport.cntls.send configure -state normal
+        focus .bugreport.cntls.send
+    } else {
+        .bugreport.expl insert end "Something went wrong with this tool.  We would ask you to submit a trouble report about the error, but we can't tell what hub it should be submitted to.  If you continue having trouble with this tool, please close it and restart."
+        pack forget .bugreport.comments
+        .bugreport.cntls.send configure -state disabled
+        focus .bugreport.cntls.ok
+    }
+    fixTextHeight .bugreport.expl
+    .bugreport.expl configure -state disabled
+
     .bugreport.details.info.text configure -state normal
     .bugreport.details.info.text delete 1.0 end
-    .bugreport.details.info.text insert end "$err\n-----\n$errorInfo"
+    .bugreport.details.info.text insert end "    USER: $details(login)\n"
+    .bugreport.details.info.text insert end "HOSTNAME: $details(hostname)\n"
+    .bugreport.details.info.text insert end "    TOOL: $details(referrer)\n"
+    .bugreport.details.info.text insert end " SESSION: $details(session)\n"
+    .bugreport.details.info.text insert end "CATEGORY: $details(category)\n"
+    .bugreport.details.info.text insert end " SUMMARY: $details(summary)\n"
+    .bugreport.details.info.text insert end "---------\n"
+    .bugreport.details.info.text insert end $details(stackTrace)
     .bugreport.details.info.text configure -state disabled
-
-    if {[shouldReport for oops]} {
-        pack forget .bugreport.details
-        pack forget .bugreport.expl
-        pack .bugreport.ok -side bottom -after .bugreport.banner -pady {0 8}
-        pack .bugreport.xmit -after .bugreport.ok -padx 8 -pady 8
-        focus .bugreport.ok
-        set dosubmit 1
-    } else {
-        pack forget .bugreport.expl
-        pack forget .bugreport.xmit
-        pack forget .bugreport.ok
-        pack .bugreport.details -after .bugreport.banner \
-            -expand yes -fill both -padx 8 -pady 8
-        focus .bugreport.details.cntls.ok
-        set dosubmit 0
-    }
 
     set w [winfo reqwidth .bugreport]
     set h [winfo reqheight .bugreport]
     set x [expr {([winfo screenwidth .bugreport]-$w)/2}]
-    set y [expr {([winfo screenheight .bugreport]-$w)/2}]
+    if {$x < 0} {set x 0}
+    set y [expr {([winfo screenheight .bugreport]-$h)/2}]
+    if {$y < 0} {set y 0}
 
     wm geometry .bugreport +$x+$y
@@ -94 +126 @@
     catch {grab set .bugreport}
     update
-
-    if {$dosubmit} {
-        submit
-    }
 }
 
@@ -123 +151 @@
     set info [.bugreport.details.info.text get 1.0 end]
 
+    pack propagate .bugreport no
     pack forget .bugreport.details
-    pack .bugreport.ok -side bottom -after .bugreport.banner -pady {0 8}
-    pack .bugreport.xmit -after .bugreport.ok -padx 8 -pady 8
+    pack forget .bugreport.expl
+    pack forget .bugreport.comments
+    pack forget .bugreport.cntls
+    pack .bugreport.xmit -after .bugreport.banner -padx 8 -pady 8
     .bugreport.xmit.title configure -text "Sending trouble report to [Rappture::Tool::resources -hubname]..."
-    focus .bugreport.ok
 
     # send off the trouble report...
     .bugreport.xmit.icon start
-    set status [catch {register $info} result]
+    set status [catch send result]
     .bugreport.xmit.icon stop
 
+    pack propagate .bugreport yes
     pack forget .bugreport.xmit
-    pack .bugreport.expl -after .bugreport.ok -padx 8 -pady 8
+    pack .bugreport.expl -after .bugreport.banner -padx 8 -pady 8
     .bugreport.expl configure -state normal
     .bugreport.expl delete 1.0 end
@@ -146 +177 @@
         .bugreport.details.info.text configure -state disabled
 
-        .bugreport.expl insert end "This tool encountered an unexpected error.  We tried to submit a trouble report automatically, but that failed.  If you want to report this incident, you can file your own trouble report.  Look for the \"Help\" or \"Support\" links on the main navigation bar of the web site.\n\nIf you continue having trouble with this tool, please close it and launch another session."
+        .bugreport.expl insert end "Oops! Ticket submission failed:\n$result\n\nIf you want to report the original problem, you can file your own trouble report by going to the web site and clicking on the \"Help\" or \"Support\" link on the main navigation bar.  If you continue having trouble with this tool, please close it and restart."
     } elseif {[regexp {Ticket #([0-9]*) +\((.*?)\) +([0-9]+) +times} $result match ticket extra times]} {
-        .bugreport.expl insert end "This tool encountered an unexpected error.  The problem has been reported as " "" "Ticket #$ticket" bold " in our system." ""
+        .bugreport.expl insert end "This problem has been reported as " "" "Ticket #$ticket" bold " in our system." ""
         if {[string is integer $times] && $times > 1} {
             .bugreport.expl insert end "  This particular problem has been reported $times times."
         }
-        .bugreport.expl insert end "\n\nIf you continue having trouble with this tool, please close it and launch another session."
+        .bugreport.expl insert end "\n\nIf you continue having trouble with this tool, please close it and restart.  Thanks for reporting the problem and helping us improve things!"
     } else {
-        .bugreport.expl insert end "This tool encountered an unexpected error, and the problem was reported.  Here is the response from the hub, which may contain information about your ticket:\n" "" $result bold "\n\nIf you continue having trouble with this tool, please close it and launch another session." ""
-    }
-    for {set h 1} {$h < 50} {incr h} {
-        .bugreport.expl configure -height $h
-        .bugreport.expl see 1.0
-        update idletasks
-        if {"" != [.bugreport.expl bbox end-1char]} {
-            break
-        }
-    }
+        .bugreport.expl insert end "This problem has been reported.  Here is the response from the hub, which may contain information about your ticket:\n" "" $result bold "\n\nIf you continue having trouble with this tool, please close it and restart.  Thanks for reporting the problem and helping us improve things!" ""
+    }
+    fixTextHeight .bugreport.expl
     .bugreport.expl configure -state disabled
-}
-
-# ----------------------------------------------------------------------
-# USAGE: download
-#
-# Used to download the current ticket information to the user's
-# desktop.
-# ----------------------------------------------------------------------
-proc Rappture::bugreport::download {} {
-    set info [.bugreport.details.info.text get 1.0 end]
-    Rappture::filexfer::download $info bugreport.txt
-}
-
-# ----------------------------------------------------------------------
-# USAGE: register <stackTrace>
-#
-# Low-level function used to send bug reports back to the hub site.
-# Error details in the <stackTrace> are posted to a URL that creates
-# a support ticket.  Returns a string of the following form,
-# representing details about the new or existing ticket:
-#   Ticket #XX (XXXXXX) XX times
-# ----------------------------------------------------------------------
-proc Rappture::bugreport::register {stackTrace} {
-    global env tcl_platform
-
-    package require http
-    package require tls
-    http::register https 443 ::tls::socket
-
+    pack .bugreport.done -side bottom -padx 8 -pady 8
+    focus .bugreport.done
+}
+
+# ----------------------------------------------------------------------
+# USAGE: register <err>
+#
+# Low-level function used to capture information about a bug report
+# prior to calling "send", which actually sends the ticket.  We usually
+# let the user preview the information and decide whether or not to
+# send the ticket.
+# ----------------------------------------------------------------------
+proc Rappture::bugreport::register {err} {
+    global errorInfo tcl_platform
+    variable details
+
+    #
+    # Figure out exactly what we'll send if the bug report is
+    # submitted, so we can show the user.
+    #
+    set stackTrace "$err\n---------\n$errorInfo"
     if {![regexp {^([^\n]+)\n} $stackTrace match summary]} {
         if {[string length $stackTrace] == 0} {
@@ -246 +262 @@
     }
 
+    set details(summary) $summary
+    set details(category) $category
+    set details(stackTrace) $stackTrace
+    set details(login) $tcl_platform(user)
+    set details(hostname) [info hostname]
+    set details(session) [Rappture::Tool::resources -session]
+    set details(referrer) "tool \"[Rappture::Tool::resources -appname]\""
+}
+
+# ----------------------------------------------------------------------
+# USAGE: send
+#
+# Low-level function used to send bug reports back to the hub site.
+# Error details gathered by a previous call to "register" are sent
+# along as a support ticket.  Returns a string of the following form,
+# representing details about the new or existing ticket:
+#   Ticket #XX (XXXXXX) XX times
+# ----------------------------------------------------------------------
+proc Rappture::bugreport::send {} {
+    variable details
+
+    package require http
+    package require tls
+    http::register https 443 ::tls::socket
+
+    set report $details(stackTrace)
+    set cmts [string trim [.bugreport.comments.info.text get 1.0 end]]
+    if {[string length $cmts] > 0} {
+        set report "$cmts\n[string repeat = 72]\n$report"
+    }
+
     set query [http::formatQuery \
         option com_support \
         task create \
         no_html 1 \
-        report $stackTrace \
-        login $tcl_platform(user) \
-        sesstoken [Rappture::Tool::resources -session] \
-        hostname [info hostname] \
-        category $category \
-        summary $summary \
-        referrer "tool \"[Rappture::Tool::resources -appname]\"" \
+        report $report \
+        login $details(login) \
+        sesstoken $details(session) \
+        hostname $details(hostname) \
+        category $details(category) \
+        summary $details(summary) \
+        referrer $details(referrer) \
     ]
     
@@ -282 +329 @@
 
 # ----------------------------------------------------------------------
+# USAGE: fixTextHeight <widget>
+#
+# Used internally to adjust the height of a text widget so it is just
+# tall enough to show the info within it.
+# ----------------------------------------------------------------------
+proc Rappture::bugreport::fixTextHeight {widget} {
+    #
+    # HACK ALERT!  In Tk8.5, we can count display lines directly.
+    #   But for earlier versions, we have to cook up something
+    #   similar.
+    #
+    if {[catch {$widget count -displaylines 1.0 end} h] == 0 && $h > 0} {
+        $widget configure -height $h
+    } else {
+        for {set h 1} {$h < 15} {incr h} {
+            $widget configure -height $h
+            $widget see 1.0
+            update idletasks
+            if {"" != [$widget bbox end-1char]} {
+                break
+            }
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
 # USAGE: shouldReport jobfailures <boolean>
 # USAGE: shouldReport for ?oops|jobs?
@@ -304 +377 @@
         }
         for {
-            # is this a tool in production?
-            if {![info exists env(RAPPTURE_VERSION)]
-                  || $env(RAPPTURE_VERSION) != "current"} {
-                return 0
-            }
-
             # is it being run within a workspace?
             set appname [Rappture::Tool::resources -appname]
@@ -343 +410 @@
 label .bugreport.banner.icon -image [Rappture::icon alert]
 pack .bugreport.banner.icon -side left -padx 2 -pady 2
-label .bugreport.banner.title -text "Oops! Unexpected Error"
+label .bugreport.banner.title -text "Oops! Internal Error"
 pack .bugreport.banner.title -side left -padx {0 8} -pady 2
 
@@ -352 +419 @@
     Rappture::bugreport::deactivate
 
-button .bugreport.ok -text "Dismiss" -command Rappture::bugreport::deactivate
-pack .bugreport.ok -side bottom -pady {0 8}
+set bg [.bugreport cget -background]
+text .bugreport.expl -borderwidth 0 -highlightthickness 0 -background $bg \
+    -height 3 -wrap word
+.bugreport.expl tag configure bold \
+    -font [option get .bugreport.expl boldFont Font]
+#
+# HACK ALERT!  We have problems with fixTextHeight working correctly
+#   on Windows for Tk8.4 and earlier.  To make it work properly, we
+#   add the binding below.  At some point, we'll ditch 8.4 and we can
+#   use the new "count -displaylines" option in Tk8.5.
+#
+bind .bugreport.expl <Map> {Rappture::bugreport::fixTextHeight %W}
+
+frame .bugreport.comments
+label .bugreport.comments.l -text "What were you doing just before this error?" -anchor w
+pack .bugreport.comments.l -side top -anchor w
+Rappture::Scroller .bugreport.comments.info -xscrollmode none -yscrollmode auto
+text .bugreport.comments.info.text -width 30 -height 3 -wrap word
+.bugreport.comments.info contents .bugreport.comments.info.text
+bind .bugreport.comments.info.text <ButtonPress> {focus %W}
+pack .bugreport.comments.info -expand yes -fill both
+
+frame .bugreport.cntls
+pack .bugreport.cntls -side bottom -fill x
+button .bugreport.cntls.ok -text "Ignore" -command {
+    Rappture::bugreport::deactivate
+}
+pack .bugreport.cntls.ok -side left -padx {4 20} -pady 8
+button .bugreport.cntls.send -text "Send Trouble Report" -command {
+    Rappture::bugreport::submit
+}
+pack .bugreport.cntls.send -side right -padx 4 -pady 8
+
+button .bugreport.cntls.show -text "Show Details..." \
+    -command {Rappture::bugreport::activate @SHOWDETAILS}
+pack .bugreport.cntls.show -side right
+
+
+frame .bugreport.details
+Rappture::Scroller .bugreport.details.info -xscrollmode auto -yscrollmode auto
+text .bugreport.details.info.text -width 50 -height 15 -wrap none
+.bugreport.details.info contents .bugreport.details.info.text
+pack .bugreport.details.info -expand yes -fill both
 
 frame .bugreport.xmit
@@ -364 +472 @@
 pack .bugreport.xmit.title -side left -expand yes -fill x
 
-text .bugreport.expl -borderwidth 0 -highlightthickness 0 -wrap word
-.bugreport.expl tag configure bold \
-    -font [option get .bugreport.expl boldFont Font]
-
-bind .bugreport.expl <Control-1><Control-1><Control-3><Control-3> {
-    Rappture::bugreport::activate @SHOWDETAILS
-}
-
-bind .bugreport.expl <Control-1><Control-1><Control-Shift-1><Control-Shift-1> {
-    Rappture::bugreport::activate @SHOWDETAILS
-}
-
-frame .bugreport.details
-frame .bugreport.details.cntls
-pack .bugreport.details.cntls -side bottom -fill x
-button .bugreport.details.cntls.ok -text "Dismiss" -command {
-    Rappture::bugreport::deactivate
-}
-pack .bugreport.details.cntls.ok -side right -padx 2 -pady 4
-button .bugreport.details.cntls.send -text "Send Trouble Report" -command {
-    Rappture::bugreport::submit
-}
-pack .bugreport.details.cntls.send -side left -padx 2 -pady 4
-button .bugreport.details.cntls.dload -text "Download" -command {
-    Rappture::bugreport::download
-}
-pack .bugreport.details.cntls.dload -side left -padx 2 -pady 4
-
-set scrollset .bugreport.details.info
-blt::scrollset $scrollset -xscrollbar $scrollset.xs -yscrollbar $scrollset.ys \
-    -window $scrollset.text
-blt::tk::scrollbar $scrollset.xs
-blt::tk::scrollbar $scrollset.ys
-text .bugreport.details.info.text -width 50 -height 15 -wrap none
-pack .bugreport.details.info -expand yes -fill both
+button .bugreport.done -text "Done" \
+    -command Rappture::bugreport::deactivate
 
 # this binding keeps the bugreport window on top

branches/blt4/gui/scripts/combobox.tcl

@@ -134 +134 @@
             $itk_component(entry) configure -state disabled
         }
-        set cmd [list event generate $itk_component(hull) <<Value>>]
-        after 10 [list catch $cmd]
+
+        after 10 [list catch [list event generate $itk_component(hull) <<Value>>]]
     } elseif {[llength $args] != 0} {
         error "wrong # args: should be \"value ?newval?\""

branches/blt4/gui/scripts/filexfer.tcl

@@ -338 +338 @@
               /apps/bin/clientaction
               /apps/xvnc/bin/clientaction
+              /usr/lib/mw/bin/clientaction
               ""
         } {

branches/blt4/gui/scripts/grab.tcl

@@ -65 +65 @@
         }
 
+        # if the window is already on the stack, then skip it
+        if {[string equal [lindex $::Rappture::grab::stack 0] $window]} {
+            return $window
+        }
+
         # add the current configuration to the grab stack
         set ::Rappture::grab::stack \

branches/blt4/gui/scripts/moleculeViewer.tcl

@@ -700 +700 @@
 }
 
-itcl::body Rappture::DeviceEditor::snap { w h } {
+itcl::body Rappture::MoleculeViewer::snap { w h } {
     if { $w <= 0 || $h <= 0 } {
         set w [winfo width $itk_component(area)]

branches/blt4/gui/scripts/sidebarframe.tcl

@@ -451 +451 @@
         release {
             set minw [winfo reqwidth $itk_component(controlbar)]
-            if { $_width != "auto" && ($_width-$minw) < 40} {
+            if {$_width-$minw < 40} {
                 set _width "auto"
                 pop close

branches/blt4/gui/scripts/textentry.tcl

@@ -231 +231 @@
         # take down any existing widget
         foreach win [pack slaves $itk_interior] {
-            pack forget $win
+            if { [winfo name $win] != "hints" } {
+                pack forget $win
+            }
         }
 

branches/blt4/gui/scripts/utils.tcl

@@ -23 +23 @@
 proc Rappture::utils::hexdump {args} {
     Rappture::getopts args params {
-        value -lines unlimited
+        value -lines unlimited
     }
     if {[llength $args] != 1} {
-        error "wrong # args: should be \"hexdump ?-lines num? data\""
+        error "wrong # args: should be \"hexdump ?-lines num? data\""
     }
     set newval [lindex $args 0]
@@ -34 +34 @@
 
     if {$params(-lines) != "unlimited" && $params(-lines) <= 0} {
-        return $rval
+        return $rval
     }
 
@@ -40 +40 @@
     set len [string length $newval]
     for {set i 0} {$i < $len} {incr i 8} {
-        append rval [format "%#06x: " $i]
-        set ascii ""
-        for {set j 0} {$j < 8} {incr j} {
-            if {$i+$j < $len} {
-                set char [string index $newval [expr {$i+$j}]]
-                binary scan $char c ichar
-                set hexchar [format "%02x" [expr {0xff & $ichar}]]
-            } else {
-                set char " "
-                set hexchar "  "
-            }
-            append rval "$hexchar "
-            if {[regexp {[\000-\037\177-\377]} $char]} {
-                append ascii "."
-            } else {
-                append ascii $char
-            }
-        }
-        append rval " | $ascii\n"
+        append rval [format "%#06x: " $i]
+        set ascii ""
+        for {set j 0} {$j < 8} {incr j} {
+            if {$i+$j < $len} {
+                set char [string index $newval [expr {$i+$j}]]
+                binary scan $char c ichar
+                set hexchar [format "%02x" [expr {0xff & $ichar}]]
+            } else {
+                set char " "
+                set hexchar "  "
+            }
+            append rval "$hexchar "
+            if {[regexp {[\000-\037\177-\377]} $char]} {
+                append ascii "."
+            } else {
+                append ascii $char
+            }
+        }
+        append rval " | $ascii\n"
 
-        if {"unlimited" != $params(-lines) && $i/8+1 >= $params(-lines)} {
-            if {$i < $len-1} {
-                append rval "more..."
-            }
-            break
-        }
+        if {"unlimited" != $params(-lines) && $i/8+1 >= $params(-lines)} {
+            if {$i < $len-1} {
+                append rval "more..."
+            }
+            break
+        }
     }
     return $rval
@@ -78 +78 @@
 proc Rappture::utils::binsize {size} {
     foreach {factor units} {
-        1073741824 GB
-        1048576 MB
-        1024 kB
-        1 bytes
+        1073741824 GB
+        1048576 MB
+        1024 kB
+        1 bytes
     } {
-        if {$size/$factor > 0} {
-            if {$factor > 1} {
-                set size [format "%.1f" [expr {double($size)/$factor}]]
-            }
-            break
-        }
+        if {$size/$factor > 0} {
+            if {$factor > 1} {
+                set size [format "%.1f" [expr {double($size)/$factor}]]
+            }
+            break
+        }
     }
     return "$size $units"
@@ -127 +127 @@
     return $desc
 }
+
+# ----------------------------------------------------------------------
+# USAGE: expandPath <path>
+#
+# Returns the true location of the provided path,
+# automatically expanding links to form an absolute path.
+# ----------------------------------------------------------------------
+proc Rappture::utils::expandPath {args} {
+    set path ""
+    set dirs [file split [lindex $args 0]]
+
+    while {[llength $dirs] > 0} {
+        set d [lindex $dirs 0]
+        set dirs [lrange $dirs 1 end]
+        if {[catch {file link [file join $path $d]} out] == 0} {
+            # directory d is a link, follow it
+            set outdirs [file split $out]
+            if {[string compare "/" [lindex $outdirs 0]] == 0} {
+                # directory leads back to root
+                # clear path
+                # reset dirs list
+                set path ""
+                set dirs $outdirs
+            } else {
+                # relative path for the link
+                # prepend directory to dirs list
+                set dirs [concat $outdirs $dirs]
+            }
+        } else {
+            set path [file join $path $d]
+        }
+    }
+    return $path
+}
+

branches/blt4/gui/scripts/xyresult.tcl

@@ -279 +279 @@
         -brightness 0
         -width 1
-        -type "histogram"
+        -type "line"
         -raise 0
         -linestyle solid

branches/blt4/lang/perl/Makefile.in

@@ -21 +21 @@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
-CFLAGS          = @CFLAGS@ 
+CFLAGS          = @CFLAGS@ -fPIC
 
 AR              = ar

branches/blt4/lang/tcl/src/Makefile.in

@@ -25 +25 @@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
-CFLAGS          = @CFLAGS@
-TCL_VERSION     = @TCL_VERSION@
+CFLAGS          = @CFLAGS@ -fPIC
+TCL_VERSION     = @TCL_VERSION@
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
 
@@ -35 +35 @@
   -I../../../src/core \
   -I$(srcdir)/../../../src/core \
+  -I$(srcdir)/../../../src/objects \
   -I$(includedir)
 version         = @PACKAGE_VERSION@
@@ -68 +69 @@
 endif
 
+FFMPEG          = @HAVE_FFMPEG_LIBS@
+ifeq ($(FFMPEG),yes)
+    OBJS += RpMediaPlayerTclInterface.o
+    LIBS += -L../../../src/objects -lRpObjects
+endif
+
+
 # Not using     RpLibraryTclInterface.o \
 

branches/blt4/lang/tcl/src/Rappture_Init.c

@@ -15 +15 @@
 
 #include <tcl.h>
+#include "config.h"
 
 #ifdef BUILD_rappture
@@ -35 +36 @@
 extern Tcl_AppInitProc RpEncoding_Init;
 extern Tcl_AppInitProc RpUtils_Init;
+
+#ifdef BUILD_with_ffmpeg
+extern Tcl_AppInitProc RpMediaPlayer_Init;
+#endif
 
 #ifdef BUILD_Rappture
@@ -65 +70 @@
         return TCL_ERROR;
     }
+#ifdef BUILD_with_ffmpeg
+    if (RpMediaPlayer_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
+#endif
     if (RpRlimit_Init(interp) != TCL_OK) {
         return TCL_ERROR;

branches/blt4/src/core/Makefile.in

@@ -29 +29 @@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
-CFLAGS          = @CFLAGS@
+CFLAGS          = @CFLAGS@ -fPIC
 DX_LIB_SPEC     = @DX_LIB_SPEC@
 DX_INC_SPEC     = @DX_INC_SPEC@
@@ -79 +79 @@
                 rappture.h
 
+LOCAL_HEADERS = \
+                config.h
 
 SCEW_HEADERS    = \
@@ -181 +183 @@
           $(INSTALL) -m 444  $(srcdir)/$$i $(incdir) ; \
         done
+        for i in $(LOCAL_HEADERS) ; do \
+          $(INSTALL) -m 444  $$i $(incdir) ; \
+        done
 
 .cc.o:

branches/blt4/src/core/RpSimpleBuffer.h

@@ -749 +749 @@
 
 /**
- * Read data from the buffer into a memory location provided by caller
+ * Move the internal position tracker to the beginning of the buffer.
  */
 template<class T>

branches/blt4/src/core/config.h.in

@@ -1 +1 @@
 /* src/core/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Build rappture with ffmpeg widgets */
+#undef BUILD_with_ffmpeg
 
 /* Define to 1 if you have the <algorithm> header file. */
@@ -31 +37 @@
 #undef HAVE_ERRNO_H
 
+/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
+#undef HAVE_FFMPEG_AVCODEC_H
+
+/* Define to 1 if you have the <ffmpeg/avformat.h> header file. */
+#undef HAVE_FFMPEG_AVFORMAT_H
+
+/* Define to 1 if you have the <ffmpeg/avutil.h> header file. */
+#undef HAVE_FFMPEG_AVUTIL_H
+
+/* Define to 1 if you have the <ffmpeg/swscale.h> header file. */
+#undef HAVE_FFMPEG_SWSCALE_H
+
 /* Define to 1 if you have the <float.h> header file. */
 #undef HAVE_FLOAT_H
@@ -36 +54 @@
 /* Define to 1 if you have the <fstream> header file. */
 #undef HAVE_FSTREAM
+
+/* Define to 1 if you have the `img_convert' function. */
+#undef HAVE_IMG_CONVERT
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -46 +67 @@
 #undef HAVE_ITERATOR
 
+/* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
+#undef HAVE_LIBAVCODEC_AVCODEC_H
+
+/* Define to 1 if you have the <libavformat/avformat.h> header file. */
+#undef HAVE_LIBAVFORMAT_AVFORMAT_H
+
+/* Define to 1 if you have the <libavutil/avutil.h> header file. */
+#undef HAVE_LIBAVUTIL_AVUTIL_H
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
@@ -51 +81 @@
 /* Define to 1 if you have the `stdc++' library (-lstdc++). */
 #undef HAVE_LIBSTDC__
+
+/* Define to 1 if you have the <libswscale/swscale.h> header file. */
+#undef HAVE_LIBSWSCALE_SWSCALE_H
 
 /* Define to 1 if you have the <limits.h> header file. */
@@ -91 +124 @@
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `sws_scale' function. */
+#undef HAVE_SWS_SCALE
+
 /* Define to 1 if you have the `sysinfo' function. */
 #undef HAVE_SYSINFO
@@ -121 +157 @@
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
@@ -139 +178 @@
 #undef STDC_HEADERS
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif

branches/blt4/src/core2/Makefile.in

@@ -37 +37 @@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
 LIB_SEARCH_DIRS = -L../core @LIB_SEARCH_DIRS@
-CFLAGS          = @CFLAGS@
+CFLAGS          = @CFLAGS@ -fPIC
 CPP             = @CPP@
 

branches/blt4/src/objects/Makefile.in

@@ -26 +26 @@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
-CFLAGS          = @CFLAGS@
+CFLAGS          = @CFLAGS@ -fPIC
+FFMPEG          = @HAVE_FFMPEG_LIBS@
 RM              = rm -f
 CC_SWITCHES = $(CFLAGS) $(INCLUDES) $(DEFINES) $(CFLAGS_DEBUG)
@@ -37 +38 @@
                 -I$(includedir)
 LIBS        = -L../core -lrappture
+
 
 RANLIB      = @RANLIB@
@@ -110 +112 @@
                 RpObject.o
 
+ifeq ($(FFMPEG),yes)
+  # since ffmpeg libraries are available,
+  # include them in compilation
+  LIBS += -lavcodec -lavformat -lswscale
+  HEADERS += RpMediaPlayer.h
+  OBJS += RpMediaPlayer.o
+endif
+
 
 name        = RpObjects

branches/blt4/src/objects/RpObject.cc

@@ -274 +274 @@
     }
 
-    v = strchrnul(hint,'=');
+    v = strchr(hint,'=');
     *hintKey = hint;
-    if ((*v == '\0') || (*(v+1) == '\0')) {
+    if ((v == NULL) || (*v == '\0') || (*(v+1) == '\0')) {
         // incomplete hint string
         *hintVal = NULL;