Changeset 2742

Timestamp:

Dec 27, 2011, 12:41:24 PM (13 years ago)

Author:

gah

Message:

sync with trunk

Location:

branches/blt4

Files:

• aclocal.m4 (modified) (1 diff)
• cf/mkindex.tcl (added)
• cf/mkobjects.tcl (added)
• cf/rpLangR.m4 (added)
• configure (modified) (16 diffs)
• configure.in (modified) (8 diffs)
• examples/app-fermi/Makefile.in (modified) (2 diffs)
• examples/app-fermi/R (added)
• examples/app-fermi/R/Makefile.in (added)
• examples/app-fermi/R/fermi.R (added)
• examples/app-fermi/R/test (added)
• examples/app-fermi/R/test/defaults.xml (added)
• examples/app-fermi/R/tool.xml (added)
• examples/lang/R (added)
• examples/lang/R/driver.xml (added)
• examples/lang/R/functions_examples.R (added)
• gui/apps/Makefile.in (modified) (2 diffs)
• gui/apps/rappture.use.in (modified) (1 diff)
• gui/apps/vtkcontour-test (modified) (1 diff)
• gui/apps/vtkstreamlines-test (modified) (3 diffs)
• gui/apps/vtkviewer-test (modified) (3 diffs)
• gui/apps/vtkvolume-test (added)
• gui/cf/config.guess (modified) (53 diffs)
• gui/cf/config.sub (modified) (51 diffs)
• gui/cf/ldAix (added)
• gui/cf/tcl.m4 (added)
• gui/scripts/Makefile.in (modified) (1 diff)
• gui/scripts/field.tcl (modified) (10 diffs)
• gui/scripts/field2dresult.tcl (modified) (2 diffs)
• gui/scripts/field3dresult.tcl (modified) (2 diffs)
• gui/scripts/molvisviewer.tcl (modified) (2 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (9 diffs)
• gui/scripts/numberresult.tcl (modified) (2 diffs)
• gui/scripts/resultset.tcl (modified) (3 diffs)
• gui/scripts/resultviewer.tcl (modified) (3 diffs)
• gui/scripts/sequenceresult.tcl (modified) (1 diff)
• gui/scripts/sidebarframe.tcl (modified) (1 diff)
• gui/scripts/tool.tcl (modified) (1 diff)
• gui/scripts/visviewer.tcl (modified) (13 diffs)
• gui/scripts/vtkcontourviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (81 diffs)
• gui/scripts/vtkviewer.tcl (modified) (4 diffs)
• gui/scripts/xylegend.tcl (modified) (1 diff)
• gui/scripts/xyprint.tcl (modified) (32 diffs)
• gui/scripts/xyresult.tcl (modified) (1 diff)
• gui/src/Makefile.in (modified) (1 diff)
• gui/src/RapptureGUI_Init.c (modified) (1 diff)
• gui/src/RpConvertDxToVtk.c (added)
• lang/Makefile.in (modified) (2 diffs)
• lang/tcl/scripts/Makefile.in (modified) (2 diffs)
• lang/tcl/src/Makefile.in (modified) (1 diff)
• packages/vizservers/configure (modified) (3 diffs)
• packages/vizservers/configure.in (modified) (2 diffs)
• packages/vizservers/nanovis/Command.cpp (modified) (1 diff)
• packages/vizservers/nanovis/RpAVTranslate.cpp (modified) (10 diffs)
• packages/vizservers/nanovis/config.h (modified) (1 diff)
• packages/vizservers/nanovis/nanovis.cpp (modified) (2 diffs)
• packages/vizservers/nanovis/nvconf.h.in (modified) (5 diffs)
• packages/vizservers/vtkvis/RpVtkRenderer.cpp (modified) (8 diffs)
• packages/vizservers/vtkvis/RpVtkRenderer.h (modified) (3 diffs)
• packages/vizservers/vtkvis/RpVtkRendererCmd.cpp (modified) (2 diffs)
• src/core/config.h.in (modified) (6 diffs)
• src/objects/RpVideo.c (modified) (4 diffs)

branches/blt4/aclocal.m4

@@ -8 +8 @@
 builtin(include,./cf/rpLangJava.m4)
 builtin(include,./cf/rpLangMatlab.m4)
+builtin(include,./cf/rpLangR.m4)

branches/blt4/configure

@@ -609 +609 @@
 TK_VERSION
 TK_XLIBSW
-TCL_SHLIB_LDFLAGS
-TCL_SHLIB_LD
-TCL_SHLIB_SUFFIX
-TCL_SHLIB_CFLAGS
-TCL_CFLAGS_DEBUG
 TK_LIB_SPEC
 TK_INC_SPEC
 TCL_VERSION
+TCL_SHLIB_SUFFIX
+TCL_SHLIB_LDFLAGS
+TCL_SHLIB_LD
+TCL_SHLIB_CFLAGS
+TCL_CFLAGS_OPTIMIZE
+TCL_CFLAGS_DEBUG
 TCL_LIB_SPEC
 TCL_INC_SPEC
@@ -673 +674 @@
 SED
 RUBY
+R
 JAVAH
 JAVAC
@@ -785 +787 @@
 with_tclsh
 with_vtk
-with_ncurses
 with_matlab
 with_octave
@@ -793 +794 @@
 with_python
 with_java
+with_R
 with_ruby
 enable_shared
@@ -1439 +1441 @@
   --with-tclsh=DIR        location of tclsh [default=yes]
   --with-vtk=DIR          location of vtk library [default=yes]
-  --with-ncurses=DIR      location of ncurses [default=yes]
   --with-matlab=DIR       location of matlab and mex compiler [default=yes]
   --with-octave=DIR       path of default octave compiler `mkoctfile'
@@ -1448 +1449 @@
   --with-python=DIR       location of python [default=yes]
   --with-java=DIR         location of java [default=yes]
+  --with-R=DIR            location of R interpreter [default=yes]
   --with-ruby=DIR         location of ruby [default=yes]
 
@@ -7445 +7447 @@
 $as_echo "$VTKDIR" >&6; }
 
-with_ncurses="yes"
-
-# Check whether --with-ncurses was given.
-if test "${with_ncurses+set}" = set; then :
-  withval=$with_ncurses;
-else
-  with_ncurses=yes
-fi
-
-
-if test "$with_vtk" != "no" ; then
-  if test "$with_vtk" = "yes" ; then
-    for path in \
-     $libdir \
-     $prefix/lib \
-     $exec_prefix/lib \
-     /usr/lib
-    do
-      for vtk in $path/vtk-* ; do
-        if test -d "${vtk}" ; then
-          VTKDIR=${vtk}
-        fi
-      done
-      if test "x${VTKDIR}" != "x" ; then
-        break
-      fi
-    done
-  fi
-fi
-
 
 
@@ -8643 +8615 @@
   done
 fi
+
+
+
+# Check whether --with-R was given.
+if test "${with_R+set}" = set; then :
+  withval=$with_R;
+else
+  with_R=yes
+fi
+
+
+R=""
+if test "$with_R" != "no" ; then
+  if test "$with_R" = "yes" ; then
+    # Extract the first word of "R", so it can be a program name with args.
+set dummy R; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_R+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $R in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_R="$R" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+R=$ac_cv_path_R
+if test -n "$R"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5
+$as_echo "$R" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    # Extract the first word of "R", so it can be a program name with args.
+set dummy R; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_R+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $R in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_R="$R" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${with_R}/bin:${with_R}"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_R="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+R=$ac_cv_path_R
+if test -n "$R"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5
+$as_echo "$R" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+
 
 
@@ -9539 +9610 @@
 #--------------------------------------------------------------------
 
-for ac_header in ffmpeg/avcodec.h
+for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h
 do :
-  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_AVCODEC_H
-  # include <ffmpeg/avcodec.h>
-  #endif
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+#define __STDC_CONSTANT_MACROS 1
 
 "
-if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_FFMPEG_AVCODEC_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in libavcodec/avcodec.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBAVCODEC_AVCODEC_H
-  # include <libavcodec/avcodec.h>
-  #endif
-
-"
-if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVCODEC_AVCODEC_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in ffmpeg/avformat.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/avformat.h" "ac_cv_header_ffmpeg_avformat_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_AVFORMAT_H
-  # include <ffmpeg/avformat.h>
-  #endif
-
-"
-if test "x$ac_cv_header_ffmpeg_avformat_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FFMPEG_AVFORMAT_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in libavformat/avformat.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-  # include <libavformat/avformat.h>
-  #endif
-
-"
-if test "x$ac_cv_header_libavformat_avformat_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in ffmpeg/avutil.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/avutil.h" "ac_cv_header_ffmpeg_avutil_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_AVUTIL_H
-  # include <ffmpeg/avutil.h>
-  #endif
-
-"
-if test "x$ac_cv_header_ffmpeg_avutil_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FFMPEG_AVUTIL_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in libavutil/avutil.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBAVUTIL_AVUTIL_H
-  # include <libavutil/avutil.h>
-  #endif
-
-"
-if test "x$ac_cv_header_libavutil_avutil_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVUTIL_AVUTIL_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in ffmpeg/swscale.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "ffmpeg/swscale.h" "ac_cv_header_ffmpeg_swscale_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_FFMPEG_SWSCALE_H
-  # include <ffmpeg/swscale.h>
-  #endif
-
-"
-if test "x$ac_cv_header_ffmpeg_swscale_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FFMPEG_SWSCALE_H 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in libswscale/swscale.h
-do :
-  ac_fn_cxx_check_header_compile "$LINENO" "libswscale/swscale.h" "ac_cv_header_libswscale_swscale_h" "#define __STDC_CONSTANT_MACROS 1
-  #ifdef HAVE_LIBSWSCALE_SWSCALE_H
-  # include <libswscale/swscale.h>
-  #endif
-
-"
-if test "x$ac_cv_header_libswscale_swscale_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSWSCALE_SWSCALE_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
@@ -9698 +9642 @@
 
   fi
-fi
-
-for ac_func in img_convert
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavcodec" >&5
+$as_echo_n "checking for main in -lavcodec... " >&6; }
+if ${ac_cv_lib_avcodec_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavcodec  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avcodec_main=yes
+else
+  ac_cv_lib_avcodec_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_main" >&5
+$as_echo "$ac_cv_lib_avcodec_main" >&6; }
+if test "x$ac_cv_lib_avcodec_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVCODEC 1
+_ACEOF
+
+  LIBS="-lavcodec $LIBS"
+
+else
+  as_fn_error $? "librappture requires libavcodec" "$LINENO" 5
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavutil" >&5
+$as_echo_n "checking for main in -lavutil... " >&6; }
+if ${ac_cv_lib_avutil_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavutil  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avutil_main=yes
+else
+  ac_cv_lib_avutil_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_main" >&5
+$as_echo "$ac_cv_lib_avutil_main" >&6; }
+if test "x$ac_cv_lib_avutil_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVUTIL 1
+_ACEOF
+
+  LIBS="-lavutil $LIBS"
+
+else
+  as_fn_error $? "librappture requires libavutil" "$LINENO" 5
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavformat" >&5
+$as_echo_n "checking for main in -lavformat... " >&6; }
+if ${ac_cv_lib_avformat_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavformat  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avformat_main=yes
+else
+  ac_cv_lib_avformat_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_main" >&5
+$as_echo "$ac_cv_lib_avformat_main" >&6; }
+if test "x$ac_cv_lib_avformat_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVFORMAT 1
+_ACEOF
+
+  LIBS="-lavformat $LIBS"
+
+else
+  as_fn_error $? "librappture requires libavformat" "$LINENO" 5
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lswscale" >&5
+$as_echo_n "checking for main in -lswscale... " >&6; }
+if ${ac_cv_lib_swscale_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lswscale  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_swscale_main=yes
+else
+  ac_cv_lib_swscale_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_main" >&5
+$as_echo "$ac_cv_lib_swscale_main" >&6; }
+if test "x$ac_cv_lib_swscale_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSWSCALE 1
+_ACEOF
+
+  LIBS="-lswscale $LIBS"
+
+fi
+
+  for ac_func in avcodec_decode_video2
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video2" "ac_cv_func_avcodec_decode_video2"
+if test "x$ac_cv_func_avcodec_decode_video2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO2 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avcodec_decode_video
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video" "ac_cv_func_avcodec_decode_video"
+if test "x$ac_cv_func_avcodec_decode_video" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avformat_open_input
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_open_input" "ac_cv_func_avformat_open_input"
+if test "x$ac_cv_func_avformat_open_input" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_OPEN_INPUT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in av_open_input_file
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_open_input_file" "ac_cv_func_av_open_input_file"
+if test "x$ac_cv_func_av_open_input_file" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_OPEN_INPUT_FILE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avio_close
+do :
+  ac_fn_cxx_check_func "$LINENO" "avio_close" "ac_cv_func_avio_close"
+if test "x$ac_cv_func_avio_close" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVIO_CLOSE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in url_close
+do :
+  ac_fn_cxx_check_func "$LINENO" "url_close" "ac_cv_func_url_close"
+if test "x$ac_cv_func_url_close" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_URL_CLOSE 1
+_ACEOF
+
+fi
+done
+
+  ac_fn_cxx_check_func "$LINENO" "av_find_stream_info" "ac_cv_func_av_find_stream_info"
+if test "x$ac_cv_func_av_find_stream_info" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_find_stream_info?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_find_decoder" "ac_cv_func_avcodec_find_decoder"
+if test "x$ac_cv_func_avcodec_find_decoder" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_codec_find_decoder ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_open" "ac_cv_func_avcodec_open"
+if test "x$ac_cv_func_avcodec_open" = xyes; then :
+
+else
+  as_fn_error $? "oops! avcodec_open ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_alloc_frame" "ac_cv_func_avcodec_alloc_frame"
+if test "x$ac_cv_func_avcodec_alloc_frame" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avcode_alloc_frame ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "av_rescale_q" "ac_cv_func_av_rescale_q"
+if test "x$ac_cv_func_av_rescale_q" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_rescale_q ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "av_read_frame" "ac_cv_func_av_read_frame"
+if test "x$ac_cv_func_av_read_frame" = xyes; then :
+
+else
+  as_fn_error $? "oops! av_read_frame ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "av_free" "ac_cv_func_av_free"
+if test "x$ac_cv_func_av_free" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_frame ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avcodec_default_release_buffer" "ac_cv_func_avcodec_default_release_buffer"
+if test "x$ac_cv_func_avcodec_default_release_buffer" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avcode_default_release_buffer ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avpicture_get_size" "ac_cv_func_avpicture_get_size"
+if test "x$ac_cv_func_avpicture_get_size" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avpicture_get_size ?!?" "$LINENO" 5
+fi
+
+  ac_fn_cxx_check_func "$LINENO" "avpicture_fill" "ac_cv_func_avpicture_fill"
+if test "x$ac_cv_func_avpicture_fill" = xyes; then :
+
+else
+  as_fn_error $? "oops! no avpicture_fill ?!?" "$LINENO" 5
+fi
+
+  for ac_func in sws_getCachedContext
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_getCachedContext" "ac_cv_func_sws_getCachedContext"
+if test "x$ac_cv_func_sws_getCachedContext" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_GETCACHEDCONTEXT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in img_convert
 do :
   ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
@@ -9711 +9962 @@
 done
 
-for ac_func in sws_scale
+  for ac_func in sws_scale
 do :
   ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
@@ -9722 +9973 @@
 done
 
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define __STDC_CONSTANT_MACROS 1
+#include <stdlib.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <ffmpeg/avcodec.h>
+#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#endif
+int x = AVMEDIA_TYPE_VIDEO;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_avmedia_type_video="yes"
+else
+  ac_avmedia_type_video="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test "$ac_avmedia_type_video" == "yes" ; then
+
+$as_echo "#define HAVE_AVMEDIA_TYPE_VIDEO 1" >>confdefs.h
+
+  fi
+fi
 
 
@@ -9801 +10085 @@
 
 
+
+
+
+
+
+
+
 ac_configure_args="--disable-threads --enable-shared"
 
@@ -9807 +10098 @@
 
 
-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/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/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/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/contour/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/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/datatable/Makefile examples/zoo/datatable/matlab/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/filechoice/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/loadrun/Makefile examples/zoo/log/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 examples/zoo/unirect2d/Makefile 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/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/contour/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/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/datatable/Makefile examples/zoo/datatable/matlab/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/filechoice/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/loadrun/Makefile examples/zoo/log/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 examples/zoo/unirect2d/Makefile oldtest/Makefile oldtest/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -10553 +10844 @@
     "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;;
     "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;;
+    "lang/R/Makefile") CONFIG_FILES="$CONFIG_FILES lang/R/Makefile" ;;
     "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;;
     "lang/ruby/build.rb") CONFIG_FILES="$CONFIG_FILES lang/ruby/build.rb" ;;
@@ -10583 +10875 @@
     "examples/app-fermi/wrapper/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/python/Makefile" ;;
     "examples/app-fermi/wrapper/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/tcl/Makefile" ;;
+    "examples/app-fermi/R/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/R/Makefile" ;;
     "examples/c-example/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c-example/Makefile" ;;
     "examples/canvas/Makefile") CONFIG_FILES="$CONFIG_FILES examples/canvas/Makefile" ;;

branches/blt4/configure.in

@@ -166 +166 @@
 fi
 
-  
+
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
@@ -200 +200 @@
 AC_MSG_RESULT([$VTKDIR])
 
-with_ncurses="yes"
-AC_ARG_WITH(
-    [ncurses],
-    [AS_HELP_STRING([--with-ncurses[=DIR]],
-        [location of ncurses @<:@default=yes@:>@])],
-    [],
-    [with_ncurses=yes])
-
-if test "$with_vtk" != "no" ; then
-  if test "$with_vtk" = "yes" ; then
-    for path in \
-     $libdir \
-     $prefix/lib \
-     $exec_prefix/lib \
-     /usr/lib
-    do
-      for vtk in $path/vtk-* ; do 
-        if test -d "${vtk}" ; then
-          VTKDIR=${vtk}
-        fi
-      done
-      if test "x${VTKDIR}" != "x" ; then
-        break
-      fi
-    done
-  fi
-fi
-
 RP_LANG_MATLAB
 RP_LANG_OCTAVE
@@ -233 +205 @@
 RP_LANG_PYTHON
 RP_LANG_JAVA
+RP_LANG_R
 
 RUBY=""
@@ -313 +286 @@
 #--------------------------------------------------------------------
 
-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
-]])
+AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
+#define __STDC_CONSTANT_MACROS 1
+])
 
 HAVE_FFMPEG_LIBS=""
@@ -382 +303 @@
     AC_DEFINE(BUILD_with_ffmpeg, 1, [Build rappture with ffmpeg widgets])
   fi
-fi
-
-AC_CHECK_FUNCS(img_convert)
-AC_CHECK_FUNCS(sws_scale)
+  AC_CHECK_LIB(avcodec, main,,AC_MSG_ERROR(librappture requires libavcodec))
+  AC_CHECK_LIB(avutil, main,,AC_MSG_ERROR(librappture requires libavutil))
+  AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(librappture requires libavformat))
+  AC_CHECK_LIB(swscale, main)
+  AC_CHECK_FUNCS(avcodec_decode_video2)
+  AC_CHECK_FUNCS(avcodec_decode_video)
+  AC_CHECK_FUNCS(avformat_open_input)
+  AC_CHECK_FUNCS(av_open_input_file)
+  AC_CHECK_FUNCS(avio_close)
+  AC_CHECK_FUNCS(url_close)
+  AC_CHECK_FUNC(av_find_stream_info,, 
+  AC_MSG_ERROR(oops! no av_find_stream_info?!?))
+  AC_CHECK_FUNC(avcodec_find_decoder,,
+    AC_MSG_ERROR(oops! no av_codec_find_decoder ?!?))
+  AC_CHECK_FUNC(avcodec_open,,AC_MSG_ERROR(oops! avcodec_open ?!?))
+  AC_CHECK_FUNC(avcodec_alloc_frame,,
+    AC_MSG_ERROR(oops! no avcode_alloc_frame ?!?))
+  AC_CHECK_FUNC(av_rescale_q,,AC_MSG_ERROR(oops! no av_rescale_q ?!?))
+  AC_CHECK_FUNC(av_read_frame,,AC_MSG_ERROR(oops! av_read_frame ?!?))
+  AC_CHECK_FUNC(av_free,,AC_MSG_ERROR(oops! no av_frame ?!?))
+  AC_CHECK_FUNC(avcodec_default_release_buffer,,
+    AC_MSG_ERROR(oops! no avcode_default_release_buffer ?!?))
+  AC_CHECK_FUNC(avpicture_get_size,,
+    AC_MSG_ERROR(oops! no avpicture_get_size ?!?))
+  AC_CHECK_FUNC(avpicture_fill,,AC_MSG_ERROR(oops! no avpicture_fill ?!?))
+  AC_CHECK_FUNCS(sws_getCachedContext)
+  AC_CHECK_FUNCS(img_convert)
+  AC_CHECK_FUNCS(sws_scale)
+  AC_TRY_COMPILE([
+#define __STDC_CONSTANT_MACROS 1
+#include <stdlib.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <ffmpeg/avcodec.h>
+#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#endif
+int x = AVMEDIA_TYPE_VIDEO;
+],, ac_avmedia_type_video="yes", ac_avmedia_type_video="no")
+  if test "$ac_avmedia_type_video" == "yes" ; then
+    AC_DEFINE(HAVE_AVMEDIA_TYPE_VIDEO,1,[Define if AVMEDIA_TYPE_VIDEO enum exists. ])
+  fi
+fi
 
 AC_SUBST(CFLAGS_DEBUG)
@@ -434 +394 @@
 AC_SUBST(PYTHON_SITE_PACKAGES)
 AC_SUBST(PYTHON_VERSION)
+AC_SUBST(R)
 AC_SUBST(RP_BASE)
 AC_SUBST(RUBY)
@@ -513 +474 @@
     lang/octave/octave2/Makefile
     lang/octave/octave3/Makefile
+    lang/R/Makefile
     lang/ruby/Makefile
     lang/ruby/build.rb
@@ -543 +505 @@
     examples/app-fermi/wrapper/python/Makefile
     examples/app-fermi/wrapper/tcl/Makefile
+    examples/app-fermi/R/Makefile
     examples/c-example/Makefile
     examples/canvas/Makefile

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

@@ -14 +14 @@
 INSTALL_SCRIPT  = ${INSTALL} -m 644
 
-F77 =           @F77@
-CC =            @CC@
-CXX =           @CXX@
-RUBY =          @RUBY@
-PERL =          @PERL@
-TCLSH =         @TCLSH@
-PYTHON =        @PYTHON@
-MEX =           @MEX@
-MKOCTFILE2 =    @MKOCTFILE2@
-MKOCTFILE3 =    @MKOCTFILE3@
-OCTAVE =        $(MKOCTFILE2) $(MKOCTFILE3)
-JAVAC =         @JAVAC@
+F77 =        @F77@
+CC =         @CC@
+CXX =        @CXX@
+RUBY =       @RUBY@
+PERL =       @PERL@
+TCLSH =      @TCLSH@
+PYTHON =     @PYTHON@
+MEX =        @MEX@
+MKOCTFILE2 = @MKOCTFILE2@
+MKOCTFILE3 = @MKOCTFILE3@
+OCTAVE =     $(MKOCTFILE2) $(MKOCTFILE3)
+JAVAC =      @JAVAC@
+R =          @R@
 
 .PHONY: tcl cee fortran octave matlab perl python ruby java 2.0 wrapper
@@ -51 +52 @@
     LANGS += java
 endif
+ifneq ($(R),)
+    LANGS += R
+endif
 
 all:    

branches/blt4/gui/apps/Makefile.in

@@ -28 +28 @@
                 $(srcdir)/vtkstreamlines-test \
                 $(srcdir)/vtkviewer-test \
+                $(srcdir)/vtkvolume-test \
                 $(srcdir)/flowvis-test \
                 $(srcdir)/rpdiff \
@@ -56 +57 @@
 
 distclean: clean
-        $(RM) encodedata rappture.env rappture rappture.use rerun rpdiff simsim xmldiff
+        $(RM) encodedata rappture.env rappture rappture.use rerun simsim xmldiff
         $(RM) Makefile *~
 

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

@@ -35 +35 @@
 prepend TK_LIBRARY ${libdir}/tk${tcl_version}
 
+prepend R_LIBS ${libdir}/R
+
 tags DEVEL

branches/blt4/gui/apps/vtkcontour-test

@@ -244 +244 @@
     if {"" != $file && [catch {
             set fid [open $file r]
-            fconfigure $fid -translation binary
+            fconfigure $fid -translation binary -encoding binary
             set info [read $fid]
             close $fid

branches/blt4/gui/apps/vtkstreamlines-test

@@ -122 +122 @@
     if {"" != $file && [catch {
             set fid [open $file r]
-            fconfigure $fid -translation binary
+            fconfigure $fid -translation binary -encoding binary
             set info [read $fid]
             close $fid
@@ -143 +143 @@
     if {"" != $file && [catch {
             set fid [open $file r]
-            fconfigure $fid -translation binary
+            fconfigure $fid -translation binary -encoding binary
             set info [read $fid]
             close $fid
@@ -164 +164 @@
     if {"" != $file && [catch {
             set fid [open $file r]
-            fconfigure $fid -translation binary
+            fconfigure $fid -translation binary -encoding binary
             set info [read $fid]
             close $fid

branches/blt4/gui/apps/vtkviewer-test

@@ -90 +90 @@
         return $_data
     }
+    public method vtkdata {args} {
+        return $_data
+    }
     public method values {args} {
         return $_data
@@ -116 +119 @@
     if {"" != $file && [catch {
             set fid [open $file r]
-            fconfigure $fid -translation binary
+            fconfigure $fid -translation binary -encoding binary
             set info [read $fid]
             close $fid
@@ -137 +140 @@
     if {"" != $file && [catch {
             set fid [open $file r]
-            fconfigure $fid -translation binary
+            fconfigure $fid -translation binary -encoding binary
             set info [read $fid]
             close $fid

branches/blt4/gui/cf/config.guess

@@ -2 +2 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-04-14'
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -19 +18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
@@ -26 +24 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
-
 
 # Originally written by Per Bothner <per@bothner.com>.
@@ -57 +54 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -70 +67 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -108 +105 @@
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
@@ -127 +123 @@
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
@@ -162 +158 @@
             sh3el) machine=shl-unknown ;;
             sh3eb) machine=sh-unknown ;;
-            sh5el) machine=sh5le-unknown ;;
             *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
         esac
@@ -201 +196 @@
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
         echo "${machine}-${os}${release}"
-        exit ;;
+        exit 0 ;;
+    amiga:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    arc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    hp300:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mac68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    macppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+        echo m88k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    pmax:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sgi:OpenBSD:*:*)
+        echo mipseb-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sun3:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     *:OpenBSD:*:*)
-        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    *:ekkoBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-        exit ;;
-    *:SolidBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-        exit ;;
-    macppc:MirBSD:*:*)
-        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-        exit ;;
-    *:MirBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-        exit ;;
+        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     alpha:OSF1:*:*)
-        case $UNAME_RELEASE in
-        *4.0)
+        if test $UNAME_RELEASE = "V4.0"; then
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-                ;;
-        *5.*)
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-                ;;
-        esac
+        fi
         # According to Compaq, /usr/sbin/psrinfo has been available on
         # OSF/1 and Tru64 systems produced since 1995.  I hope that
@@ -264 +277 @@
                 UNAME_MACHINE="alphaev79" ;;
         esac
-        # A Pn.n version is a patched version.
         # A Vn.n version is a released version.
         # A Tn.n version is a released field test version.
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        exit ;;
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        exit 0 ;;
     Alpha\ *:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -276 +288 @@
         # of the specific Alpha model?
         echo alpha-pc-interix
-        exit ;;
+        exit 0 ;;
     21064:Windows_NT:50:3)
         echo alpha-dec-winnt3.5
-        exit ;;
+        exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
         echo m68k-unknown-sysv4
-        exit ;;
+        exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-amigaos
-        exit ;;
+        exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-morphos
-        exit ;;
+        exit 0 ;;
     *:OS/390:*:*)
         echo i370-ibm-openedition
-        exit ;;
-    *:z/VM:*:*)
-        echo s390-ibm-zvmoe
-        exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-        exit ;;
+        exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
-        exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-        echo arm-unknown-riscos
-        exit ;;
+        exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
-        exit ;;
+        exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
         # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
@@ -314 +317 @@
                 echo pyramid-pyramid-bsd
         fi
-        exit ;;
+        exit 0 ;;
     NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
-        exit ;;
-    DRS?6000:unix:4.0:6*)
-        echo sparc-icl-nx6
-        exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+        exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
         case `/usr/bin/uname -p` in
-            sparc) echo sparc-icl-nx7; exit ;;
+            sparc) echo sparc-icl-nx7 && exit 0 ;;
         esac ;;
     sun4H:SunOS:5.*:*)
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+        exit 0 ;;
+    i86pc:SunOS:5.*:*)
         echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     sun4*:SunOS:6*:*)
         # According to config.sub, this is the proper way to canonicalize
@@ -339 +339 @@
         # it's likely to be more like Solaris than SunOS4.
         echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     sun4*:SunOS:*:*)
         case "`/usr/bin/arch -k`" in
@@ -348 +348 @@
         # Japanese Language versions have a version number like `4.1.3-JL'.
         echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-        exit ;;
+        exit 0 ;;
     sun3*:SunOS:*:*)
         echo m68k-sun-sunos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     sun*:*:4.2BSD:*)
         UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
@@ -363 +363 @@
                 ;;
         esac
-        exit ;;
+        exit 0 ;;
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
@@ -377 +377 @@
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-        echo m68k-apple-machten${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     RISC*:Mach:*:*)
         echo mips-dec-mach_bsd4.3
-        exit ;;
+        exit 0 ;;
     RISC*:ULTRIX:*:*)
         echo mips-dec-ultrix${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     VAX*:ULTRIX*:*:*)
         echo vax-dec-ultrix${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
         echo clipper-intergraph-clix${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
         eval $set_cc_for_build
@@ -434 +431 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c &&
-          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-          SYSTEM_NAME=`$dummy $dummyarg` &&
-            { echo "$SYSTEM_NAME"; exit; }
+        $CC_FOR_BUILD -o $dummy $dummy.c \
+          && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+          && exit 0
         echo mips-mips-riscos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
         echo powerpc-motorola-powermax
-        exit ;;
+        exit 0 ;;
     Motorola:*:4.3:PL8-*)
         echo powerpc-harris-powermax
-        exit ;;
+        exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
         echo powerpc-harris-powermax
-        exit ;;
+        exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
-        exit ;;
+        exit 0 ;;
     m88k:CX/UX:7*:*)
         echo m88k-harris-cxux7
-        exit ;;
+        exit 0 ;;
     m88k:*:4*:R4*)
         echo m88k-motorola-sysv4
-        exit ;;
+        exit 0 ;;
     m88k:*:3*:R3*)
         echo m88k-motorola-sysv3
-        exit ;;
+        exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
@@ -476 +472 @@
             echo i586-dg-dgux${UNAME_RELEASE}
         fi
-        exit ;;
+        exit 0 ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
-        exit ;;
+        exit 0 ;;
     M88*:*:R3*:*)
         # Delta 88k system running SVR3
         echo m88k-motorola-sysv3
-        exit ;;
+        exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
         echo m88k-tektronix-sysv3
-        exit ;;
+        exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
         echo m68k-tektronix-bsd
-        exit ;;
+        exit 0 ;;
     *:IRIX*:*:*)
         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-        exit ;;
+        exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+        echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+        exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
         echo i386-ibm-aix
-        exit ;;
+        exit 0 ;;
     ia64:AIX:*:*)
         if [ -x /usr/bin/oslevel ] ; then
@@ -506 +502 @@
         fi
         echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-        exit ;;
+        exit 0 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -521 +517 @@
                         }
 EOF
-                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-                then
-                        echo "$SYSTEM_NAME"
-                else
-                        echo rs6000-ibm-aix3.2.5
-                fi
+                $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+                echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                 echo rs6000-ibm-aix3.2.4
@@ -532 +524 @@
                 echo rs6000-ibm-aix3.2
         fi
-        exit ;;
-    *:AIX:*:[456])
+        exit 0 ;;
+    *:AIX:*:[45])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -546 +538 @@
         fi
         echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-        exit ;;
+        exit 0 ;;
     *:AIX:*:*)
         echo rs6000-ibm-aix
-        exit ;;
+        exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
         echo romp-ibm-bsd4.4
-        exit ;;
+        exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-        exit ;;                             # report: romp-ibm BSD 4.3
+        exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
         echo rs6000-bull-bosx
-        exit ;;
+        exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
         echo m68k-bull-sysv3
-        exit ;;
+        exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
         echo m68k-hp-bsd
-        exit ;;
+        exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
         echo m68k-hp-bsd4.4
-        exit ;;
+        exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -629 +621 @@
         if [ ${HP_ARCH} = "hppa2.0w" ]
         then
-            eval $set_cc_for_build
-
-            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-            # generating 64-bit code.  GNU and HP use different nomenclature:
-            #
-            # $ CC_FOR_BUILD=cc ./config.guess
-            # => hppa2.0w-hp-hpux11.23
-            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-            # => hppa64-hp-hpux11.23
-
-            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-                grep __LP64__ >/dev/null
+            # avoid double evaluation of $set_cc_for_build
+            test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
             then
                 HP_ARCH="hppa2.0w"
@@ -649 +631 @@
         fi
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-        exit ;;
+        exit 0 ;;
     ia64:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ia64-hp-hpux${HPUX_REV}
-        exit ;;
+        exit 0 ;;
     3050*:HI-UX:*:*)
         eval $set_cc_for_build
@@ -681 +663 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-                { echo "$SYSTEM_NAME"; exit; }
+        $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
         echo unknown-hitachi-hiuxwe2
-        exit ;;
+        exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
         echo hppa1.1-hp-bsd
-        exit ;;
+        exit 0 ;;
     9000/8??:4.3bsd:*:*)
         echo hppa1.0-hp-bsd
-        exit ;;
+        exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
         echo hppa1.0-hp-mpeix
-        exit ;;
+        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
-        exit ;;
+        exit 0 ;;
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
-        exit ;;
+        exit 0 ;;
     i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
@@ -706 +687 @@
             echo ${UNAME_MACHINE}-unknown-osf1
         fi
-        exit ;;
+        exit 0 ;;
     parisc*:Lites*:*:*)
         echo hppa1.1-hp-lites
-        exit ;;
+        exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
         if getsysinfo -f scalar_acc
@@ -718 +699 @@
         else echo c2-convex-bsd
         fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
         echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
         echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
         echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
@@ -736 +717 @@
               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
               -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*T3E:*:*:*)
         echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*SV1:*:*:*)
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     *:UNICOS/mp:*:*)
-        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -754 +735 @@
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     sparc*:BSD/OS:*:*)
         echo sparc-unknown-bsdi${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:BSD/OS:*:*)
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:FreeBSD:*:*)
-        case ${UNAME_MACHINE} in
-            pc98)
-                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-            amd64)
-                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-            *)
-                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-        esac
-        exit ;;
+        # Determine whether the default compiler uses glibc.
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <features.h>
+        #if __GLIBC__ >= 2
+        LIBC=gnu
+        #else
+        LIBC=
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+        exit 0 ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
-        exit ;;
-    *:MINGW*:*)
+        exit 0 ;;
+    i*:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
-        exit ;;
-    i*:windows32*:*)
-        # uname -m includes "-pc" on this system.
-        echo ${UNAME_MACHINE}-mingw32
-        exit ;;
+        exit 0 ;;
+    i*:MSYS*:*)
+        echo ${UNAME_MACHINE}-pc-msys
+        exit 0 ;;
     i*:PW*:*)
         echo ${UNAME_MACHINE}-pc-pw32
-        exit ;;
-    *:Interix*:[3456]*)
-        case ${UNAME_MACHINE} in
-            x86)
-                echo i586-pc-interix${UNAME_RELEASE}
-                exit ;;
-            EM64T | authenticamd)
-                echo x86_64-unknown-interix${UNAME_RELEASE}
-                exit ;;
-            IA64)
-                echo ia64-unknown-interix${UNAME_RELEASE}
-                exit ;;
-        esac ;;
+        exit 0 ;;
+    x86:Interix*:3*)
+        echo i586-pc-interix3
+        exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
         echo i${UNAME_MACHINE}-pc-mks
-        exit ;;
+        exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -812 +782 @@
         # UNAME_MACHINE based on the output of uname instead of i386?
         echo i586-pc-interix
-        exit ;;
+        exit 0 ;;
     i*:UWIN*:*)
         echo ${UNAME_MACHINE}-pc-uwin
-        exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-        echo x86_64-unknown-cygwin
-        exit ;;
+        exit 0 ;;
     p*:CYGWIN*:*)
         echo powerpcle-unknown-cygwin
-        exit ;;
+        exit 0 ;;
     prep*:SunOS:5.*:*)
         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     *:GNU:*:*)
-        # the GNU system
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-        exit ;;
-    *:GNU/*:*:*)
-        # other systems with GNU libc and userland
-        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-        exit ;;
+        exit 0 ;;
     i*86:Minix:*:*)
         echo ${UNAME_MACHINE}-pc-minix
-        exit ;;
+        exit 0 ;;
     arm*:Linux:*:*)
-        eval $set_cc_for_build
-        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-            | grep -q __ARM_EABI__
-        then
-            echo ${UNAME_MACHINE}-unknown-linux-gnu
-        else
-            echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-        fi
-        exit ;;
-    avr32*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
-    cris:Linux:*:*)
-        echo cris-axis-linux-gnu
-        exit ;;
-    crisv32:Linux:*:*)
-        echo crisv32-axis-linux-gnu
-        exit ;;
-    frv:Linux:*:*)
-        echo frv-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     ia64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
-    m32r*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     m68*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     mips:Linux:*:*)
         eval $set_cc_for_build
@@ -883 +823 @@
         #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^CPU/{
-                s: ::g
-                p
-            }'`"
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
         ;;
     mips64:Linux:*:*)
@@ -906 +842 @@
         #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^CPU/{
-                s: ::g
-                p
-            }'`"
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
         ;;
-    or32:Linux:*:*)
-        echo or32-unknown-linux-gnu
-        exit ;;
     ppc:Linux:*:*)
         echo powerpc-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     ppc64:Linux:*:*)
         echo powerpc64-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     alpha:Linux:*:*)
         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -935 +864 @@
         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-        exit ;;
+        exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
@@ -943 +872 @@
           *)    echo hppa-unknown-linux-gnu ;;
         esac
-        exit ;;
+        exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
         echo hppa64-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
         echo ${UNAME_MACHINE}-ibm-linux
-        exit ;;
-    sh64*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     sh*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
-    vax:Linux:*:*)
-        echo ${UNAME_MACHINE}-dec-linux-gnu
-        exit ;;
+        exit 0 ;;
     x86_64:Linux:*:*)
         echo x86_64-unknown-linux-gnu
-        exit ;;
-    xtensa*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     i*86:Linux:*:*)
         # The BFD linker knows what the default object file format is, so
@@ -985 +905 @@
           a.out-i386-linux)
                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit ;;
+                exit 0 ;;
+          coff-i386)
+                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+                exit 0 ;;
           "")
                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
                 # one that does not give us useful --help.
                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-                exit ;;
+                exit 0 ;;
         esac
         # Determine whether the default compiler is a.out or elf
@@ -1007 +930 @@
         # endif
         #else
-        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+        #ifdef __INTEL_COMPILER
         LIBC=gnu
         #else
@@ -1013 +936 @@
         #endif
         #endif
-        #ifdef __dietlibc__
-        LIBC=dietlibc
-        #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^LIBC/{
-                s: ::g
-                p
-            }'`"
-        test x"${LIBC}" != x && {
-                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-                exit
-        }
-        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
         ;;
     i*86:DYNIX/ptx:4*:*)
@@ -1033 +946 @@
         # sysname and nodename.
         echo i386-sequent-sysv4
-        exit ;;
+        exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
@@ -1041 +954 @@
         # Use sysv4.2uw... so that sysv4* matches it.
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-        exit ;;
+        exit 0 ;;
     i*86:OS/2:*:*)
         # If we were able to find `uname', then EMX Unix compatibility
         # is probably installed.
         echo ${UNAME_MACHINE}-pc-os2-emx
-        exit ;;
+        exit 0 ;;
     i*86:XTS-300:*:STOP)
         echo ${UNAME_MACHINE}-unknown-stop
-        exit ;;
+        exit 0 ;;
     i*86:atheos:*:*)
         echo ${UNAME_MACHINE}-unknown-atheos
-        exit ;;
-    i*86:syllable:*:*)
-        echo ${UNAME_MACHINE}-pc-syllable
-        exit ;;
+        exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     i*86:*DOS:*:*)
         echo ${UNAME_MACHINE}-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
@@ -1069 +979 @@
                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
-        exit ;;
-    i*86:*:5:[678]*)
-        # UnixWare 7.x, OpenUNIX and OpenServer 6.
+        exit 0 ;;
+    i*86:*:5:[78]*)
         case `/bin/uname -X | grep "^Machine"` in
             *486*)           UNAME_MACHINE=i486 ;;
@@ -1078 +987 @@
         esac
         echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-        exit ;;
+        exit 0 ;;
     i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
@@ -1096 +1005 @@
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
-        exit ;;
+        exit 0 ;;
     pc:*:*:*)
         # Left here for compatibility:
@@ -1102 +1011 @@
         # the processor, so we play safe by assuming i386.
         echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
         echo i386-pc-mach3
-        exit ;;
+        exit 0 ;;
     paragon:*:*:*)
         echo i860-intel-osf1
-        exit ;;
+        exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
         if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
@@ -1115 +1024 @@
           echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
         fi
-        exit ;;
+        exit 0 ;;
     mini*:CTIX:SYS*5:*)
         # "miniframe"
         echo m68010-convergent-sysv
-        exit ;;
+        exit 0 ;;
     mc68k:UNIX:SYSTEM5:3.51m)
         echo m68k-convergent-sysv
-        exit ;;
+        exit 0 ;;
     M680?0:D-NIX:5.3:*)
         echo m68k-diab-dnix
-        exit ;;
-    M68*:*:R3V[5678]*:*)
-        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+        exit 0 ;;
+    M68*:*:R3V[567]*:*)
+        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
         OS_REL=''
         test -r /etc/.relid \
         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+          && echo i486-ncr-sysv4.3${OS_REL} && exit 0
         /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+          && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
-        exit ;;
+        exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
         echo powerpc-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
         echo mips-sni-sysv4
-        exit ;;
+        exit 0 ;;
     RM*:SINIX-*:*:*)
         echo mips-sni-sysv4
-        exit ;;
+        exit 0 ;;
     *:SINIX-*:*:*)
         if uname -p 2>/dev/null >/dev/null ; then
@@ -1170 +1079 @@
                 echo ns32k-sni-sysv
         fi
-        exit ;;
+        exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
         # From Gerald Hewes <hewes@openmarket.com>.
         # How about differentiating between stratus architectures? -djm
         echo hppa1.1-stratus-sysv4
-        exit ;;
+        exit 0 ;;
     *:*:*:FTX*)
         # From seanf@swdc.stratus.com.
         echo i860-stratus-sysv4
-        exit ;;
-    i*86:VOS:*:*)
-        # From Paul.Green@stratus.com.
-        echo ${UNAME_MACHINE}-stratus-vos
-        exit ;;
+        exit 0 ;;
     *:VOS:*:*)
         # From Paul.Green@stratus.com.
         echo hppa1.1-stratus-vos
-        exit ;;
+        exit 0 ;;
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     news*:NEWS-OS:6*:*)
         echo mips-sony-newsos6
-        exit ;;
+        exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
@@ -1204 +1109 @@
                 echo mips-unknown-sysv${UNAME_RELEASE}
         fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
         echo powerpc-be-beos
-        exit ;;
+        exit 0 ;;
     BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
         echo powerpc-apple-beos
-        exit ;;
+        exit 0 ;;
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
         echo i586-pc-beos
-        exit ;;
-    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
-        echo i586-pc-haiku
-        exit ;;
+        exit 0 ;;
     SX-4:SUPER-UX:*:*)
         echo sx4-nec-superux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     SX-5:SUPER-UX:*:*)
         echo sx5-nec-superux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     SX-6:SUPER-UX:*:*)
         echo sx6-nec-superux${UNAME_RELEASE}
-        exit ;;
-    SX-7:SUPER-UX:*:*)
-        echo sx7-nec-superux${UNAME_RELEASE}
-        exit ;;
-    SX-8:SUPER-UX:*:*)
-        echo sx8-nec-superux${UNAME_RELEASE}
-        exit ;;
-    SX-8R:SUPER-UX:*:*)
-        echo sx8r-nec-superux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     Power*:Rhapsody:*:*)
         echo powerpc-apple-rhapsody${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:Rhapsody:*:*)
         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:Darwin:*:*)
-        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        case $UNAME_PROCESSOR in
-            unknown) UNAME_PROCESSOR=powerpc ;;
+        case `uname -p` in
+            *86) UNAME_PROCESSOR=i686 ;;
+            powerpc) UNAME_PROCESSOR=powerpc ;;
         esac
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
         UNAME_PROCESSOR=`uname -p`
@@ -1255 +1148 @@
         fi
         echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
-        exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-        echo nse-tandem-nsk${UNAME_RELEASE}
-        exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+        exit 0 ;;
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:NonStop-UX:*:*)
         echo mips-compaq-nonstopux
-        exit ;;
+        exit 0 ;;
     BS2000:POSIX*:*:*)
         echo bs2000-siemens-sysv
-        exit ;;
+        exit 0 ;;
     DS/*:UNIX_System_V:*:*)
         echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:Plan9:*:*)
         # "uname -m" is not consistent, so use $cputype instead. 386
@@ -1284 +1174 @@
         fi
         echo ${UNAME_MACHINE}-unknown-plan9
-        exit ;;
+        exit 0 ;;
     *:TOPS-10:*:*)
         echo pdp10-unknown-tops10
-        exit ;;
+        exit 0 ;;
     *:TENEX:*:*)
         echo pdp10-unknown-tenex
-        exit ;;
+        exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
         echo pdp10-dec-tops20
-        exit ;;
+        exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
         echo pdp10-xkl-tops20
-        exit ;;
+        exit 0 ;;
     *:TOPS-20:*:*)
         echo pdp10-unknown-tops20
-        exit ;;
+        exit 0 ;;
     *:ITS:*:*)
         echo pdp10-unknown-its
-        exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-        exit ;;
-    *:DragonFly:*:*)
-        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        exit ;;
-    *:*VMS:*:*)
-        UNAME_MACHINE=`(uname -p) 2>/dev/null`
-        case "${UNAME_MACHINE}" in
-            A*) echo alpha-dec-vms ; exit ;;
-            I*) echo ia64-dec-vms ; exit ;;
-            V*) echo vax-dec-vms ; exit ;;
-        esac ;;
-    *:XENIX:*:SysV)
-        echo i386-pc-xenix
-        exit ;;
-    i*86:skyos:*:*)
-        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-        exit ;;
-    i*86:rdos:*:*)
-        echo ${UNAME_MACHINE}-pc-rdos
-        exit ;;
+        exit 0 ;;
 esac
 
@@ -1356 +1224 @@
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
@@ -1445 +1313 @@
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-        { echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
@@ -1459 +1326 @@
     c1*)
         echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     c2*)
         if getsysinfo -f scalar_acc
@@ -1465 +1332 @@
         else echo c2-convex-bsd
         fi
-        exit ;;
+        exit 0 ;;
     c34*)
         echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     c38*)
         echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     c4*)
         echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     esac
 fi
@@ -1485 +1352 @@
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please

branches/blt4/gui/cf/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-04-14'
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-02-22'
 
 # This file is (in principle) common to ALL GNU software.
@@ -23 +22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
-
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
@@ -73 +71 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -86 +84 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -102 +100 @@
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
@@ -121 +119 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -149 +145 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray)
+        -apple | -axis)
                 os=
                 basic_machine=$1
@@ -174 +170 @@
                 os=-hiuxwe2
                 ;;
-        -sco6)
-                os=-sco5v6
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-                ;;
         -sco5)
                 os=-sco3.2v5
@@ -191 +183 @@
                 ;;
         -sco3.2v[4-9]*)
-                # Don't forget version if it is 3.2v4 or newer.
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-                ;;
-        -sco5v6*)
                 # Don't forget version if it is 3.2v4 or newer.
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241 +229 @@
         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-        | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | bfin \
-        | c4x | clipper \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | clipper \
         | d10v | d30v | dlx | dsp16xx \
-        | fido | fr30 | frv \
+        | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
-        | ip2k | iq2000 \
-        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-        | maxq | mb | microblaze | mcore | mep | metag \
+        | ip2k \
+        | m32r | m68000 | m68k | m88k | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
-        | mips64octeon | mips64octeonel \
+        | mips64vr | mips64vrel \
         | mips64orion | mips64orionel \
-        | mips64r5900 | mips64r5900el \
-        | mips64vr | mips64vrel \
         | mips64vr4100 | mips64vr4100el \
         | mips64vr4300 | mips64vr4300el \
         | mips64vr5000 | mips64vr5000el \
-        | mips64vr5900 | mips64vr5900el \
         | mipsisa32 | mipsisa32el \
         | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
-        | mipsisa64r2 | mipsisa64r2el \
         | mipsisa64sb1 | mipsisa64sb1el \
         | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
-        | mt \
         | msp430 \
-        | nios | nios2 \
         | ns16k | ns32k \
-        | or32 \
+        | openrisc | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | score \
-        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-        | spu | strongarm \
-        | tahoe | thumb | tic4x | tic80 | tron \
+        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+        | strongarm \
+        | tahoe | thumb | tic80 | tron \
         | v850 | v850e \
         | we32k \
-        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | x86 | xscale | xstormy16 | xtensa \
         | z8k)
                 basic_machine=$basic_machine-unknown
@@ -298 +275 @@
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-                ;;
-        ms1)
-                basic_machine=mt-unknown
                 ;;
 
@@ -321 +295 @@
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* | avr32-* \
-        | bfin-* | bs2000-* \
+        | avr-* \
+        | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-        | clipper-* | craynv-* | cydra-* \
+        | clipper-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
-        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
-        | ip2k-* | iq2000-* \
-        | m32c-* | m32r-* | m32rle-* \
+        | ip2k-* \
+        | m32r-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+        | m88110-* | m88k-* | mcore-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
-        | mips64octeon-* | mips64octeonel-* \
+        | mips64vr-* | mips64vrel-* \
         | mips64orion-* | mips64orionel-* \
-        | mips64r5900-* | mips64r5900el-* \
-        | mips64vr-* | mips64vrel-* \
         | mips64vr4100-* | mips64vr4100el-* \
         | mips64vr4300-* | mips64vr4300el-* \
         | mips64vr5000-* | mips64vr5000el-* \
-        | mips64vr5900-* | mips64vr5900el-* \
         | mipsisa32-* | mipsisa32el-* \
         | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
-        | mipsisa64r2-* | mipsisa64r2el-* \
         | mipsisa64sb1-* | mipsisa64sb1el-* \
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
-        | mmix-* \
-        | mt-* \
         | msp430-* \
-        | nios-* | nios2-* \
-        | none-* | np1-* | ns16k-* | ns32k-* \
+        | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -363 +330 @@
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-        | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
         | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa*-* \
+        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+        | xtensa-* \
         | ymp-* \
         | z8k-*)
-                ;;
-        # Recognize the basic CPU types without company name, with glob match.
-        xtensa*)
-                basic_machine=$basic_machine-unknown
                 ;;
         # Recognize the various machine names and aliases which stand
@@ -398 +360 @@
                 os=-udi
                 ;;
-        abacus)
-                basic_machine=abacus-unknown
-                ;;
         adobe68k)
                 basic_machine=m68010-adobe
@@ -415 +374 @@
                 os=-bsd
                 ;;
-        amd64)
-                basic_machine=x86_64-pc
-                ;;
-        amd64-*)
-                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
         amdahl)
                 basic_machine=580-amdahl
@@ -452 +405 @@
                 os=-dynix
                 ;;
-        blackfin)
-                basic_machine=bfin-unknown
-                os=-linux
-                ;;
-        blackfin-*)
-                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
         c90)
                 basic_machine=c90-cray
@@ -488 +433 @@
                 os=-unicos
                 ;;
-        craynv)
-                basic_machine=craynv-cray
-                os=-unicosmp
-                ;;
-        cr16)
-                basic_machine=cr16-unknown
-                os=-elf
-                ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
-        crisv32 | crisv32-* | etraxfs*)
-                basic_machine=crisv32-axis
-                ;;
         cris | cris-* | etrax*)
                 basic_machine=cris-axis
-                ;;
-        crx)
-                basic_machine=crx-unknown
-                os=-elf
                 ;;
         da30 | da30-*)
@@ -530 +460 @@
                 basic_machine=m88k-motorola
                 os=-sysv3
-                ;;
-        dicos)
-                basic_machine=i686-pc
-                os=-dicos
-                ;;
-        djgpp)
-                basic_machine=i586-pc
-                os=-msdosdjgpp
                 ;;
         dpx20 | dpx20-*)
@@ -689 +611 @@
                 os=-sysv
                 ;;
-        m68knommu)
-                basic_machine=m68k-unknown
-                os=-linux
-                ;;
-        m68knommu-*)
-                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
         m88k-omron*)
                 basic_machine=m88k-omron
@@ -709 +623 @@
                 ;;
         mingw32)
-                basic_machine=i386-pc
+                basic_machine=i686-pc
                 os=-mingw32
                 ;;
-        mingw32ce)
-                basic_machine=arm-unknown
-                os=-mingw32ce
+        msys)
+                basic_machine=i686-pc
+                os=-msys
                 ;;
         miniframe)
@@ -729 +643 @@
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
+                ;;
         monitor)
                 basic_machine=m68k-rom68k
@@ -740 +658 @@
                 basic_machine=i386-pc
                 os=-msdos
-                ;;
-        ms1-*)
-                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
         mvs)
@@ -812 +727 @@
                 basic_machine=np1-gould
                 ;;
+        nv1)
+                basic_machine=nv1-cray
+                os=-unicosmp
+                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
@@ -819 +738 @@
                 os=-proelf
                 ;;
-        openrisc | openrisc-*)
+        or32 | or32-*)
                 basic_machine=or32-unknown
-                ;;
-        os400)
-                basic_machine=powerpc-ibm
-                os=-os400
+                os=-coff
                 ;;
         OSE68000 | ose68000)
@@ -842 +758 @@
                 os=-osf
                 ;;
-        parisc)
-                basic_machine=hppa-unknown
-                os=-linux
-                ;;
-        parisc-*)
-                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
         pbd)
                 basic_machine=sparc-tti
@@ -859 +767 @@
                 basic_machine=ns32k-pc532
                 ;;
-        pc98)
-                basic_machine=i386-pc
-                ;;
-        pc98-*)
-                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
@@ -871 +773 @@
                 basic_machine=i686-pc
                 ;;
-        pentiumii | pentium2 | pentiumiii | pentium3)
+        pentiumii | pentium2)
                 basic_machine=i686-pc
-                ;;
-        pentium4)
-                basic_machine=i786-pc
                 ;;
         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
@@ -883 +782 @@
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+        pentiumii-* | pentium2-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        pentium4-*)
-                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
@@ -921 +817 @@
                 os=-pw32
                 ;;
-        rdos)
-                basic_machine=i386-pc
-                os=-rdos
-                ;;
         rom68k)
                 basic_machine=m68k-rom68k
@@ -951 +843 @@
                 basic_machine=mipsisa64sb1el-unknown
                 ;;
-        sde)
-                basic_machine=mipsisa32-sde
-                os=-elf
-                ;;
-        sei)
-                basic_machine=mips-sei
-                os=-seiux
-                ;;
         sequent)
                 basic_machine=i386-sequent
@@ -966 +850 @@
                 os=-hms
                 ;;
-        sh5el)
-                basic_machine=sh5le-unknown
-                ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
         sparclite-wrs | simso-wrs)
                 basic_machine=sparclite-wrs
@@ -1046 +924 @@
                 os=-unicos
                 ;;
+        tic4x | c4x*)
+                basic_machine=tic4x-unknown
+                os=-coff
+                ;;
         tic54x | c54x*)
                 basic_machine=tic54x-unknown
@@ -1058 +940 @@
                 os=-coff
                 ;;
-        tile*)
-                basic_machine=tile-unknown
-                os=-linux-gnu
-                ;;
         tx39)
                 basic_machine=mipstx39-unknown
@@ -1075 +953 @@
                 basic_machine=m68k-ncr
                 ;;
-        tpf)
-                basic_machine=s390x-ibm
-                os=-tpf
-                ;;
         udi29k)
                 basic_machine=a29k-amd
@@ -1121 +995 @@
                 basic_machine=hppa1.1-winbond
                 os=-proelf
-                ;;
-        xbox)
-                basic_machine=i686-pc
-                os=-mingw32
                 ;;
         xps | xps100)
@@ -1156 +1026 @@
                 basic_machine=romp-ibm
                 ;;
-        mmix)
-                basic_machine=mmix-knuth
-                ;;
         rs6000)
                 basic_machine=rs6000-ibm
@@ -1175 +1042 @@
                 basic_machine=we32k-att
                 ;;
-        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
                 basic_machine=sh-unknown
                 ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
+        sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
@@ -1251 +1121 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-              | -openbsd* | -solidbsd* \
-              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-              | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -msys* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1266 +1133 @@
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+              | -powermax* | -dnix*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1285 +1151 @@
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
@@ -1291 +1157 @@
                 os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
-        -linux-dietlibc)
-                os=-linux-dietlibc
-                ;;
         -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
@@ -1306 +1169 @@
                 os=-openedition
                 ;;
-        -os400*)
-                os=-os400
-                ;;
         -wince*)
                 os=-wince
@@ -1329 +1189 @@
         -atheos*)
                 os=-atheos
-                ;;
-        -syllable*)
-                os=-syllable
                 ;;
         -386bsd)
@@ -1355 +1212 @@
                 os=-sysv4
                 ;;
-        -tpf*)
-                os=-tpf
-                ;;
         -triton*)
                 os=-sysv3
@@ -1393 +1247 @@
         -kaos*)
                 os=-kaos
-                ;;
-        -zvmoe)
-                os=-zvmoe
-                ;;
-        -dicos*)
-                os=-dicos
                 ;;
         -none)
@@ -1422 +1270 @@
 
 case $basic_machine in
-        score-*)
-                os=-elf
-                ;;
-        spu-*)
-                os=-elf
-                ;;
         *-acorn)
                 os=-riscix1.2
@@ -1436 +1278 @@
         arm*-semi)
                 os=-aout
-                ;;
-        c4x-* | tic4x-*)
-                os=-coff
                 ;;
         # This must come before the *-dec entry.
@@ -1465 +1304 @@
                 os=-aout
                 ;;
-        mep-*)
-                os=-elf
-                ;;
         mips*-cisco)
                 os=-elf
@@ -1486 +1322 @@
                 os=-beos
                 ;;
-        *-haiku)
-                os=-haiku
-                ;;
         *-ibm)
                 os=-aix
-                ;;
-        *-knuth)
-                os=-mmixware
                 ;;
         *-wec)
@@ -1627 +1457 @@
                                 vendor=ibm
                                 ;;
-                        -os400*)
-                                vendor=ibm
-                                ;;
                         -ptx*)
                                 vendor=sequent
                                 ;;
-                        -tpf*)
-                                vendor=ibm
-                                ;;
                         -vxsim* | -vxworks* | -windiss*)
                                 vendor=wrs
@@ -1660 +1484 @@
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:

branches/blt4/gui/scripts/Makefile.in

@@ -131 +131 @@
                 $(srcdir)/vtkcontourviewer.tcl \
                 $(srcdir)/vtkstreamlinesviewer.tcl \
+                $(srcdir)/vtkvolumeviewer.tcl \
+                $(srcdir)/vtkheightmapviewer.tcl \
                 $(srcdir)/xylegend.tcl \
                 $(srcdir)/xyprint.tcl \

branches/blt4/gui/scripts/field.tcl

@@ -35 +35 @@
     public method flowhints { cname }
     public method type {}
+    public method vtkdata {{what -overall}}
 
     protected method _build {}
@@ -50 +51 @@
     private variable _comp2vtk   ;# maps component name => vtkFloatArray
     private variable _comp2vtkstreamlines   ;# maps component name => vtkFloatArray
+    private variable _comp2vtkvolume   ;# maps component name => vtkFloatArray
+    private variable _comp2volume   ;# maps component name => vtkFloatArray
     private variable _comp2dx    ;# maps component name => OpenDX data
     private variable _comp2unirect2d ;# maps component name => unirect2d obj
@@ -201 +204 @@
         return ""  ;# no mesh -- it's embedded in the value data
     }
+    if {[info exists _comp2vtkvolume($what)]} {
+        return ""  ;# no mesh -- it's embedded in the value data
+    }
     if {[info exists _comp2unirect2d($what)]} {
         set mobj [lindex $_comp2unirect2d($what) 0]
@@ -261 +267 @@
     if { [info exists _comp2vtk($what)] } {
         return ""
+    }
+    if { [info exists _comp2vtkvolume($what)] } {
+        return $_comp2vtkvolume($what)
     }
     if { [info exists _comp2vtkstreamlines($what)] } {
@@ -578 +587 @@
     catch {unset _comp2dims}
     catch {unset _comp2style}
+    array unset _comp2volume
     array unset _comp2vtkstreamlines
     array unset _comp2unirect2d
@@ -603 +613 @@
             }
         } elseif {[$_field element $cname.opendx] != ""} {
-            set type "opendx"
+            global env
+            if { [info exists env(VTKVOLUME)] } {
+                set type "vtkvolume"
+            } else {
+                set type "dx"
+            }
         } elseif {[$_field element $cname.dx] != ""} {
-            set type "dx"
+            global env
+            if { [info exists env(VTKVOLUME)] } {
+                set type "vtkvolume"
+            } else {
+                set type "dx"
+            }
         }
         set _comp2style($cname) ""
@@ -796 +816 @@
             set _comp2style($cname) [$_field get $cname.style]
             incr _counter
+        } elseif {$type == "vtkvolume"} {
+            set _comp2dims($cname) "3D"
+            # Allow redirects to another element.
+            set data [$_field get -decode no $cname.dx]
+            set data [Rappture::encoding::decode -as zb64 $data]
+            if 1 {
+            set file "/tmp/$cname.dx"
+            set f [open $file "w"]
+            puts $f $data
+            close $f
+            }
+            set data [Rappture::ConvertDxToVtk $data]
+            if 1 {
+            set file "/tmp/$cname.vtk"
+            set f [open $file "w"]
+            puts $f $data
+            close $f
+            }
+            set _comp2vtkvolume($cname) $data
+            set _comp2style($cname) [$_field get $cname.style]
+            incr _counter
         } elseif {$type == "vtkstreamlines2"} {
             set _comp2dims($cname) "3D"
@@ -801 +842 @@
             set _comp2style($cname) [$_field get $cname.style]
             incr _counter
-        } elseif {$type == "dx"} {
+        } elseif {$type == "dx" } {
             #
             # HACK ALERT!  Extract gzipped, base64-encoded OpenDX
@@ -809 +850 @@
             set _comp2dims($cname) "3D"
             set _comp2dx($cname)  [$_field get -decode no $cname.dx]
+            if 1 {
+            set data  [$_field get -decode yes $cname.dx]
+            set file "/tmp/junk.dx"
+            set f [open $file "w"]
+            puts $f $data
+            close $f
+            if { [string match "<ODX>*" $data] } {
+                set data [string range $data 5 end]
+                set _comp2dx($cname) \
+                        [Rappture::encoding::encode -as zb64 $data]
+            } 
+            }
             set _comp2style($cname) [$_field get $cname.style]
             if {[$_field element $cname.flow] != ""} {
@@ -955 +1008 @@
     return $_comp2extents($what)
 }
+
+# ----------------------------------------------------------------------
+# USAGE: blob ?<name>?
+#
+# Returns a string representing the blob of data for the mesh and values.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Field::vtkdata {{what -overall}} {
+    if {$what == "component0"} {
+        set what "component"
+    }
+    if {[info exists _comp2xy($what)]} {
+        return ""
+    }
+    if { [info exists _comp2vtk($what)] } {
+        return ""
+    }
+    if { [info exists _comp2vtkstreamlines($what)] } {
+        # Return the contents of the vtk file.
+        return $_comp2vtkstreamlines($what)
+    }
+    if { [info exists _comp2vtkvolume($what)] } {
+        # Return the contents of the vtk file.
+        return $_comp2vtkvolume($what)
+    }
+    if {[info exists _comp2dx($what)]} {
+        return $_comp2dx($what)
+    }
+    if {[info exists _comp2unirect2d($what)]} {
+        return [$_comp2unirect2d($what) blob]
+    }
+    if {[info exists _comp2unirect3d($what)]} {
+        return [$_comp2unirect3d($what) blob]
+    }
+    error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"
+}

branches/blt4/gui/scripts/field2dresult.tcl

@@ -61 +61 @@
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkcontour" {
+        "vtkcontour" - "vtkheightmap" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -76 +76 @@
                 itk_component add renderer {
                     Rappture::HeightmapViewer $itk_interior.ren $servers 
+                }
+            }
+            "vtkheightmap" {
+                itk_component add renderer {
+                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers 
                 }
             }

branches/blt4/gui/scripts/field3dresult.tcl

@@ -59 +59 @@
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkcontour" - "vtkstreamlines" {
+        "vtkcontour" - "vtkstreamlines" - "vtkvolume" - "vtkviewer"  {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -81 +81 @@
                     Rappture::FlowvisViewer $itk_interior.ren $servers
                 }
+            }
+            "vtkvolume" {
+                catch {
+                itk_component add renderer {
+                    Rappture::VtkVolumeViewer $itk_interior.ren $servers
+                }
+                } errs
+                puts stderr errs=$errs
             }
             "vtkstreamlines" {

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -601 +601 @@
                     0,1 $f.cancel 
                 blt::table $inner \
-                    0,0 $inner.pdb -anchor w \
-                    1,0 $inner.image -anchor w \
-                    2,0 $f -fill x -pady 4
+                    0,0 $inner.summary -anchor w \
+                    1,0 $inner.pdb -anchor w \
+                    2,0 $inner.image -anchor w \
+                    3,0 $f -fill x -pady 4
                 $inner.pdb select
             } else {
@@ -1209 +1210 @@
     set _view(c) $c 
     if { !$_rotatePending } {
-        $_dispatcher event -after 50 !rotate
+        $_dispatcher event -after 100 !rotate
         set _rotatePending 1
     }

branches/blt4/gui/scripts/nanovisviewer.tcl

@@ -156 +156 @@
     private variable _first ""     ;# This is the topmost volume.
     private variable _buffering 0
-    
+
     # This 
     # indicates which isomarkers and transfer
@@ -181 +181 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::constructor {hostlist args} {
+    set _serverType "nanovis"
 
     # Draw legend event
@@ -237 +238 @@
 
     itk_component add 3dview {
-        label $itk_component(plotarea).vol -image $_image(plot) \
+        label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
     } {
@@ -749 +750 @@
         if { ![info exists _vol2style($vol)] } {
             puts stderr "unknown volume $vol"
-            continue;                   # How does this happen?
+            continue;                        # How does this happen?
         }
         set tf $_vol2style($vol)
@@ -843 +844 @@
         }
     }
+
+    # The colormap may have changed. Resync the slicers with the colormap.
+    set vols [CurrentVolumes -cutplanes]
+    SendCmd "volume data state $_settings($this-volume) $vols"
+
+    # Adjust the cutplane for only the first component in the topmost volume
+    # (i.e. the first volume designated in the field).
+    set vol [lindex $vols 0]
+    foreach axis {x y z} {
+        # Turn off cutplanes for all volumes
+        SendCmd "cutplane state 0 $axis"
+        if { $_settings($this-${axis}cutplane) } {
+            # Turn on cutplane for this particular volume and set the position
+            SendCmd "cutplane state 1 $axis $vol"
+            set pos [expr {0.01*$_settings($this-${axis}cutposition)}]
+            SendCmd "cutplane position $pos $axis $vol"
+        }
+    }
 }
 
@@ -985 +1004 @@
         updatetransferfuncs
     }
-
-    # Sync the state of slicers
-    set vols [CurrentVolumes -cutplanes]
     foreach axis {x y z} {
-        SendCmd "cutplane state $_settings($this-${axis}cutplane) $axis $vols"
-        set pos [expr {0.01*$_settings($this-${axis}cutposition)}]
-        SendCmd "cutplane position $pos $axis $vols"
-    }
-    SendCmd "volume data state $_settings($this-volume) $vols"
-    set _buffering 0;                   # Turn off buffering.
+        # Turn off cutplanes for all volumes
+        SendCmd "cutplane state 0 $axis"
+    }
+    set _buffering 0;                        # Turn off buffering.
     # Actually write the commands to the server socket.  If it fails, we don't
     # care.  We're finished here.
     blt::busy hold $itk_component(hull)
-    SendBytes $_outbuf;                 
+    SendBytes $_outbuf;                        
     blt::busy release $itk_component(hull)
-    set _outbuf "";                     # Clear the buffer.             
+    set _outbuf "";                        # Clear the buffer.                
 }
 
@@ -1022 +1036 @@
             }
             array set style [lindex [$_first components -style $comp] 0]
-            if {$what != "-cutplanes" || $style(-cutplanes)} {
+            if { $what != "-cutplanes" || $style(-cutplanes) } {
                 lappend rlist $vol
             }
@@ -1300 +1314 @@
             if { [isconnected] } {
                 set vols [CurrentVolumes -cutplanes] 
-                SendCmd "cutplane state $bool $axis $vols"
+                set vol [lindex $vols 0]
+                SendCmd "cutplane state $bool $axis $vol"
             }
             if { $bool } {
@@ -1992 +2007 @@
             set newpos [expr {0.01*$newval}]
             set vols [CurrentVolumes -cutplanes]
-            SendCmd "cutplane position $newpos $axis $vols"
+            set vol [lindex $vols 0]
+            SendCmd "cutplane position $newpos $axis $vol"
         }
         default {

branches/blt4/gui/scripts/numberresult.tcl

@@ -875 +875 @@
     set g $itk_component(plot)
     set elem ""
-  
+
     # Peek inside of Blt_ZoomStack package to see if we're currently in the
     # middle of a zoom selection.
@@ -889 +889 @@
             # for dealing with xy line plots
             set elem $info(name)
-
             # Some elements are generated dynamically and therefore will
-            # not have a dataobj object associated with them.
+            # not have a data object associated with them.
             set mapx [$g element cget $elem -mapx]
             set mapy [$g element cget $elem -mapy]

branches/blt4/gui/scripts/resultset.tcl

@@ -1095 +1095 @@
     }
     if { $_active == "" } {
-        return
+        return;                         # Nothing active. Don't do anything.
     }
     eval lappend params [_getValues $_active all]
@@ -1527 +1527 @@
                 if {$col == "xmlobj"} {
                     set val "#[expr {$which+1}]"
-                } else {
-                    set val [lindex [$_results get -format $col $which] 0]
+                } else { 
+                    # Be careful giving singleton elements as the "columns"
+                    # argument to "Tuples::get". It is expecting a list.
+                    set val [lindex [$_results get -format [list $col] $which] 0]
                 }
                 if {[info exists label2val($val)]} {
@@ -1620 +1622 @@
             foreach col $_cntlInfo($this-all) {
                 set quantity $_cntlInfo($this-$col-label)
-                set val [lindex [$_results get -format $col $index] 0]
+                # Be careful giving singleton elements as the "columns"
+                # argument to "Tuples::get". It is expecting a list.
+                set val [lindex [$_results get -format [list $col] $index] 0]
                 if {$col == "xmlobj"} {
                     set num [lindex [$_results find -format xmlobj $val] 0]

branches/blt4/gui/scripts/resultviewer.tcl

@@ -220 +220 @@
                 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
                 set w $itk_interior.vtkviewer
-                catch { Rappture::VtkViewer $w $servers } errs
-                puts stderr errs=$errs
+                Rappture::VtkViewer $w $servers
                 set _mode2widget($mode) $w
             }
@@ -267 +266 @@
                             if { [$dataobj hints type] == "contour" } {
                                 set resultMode "vtkcontour" 
+                            } elseif { [info exists env(VTKHEIGHTMAP)] } {
+                                set resultMode "vtkheightmap"
                             } else {
                                 set resultMode "heightmap"
@@ -298 +299 @@
                                 }
                             }
+                            "vtkvolume" {
+                                set fmt "vtkvolume"
+                            }
                             "vtkstreamlines" {
                                 set fmt "vtkstreamlines"

branches/blt4/gui/scripts/sequenceresult.tcl

@@ -397 +397 @@
     global readyForNextFrame 
     set readyForNextFrame 1;            # By default, always ready
-
-    # toggle the button to "play" mode
-    $itk_component(play) configure \
-        -bitmap [Rappture::icon play] \
-        -command [itcl::code $this play]
+                                        
+    # Check if the play button still exists. We may be in the process
+    # of destroying the widget.
+    if { [info exists itk_component(play)] } {
+        # toggle the button to "play" mode
+        $itk_component(play) configure \
+            -bitmap [Rappture::icon play] \
+            -command [itcl::code $this play]
+    }
 }
 

branches/blt4/gui/scripts/sidebarframe.tcl

@@ -310 +310 @@
 # argument can be a panel index, name, or title.
 # ----------------------------------------------------------------------
-itcl::body Rappture::SidebarFrame::select { which} {
+itcl::body Rappture::SidebarFrame::select {which} {
     set pname ""
     switch -glob -- $which {

branches/blt4/gui/scripts/tool.tcl

@@ -206 +206 @@
 
             if { $status != 0 } {
-                foreach {pstatus pid mesg} $::Rappture::Tool::job(control) break
-                if { $pstatus != "EXITED" } {
-                    set result "Abnormal program termination \"$pstatus\": $mesg"
+                foreach {code pid mesg} $::Rappture::Tool::job(control) break
+                if { $code != "EXITED" } {
+                    set result "Abnormal program termination \"$code\": $mesg"
                     return [list $status $result]
                 }
             }
-        }
+        }
         # ...job is finished
         array set times [Rappture::rusage measure]
+
         if {[resources -jobprotocol] != "submit"} {
             set id [$_xmlobj get tool.id]

branches/blt4/gui/scripts/visviewer.tcl

@@ -25 +25 @@
     set _servers(vtkvis)  "localhost:2010"
 
-    protected variable _sid ""        ;# socket connection to server
-    private common _done            ;# Used to indicate status of send.
-    private variable _buffer        ;# buffer for incoming/outgoing commands
+    protected variable _serverType "???";# Type of server.
+    protected variable _sid ""      ;   # socket connection to server
+    private common _done            ;   # Used to indicate status of send.
+    private variable _buffer        ;   # buffer for incoming/outgoing commands
     private variable _initialized 
     private variable _isOpen 0
+    private variable _afterId -1
+    private variable _icon 0
+
     # Number of milliseconds to wait before idle timeout.
     # If greater than 0, automatically disconnect from the visualization
@@ -37 +41 @@
     #private variable _idleTimeout 0;       # No timeout
 
-    protected variable _dispatcher ""   ;# dispatcher for !events
-    protected variable _hosts ""    ;# list of hosts for server
-    protected variable _parser ""   ;# interpreter for incoming commands
+    protected variable _dispatcher "";  # dispatcher for !events
+    protected variable _hosts ""    ;   # list of hosts for server
+    protected variable _parser ""   ;   # interpreter for incoming commands
     protected variable _image
     protected variable _hostname
@@ -56 +60 @@
     private method SendHelper.old {}
     private method CheckConnection {}
+    private method SplashScreen { state } 
 
     protected method SendEcho { channel {data ""} }
@@ -67 +72 @@
     protected method Color2RGB { color }
     protected method Euler2XYZ { theta phi psi }
+    protected method StartWaiting {} 
+    protected method StopWaiting {} 
+
+    private method Waiting { option widget } 
 
     private proc CheckNameList { namelist }  {
-        set pattern {^[a-zA-Z0-9\.]+:[0-9]+(,[a-zA-Z0-9\.]+:[0-9]+)*$}
-        if { ![regexp $pattern $namelist match] } {
-            error "bad visualization server address \"$namelist\": should be host:port,host:port,..."
+        foreach host $namelist {
+            set pattern {^[a-zA-Z0-9\.]+:[0-9]}
+            if { ![regexp $pattern $host match] } {
+                error "bad visualization server address \"$host\": should be host:port,host:port,..."
+            }
         }
     }
-    public proc GetServerList { tag } {
-        return $_servers($tag)
-    }
-    public proc SetServerList { tag namelist } {
+    public proc GetServerList { type } {
+        return $_servers($type)
+    }
+    public proc SetServerList { type namelist } {
+        # Convert the comma separated list into a Tcl list.  OGRE also adds
+        # a trailing comma that we want to ignore.
+        regsub -all "," $namelist " " namelist
         CheckNameList $namelist
-        set _servers($tag) $namelist
+        set _servers($type) $namelist
+    }
+    public proc RemoveServerFromList { type server } {
+        if { ![info exists _servers($type)] } {
+            error "unknown server type \"$type\""
+        }
+        set i [lsearch $_servers($type) $server]
+        if { $i < 0 } {
+            return
+        }
+        set _servers($type) [lreplace $_servers($type) $i $i]
     }
     public proc SetPymolServerList { namelist } {
@@ -106 +130 @@
     $_dispatcher register !timeout
     $_dispatcher dispatch $this !timeout "[itcl::code $this Disconnect]; list"
+
+    $_dispatcher register !waiting
 
     CheckNameList $hostlist
@@ -118 +144 @@
         $_parser hide $cmd
     }
-
     #
     # Set up the widgets in the main body
@@ -155 +180 @@
 #   Shuffle the list of server hosts.
 #
-itcl::body Rappture::VisViewer::Shuffle { hostlist } {
-    set hosts [split $hostlist ,]
+itcl::body Rappture::VisViewer::Shuffle { hosts } {
     set randomHosts {}
     set ticks [clock clicks]
@@ -200 +224 @@
 itcl::body Rappture::VisViewer::Connect { hostlist } {
     blt::busy hold $itk_component(hull) -cursor watch
-    # Can't call update because of all the pending stuff going on
-    #update
-    
-    # Shuffle the list of servers so as to pick random 
-    set servers [Shuffle $hostlist]
-    
-    # Get the first server
-    foreach {hostname port} [split [lindex $servers 0] :] break
-    set servers [lrange $servers 1 end]
-    
-    while {1} {
-        puts stderr "connecting to $hostname:$port..."
+
+    puts stderr "server type is $_serverType"
+    foreach server [Shuffle $hostlist] {
+        puts stderr "connecting to $server..."
+        foreach {hostname port} [split $server ":"] break
         if { [catch {socket $hostname $port} _sid] != 0 } {
             set _sid ""
-            if {[llength $servers] == 0} {
-                blt::busy release $itk_component(hull)
-                return 0
-            }
-            # Get the next server
-            foreach {hostname port} [split [lindex $servers 0] :] break
-            set servers [lrange $servers 1 end]
-            continue
-        }
-        set _hostname $hostname:$port
+            RemoveServerFromList $_serverType $server
+            continue
+        }
+        set _hostname $server
         fconfigure $_sid -translation binary -encoding binary
         
-        # Read back a reconnection order
+        # Read back the server identification string.
         if { [gets $_sid data] <= 0 } {
-            error "reading from server"
+            set _sid ""
+            puts stderr "reading from server"
+            RemoveServerFromList $_serverType $server
+            continue
         }
         puts stderr "render server is $data"
@@ -242 +256 @@
         return 1
     }
-    #NOTREACHED
     blt::busy release $itk_component(hull)
+    set x [expr {[winfo rootx $itk_component(hull)]+10}]
+    set y [expr {[winfo rooty $itk_component(hull)]+10}]
+    Rappture::Tooltip::cue @$x,$y "Can't connect to any $_serverType visualization server.  This may be a network problem.  Wait a few moments and try resetting the view."
     return 0
 }
@@ -254 +270 @@
 #
 itcl::body Rappture::VisViewer::Disconnect {} {
+    after cancel $_afterId
     $_dispatcher cancel !timeout
     catch {close $_sid} 
@@ -307 +324 @@
         Rappture::Tooltip::cue hide
     } else {
-        Rappture::Tooltip::cue @$x,$y "Can't connect to visualization server.  This may be a network problem.  Wait a few moments and try resetting the view."
+        Rappture::Tooltip::cue @$x,$y "Can't connect to any $_serverType visualization server.  This may be a network problem.  Wait a few moments and try resetting the view."
         return 0
     }
@@ -400 +417 @@
         flush $_sid
     }
-    if 0 {
-    if { ![CheckConnection] } {
-        puts stderr "connection is now down"
-        return 0
-    }
-    }
     return $_done($this)
+}
+
+#
+# ReceiveBytes --
+#
+#    Read some number of bytes from the visualization server. 
+#
+itcl::body Rappture::VisViewer::StartWaiting {} {
+    after cancel $_afterId 
+    set _afterId [after 500 [itcl::code $this SplashScreen on]]
+}
+
+itcl::body Rappture::VisViewer::StopWaiting {} { 
+    SplashScreen off
 }
 
@@ -539 +564 @@
     }
 }
+
+itcl::body Rappture::VisViewer::SplashScreen { state } {
+    after cancel $_afterId
+    set _afterId -1
+    if { $state } {
+        if { [winfo exists $itk_component(plotarea).view.splash] } {
+            return
+        }
+        set inner [frame $itk_component(plotarea).view.splash]
+        $inner configure -relief raised -bd 2 
+        label $inner.text1 -text "Rendering, please wait." \
+            -font "Arial 10"
+        label $inner.icon 
+        pack $inner -expand yes -anchor c
+        blt::table $inner \
+            0,0 $inner.text1 -anchor w \
+            0,1 $inner.icon 
+        Waiting start $inner.icon
+    } else {
+        if { ![winfo exists $itk_component(plotarea).view.splash] } {
+            return
+        }
+        Waiting stop $itk_component(plotarea).view.splash
+        destroy $itk_component(plotarea).view.splash
+    }
+}
+
+itcl::body Rappture::VisViewer::Waiting { option widget } {
+    switch -- $option {
+        "start" {
+            $_dispatcher dispatch $this !waiting \
+                "[itcl::code $this Waiting "next" $widget] ; list"
+            set _icon 0
+            $widget configure -image [Rappture::icon bigroller${_icon}]
+            $_dispatcher event -after 150 !waiting
+        }
+        "next" {
+            incr _icon
+            if { $_icon >= 8 } {
+                set _icon 0
+            }
+            $widget configure -image [Rappture::icon bigroller${_icon}]
+            $_dispatcher event -after 150 !waiting
+        }
+        "stop" {
+            $_dispatcher cancel !waiting
+        }
+    }
+}

branches/blt4/gui/scripts/vtkcontourviewer.tcl

@@ -144 +144 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkContourViewer::constructor {hostlist args} {
+    set  _serverType "vtkvis"
     package require vtk
     # Draw legend event
@@ -790 +791 @@
             set _image(legend) [image create picture]
         }
+        $_image(legend) configure -data $bytes
         puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-        set src [image create picture -data $bytes]
-        blt::winop image rotate $src $_image(legend) 90
-        set dst $_image(legend)
         DrawLegend
     }

branches/blt4/gui/scripts/vtkstreamlinesviewer.tcl

@@ -68 +68 @@
     protected method Disconnect {}
     protected method DoResize {}
+    protected method DoReseed {}
     protected method DoRotate {}
     protected method AdjustSetting {what {value ""}}
-    protected method FixSettings { args  }
+    protected method InitSettings { args  }
     protected method Pan {option x y}
     protected method Pick {x y}
@@ -79 +80 @@
     protected method Rotate {option x y}
     protected method SendCmd {string}
+    protected method SendCmdNoWait {string}
     protected method Zoom {option}
 
@@ -84 +86 @@
     private method BuildAxisTab {}
     private method BuildCameraTab {}
-    private method BuildColormap { colormap dataobj comp }
-    private method BuildCutawayTab {}
+    private method BuildColormap { name colors }
+    private method BuildCutplaneTab {}
     private method BuildDownloadPopup { widget command } 
     private method BuildStreamsTab {}
     private method BuildVolumeTab {}
     private method ConvertToVtkData { dataobj comp } 
-    private method DrawLegend {}
+    private method DrawLegend { title }
+    private method Combo { option }
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
+    private method EventuallyReseed { numPoints } 
     private method EventuallyRotate { q } 
+    private method EventuallySetCutplane { axis args } 
     private method GetImage { args } 
     private method GetVtkData { args } 
@@ -102 +107 @@
     private method RequestLegend {}
     private method SetColormap { dataobj comp }
+    private method ChangeColormap { dataobj comp color }
+    private method ColorsToColormap { color }
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp } 
@@ -107 +114 @@
 
     private variable _arcball ""
-    private variable _outbuf       ;# buffer for outgoing commands
-
-    private variable _dlist ""     ;# list of data objects
-    private variable _allDataObjs
+    private variable _outbuf       ;    # buffer for outgoing commands
+
+    private variable _dlist ""     ;    # list of data objects
     private variable _obj2datasets
-    private variable _obj2ovride   ;# maps dataobj => style override
-    private variable _datasets     ;# contains all the dataobj-component 
-                                   ;# datasets in the server
-    private variable _colormaps    ;# contains all the colormaps
-                                   ;# in the server.
+    private variable _obj2ovride   ;    # maps dataobj => style override
+    private variable _datasets     ;    # contains all the dataobj-component 
+                                   ;    # datasets in the server
+    private variable _colormaps    ;    # contains all the colormaps
+                                   ;    # in the server.
     private variable _dataset2style    ;# maps dataobj-component to transfunc
-    private variable _style2datasets   ;# maps tf back to list of 
-                                    # dataobj-components using the tf.
-
-    private variable _click        ;# info used for rotate operations
-    private variable _limits       ;# autoscale min/max for all axes
-    private variable _view         ;# view params for 3D view
+
+    private variable _click        ;    # info used for rotate operations
+    private variable _limits       ;    # autoscale min/max for all axes
+    private variable _view         ;    # view params for 3D view
     private variable _settings
-    private variable _volume
-    private variable _axis
-    private variable _streamlines
-    private variable _reset 1      ;# indicates if camera needs to be reset
-                                    # to starting position.
-
-    private variable _first ""     ;# This is the topmost dataset.
+    private variable _style;            # Array of current component styles.
+    private variable _initialStyle;     # Array of initial component styles.
+    private variable _reset 1;          # indicates if camera needs to be reset
+                                        # to starting position.
+
+    private variable _first ""     ;    # This is the topmost dataset.
     private variable _start 0
     private variable _buffering 0
@@ -137 +140 @@
     private variable _seeds
 
-    common _downloadPopup          ;# download options from popup
+    common _downloadPopup;              # download options from popup
     private common _hardcopy
     private variable _width 0
     private variable _height 0
     private variable _resizePending 0
+    private variable _reseedPending 0
     private variable _rotatePending 0
+    private variable _cutplanePending 0
+    private variable _legendPending 0
     private variable _outline
+    private variable _vectorFields 
+    private variable _scalarFields 
+    private variable _fields 
+    private variable _currentField ""
+    private variable _field      ""
+    private variable _numSeeds 200
+    private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
 }
 
@@ -155 +168 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::constructor {hostlist args} {
+    set _serverType "vtkvis"
     package require vtk
+
     # Rebuild event
     $_dispatcher register !rebuild
@@ -164 +179 @@
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
+    # Reseed event
+    $_dispatcher register !reseed
+    $_dispatcher dispatch $this !reseed "[itcl::code $this DoReseed]; list"
+
     # Rotate event
     $_dispatcher register !rotate
     $_dispatcher dispatch $this !rotate "[itcl::code $this DoRotate]; list"
 
-    set _outbuf ""
+    # Legend event
+    $_dispatcher register !legend
+    $_dispatcher dispatch $this !legend "[itcl::code $this RequestLegend]; list"
+
+    # X-Cutplane event
+    $_dispatcher register !xcutplane
+    $_dispatcher dispatch $this !xcutplane \
+        "[itcl::code $this AdjustSetting cutplane-xposition]; list"
+
+    # Y-Cutplane event
+    $_dispatcher register !ycutplane
+    $_dispatcher dispatch $this !ycutplane \
+        "[itcl::code $this AdjustSetting cutplane-yposition]; list"
+
+    # Z-Cutplane event
+    $_dispatcher register !zcutplane
+    $_dispatcher dispatch $this !zcutplane \
+        "[itcl::code $this AdjustSetting cutplane-zposition]; list"
 
     #
@@ -203 +239 @@
     set _limits(zmax) 1.0
 
-    array set _axis [subst {
-        xgrid           0
-        ygrid           0
-        zgrid           0
-        xcutaway        0
-        ycutaway        0
-        zcutaway        0
-        xposition       0
-        yposition       0
-        zposition       0
-        xdirection      -1
-        ydirection      -1
-        zdirection      -1
-        visible         1
-        labels          1
-    }]
-    array set _volume [subst {
-        edges           0
-        lighting        1
-        opacity         40
-        visible         1
-        wireframe       0
-    }]
-    array set _streamlines [subst {
-        seeds           0
-        visible         1
-        opacity         100
-    }]
     array set _settings [subst {
-        legend          1
+        axis-xgrid              0
+        axis-ygrid              0
+        axis-zgrid              0
+        axis-xcutplane          0
+        axis-ycutplane          0
+        axis-zcutplane          0
+        axis-xposition          0
+        axis-yposition          0
+        axis-zposition          0
+        axis-visible            1
+        axis-labels             1
+        cutplane-edges          0
+        cutplane-xvisible       0
+        cutplane-yvisible       0
+        cutplane-zvisible       0
+        cutplane-xposition      50
+        cutplane-yposition      50
+        cutplane-zposition      50
+        cutplane-visible        1
+        cutplane-wireframe      0
+        cutplane-opacity        100
+        volume-edges            0
+        volume-lighting         1
+        volume-opacity          40
+        volume-visible          1
+        volume-wireframe        0
+        streamlines-seeds       0
+        streamlines-visible     1
+        streamlines-opacity     100
+        streamlines-numpoints   200
+        streamlines-lighting    1
+        streamlines-scale       1
+        legend-visible          1
     }]
 
@@ -243 +283 @@
     }
 
+    itk_component add fieldmenu {
+        menu $itk_component(plotarea).menu -bg black -fg white -relief flat \
+            -tearoff no 
+    } {
+        usual
+        ignore -background -foreground -relief -tearoff
+    }
     set c $itk_component(view)
     bind $c <Configure> [itcl::code $this EventuallyResize %w %h]
@@ -299 +346 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
+    itk_component add volume {
+        Rappture::PushButton $f.volume \
+            -onimage [Rappture::icon volume-on] \
+            -offimage [Rappture::icon volume-off] \
+            -variable [itcl::scope _settings(volume-visible)] \
+            -command [itcl::code $this AdjustSetting volume-visible] 
+    }
+    $itk_component(volume) select
+    Rappture::Tooltip::for $itk_component(volume) \
+        "Don't display the volume"
+    pack $itk_component(volume) -padx 2 -pady 2
+
+    itk_component add streamlines {
+        Rappture::PushButton $f.streamlines \
+            -onimage [Rappture::icon streamlines-on] \
+            -offimage [Rappture::icon streamlines-off] \
+            -variable [itcl::scope _settings(streamlines-visible)] \
+            -command [itcl::code $this AdjustSetting streamlines-visible] \
+    }
+    $itk_component(streamlines) select
+    Rappture::Tooltip::for $itk_component(streamlines) \
+        "Toggle the streamlines on/off"
+    pack $itk_component(streamlines) -padx 2 -pady 2
+
+    itk_component add cutplane {
+        Rappture::PushButton $f.cutplane \
+            -onimage [Rappture::icon cutbutton] \
+            -offimage [Rappture::icon cutbutton] \
+            -variable [itcl::scope _settings(cutplane-visible)] \
+            -command [itcl::code $this AdjustSetting cutplane-visible] 
+    }
+    $itk_component(cutplane) select
+    Rappture::Tooltip::for $itk_component(cutplane) \
+        "Show/Hide cutplanes"
+    pack $itk_component(cutplane) -padx 2 -pady 2
+
+
     if { [catch {
         BuildVolumeTab
         BuildStreamsTab
+        BuildCutplaneTab
         BuildAxisTab
-        BuildCutawayTab
         BuildCameraTab
     } errs] != 0 } {
@@ -389 +473 @@
     eval itk_initialize $args
     Connect
+    update
 }
 
@@ -396 +481 @@
 itcl::body Rappture::VtkStreamlinesViewer::destructor {} {
     Disconnect
-    $_dispatcher cancel !rebuild
-    $_dispatcher cancel !resize
-    $_dispatcher cancel !rotate
     image delete $_image(plot)
     image delete $_image(download)
@@ -411 +493 @@
         set _height 500
     }
-    #puts stderr "DoResize screen size $_width $_height"
     set _start [clock clicks -milliseconds]
-    #puts stderr "screen size request width=$_width height=$_height"
     SendCmd "screen size $_width $_height"
-    RequestLegend
+    set _legendPending 1
 
     #SendCmd "imgflush"
@@ -431 +511 @@
 }
 
+itcl::body Rappture::VtkStreamlinesViewer::DoReseed {} {
+    foreach dataset [CurrentDatasets -visible] {
+        foreach {dataobj comp} [split $dataset -] break
+        # This command works for either random or fmesh seeds
+        SendCmd "streamlines seed numpts $_numSeeds $dataset"
+    }
+    set _reseedPending 0
+}
+
 itcl::body Rappture::VtkStreamlinesViewer::EventuallyResize { w h } {
-    #puts stderr "EventuallyResize $w $h"
     set _width $w
     set _height $h
@@ -438 +526 @@
     if { !$_resizePending } {
         set _resizePending 1
-        $_dispatcher event -after 200 !resize
+        $_dispatcher event -after 400 !resize
+    }
+}
+
+itcl::body Rappture::VtkStreamlinesViewer::EventuallyReseed { numPoints } {
+    set _numSeeds $numPoints
+    if { !$_reseedPending } {
+        set _reseedPending 1
+        $_dispatcher event -after 600 !reseed
     }
 }
@@ -445 +541 @@
 
 itcl::body Rappture::VtkStreamlinesViewer::EventuallyRotate { q } {
-    #puts stderr "EventuallyRotate $w $h"
     foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break
     if { !$_rotatePending } {
@@ -451 +546 @@
         global rotate_delay 
         $_dispatcher event -after $rotate_delay !rotate
+    }
+}
+
+itcl::body Rappture::VtkStreamlinesViewer::EventuallySetCutplane { axis args } {
+    if { !$_cutplanePending } {
+        set _cutplanePending 1
+        $_dispatcher event -after 100 !${axis}cutplane
     }
 }
@@ -489 +591 @@
         lappend _dlist $dataobj
     }
-    set _allDataObjs($dataobj) 1
     set _obj2ovride($dataobj-color) $params(-color)
     set _obj2ovride($dataobj-width) $params(-width)
@@ -518 +619 @@
         # Remove it from the dataobj list.
         set _dlist [lreplace $_dlist $pos $pos]
-        foreach comp [$dataobj components] {
-            SendCmd "dataset visible 0 $dataobj-$comp"
-        }
+        SendCmd "dataset visible 0"
         array unset _obj2ovride $dataobj-*
+        array unset _settings $dataobj-*
         # Append to the end of the dataobj list.
         lappend _dlist $dataobj
@@ -571 +671 @@
                 }
                 if { ![info exists _obj2ovride($dataobj-raise)] } {
-                    # No setting indicates that the object isn't invisible.
+                    # No setting indicates that the object isn't visible.
                     continue
                 }
@@ -707 +807 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::Connect {} {
-    #puts stderr "Enter Connect: [info level -1]"
     set _hosts [GetServerList "vtkvis"]
     if { "" == $_hosts } {
@@ -714 +813 @@
     set result [VisViewer::Connect $_hosts]
     if { $result } {
-        #puts stderr "Connected to $_hostname sid=$_sid"
         set w [winfo width $itk_component(view)]
         set h [winfo height $itk_component(view)]
@@ -748 +846 @@
     VisViewer::Disconnect
 
+    $_dispatcher cancel !rebuild
+    $_dispatcher cancel !resize
+    $_dispatcher cancel !reseed
+    $_dispatcher cancel !rotate
+    $_dispatcher cancel !xcutplane
+    $_dispatcher cancel !ycutplane
+    $_dispatcher cancel !zcutplane
+    $_dispatcher cancel !legend
     # disconnected -- no more data sitting on server
     set _outbuf ""
@@ -753 +859 @@
     array unset _data 
     array unset _colormaps 
+    array unset _seeds 
+    array unset _dataset2style 
+    array unset _obj2datasets 
 }
 
@@ -760 +869 @@
 itcl::body Rappture::VtkStreamlinesViewer::sendto { bytes } {
     SendBytes "$bytes\n"
+    StartWaiting
 }
 
@@ -774 +884 @@
     } else {
         SendBytes "$string\n"
+        StartWaiting
+    }
+}
+
+#
+# SendCmdNoWait
+#
+#       Send commands off to the rendering server.  If we're currently
+#       sending data objects to the server, buffer the commands to be 
+#       sent later.
+#
+itcl::body Rappture::VtkStreamlinesViewer::SendCmdNoWait {string} {
+    if { $_buffering } {
+        append _outbuf $string "\n"
+    } else {
+        SendBytes "$string\n"
     }
 }
@@ -792 +918 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
+    StopWaiting
     if { $info(-type) == "image" } {
         if 0 {
@@ -810 +937 @@
         set tag $this-print-$info(-token)
         set _hardcopy($tag) $bytes
+    }
+    if { $_legendPending } {
+        RequestLegend
     }
 }
@@ -863 +993 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::Rebuild {} {
-
+    update
     set w [winfo width $itk_component(view)]
     set h [winfo height $itk_component(view)]
@@ -871 +1001 @@
     }
 
+    set _buffering 1
+    set _legendPending 1
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
-    set _buffering 1
-
     set _width $w
     set _height $h
@@ -892 +1022 @@
     DoRotate
     PanCamera
-    set _first [lindex [get -objects] 0] 
-    if { $_reset || $_first == "" } {
-        Zoom reset
-        set _reset 0
-    }
-    FixSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
-        axis-visible axis-labels \
-        streamlines-seeds streamlines-visible streamlines-opacity \
-        volume-edges volume-lighting volume-opacity volume-visible \
-        volume-wireframe 
-
-    #SendCmd "imgflush"
+    set _first ""
+    InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
+        axis-visible axis-labels cutplane-visible \
+        cutplane-xposition cutplane-yposition cutplane-zposition \
+        cutplane-xvisible cutplane-yvisible cutplane-zvisible
+
+    SendCmd "imgflush"
 
     set _limits(zmin) ""
@@ -921 +1046 @@
                 append _outbuf $bytes
                 set _datasets($tag) 1
+                SetObjectStyle $dataobj $comp
             }
             lappend _obj2datasets($dataobj) $tag
@@ -928 +1054 @@
                 SendCmd "dataset visible 0 $tag"
             }
-            SetObjectStyle $dataobj $comp
         }
     }
@@ -936 +1061 @@
             array set view $location
         }
-    }
-    foreach axis { x y z } {
-        set label [$_first hints ${axis}label]
-        if { $label != "" } {
-            SendCmd "axis name $axis $label"
-        }
-        set units [$_first hints ${axis}units]
-        if { $units != "" } {
-            SendCmd "axis units $axis $units"
-        }
-    }
-        
+
+        if 0 {
+            # Tell the server the name of the tool, the version, and dataset
+            # that we are rendering.  Have to do it here because we don't know
+            # what data objects are using the renderer until be get here.
+            set args ""
+            lappend args tool [$_first hints toolId]
+            lappend args version [$_first hints toolRevision]
+            lappend args dataset [$_first hints label]
+            SendCmd "clientinfo $args"
+        }
+
+        foreach axis { x y z } {
+            set label [$_first hints ${axis}label]
+            if { $label != "" } {
+                SendCmd "axis name $axis $label"
+            }
+            set units [$_first hints ${axis}units]
+            if { $units != "" } {
+                SendCmd "axis units $axis $units"
+            }
+        }
+        array unset _scalarFields
+        array unset _vectorFields
+        set _currentField [$_first hints default]
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
+        foreach { name title units } [$_first hints vectors] {
+            set _vectorFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground black \
+                -activeforeground white \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        foreach { name title units } [$_first hints scalars] {
+            set _scalarFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground black \
+                -activeforeground white \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        $itk_component(field) value $_currentField
+    }
+
+    InitSettings streamlines-visible streamlines-palette volume-visible 
+
+    if { $_reset } {
+        InitSettings streamlines-seeds streamlines-opacity \
+            streamlines-numpoints streamlines-lighting \
+            streamlines-palette streamlines-field \
+            volume-edges volume-lighting volume-opacity volume-wireframe 
+        Zoom reset
+        set _reset 0
+    }
     set _buffering 0;                        # Turn off buffering.
 
@@ -953 +1131 @@
     # care.  We're finished here.
     blt::busy hold $itk_component(hull)
-    SendBytes $_outbuf;                        
+    sendto $_outbuf;                        
     blt::busy release $itk_component(hull)
     set _outbuf "";                        # Clear the buffer.                
@@ -1163 +1341 @@
 
 # ----------------------------------------------------------------------
-# USAGE: FixSettings <what> ?<value>?
+# USAGE: InitSettings <what> ?<value>?
 #
 # Used internally to update rendering settings whenever parameters
@@ -1169 +1347 @@
 # to the back end.
 # ----------------------------------------------------------------------
-itcl::body Rappture::VtkStreamlinesViewer::FixSettings { args } {
-    foreach setting $args {
-        AdjustSetting $setting
+itcl::body Rappture::VtkStreamlinesViewer::InitSettings { args } {
+    foreach spec $args {
+        if { [info exists _settings($_first-$spec)] } {
+            # Reset global setting with dataobj specific setting
+            set _settings($spec) $_settings($_first-$spec)
+        }
+        AdjustSetting $spec
     }
 }
@@ -1188 +1370 @@
     switch -- $what {
         "volume-opacity" {
-            set val $_volume(opacity)
+            set val $_settings(volume-opacity)
             set sval [expr { 0.01 * double($val) }]
-            foreach dataset [CurrentDatasets -visible $_first] {
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "polydata opacity $sval $dataset"
             }
         }
         "volume-wireframe" {
-            set bool $_volume(wireframe)
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set bool $_settings(volume-wireframe)
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "polydata wireframe $bool $dataset"
             }
         }
         "volume-visible" {
-            set bool $_volume(visible)
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set bool $_settings(volume-visible)
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "polydata visible $bool $dataset"
             }
+            if { $bool } {
+                Rappture::Tooltip::for $itk_component(volume) \
+                    "Hide the volume"
+            } else {
+                Rappture::Tooltip::for $itk_component(volume) \
+                    "Show the volume"
+            }
         }
         "volume-lighting" {
-            set bool $_volume(lighting)
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set bool $_settings(volume-lighting)
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "polydata lighting $bool $dataset"
             }
         }
         "volume-edges" {
-            set bool $_volume(edges)
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set bool $_settings(volume-edges)
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "polydata edges $bool $dataset"
             }
         }
         "axis-visible" {
-            set bool $_axis(visible)
+            set bool $_settings(axis-visible)
             SendCmd "axis visible all $bool"
         }
         "axis-labels" {
-            set bool $_axis(labels)
+            set bool $_settings(axis-labels)
             SendCmd "axis labels all $bool"
         }
-        "axis-xgrid" {
-            set bool $_axis(xgrid)
-            SendCmd "axis grid x $bool"
-        }
-        "axis-ygrid" {
-            set bool $_axis(ygrid)
-            SendCmd "axis grid y $bool"
-        }
-        "axis-zgrid" {
-            set bool $_axis(zgrid)
-            SendCmd "axis grid z $bool"
+        "axis-xgrid" - "axis-ygrid" - "axis-zgrid" {
+            set axis [string range $what 5 5]
+            set bool $_settings($what)
+            SendCmd "axis grid $axis $bool"
         }
         "axis-mode" {
             set mode [$itk_component(axismode) value]
             set mode [$itk_component(axismode) translate $mode]
+            set _settings($what) $mode
             SendCmd "axis flymode $mode"
         }
-        "axis-xcutaway" - "axis-ycutaway" - "axis-zcutaway" {
-            set axis [string range $what 5 5]
-            set bool $_axis(${axis}cutaway)
+        "cutplane-edges" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "cutplane edges $bool $dataset"
+            }
+        }
+        "cutplane-visible" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "cutplane visible $bool $dataset"
+            }
+        }
+        "cutplane-wireframe" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "cutplane wireframe $bool $dataset"
+            }
+        }
+        "cutplane-lighting" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "cutplane lighting $bool $dataset"
+            }
+        }
+        "cutplane-opacity" {
+            set val $_settings($what)
+            set sval [expr { 0.01 * double($val) }]
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "cutplane opacity $sval $dataset"
+            }
+        }
+        "cutplane-xvisible" - "cutplane-yvisible" - "cutplane-zvisible" {
+            set axis [string range $what 9 9]
+            set bool $_settings($what)
             if { $bool } {
-                set pos [expr $_axis(${axis}position) * 0.01]
-                set dir $_axis(${axis}direction)
                 $itk_component(${axis}CutScale) configure -state normal \
                     -troughcolor white
-                SendCmd "renderer clipplane $axis $pos $dir"
             } else {
                 $itk_component(${axis}CutScale) configure -state disabled \
                     -troughcolor grey82
-                SendCmd "renderer clipplane $axis 1 -1"
             }
-        }
-        "axis-xposition" - "axis-yposition" - "axis-zposition" - 
-        "axis-xdirection" - "axis-ydirection" - "axis-zdirection" {
-            set axis [string range $what 5 5]
-            #set dir $_axis(${axis}direction)
-            set pos [expr $_axis(${axis}position) * 0.01]
-            SendCmd "renderer clipplane ${axis} $pos -1"
+            SendCmd "cutplane axis $axis $bool"
+        }
+        "cutplane-xposition" - "cutplane-yposition" - "cutplane-zposition" {
+            set axis [string range $what 9 9]
+            set pos [expr $_settings($what) * 0.01]
+            SendCmd "cutplane slice ${axis} ${pos}"
+            set _cutplanePending 0
         }
         "streamlines-seeds" {
-            set bool $_streamlines(seeds)
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "streamlines seed visible $bool $dataset"
             }
         }
+        "streamlines-numpoints" {
+            set density $_settings($what)
+            EventuallyReseed $density
+        }
         "streamlines-visible" {
-            set bool $_streamlines(visible)
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
                 SendCmd "streamlines visible $bool $dataset"
             }
+            if { $bool } {
+                Rappture::Tooltip::for $itk_component(streamlines) \
+                    "Hide the streamlines"
+            } else {
+                Rappture::Tooltip::for $itk_component(streamlines) \
+                    "Show the streamlines"
+            }
         }
         "streamlines-mode" {
             set mode [$itk_component(streammode) value]
-            foreach dataset [CurrentDatasets -visible $_first] {
+            set _settings(streamlines-mode) $mode
+            foreach dataset [CurrentDatasets -visible] {
                 switch -- $mode {
                     "lines" {
@@ -1285 +1507 @@
                     }
                     "ribbons" {
-                        SendCmd "streamlines ribbons 1 0 $dataset"
+                        SendCmd "streamlines ribbons 3 0 $dataset"
                     }
                     "tubes" {
-                        SendCmd "streamlines tubes 5 1 $dataset"
+                        SendCmd "streamlines tubes 5 3 $dataset"
                     }
                 }
             }
         }
+        "streamlines-palette" {
+            set palette [$itk_component(palette) value]
+            set _settings(streamlines-palette) $palette
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach {dataobj comp} [split $dataset -] break
+                ChangeColormap $dataobj $comp $palette
+            }
+            set _legendPending 1
+        }
         "streamlines-opacity" {
-            set val $_streamlines(opacity)
+            set val $_settings(streamlines-opacity)
             set sval [expr { 0.01 * double($val) }]
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -1300 +1531 @@
             }
         }
+        "streamlines-scale" {
+            set val $_settings(streamlines-scale)
+            set sval [expr { 0.01 * double($val) }]
+            foreach dataset [CurrentDatasets -visible $_first] {
+                SendCmd "streamlines scale $sval $sval $sval $dataset"
+            }
+        }
+        "streamlines-lighting" {
+            set bool $_settings(streamlines-lighting)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                SendCmd "streamlines lighting $bool $dataset"
+            }
+        }
+        "streamlines-field" {
+            set new [$itk_component(field) value]
+            set value [$itk_component(field) translate $new]
+            set _settings(streamlines-field) $value
+            if { [info exists _scalarFields($new)] } {
+                set name $_scalarFields($new)
+                set _colorMode scalar
+                set _currentField $new
+            } elseif { [info exists _vectorFields($new)] } {
+                set name $_vectorFields($new)
+                set _colorMode vmag
+                set _currentField $new
+            } else {
+                puts stderr "unknown field \"$new\""
+                return
+            }
+            foreach dataset [CurrentDatasets -visible] {
+                puts stderr "streamlines colormode $_colorMode ${name} $dataset"
+                puts stderr "cutplane colormode $_colorMode ${name} $dataset"
+                SendCmd "streamlines colormode $_colorMode ${name} $dataset"
+                SendCmd "cutplane colormode $_colorMode ${name} $dataset"
+            }
+            set _legendPending 1
+        }
         default {
             error "don't know how to fix $what"
@@ -1314 +1582 @@
 #
 itcl::body Rappture::VtkStreamlinesViewer::RequestLegend {} {
-    #puts stderr "RequestLegend _first=$_first"
-    #puts stderr "RequestLegend width=$_width height=$_height"
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
     set c $itk_component(legend)
     set w 12
-    set h [expr {$_height - 2 * ($lineht + 2)}]
+    set h [expr {$_height - 3 * ($lineht + 2)}]
     if { $h < 1} {
         return
     }
+    if { [info exists _scalarFields($_currentField)] } {
+        set name $_scalarFields($_currentField)
+    } elseif { [info exists _vectorFields($_currentField)] } {
+        set name $_vectorFields($_currentField)
+    } else {
+        return
+    }
     # Set the legend on the first streamlines dataset.
-    foreach dataset [CurrentDatasets -visible] {
+    foreach dataset [CurrentDatasets -visible $_first] {
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            #puts stderr "RequestLegend w=$w h=$h"
-            SendCmd "legend $_dataset2style($dataset) vmag {} $w $h 0"
+            SendCmdNoWait \
+                "legend $_dataset2style($dataset) $_colorMode $name {} $w $h 0"
             break;
         }
     }
+}
+
+#
+# ChangeColormap --
+#
+itcl::body Rappture::VtkStreamlinesViewer::ChangeColormap {dataobj comp color} {
+    set tag $dataobj-$comp
+    if { ![info exist _style($tag)] } {
+        error "no initial colormap"
+    }
+    array set style $_style($tag)
+    set style(-color) $color
+    set _style($tag) [array get style]
+    SetColormap $dataobj $comp
 }
 
@@ -1340 +1627 @@
 itcl::body Rappture::VtkStreamlinesViewer::SetColormap { dataobj comp } {
     array set style {
-        -color rainbow
+        -color BGYOR
         -levels 6
         -opacity 1.0
     }
     set tag $dataobj-$comp
-    array set style [$dataobj style $comp]
-    set colormap "$style(-color):$style(-levels):$style(-opacity)"
-    if { [info exists _colormaps($colormap)] } {
-        puts stderr "Colormap $colormap already built"
-        return $colormap
-    }
-    if { ![info exists _dataset2style($tag)] } {
-        set _dataset2style($tag) $colormap
-        lappend _style2datasets($colormap) $tag
-    }
-    if { ![info exists _colormaps($colormap)] } {
-        # Build the pseudo colormap if it doesn't exist.
-        BuildColormap $colormap $dataobj $comp
-        set _colormaps($colormap) 1
-    }
-    SendCmd "streamlines colormap $colormap $tag"
-    return $colormap
-}
-
-#
-# BuildColormap --
-#
-itcl::body Rappture::VtkStreamlinesViewer::BuildColormap { colormap dataobj comp } {
-    array set style {
-        -color rainbow
-        -levels 6
-        -opacity 1.0
-    }
-    array set style [$dataobj style $comp]
-    if {$style(-color) == "rainbow"} {
-        set style(-color) "white:yellow:green:cyan:blue:magenta"
-    }
-    set clist [split $style(-color) :]
+    if { ![info exists _initialStyle($tag)] } {
+        # Save the initial component style.
+        set _initialStyle($tag) [$dataobj style $comp]
+    }
+
+    # Override defaults with initial style defined in xml.
+    array set style $_initialStyle($tag)
+
+    if { ![info exists _style($tag)] } {
+        set _style($tag) [array get style]
+    }
+    # Override initial style with current style.
+    array set style $_style($tag)
+
+    set name "$style(-color):$style(-levels):$style(-opacity)"
+    if { ![info exists _colormaps($name)] } {
+        BuildColormap $name [array get style]
+        set _colormaps($name) 1
+    }
+    if { ![info exists _dataset2style($tag)] ||
+         $_dataset2style($tag) != $name } {
+        SendCmd "streamlines colormap $name $tag"
+        SendCmd "cutplane colormap $name $tag"
+        set _dataset2style($tag) $name
+    }
+}
+
+itcl::body Rappture::VtkStreamlinesViewer::ColorsToColormap { colors } {
+    switch -- $colors {
+        "grey-to-blue" {
+            return {
+                0.0                      0.200 0.200 0.200
+                0.14285714285714285      0.400 0.400 0.400
+                0.2857142857142857       0.600 0.600 0.600
+                0.42857142857142855      0.900 0.900 0.900
+                0.5714285714285714       0.800 1.000 1.000
+                0.7142857142857143       0.600 1.000 1.000
+                0.8571428571428571       0.400 0.900 1.000
+                1.0                      0.000 0.600 0.800
+            }
+        }
+        "blue-to-grey" {
+            return {
+                0.0                     0.000 0.600 0.800 
+                0.14285714285714285     0.400 0.900 1.000 
+                0.2857142857142857      0.600 1.000 1.000 
+                0.42857142857142855     0.800 1.000 1.000 
+                0.5714285714285714      0.900 0.900 0.900 
+                0.7142857142857143      0.600 0.600 0.600 
+                0.8571428571428571      0.400 0.400 0.400 
+                1.0                     0.200 0.200 0.200
+            }
+        }
+        "blue" {
+            return { 
+                0.0                     0.900 1.000 1.000 
+                0.1111111111111111      0.800 0.983 1.000 
+                0.2222222222222222      0.700 0.950 1.000 
+                0.3333333333333333      0.600 0.900 1.000 
+                0.4444444444444444      0.500 0.833 1.000 
+                0.5555555555555556      0.400 0.750 1.000 
+                0.6666666666666666      0.300 0.650 1.000 
+                0.7777777777777778      0.200 0.533 1.000 
+                0.8888888888888888      0.100 0.400 1.000 
+                1.0                     0.000 0.250 1.000
+            }
+        }
+        "brown-to-blue" {
+            return {
+                0.0                             0.200   0.100   0.000 
+                0.09090909090909091             0.400   0.187   0.000 
+                0.18181818181818182             0.600   0.379   0.210 
+                0.2727272727272727              0.800   0.608   0.480 
+                0.36363636363636365             0.850   0.688   0.595 
+                0.45454545454545453             0.950   0.855   0.808 
+                0.5454545454545454              0.800   0.993   1.000 
+                0.6363636363636364              0.600   0.973   1.000 
+                0.7272727272727273              0.400   0.940   1.000 
+                0.8181818181818182              0.200   0.893   1.000 
+                0.9090909090909091              0.000   0.667   0.800 
+                1.0                             0.000   0.480   0.600 
+            }
+        }
+        "blue-to-brown" {
+            return {
+                0.0                             0.000   0.480   0.600 
+                0.09090909090909091             0.000   0.667   0.800 
+                0.18181818181818182             0.200   0.893   1.000 
+                0.2727272727272727              0.400   0.940   1.000 
+                0.36363636363636365             0.600   0.973   1.000 
+                0.45454545454545453             0.800   0.993   1.000 
+                0.5454545454545454              0.950   0.855   0.808 
+                0.6363636363636364              0.850   0.688   0.595 
+                0.7272727272727273              0.800   0.608   0.480 
+                0.8181818181818182              0.600   0.379   0.210 
+                0.9090909090909091              0.400   0.187   0.000 
+                1.0                             0.200   0.100   0.000 
+            }
+        }
+        "blue-to-orange" {
+            return {
+                0.0                             0.000   0.167   1.000
+                0.09090909090909091             0.100   0.400   1.000
+                0.18181818181818182             0.200   0.600   1.000
+                0.2727272727272727              0.400   0.800   1.000
+                0.36363636363636365             0.600   0.933   1.000
+                0.45454545454545453             0.800   1.000   1.000
+                0.5454545454545454              1.000   1.000   0.800
+                0.6363636363636364              1.000   0.933   0.600
+                0.7272727272727273              1.000   0.800   0.400
+                0.8181818181818182              1.000   0.600   0.200
+                0.9090909090909091              1.000   0.400   0.100
+                1.0                             1.000   0.167   0.000
+            }
+        }
+        "orange-to-blue" {
+            return {
+                0.0                             1.000   0.167   0.000
+                0.09090909090909091             1.000   0.400   0.100
+                0.18181818181818182             1.000   0.600   0.200
+                0.2727272727272727              1.000   0.800   0.400
+                0.36363636363636365             1.000   0.933   0.600
+                0.45454545454545453             1.000   1.000   0.800
+                0.5454545454545454              0.800   1.000   1.000
+                0.6363636363636364              0.600   0.933   1.000
+                0.7272727272727273              0.400   0.800   1.000
+                0.8181818181818182              0.200   0.600   1.000
+                0.9090909090909091              0.100   0.400   1.000
+                1.0                             0.000   0.167   1.000
+            }
+        }
+        "rainbow" {
+            set clist {
+                "#EE82EE"
+                "#4B0082" 
+                "blue" 
+                "#008000" 
+                "yellow" 
+                "#FFA500" 
+                "red" 
+            }
+        }
+        "BGYOR" {
+            set clist {
+                "blue" 
+                "#008000" 
+                "yellow" 
+                "#FFA500" 
+                "red" 
+            }
+        }
+        "ROYGB" {
+            set clist {
+                "red" 
+                "#FFA500" 
+                "yellow" 
+                "#008000" 
+                "blue" 
+            }
+        }
+        "RYGCB" {
+            set clist {
+                "red" 
+                "yellow" 
+                "green"
+                "cyan"
+                "blue"
+            }
+        }
+        "BCGYR" {
+            set clist {
+                "blue" 
+                "cyan"
+                "green"
+                "yellow" 
+                "red" 
+            }
+        }
+        "spectral" {
+            return {
+                0.0 0.150 0.300 1.000 
+                0.1 0.250 0.630 1.000 
+                0.2 0.450 0.850 1.000 
+                0.3 0.670 0.970 1.000 
+                0.4 0.880 1.000 1.000 
+                0.5 1.000 1.000 0.750 
+                0.6 1.000 0.880 0.600 
+                0.7 1.000 0.680 0.450 
+                0.8 0.970 0.430 0.370 
+                0.9 0.850 0.150 0.196 
+                1.0 0.650 0.000 0.130
+            }
+        }
+        "green-to-magenta" {
+            return {
+                0.0 0.000 0.316 0.000 
+                0.06666666666666667 0.000 0.526 0.000 
+                0.13333333333333333 0.000 0.737 0.000 
+                0.2 0.000 0.947 0.000 
+                0.26666666666666666 0.316 1.000 0.316 
+                0.3333333333333333 0.526 1.000 0.526 
+                0.4 0.737 1.000 0.737 
+                0.4666666666666667 1.000 1.000 1.000 
+                0.5333333333333333 1.000 0.947 1.000 
+                0.6 1.000 0.737 1.000 
+                0.6666666666666666 1.000 0.526 1.000 
+                0.7333333333333333 1.000 0.316 1.000 
+                0.8 0.947 0.000 0.947 
+                0.8666666666666667 0.737 0.000 0.737 
+                0.9333333333333333 0.526 0.000 0.526 
+                1.0 0.316 0.000 0.316
+            }
+        }
+        "greyscale" {
+            return { 
+                0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0
+            }
+        }
+        "nanohub" {
+            set clist "white yellow green cyan blue magenta"
+        }
+        default {
+            set clist $colors
+        }
+    }
     set cmap {}
     for {set i 0} {$i < [llength $clist]} {incr i} {
@@ -1384 +1863 @@
         append cmap "$x [Color2RGB $color] "
     }
+    return $cmap
+}
+
+#
+# BuildColormap --
+#
+itcl::body Rappture::VtkStreamlinesViewer::BuildColormap { name styles } {
+    array set style $styles
+    set cmap [ColorsToColormap $style(-color)]
     if { [llength $cmap] == 0 } {
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    if { ![info exists _volume(opacity)] } {
-        set _volume(opacity) $style(-opacity)
-    }
-    set max $_volume(opacity)
+    if { ![info exists _settings(volume-opacity)] } {
+        set _settings(volume-opacity) $style(-opacity)
+    }
+    set max $_settings(volume-opacity)
 
     set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $colormap { $cmap } { $wmap }"
+    SendCmd "colormap add $name { $cmap } { $wmap }"
 }
 
@@ -1418 +1906 @@
 
 itcl::body Rappture::VtkStreamlinesViewer::limits { dataobj } {
-
+    return
     array unset _limits $dataobj-*
     foreach comp [$dataobj components] {
@@ -1426 +1914 @@
             set tmpfile file[pid].vtk
             set f [open "$tmpfile" "w"]
+            fconfigure $f -translation binary -encoding binary
             puts $f $data 
             close $f
             set reader [vtkDataSetReader $tag-xvtkDataSetReader]
             $reader SetFileName $tmpfile
-            $reader ReadAllNormalsOn
             $reader ReadAllScalarsOn
             $reader ReadAllVectorsOn
@@ -1439 +1927 @@
             set pointData [$output GetPointData]
             puts stderr "\#scalars=[$reader GetNumberOfScalarsInFile]"
-            puts stderr "\#vectors=[$reader GetNumberOfVectorsInFile]"
-            puts stderr "\#tensors=[$reader GetNumberOfTensorsInFile]"
-            puts stderr "\#normals=[$reader GetNumberOfNormalsInFile]"
             puts stderr "\#fielddata=[$reader GetNumberOfFieldDataInFile]"
             puts stderr "fielddataname=[$reader GetFieldDataNameInFile 0]"
@@ -1447 +1932 @@
             set pointData [$output GetPointData]
             puts stderr "field \#arrays=[$fieldData GetNumberOfArrays]"
+            for { set i 0 } { $i < [$fieldData GetNumberOfArrays] } { incr i } {
+                puts stderr [$fieldData GetArrayName $i]
+            }
             puts stderr "point \#arrays=[$pointData GetNumberOfArrays]"
+            for { set i 0 } { $i < [$pointData GetNumberOfArrays] } { incr i } {
+                set name [$pointData GetArrayName $i]
+                if { ![info exists _fields($name)] } {
+                    $itk_component(field) choices insert end "$name" "$name"
+                    set _fields($name) 1
+                }
+            }
             puts stderr "field \#components=[$fieldData GetNumberOfComponents]"
             puts stderr "point \#components=[$pointData GetNumberOfComponents]"
@@ -1493 +1988 @@
     checkbutton $inner.volume \
         -text "Show Volume" \
-        -variable [itcl::scope _volume(visible)] \
+        -variable [itcl::scope _settings(volume-visible)] \
         -command [itcl::code $this AdjustSetting volume-visible] \
         -font "Arial 9"
@@ -1499 +1994 @@
     checkbutton $inner.wireframe \
         -text "Show Wireframe" \
-        -variable [itcl::scope _volume(wireframe)] \
+        -variable [itcl::scope _settings(volume-wireframe)] \
         -command [itcl::code $this AdjustSetting volume-wireframe] \
         -font "Arial 9"
@@ -1505 +2000 @@
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
-        -variable [itcl::scope _volume(lighting)] \
+        -variable [itcl::scope _settings(volume-lighting)] \
         -command [itcl::code $this AdjustSetting volume-lighting] \
         -font "Arial 9"
@@ -1511 +2006 @@
     checkbutton $inner.edges \
         -text "Show Edges" \
-        -variable [itcl::scope _volume(edges)] \
+        -variable [itcl::scope _settings(volume-edges)] \
         -command [itcl::code $this AdjustSetting volume-edges] \
         -font "Arial 9"
@@ -1517 +2012 @@
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _volume(opacity)] \
+        -variable [itcl::scope _settings(volume-opacity)] \
         -width 10 \
         -showvalue off \
@@ -1542 +2037 @@
     set inner [$itk_component(main) insert end \
         -title "Streams Settings" \
-        -icon [Rappture::icon stream]]
+        -icon [Rappture::icon streamlines-on]]
     $inner configure -borderwidth 4
 
     checkbutton $inner.streamlines \
         -text "Show Streamlines" \
-        -variable [itcl::scope _streamlines(visible)] \
+        -variable [itcl::scope _settings(streamlines-visible)] \
         -command [itcl::code $this AdjustSetting streamlines-visible] \
         -font "Arial 9"
+    
+    checkbutton $inner.lighting \
+        -text "Enable Lighting" \
+        -variable [itcl::scope _settings(streamlines-lighting)] \
+        -command [itcl::code $this AdjustSetting streamlines-lighting] \
+        -font "Arial 9"
 
     checkbutton $inner.seeds \
         -text "Show Seeds" \
-        -variable [itcl::scope _streamlines(seeds)] \
+        -variable [itcl::scope _settings(streamlines-seeds)] \
         -command [itcl::code $this AdjustSetting streamlines-seeds] \
         -font "Arial 9"
@@ -1570 +2071 @@
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _streamlines(opacity)] \
+        -variable [itcl::scope _settings(streamlines-opacity)] \
         -width 10 \
         -showvalue off \
         -command [itcl::code $this AdjustSetting streamlines-opacity]
 
+    label $inner.density_l -text "Number of Seeds" -font "Arial 9"
+    ::scale $inner.density -from 1 -to 1000 -orient horizontal \
+        -variable [itcl::scope _settings(streamlines-numpoints)] \
+        -width 10 \
+        -showvalue on \
+        -command [itcl::code $this AdjustSetting streamlines-numpoints]
+
+    label $inner.scale_l -text "Scale" -font "Arial 9"
+    ::scale $inner.scale -from 1 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(streamlines-scale)] \
+        -width 10 \
+        -showvalue off \
+        -command [itcl::code $this AdjustSetting streamlines-scale]
+
+    label $inner.field_l -text "Field" -font "Arial 9" 
+    itk_component add field {
+        Rappture::Combobox $inner.field -width 10 -editable no
+    }
+    bind $inner.field <<Value>> \
+        [itcl::code $this AdjustSetting streamlines-field]
+
+    label $inner.palette_l -text "Palette" -font "Arial 9" 
+    itk_component add palette {
+        Rappture::Combobox $inner.palette -width 10 -editable no
+    }
+    $inner.palette choices insert end \
+        "BCGYR"              "BCGYR"            \
+        "BGYOR"              "BGYOR"            \
+        "blue"               "blue"             \
+        "blue-to-brown"      "blue-to-brown"    \
+        "blue-to-orange"     "blue-to-orange"   \
+        "blue-to-grey"       "blue-to-grey"     \
+        "green-to-magenta"   "green-to-magenta" \
+        "greyscale"          "greyscale"        \
+        "nanohub"            "nanohub"          \
+        "rainbow"            "rainbow"          \
+        "spectral"           "spectral"         \
+        "ROYGB"              "ROYGB"            \
+        "RYGCB"              "RYGCB"            \
+        "brown-to-blue"      "brown-to-blue"    \
+        "grey-to-blue"       "grey-to-blue"     \
+        "orange-to-blue"     "orange-to-blue"   
+
+    $itk_component(palette) value "BCGYR"
+    bind $inner.palette <<Value>> \
+        [itcl::code $this AdjustSetting streamlines-palette]
+
     blt::table $inner \
         0,0 $inner.streamlines -anchor w -pady 2 -cspan 2 \
-        1,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
-        2,0 $inner.mode_l      -anchor w -pady 2  \
-        2,1 $inner.mode        -anchor w -pady 2  \
-        3,0 $inner.opacity_l   -anchor w -pady 2  \
-        4,0 $inner.opacity     -fill x   -pady 2 -cspan 2
+        1,0 $inner.lighting    -anchor w -pady 2 -cspan 2 \
+        2,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
+        3,0 $inner.density_l   -anchor w -pady 2 -cspan 2 \
+        4,0 $inner.density     -fill x   -pady 2 -cspan 2 \
+        5,0 $inner.mode_l      -anchor w -pady 2  \
+        5,1 $inner.mode        -anchor w -pady 2  \
+        6,0 $inner.opacity_l   -anchor w -pady 2 -cspan 2 \
+        7,0 $inner.opacity     -fill x   -pady 2 -cspan 2 \
+        8,0 $inner.field_l     -anchor w -pady 2  \
+        8,1 $inner.field       -anchor w -pady 2  \
+        9,0 $inner.palette_l   -anchor w -pady 2  \
+        9,1 $inner.palette     -anchor w -pady 2  \
+        
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r5 c1 c2 -resize expand
+    blt::table configure $inner r10 c1 c2 -resize expand
 }
 
@@ -1599 +2155 @@
     checkbutton $inner.visible \
         -text "Show Axes" \
-        -variable [itcl::scope _axis(visible)] \
+        -variable [itcl::scope _settings(axis-visible)] \
         -command [itcl::code $this AdjustSetting axis-visible] \
         -font "Arial 9"
@@ -1605 +2161 @@
     checkbutton $inner.labels \
         -text "Show Axis Labels" \
-        -variable [itcl::scope _axis(labels)] \
+        -variable [itcl::scope _settings(axis-labels)] \
         -command [itcl::code $this AdjustSetting axis-labels] \
         -font "Arial 9"
@@ -1611 +2167 @@
     checkbutton $inner.gridx \
         -text "Show X Grid" \
-        -variable [itcl::scope _axis(xgrid)] \
+        -variable [itcl::scope _settings(axis-xgrid)] \
         -command [itcl::code $this AdjustSetting axis-xgrid] \
         -font "Arial 9"
     checkbutton $inner.gridy \
         -text "Show Y Grid" \
-        -variable [itcl::scope _axis(ygrid)] \
+        -variable [itcl::scope _settings(axis-ygrid)] \
         -command [itcl::code $this AdjustSetting axis-ygrid] \
         -font "Arial 9"
     checkbutton $inner.gridz \
         -text "Show Z Grid" \
-        -variable [itcl::scope _axis(zgrid)] \
+        -variable [itcl::scope _settings(axis-zgrid)] \
         -command [itcl::code $this AdjustSetting axis-zgrid] \
         -font "Arial 9"
@@ -1687 +2243 @@
 }
 
-itcl::body Rappture::VtkStreamlinesViewer::BuildCutawayTab {} {
+itcl::body Rappture::VtkStreamlinesViewer::BuildCutplaneTab {} {
 
     set fg [option get $itk_component(hull) font Font]
     
     set inner [$itk_component(main) insert end \
-        -title "Cutaway Along Axis" \
+        -title "Cutplane Settings" \
         -icon [Rappture::icon cutbutton]] 
 
     $inner configure -borderwidth 4
+
+    checkbutton $inner.visible \
+        -text "Show Cutplanes" \
+        -variable [itcl::scope _settings(cutplane-visible)] \
+        -command [itcl::code $this AdjustSetting cutplane-visible] \
+        -font "Arial 9"
+
+    checkbutton $inner.wireframe \
+        -text "Show Wireframe" \
+        -variable [itcl::scope _settings(cutplane-wireframe)] \
+        -command [itcl::code $this AdjustSetting cutplane-wireframe] \
+        -font "Arial 9"
+
+    checkbutton $inner.lighting \
+        -text "Enable Lighting" \
+        -variable [itcl::scope _settings(cutplane-lighting)] \
+        -command [itcl::code $this AdjustSetting cutplane-lighting] \
+        -font "Arial 9"
+
+    checkbutton $inner.edges \
+        -text "Show Edges" \
+        -variable [itcl::scope _settings(cutplane-edges)] \
+        -command [itcl::code $this AdjustSetting cutplane-edges] \
+        -font "Arial 9"
+
+    label $inner.opacity_l -text "Opacity" -font "Arial 9"
+    ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(cutplane-opacity)] \
+        -width 10 \
+        -showvalue off \
+        -command [itcl::code $this AdjustSetting cutplane-opacity]
+    $inner.opacity set $_settings(cutplane-opacity)
 
     # X-value slicer...
@@ -1702 +2290 @@
             -onimage [Rappture::icon x-cutplane] \
             -offimage [Rappture::icon x-cutplane] \
-            -command [itcl::code $this AdjustSetting axis-xcutaway] \
-            -variable [itcl::scope _axis(xcutaway)]
+            -command [itcl::code $this AdjustSetting cutplane-xvisible] \
+            -variable [itcl::scope _settings(cutplane-xvisible)]
     }
     Rappture::Tooltip::for $itk_component(xCutButton) \
-        "Toggle the X-axis cutaway on/off"
+        "Toggle the X-axis cutplane on/off"
 
     itk_component add xCutScale {
@@ -1712 +2300 @@
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
-            -command [itcl::code $this Slice move x] \
-            -variable [itcl::scope _axis(xposition)]
+            -command [itcl::code $this EventuallySetCutplane x] \
+            -variable [itcl::scope _settings(cutplane-xposition)]
     } {
         usual
         ignore -borderwidth -highlightthickness
     }
-    # Set the default cutaway value before disabling the scale.
-    $itk_component(xCutScale) set 100
+    # Set the default cutplane value before disabling the scale.
+    $itk_component(xCutScale) set 50
     $itk_component(xCutScale) configure -state disabled
     Rappture::Tooltip::for $itk_component(xCutScale) \
         "@[itcl::code $this Slice tooltip x]"
-
-    itk_component add xDirButton {
-        Rappture::PushButton $inner.xdir \
-            -onimage [Rappture::icon arrow-down] \
-            -onvalue -1 \
-            -offimage [Rappture::icon arrow-up] \
-            -offvalue 1 \
-            -command [itcl::code $this AdjustSetting axis-xdirection] \
-            -variable [itcl::scope _axis(xdirection)]
-    }
-    set _axis(xdirection) -1 
-    Rappture::Tooltip::for $itk_component(xDirButton) \
-        "Toggle the direction of the X-axis cutaway"
 
     # Y-value slicer...
@@ -1742 +2317 @@
             -onimage [Rappture::icon y-cutplane] \
             -offimage [Rappture::icon y-cutplane] \
-            -command [itcl::code $this AdjustSetting axis-ycutaway] \
-            -variable [itcl::scope _axis(ycutaway)]
+            -command [itcl::code $this AdjustSetting cutplane-yvisible] \
+            -variable [itcl::scope _settings(cutplane-yvisible)]
     }
     Rappture::Tooltip::for $itk_component(yCutButton) \
-        "Toggle the Y-axis cutaway on/off"
+        "Toggle the Y-axis cutplane on/off"
 
     itk_component add yCutScale {
@@ -1752 +2327 @@
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
-            -command [itcl::code $this Slice move y] \
-            -variable [itcl::scope _axis(yposition)]
+            -command [itcl::code $this EventuallySetCutplane y] \
+            -variable [itcl::scope _settings(cutplane-yposition)]
     } {
         usual
@@ -1760 +2335 @@
     Rappture::Tooltip::for $itk_component(yCutScale) \
         "@[itcl::code $this Slice tooltip y]"
-    # Set the default cutaway value before disabling the scale.
-    $itk_component(yCutScale) set 100
+    # Set the default cutplane value before disabling the scale.
+    $itk_component(yCutScale) set 50
     $itk_component(yCutScale) configure -state disabled
-
-    itk_component add yDirButton {
-        Rappture::PushButton $inner.ydir \
-            -onimage [Rappture::icon arrow-down] \
-            -onvalue -1 \
-            -offimage [Rappture::icon arrow-up] \
-            -offvalue 1 \
-            -command [itcl::code $this AdjustSetting axis-ydirection] \
-            -variable [itcl::scope _axis(ydirection)]
-    }
-    Rappture::Tooltip::for $itk_component(yDirButton) \
-        "Toggle the direction of the Y-axis cutaway"
-    set _axis(ydirection) -1 
 
     # Z-value slicer...
@@ -1782 +2344 @@
             -onimage [Rappture::icon z-cutplane] \
             -offimage [Rappture::icon z-cutplane] \
-            -command [itcl::code $this AdjustSetting axis-zcutaway] \
-            -variable [itcl::scope _axis(zcutaway)]
+            -command [itcl::code $this AdjustSetting cutplane-zvisible] \
+            -variable [itcl::scope _settings(cutplane-zvisible)]
     }
     Rappture::Tooltip::for $itk_component(zCutButton) \
-        "Toggle the Z-axis cutaway on/off"
+        "Toggle the Z-axis cutplane on/off"
 
     itk_component add zCutScale {
@@ -1792 +2354 @@
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
-            -command [itcl::code $this Slice move z] \
-            -variable [itcl::scope _axis(zposition)]
+            -command [itcl::code $this EventuallySetCutplane z] \
+            -variable [itcl::scope _settings(cutplane-zposition)]
     } {
         usual
         ignore -borderwidth -highlightthickness
     }
-    $itk_component(zCutScale) set 100
+    $itk_component(zCutScale) set 50
     $itk_component(zCutScale) configure -state disabled
     #$itk_component(zCutScale) configure -state disabled
@@ -1804 +2366 @@
         "@[itcl::code $this Slice tooltip z]"
 
-    itk_component add zDirButton {
-        Rappture::PushButton $inner.zdir \
-            -onimage [Rappture::icon arrow-down] \
-            -onvalue -1 \
-            -offimage [Rappture::icon arrow-up] \
-            -offvalue 1 \
-            -command [itcl::code $this AdjustSetting axis-zdirection] \
-            -variable [itcl::scope _axis(zdirection)]
-    }
-    set _axis(zdirection) -1 
-    Rappture::Tooltip::for $itk_component(zDirButton) \
-        "Toggle the direction of the Z-axis cutaway"
-
     blt::table $inner \
-        0,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
-        1,0 $itk_component(xCutScale)   -fill y \
-        0,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
-        1,1 $itk_component(yCutScale)   -fill y \
-        0,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
-        1,2 $itk_component(zCutScale)   -fill y \
+        0,0 $inner.visible              -anchor w -pady 2 -cspan 4 \
+        1,0 $inner.lighting             -anchor w -pady 2 -cspan 4 \
+        2,0 $inner.wireframe            -anchor w -pady 2 -cspan 4 \
+        3,0 $inner.edges                -anchor w -pady 2 -cspan 4 \
+        4,0 $inner.opacity_l            -anchor w -pady 2 -cspan 3 \
+        5,0 $inner.opacity              -fill x   -pady 2 -cspan 3 \
+        6,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
+        7,0 $itk_component(xCutScale)   -fill y \
+        6,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
+        7,1 $itk_component(yCutScale)   -fill y \
+        6,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
+        7,2 $itk_component(zCutScale)   -fill y \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r1 c3 -resize expand
+    blt::table configure $inner r7 c3 -resize expand
 }
 
@@ -1899 +2454 @@
         }
     }
-    return [list .txt $bytes]
+    return [list .vtk $bytes]
 }
 
@@ -1957 +2512 @@
     set tag $dataobj-$comp
     set style [$dataobj style $comp]
-    #puts stderr "style $dataobj-$comp \"$style\""
-    if { $dataobj != $_first } {
-        set settings(-wireframe) 1
-    }
     array set settings {
         -color \#808080
@@ -1973 +2524 @@
         -visible 1
     }
+    if { $dataobj != $_first } {
+        set settings(-opacity) 1
+    }
     array set settings $style
     SendCmd "streamlines add $tag"
-    SendCmd "streamlines seed visible off"
+    SendCmd "streamlines seed visible off $tag"
     set seeds [$dataobj hints seeds]
     if { $seeds != "" && ![info exists _seeds($dataobj)] } {
         set length [string length $seeds]
-        set stag $dataobj-seeds
-        SendCmd "dataset add $stag data follows $length"
+        SendCmd "streamlines seed fmesh 200 data follows $length $tag"
         SendCmd "$seeds"
-        SendCmd "dataset visible 0 $stag"
-        SendCmd "streamlines seed random 1000 $stag"
         set _seeds($dataobj) 1
     }
+    SendCmd "cutplane add $tag"
+    SendCmd "cutplane edges 0 $tag"
+    SendCmd "cutplane wireframe 0 $tag"
+    SendCmd "cutplane lighting 1 $tag"
+    SendCmd "cutplane linewidth 1 $tag"
+    #SendCmd "cutplane linecolor 1 1 1 $tag"
+    #SendCmd "cutplane visible $tag"
+    foreach axis { x y z } {
+        SendCmd "cutplane slice $axis 1.0 $tag"
+        SendCmd "cutplane axis $axis 0 $tag"
+    }
+
     SendCmd "polydata add $tag"
     SendCmd "polydata edges $settings(-edges) $tag"
-    set _volume(edges) $settings(-edges)
+    set _settings(volume-edges) $settings(-edges)
     SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
     SendCmd "polydata lighting $settings(-lighting) $tag"
-    set _volume(lighting) $settings(-lighting)
+    set _settings(volume-lighting) $settings(-lighting)
     SendCmd "polydata linecolor [Color2RGB $settings(-edgecolor)] $tag"
     SendCmd "polydata linewidth $settings(-linewidth) $tag"
     SendCmd "polydata opacity $settings(-opacity) $tag"
-    set _volume(opacity) $settings(-opacity)
+    set _settings(volume-opacity) $settings(-opacity)
     SendCmd "polydata wireframe $settings(-wireframe) $tag"
-    set _volume(wireframe) $settings(-wireframe)
-    set _volume(opacity) [expr $settings(-opacity) * 100.0]
+    set _settings(volume-wireframe) $settings(-wireframe)
+    set _settings(volume-opacity) [expr $settings(-opacity) * 100.0]
     SetColormap $dataobj $comp
 }
@@ -2017 +2580 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::ReceiveLegend { colormap title vmin vmax size } {
-    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
+    set _legendPending 0
+    puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
     set _limits(vmin) $vmin
     set _limits(vmax) $vmax
     set _title $title
+    regsub {\(mag\)} $title "" _title 
     if { [IsConnected] } {
         set bytes [ReceiveBytes $size]
@@ -2028 +2593 @@
         $_image(legend) configure -data $bytes
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-        DrawLegend
+        if { [catch {DrawLegend $_title} errs] != 0 } {
+            puts stderr errs=$errs
+        }
     }
 }
@@ -2038 +2605 @@
 #       of the contour plot area.
 #
-itcl::body Rappture::VtkStreamlinesViewer::DrawLegend {} {
+itcl::body Rappture::VtkStreamlinesViewer::DrawLegend { name } {
     set c $itk_component(view)
     set w [winfo width $c]
@@ -2045 +2612 @@
     set lineht [font metrics $font -linespace]
     
-    if { $_settings(legend) } {
+    if { [info exists _fields($name)] } {
+        foreach { title units } $_fields($name) break
+        if { $units != "" } {
+            set title [format "%s (%s)" $title $units]
+        }
+    } else {
+        set title $name
+    }
+    if { $_settings(legend-visible) } {
         set x [expr $w - 2]
         if { [$c find withtag "legend"] == "" } {
-            $c create image $x [expr {$lineht+2}] \
+            set y 2 
+            $c create text $x $y \
                 -anchor ne \
-                -image $_image(legend) -tags "colormap legend"
-            $c create text $x 2 \
+                -fill $itk_option(-plotforeground) -tags "title legend" \
+                -font $font
+            incr y $lineht
+            $c create text $x $y \
                 -anchor ne \
                 -fill $itk_option(-plotforeground) -tags "vmax legend" \
                 -font $font
+            incr y $lineht
+            $c create image $x $y \
+                -anchor ne \
+                -image $_image(legend) -tags "colormap legend"
             $c create text $x [expr {$h-2}] \
                 -anchor se \
@@ -2063 +2645 @@
             $c bind colormap <Motion> [itcl::code $this MotionLegend %x %y]
         }
+        $c bind title <ButtonPress> [itcl::code $this Combo post]
+        $c bind title <Enter> [itcl::code $this Combo activate]
+        $c bind title <Leave> [itcl::code $this Combo deactivate]
         # Reset the item coordinates according the current size of the plot.
-        $c coords colormap $x [expr {$lineht+2}]
+        $c itemconfigure title -text $title
         if { $_limits(vmin) != "" } {
             $c itemconfigure vmin -text [format %g $_limits(vmin)]
@@ -2071 +2656 @@
             $c itemconfigure vmax -text [format %g $_limits(vmax)]
         }
-        $c coords vmin $x [expr {$h-2}]
-        $c coords vmax $x 2
+        set y 2
+        $c coords title $x $y
+        incr y $lineht
+        $c coords vmax $x $y
+        incr y $lineht
+        $c coords colormap $x $y
+        $c coords vmin $x [expr {$h - 2}]
     }
 }
@@ -2113 +2703 @@
     set coords [$c coords colormap]
     set imgX [expr $w - [image width $_image(legend)] - 2]
-    set imgY [expr $y - $lineht - 2]
-
+    set imgY [expr $y - 2 * ($lineht + 2)]
+
+    if { [info exists _fields($_title)] } {
+        foreach { title units } $_fields($_title) break
+        if { $units != "" } {
+            set title [format "%s (%s)" $title $units]
+        }
+    } else {
+        set title $_title
+    }
     # Make a swatch of the selected color
     if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
@@ -2129 +2727 @@
 
     # Compute the value of the point
-    set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
-    #puts stderr "t=$t x=$x y=$y imgY=$imgY"
-    set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
+    if { [info exists _limits(vmax)] && [info exists _limits(vmin)] } {
+        set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
+        set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
+    } else {
+        set value 0.0
+    }
     set tipx [expr $x + 15] 
     set tipy [expr $y - 5]
-    #puts stderr "tipx=$tipx tipy=$tipy x=$x y=$y"
-    Rappture::Tooltip::text $c "$_title $value"
+    Rappture::Tooltip::text $c "$title $value"
     Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
 }
@@ -2152 +2752 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_axis(${axis}position)
+            set oldval $_settings(axis-${axis}position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {
@@ -2158 +2758 @@
             }
             set newpos [expr {0.01*$newval}]
-            SendCmd "renderer clipplane $axis $newpos -1"
+            SendCmd "cutplane slice $axis $newpos"
         }
         "tooltip" {
@@ -2170 +2770 @@
     }
 }
+
+
+# ----------------------------------------------------------------------
+# USAGE: _dropdown post
+# USAGE: _dropdown unpost
+# USAGE: _dropdown select
+#
+# Used internally to handle the dropdown list for this combobox.  The
+# post/unpost options are invoked when the list is posted or unposted
+# to manage the relief of the controlling button.  The select option
+# is invoked whenever there is a selection from the list, to assign
+# the value back to the gauge.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkStreamlinesViewer::Combo {option} {
+    set c $itk_component(view) 
+    switch -- $option {
+        post {
+            foreach { x1 y1 x2 y2 } [$c bbox title] break
+            set x1 [expr [winfo width $itk_component(view)] - [winfo reqwidth $itk_component(fieldmenu)]]
+            set x [expr $x1 + [winfo rootx $itk_component(view)]]
+            set y [expr $y2 + [winfo rooty $itk_component(view)]]
+            puts stderr "combo x=$x y=$y"
+            tk_popup $itk_component(fieldmenu) $x $y
+        }
+        activate {
+            $c itemconfigure title -fill red
+        }
+        deactivate {
+            $c itemconfigure title -fill white 
+        }
+        invoke {
+            $itk_component(field) value $_currentField
+            AdjustSetting streamlines-field
+        }
+        default {
+            error "bad option \"$option\": should be post, unpost, select"
+        }
+    }
+}

branches/blt4/gui/scripts/vtkviewer.tcl

@@ -153 +153 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer::constructor {hostlist args} {
+    set _serverType "vtkvis"
     package require vtk
+
     # Rebuild event
     $_dispatcher register !rebuild
@@ -1385 +1387 @@
             set tmpfile file[pid].vtk
             set f [open "$tmpfile" "w"]
+            fconfigure $f -translation binary -encoding binary
             puts $f $data 
             close $f
             set reader [vtkDataSetReader $tag-xvtkDataSetReader]
             $reader SetFileName $tmpfile
-            $reader ReadFromInputStringOn
             $reader ReadAllNormalsOn
             $reader ReadAllScalarsOn
@@ -1416 +1418 @@
             rename $output ""
             rename $reader ""
-            rename $arr ""
             file delete $tmpfile
         }
@@ -1885 +1886 @@
         SendCmd "glyphs wireframe $settings(-wireframe) $tag"
         #SendCmd "glyphs ccolor [Color2RGB $settings(-color)] $tag"
-        #SendCmd "glyphs colormode ccolor $tag"
-        SendCmd "glyphs smode vcomp $tag"
+        #SendCmd "glyphs colormode ccolor {} $tag"
+        SendCmd "glyphs smode vcomp {} $tag"
         SendCmd "glyphs opacity $settings(-opacity) $tag"
         SendCmd "glyphs visible $settings(-visible) $tag"

branches/blt4/gui/scripts/xylegend.tcl

@@ -68 +68 @@
     private variable _unmapHidden 0
 
-    constructor {args} { graph }
+    constructor {graph args} {}
     destructor {}
 

branches/blt4/gui/scripts/xyprint.tcl

@@ -38 +38 @@
     private variable _preview "";       # Preview image.
     private variable _savedSettings;    # Array of settings.
-    private variable _legendFontFamily ""
-    private variable _legendFontSize ""
-    private variable _tickFontFamily ""
-    private variable _titleFontFamily ""
-    private variable _tickFontSize ""
-    private variable _titleFontSize ""
-    private variable _format ""
-    private variable _axis ""
-    private variable _style ""
-    private variable _position ""
 
     private common _oldSettingsFile "~/.rpsettings"
@@ -92 +82 @@
     # Same dialog may be used for different graphs
     private common _settings
-    private common _fonts
     private common _wait
 }
@@ -119 +108 @@
         label $itk_interior.preview \
             -highlightthickness 0 -bd 0 -image $_preview -width 2.5i \
-                -height 2.25i -background grey -padx 10 -pady 10
+                -height 2.5i -background grey
     } {
         ignore -background
@@ -165 +154 @@
     set _clone ""
     set _graph ""
-    foreach font [array names _fonts] {
-        font delete $font
-    }
-    array unset _fonts
 }
 
@@ -420 +405 @@
             -majorticks {} -minorticks {}
         $_clone axis configure $axis \
-            -tickfont $_fonts($axis-ticks) \
-            -titlefont $_fonts($axis-title)
+            -tickfont $tickfont \
+            -titlefont $titlefont
     }
     set count 0
@@ -491 +476 @@
     set w [Inches2Pixels $_settings($this-layout-width) 3.4]
     set h [Inches2Pixels $_settings($this-layout-height) 3.4]
+    $_clone snap $img -width $w -height $h
+
     set pixelsPerInch [winfo pixels . 1i]
     set cw [winfo width $itk_component(preview)]
@@ -507 +494 @@
     set sy [expr double($maxheight)/$h]
     set s [expr min($sx,$sy)]
-    $_clone snap $img -width $w -height $h
 
     set pw [expr int(round($s * $w))]
@@ -544 +530 @@
 
 itcl::body Rappture::XyPrint::GetAxisType { axis } {
-    return [$_clone axis type $axis]
+    foreach type { x y x2 y2 } {
+        set axes [$_clone ${type}axis use]
+        if { [lsearch $axes $axis] >= 0 } {
+            return [string range $type 0 0]
+        }
+    }
+    return ""
 }
 
 itcl::body Rappture::XyPrint::GetAxis {} {
-    set axis $_settings($this-axis-selected)
-    foreach option { -grid -min -max -loose -title -stepsize -subdivisions } {
+    set axis [$itk_component(axis_combo) current]
+    foreach option { -min -max -loose -title -stepsize -subdivisions } {
         set _settings($this-axis$option) [$_clone axis cget $axis $option]
     }
+    foreach attr { fontfamily fontsize fontweight fontslant } {
+        set specific $this-$axis-ticks
+        set general $this-axis-ticks
+        set _settings(${general}-${attr}) $_settings(${specific}-${attr})
+        set specific $this-$axis-title
+        set general $this-axis-title
+        set _settings(${general}-${attr}) $_settings(${specific}-${attr})
+    }
     set type [GetAxisType $axis]
-    if { $type != "" } {
-        set _settings($this-axis-plotpad${type}) \
-            [Pixels2Inches [$_clone cget -plotpad${type}]]
-        set _settings($this-axis-zero) [$_clone marker cget ${type}-zero -hide]
-    }
+    if { [$_clone grid cget -map${type}] == $axis } {
+        set _settings($this-axis-grid) 1
+    }  else {
+        set _settings($this-axis-grid) 0
+    }
+    set _settings($this-axis-plotpad${type}) \
+        [Pixels2Inches [$_clone cget -plotpad${type}]]
+    set _settings($this-axis-zero) [$_clone marker cget ${type}-zero -hide]
 }
 
@@ -745 +748 @@
     set _settings($this-legend-anchor)    [$page.anchor current]
     if { $_clone != "" } {
-        font configure $_fonts(legend) \
-            -family $_settings($this-legend-font-family) \
-            -size $_settings($this-legend-font-size) \
-            -weight $_settings($this-legend-font-weight) \
-            -slant $_settings($this-legend-font-slant)
+        lappend font $_settings($this-legend-fontfamily)
+        lappend font $_settings($this-legend-fontsize)
+        lappend font $_settings($this-legend-fontweight)
+        lappend font $_settings($this-legend-fontslant)
         foreach option { -hide -position -anchor -borderwidth } {
             SetComponentOption legend $option
         }
-        $_clone legend configure -font fixed -font $_fonts(legend)
+        $_clone legend configure -font fixed -font $font
     }
     ApplyElementSettings
@@ -952 +954 @@
         -onvalue "bold" -offvalue "normal" \
         -command [itcl::code $this ApplyLegendSettings] \
-        -variable [itcl::scope _settings($this-legend-font-weight)]
+        -variable [itcl::scope _settings($this-legend-fontweight)]
     Rappture::Tooltip::for $page.fontweight \
         "Use the bold version of the font."
@@ -962 +964 @@
         -onvalue "italic" -offvalue "roman" \
         -command [itcl::code $this ApplyLegendSettings] \
-        -variable [itcl::scope _settings($this-legend-font-slant)]
+        -variable [itcl::scope _settings($this-legend-fontslant)]
     Rappture::Tooltip::for $page.fontslant \
         "Use the italic version of the font."
@@ -982 +984 @@
         5,1 $page.label -fill x -cspan 5 \
         6,0 $page.color_l -anchor e \
-        6,1 $page.color -fill x  \
-        6,2 $page.symbol_l -anchor e \
-        6,3 $page.symbol -fill both -cspan 3 \
-        7,0 $page.dashes_l -anchor e \
-        7,1 $page.dashes -fill x 
+        6,1 $page.color -fill x \
+        6,2 $page.symbol_l -anchor e \
+        6,3 $page.symbol -fill both -cspan 3 \
+        7,0 $page.dashes_l -anchor e \
+        7,1 $page.dashes -fill x \
 
     blt::table configure $page r* -resize none -pady { 0 2 }
+    blt::table configure $page c3 c4 -resize none
     blt::table configure $page r8 -resize both
 
@@ -1026 +1029 @@
         "Set the title of the current axis."
 
-    label $page.min_l -text "min" 
+    label $page.min_l -text "min"
     entry $page.min -width 10 \
         -textvariable [itcl::scope _settings($this-axis-min)]
@@ -1033 +1036 @@
         "Set the minimum limit for the current axis. If empty, the minimum is automatically determined."
 
-    label $page.max_l -text "max" 
+    label $page.max_l -text "max"
     entry $page.max -width 10 \
         -textvariable [itcl::scope _settings($this-axis-max)]
@@ -1040 +1043 @@
         "Set the maximum limit for the current axis. If empty, the maximum is automatically determined."
 
-    label $page.subdivisions_l -text "subdivisions" 
+    label $page.subdivisions_l -text "subdivisions"
     entry $page.subdivisions \
         -textvariable [itcl::scope _settings($this-axis-subdivisions)]
@@ -1048 +1051 @@
         "Set the number of subdivisions (minor ticks) for the current axis."
 
-    label $page.stepsize_l -text "step size" 
+    label $page.stepsize_l -text "step size"
     entry $page.stepsize \
         -textvariable [itcl::scope _settings($this-axis-stepsize)]
@@ -1144 +1147 @@
         -onvalue "bold" -offvalue "normal" \
         -command [itcl::code $this ApplyAxisSettings] \
-        -variable [itcl::scope _settings($this-axis-tickfont-weight)]
+        -variable [itcl::scope _settings($this-axis-ticks-fontweight)]
     Rappture::Tooltip::for $page.tickfontweight \
         "Use the bold version of the tick font."
@@ -1154 +1157 @@
         -onvalue "italic" -offvalue "roman" \
         -command [itcl::code $this ApplyAxisSettings] \
-        -variable [itcl::scope _settings($this-axis-tickfont-slant)]
+        -variable [itcl::scope _settings($this-axis-ticks-fontslant)]
     Rappture::Tooltip::for $page.tickfontslant \
         "Use the italic version of the tick font."
@@ -1220 +1223 @@
         -onvalue "bold" -offvalue "normal" \
         -command [itcl::code $this ApplyAxisSettings] \
-        -variable [itcl::scope _settings($this-axis-titlefont-weight)]
+        -variable [itcl::scope _settings($this-axis-title-fontweight)]
     Rappture::Tooltip::for $page.titlefontweight \
         "Use the bold version of the title font."
@@ -1230 +1233 @@
         -onvalue "italic" -offvalue "roman" \
         -command [itcl::code $this ApplyAxisSettings] \
-        -variable [itcl::scope _settings($this-axis-titlefont-slant)]
+        -variable [itcl::scope _settings($this-axis-title-fontslant)]
     Rappture::Tooltip::for $page.titlefontslant \
         "Use the italic version of the title font."
@@ -1263 +1266 @@
         8,4 $page.plotpad -fill both -cspan 3 
 
-    blt::table configure $page  c0 c7 c8 -resize none
+    blt::table configure $page  c0 c4 c5 c6 c7 c8 -resize none
 }
 
@@ -1272 +1275 @@
 
 itcl::body Rappture::XyPrint::ApplyAxisSettings {} {
-    if { $_clone == "" } {
-        return
-    }
-    set axis $_settings($this-axis-selected)
+    set axis [$itk_component(axis_combo) current]
     set type [GetAxisType $axis]
     set page $itk_component(axis_page)
@@ -1282 +1282 @@
         SetNamedComponentOption axis $axis $option
     }
+    set _settings($this-axis-ticks-fontfamily)  [$page.tickfontfamily value]
+    set _settings($this-axis-ticks-fontsize)    [$page.tickfontsize value]
+    set _settings($this-axis-title-fontfamily)  [$page.titlefontfamily value]
+    set _settings($this-axis-title-fontsize)    [$page.titlefontsize value]
+
+    set tickfont {}
+    set titlefont {}
+
+    foreach attr { fontfamily fontsize fontweight fontslant } {
+        set specific $this-$axis-ticks
+        set general  $this-axis-ticks
+        set _settings(${specific}-${attr}) $_settings(${general}-${attr})
+        lappend tickfont $_settings(${general}-${attr})
+        set specific $this-$axis-title
+        set general  $this-axis-title
+        set _settings(${specific}-${attr}) $_settings(${general}-${attr})
+        lappend titlefont $_settings(${general}-${attr})
+    }
+    $_clone axis configure $axis -tickfont $tickfont -titlefont $titlefont
     $_clone marker configure ${type}-zero -hide $_settings($this-axis-zero)
-    font configure $axis-title \
-        -family $_settings($this-axis-titlefont-family) \
-        -size   $_settings($this-axis-titlefont-size) \
-        -weight $_settings($this-axis-titlefont-weight) \
-        -slant  $_settings($this-axis-titlefont-slant)
-    font configure $axis-ticks \
-        -family $_settings($this-axis-tickfont-family) \
-        -size   $_settings($this-axis-tickfont-size) \
-        -weight $_settings($this-axis-tickfont-weight) \
-        -slant  $_settings($this-axis-tickfont-slant)
-    $_clone axis configure $axis -tickfont fixed -titlefont fixed
-    $_clone axis configure $axis -tickfont $axis-ticks -titlefont $axis-title
     GetAxis
     RegeneratePreview
@@ -1346 +1353 @@
     # Always set to "ps" "ieee"
     set _settings($this-general-format) ps
-    set _settings($this-general-style)  ieee
+    set _settings($this-general-style) ieee
     set _settings($this-general-remember) 0
     set page $itk_component(graph_page)
+    $page.format value [$page.format label $_settings($this-general-format)]
+    $page.style value [$page.style label $_settings($this-general-style)]
 
     # Layout settings
@@ -1375 +1384 @@
     set _settings($this-legend-borderwidth) 0
 
-    array unset info
-    array set info [font configure legend]
-    set _settings($this-legend-font-family) $info(-family)
-    set _settings($this-legend-font-size)   $info(-size)
-    set _settings($this-legend-font-weight) $info(-weight)
-    set _settings($this-legend-font-slant)  $info(-slant)
-    if { $info(-weight) == "bold" } {
+    $page.fontfamily value $_settings($this-legend-fontfamily)
+    $page.fontsize value $_settings($this-legend-fontsize)
+    if { $_settings($this-legend-fontweight) == "bold" } {
         set _settings($this-legend-font-bold) 1
     }
@@ -1387 +1392 @@
     set _settings($this-legend-position) [$_clone legend cget -position]
     set _settings($this-legend-anchor) [$_clone legend cget -anchor]
+    $page.position value \
+        [$page.position label $_settings($this-legend-position)]
     $page.anchor value [$page.anchor label $_settings($this-legend-anchor)]
     GetElement
@@ -1408 +1415 @@
 
     array set info [font configure $axis-title]
-    set _settings($this-axis-titlefont-family) $info(-family)
-    set _settings($this-axis-titlefont-size)   $info(-size)
-    set _settings($this-axis-titlefont-weight) $info(-weight)
-    set _settings($this-axis-titlefont-slant)  $info(-slant)
+    set _settings($this-axis-title-fontfamily) $info(-family)
+    set _settings($this-axis-title-fontsize)   $info(-size)
+    set _settings($this-axis-title-fontweight) $info(-weight)
+    set _settings($this-axis-title-fontslant)  $info(-slant)
 
     array set info [font configure $axis-ticks]
-    set _settings($this-axis-tickfont-family) $info(-family)
-    set _settings($this-axis-tickfont-size)   $info(-size)
-    set _settings($this-axis-tickfont-weight) $info(-weight)
-    set _settings($this-axis-tickfont-slant)  $info(-slant)
+    set _settings($this-axis-tick-fontfamily) $info(-family)
+    set _settings($this-axis-tick-fontsize)   $info(-size)
+    set _settings($this-axis-tick-fontweight) $info(-weight)
+    set _settings($this-axis-tick-fontslant)  $info(-slant)
 
     # Always hide the zero line.
@@ -1446 +1453 @@
     set parser [interp create -safe]
     $parser alias xyprint [itcl::code $this restore]
-    $parser alias font font
     set f [open $_settingsFile "r"]
     set code [read $f]
@@ -1459 +1465 @@
         $parser eval $_savedSettings($key)
     }
-    foreach {name value} [$parser eval "array get general"] {
-        set _settings($this-graph-$name) $value
+    # Restore settings to this instance
+    foreach {name value} [$parser eval "array get settings"] {
+        set _settings($this-$name) $value
     }
     interp delete $parser
@@ -1500 +1507 @@
     # Create stanza associated with tool and plot title.
     # General settings
-    append out "    set general(format) $_settings($this-general-format)\n"
-    append out "    set general(style) $_settings($this-general-style)\n"
-
-    foreach font [array names _fonts] {
-        append out "    font configure $font"
-        array unset info
-        array set info [font configure $font]
-        foreach opt { -family -size -weight -slant } {
-            set value [list $info($opt)]
-            append out " $opt $value"
-        }
-        append out "\n"
-    }
+    set length [string length "${this}-"]
+    append out "    array set settings {\n" 
+    foreach item [array names _settings ${this}-*] {
+        set field [string range $item $length end]
+        if { [regexp {^element-[0-9]+$} $field] } {
+            continue
+        }
+        set value $_settings($item)
+        append out "        [list $field] [list $value]\n"
+    }
+    append out "    }\n" 
+    # Legend font
+    lappend legendfont $_settings($this-legend-fontfamily)
+    lappend legendfont $_settings($this-legend-fontsize)
+    lappend legendfont $_settings($this-legend-fontweight)
+    lappend legendfont $_settings($this-legend-fontslant)
+    # Axis tick font
+    lappend axistickfont $_settings($this-axis-ticks-fontfamily)
+    lappend axistickfont $_settings($this-axis-ticks-fontsize)
+    lappend axistickfont $_settings($this-axis-ticks-fontweight)
+    lappend axistickfont $_settings($this-axis-ticks-fontslant)
+    # Axis title font
+    lappend axistitlefont $_settings($this-axis-title-fontfamily)
+    lappend axistitlefont $_settings($this-axis-title-fontsize)
+    lappend axistitlefont $_settings($this-axis-title-fontweight)
+    lappend axistitlefont $_settings($this-axis-title-fontslant)
     append out "\n"
 
@@ -1530 +1550 @@
         append out " $opt $value"
     }
-    append out " -font legend\n"
+    append out " -font \"$legendfont\"\n"
 
     # Element settings
@@ -1559 +1579 @@
         append out "    if \{ \[preview axis names \"$axis\"\] == \"$axis\" \} \{\n"
         append out "        preview axis configure \"$axis\""
-        foreach opt { -hide -min -max -loose -title -stepsize -subdivisions } {
+        foreach opt { -grid -hide -min -max -loose -title -stepsize -subdivisions } {
             set value [list [$_clone axis cget $axis $opt]]
             append out " $opt $value"
         }
-        append out " -tickfont \"$axis-ticks\""
-        append out " -titlefont \"$axis-title\"\n"
+        append out " -tickfont \"$axistickfont\""
+        append out " -titlefont \"$axistitlefont\"\n"
         set hide [$_clone marker cget ${axis}-zero -hide]
         append out "        preview marker configure \"${axis}-zero\" -hide $hide\n"

branches/blt4/gui/scripts/xyresult.tcl

@@ -173 +173 @@
 
     # Add bindings so you can mouse over points to see values:
-    bind $itk_component(plot) <Motion> \
+    #
+    $itk_component(plot) element bind all <Enter> \
         [itcl::code $this Hilite at %x %y]
-    bind $itk_component(plot) <Leave> \
+    $itk_component(plot) element bind all <Motion> \
+        [itcl::code $this Hilite at %x %y]
+    $itk_component(plot) element bind all <Leave> \
         [itcl::code $this Hilite off %x %y]
 

branches/blt4/gui/src/Makefile.in

@@ -52 +52 @@
                 RapptureGUI_Init.o \
                 RpCanvPlacard.o \
-                RpDiffview.o
+                RpDiffview.o \
+                RpConvertDxToVtk.o
 
 name            = RapptureGUI$(version)

branches/blt4/gui/src/RapptureGUI_Init.c

@@ -45 +45 @@
         return TCL_ERROR;
     }
+    if (RpConvertDxToVtk_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
     return TCL_OK;
 }

branches/blt4/lang/Makefile.in

@@ -20 +20 @@
 PYTHON          = @PYTHON_DISTUTILS@
 MEX             = @MEX@
-OCTAVE          = @OCTAVE_VERSION@
-JAVAC           = @JAVAC@
+OCTAVE          = @OCTAVE_VERSION@
+JAVAC           = @JAVAC@
+R               = @R@
 
 # Rappture requires it. We always build a Tcl language API.
@@ -44 +45 @@
   LANGS += java
 endif
+ifneq ($(R),)
+  LANGS += R
+endif
 
-.PHONY: tcl octave matlab perl python ruby java
+.PHONY: tcl octave matlab perl python ruby java R
 
 all:

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

@@ -56 +56 @@
                 note \
                 number \
+                periodicelement \
                 phase \
                 string
@@ -80 +81 @@
 
 tclIndex: install-objects install-types install-validations $(FILES)
-        $(TCLSH) $(srcdir)/../tclconfig/mkindex.tcl --srcdir $(srcdir) \
+        $(TCLSH) $(srcdir)/../cf/mkindex.tcl --srcdir $(srcdir) \
                 --outfile tclIndex
-        $(TCLSH) $(srcdir)/../tclconfig/mkobjects.tcl --srcdir $(srcdir) \
+        $(TCLSH) $(srcdir)/../cf/mkobjects.tcl --srcdir $(srcdir) \
                 $(OBJECTS)
 

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

@@ -51 +51 @@
 LIBS = \
         -L../../../src/core -lrappture \
-        $(TCL_LIB_SPEC) -lexpat -lz -lm -lstdc++
+        $(TCL_LIB_SPEC) -lncurses -lexpat -lz -lm -lstdc++
 
 OBJS = \
         Rappture_Init.o \
+        RpCurses.o \
         RpDaemon.o \
         RpEncodeTclInterface.o \

branches/blt4/packages/vizservers/configure

@@ -8529 +8529 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-#define SIZEOF_LONG ${ac_cv_sizeof_long}
-#if SIZEOF_LONG == 8
-#  define INT64_C(c)  c ## L
-#  define UINT64_C(c) c ## UL
-#else
-#  define INT64_C(c)  c ## LL
-#  define UINT64_C(c) c ## ULL
-#endif
+#define __STDC_CONSTANT_MACROS 1
 
 "
@@ -8549 +8542 @@
 
 CPPFLAGS=$save_CPPFLAGS
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavcodec" >&5
+$as_echo_n "checking for main in -lavcodec... " >&6; }
+if ${ac_cv_lib_avcodec_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavcodec  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avcodec_main=yes
+else
+  ac_cv_lib_avcodec_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_main" >&5
+$as_echo "$ac_cv_lib_avcodec_main" >&6; }
+if test "x$ac_cv_lib_avcodec_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVCODEC 1
+_ACEOF
+
+  LIBS="-lavcodec $LIBS"
+
+else
+  as_fn_error $? "requires libavcodec" "$LINENO" 5
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavutil" >&5
+$as_echo_n "checking for main in -lavutil... " >&6; }
+if ${ac_cv_lib_avutil_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavutil  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avutil_main=yes
+else
+  ac_cv_lib_avutil_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_main" >&5
+$as_echo "$ac_cv_lib_avutil_main" >&6; }
+if test "x$ac_cv_lib_avutil_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVUTIL 1
+_ACEOF
+
+  LIBS="-lavutil $LIBS"
+
+else
+  as_fn_error $? "requires libavutil" "$LINENO" 5
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavformat" >&5
+$as_echo_n "checking for main in -lavformat... " >&6; }
+if ${ac_cv_lib_avformat_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lavformat  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_avformat_main=yes
+else
+  ac_cv_lib_avformat_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_main" >&5
+$as_echo "$ac_cv_lib_avformat_main" >&6; }
+if test "x$ac_cv_lib_avformat_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAVFORMAT 1
+_ACEOF
+
+  LIBS="-lavformat $LIBS"
+
+else
+  as_fn_error $? "requires libavformat" "$LINENO" 5
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lswscale" >&5
+$as_echo_n "checking for main in -lswscale... " >&6; }
+if ${ac_cv_lib_swscale_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lswscale  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_swscale_main=yes
+else
+  ac_cv_lib_swscale_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_main" >&5
+$as_echo "$ac_cv_lib_swscale_main" >&6; }
+if test "x$ac_cv_lib_swscale_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSWSCALE 1
+_ACEOF
+
+  LIBS="-lswscale $LIBS"
+
+fi
+
+for ac_func in avcodec_decode_video2
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video2" "ac_cv_func_avcodec_decode_video2"
+if test "x$ac_cv_func_avcodec_decode_video2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO2 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avcodec_decode_video
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video" "ac_cv_func_avcodec_decode_video"
+if test "x$ac_cv_func_avcodec_decode_video" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avformat_open_input
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_open_input" "ac_cv_func_avformat_open_input"
+if test "x$ac_cv_func_avformat_open_input" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_OPEN_INPUT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_open_input_file
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_open_input_file" "ac_cv_func_av_open_input_file"
+if test "x$ac_cv_func_av_open_input_file" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_OPEN_INPUT_FILE 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_guess_format
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_guess_format" "ac_cv_func_av_guess_format"
+if test "x$ac_cv_func_av_guess_format" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_GUESS_FORMAT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in guess_format
+do :
+  ac_fn_cxx_check_func "$LINENO" "guess_format" "ac_cv_func_guess_format"
+if test "x$ac_cv_func_guess_format" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GUESS_FORMAT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_dump_format
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_dump_format" "ac_cv_func_av_dump_format"
+if test "x$ac_cv_func_av_dump_format" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_DUMP_FORMAT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in dump_format
+do :
+  ac_fn_cxx_check_func "$LINENO" "dump_format" "ac_cv_func_dump_format"
+if test "x$ac_cv_func_dump_format" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DUMP_FORMAT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avio_open
+do :
+  ac_fn_cxx_check_func "$LINENO" "avio_open" "ac_cv_func_avio_open"
+if test "x$ac_cv_func_avio_open" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVIO_OPEN 1
+_ACEOF
+
+fi
+done
+
+for ac_func in url_fopen
+do :
+  ac_fn_cxx_check_func "$LINENO" "url_fopen" "ac_cv_func_url_fopen"
+if test "x$ac_cv_func_url_fopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_URL_FOPEN 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avio_close
+do :
+  ac_fn_cxx_check_func "$LINENO" "avio_close" "ac_cv_func_avio_close"
+if test "x$ac_cv_func_avio_close" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVIO_CLOSE 1
+_ACEOF
+
+fi
+done
+
+for ac_func in url_fclose
+do :
+  ac_fn_cxx_check_func "$LINENO" "url_fclose" "ac_cv_func_url_fclose"
+if test "x$ac_cv_func_url_fclose" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_URL_FCLOSE 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avformat_alloc_context
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
+if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_ALLOC_CONTEXT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_alloc_format_context
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_alloc_format_context" "ac_cv_func_av_alloc_format_context"
+if test "x$ac_cv_func_av_alloc_format_context" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_ALLOC_FORMAT_CONTEXT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_set_parameters
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_set_parameters" "ac_cv_func_av_set_parameters"
+if test "x$ac_cv_func_av_set_parameters" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_SET_PARAMETERS 1
+_ACEOF
+
+fi
+done
+
+for ac_func in avformat_write_header
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_write_header" "ac_cv_func_avformat_write_header"
+if test "x$ac_cv_func_avformat_write_header" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_WRITE_HEADER 1
+_ACEOF
+
+fi
+done
+
+for ac_func in av_write_header
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_write_header" "ac_cv_func_av_write_header"
+if test "x$ac_cv_func_av_write_header" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_WRITE_HEADER 1
+_ACEOF
+
+fi
+done
+
+ac_fn_cxx_check_func "$LINENO" "av_write_trailer" "ac_cv_func_av_write_trailer"
+if test "x$ac_cv_func_av_write_trailer" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_write_trailer?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_freep" "ac_cv_func_av_freep"
+if test "x$ac_cv_func_av_freep" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_freep ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_free" "ac_cv_func_av_free"
+if test "x$ac_cv_func_av_free" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_free ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_new_stream" "ac_cv_func_av_new_stream"
+if test "x$ac_cv_func_av_new_stream" = xyes; then :
+
+else
+  as_fn_error $? "oops! av_new_stream ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_malloc" "ac_cv_func_av_malloc"
+if test "x$ac_cv_func_av_malloc" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_malloc ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_init_packet" "ac_cv_func_av_init_packet"
+if test "x$ac_cv_func_av_init_packet" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_init_packet ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_rescale_q" "ac_cv_func_av_rescale_q"
+if test "x$ac_cv_func_av_rescale_q" = xyes; then :
+
+else
+  as_fn_error $? "oops! no av_rescale_q ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "av_write_frame" "ac_cv_func_av_write_frame"
+if test "x$ac_cv_func_av_write_frame" = xyes; then :
+
+else
+  as_fn_error $? "oops! av_write_frame ?!?" "$LINENO" 5
+fi
+
+ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
+if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
+
+else
+  as_fn_error $? "oops! avformat_alloc_context ?!?" "$LINENO" 5
+fi
+
+for ac_func in img_convert
+do :
+  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
+if test "x$ac_cv_func_img_convert" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IMG_CONVERT 1
+_ACEOF
+
+fi
+done
+
+for ac_func in sws_scale
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
+if test "x$ac_cv_func_sws_scale" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_SCALE 1
+_ACEOF
+
+fi
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define __STDC_CONSTANT_MACROS 1
+#include <stdlib.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <ffmpeg/avcodec.h>
+#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#endif
+int x = AVMEDIA_TYPE_VIDEO;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_avmedia_type_video="yes"
+else
+  ac_avmedia_type_video="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$ac_avmedia_type_video" == "yes" ; then
+
+$as_echo "#define HAVE_AVMEDIA_TYPE_VIDEO 1" >>confdefs.h
+
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5
@@ -8689 +9149 @@
 
 fi
-
-for ac_func in avformat_alloc_context
-do :
-  ac_fn_cxx_check_func "$LINENO" "avformat_alloc_context" "ac_cv_func_avformat_alloc_context"
-if test "x$ac_cv_func_avformat_alloc_context" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_AVFORMAT_ALLOC_CONTEXT 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_free in -lavutil" >&5
-$as_echo_n "checking for av_free in -lavutil... " >&6; }
-if ${ac_cv_lib_avutil_av_free+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavutil  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char av_free ();
-int
-main ()
-{
-return av_free ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_avutil_av_free=yes
-else
-  ac_cv_lib_avutil_av_free=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_free" >&5
-$as_echo "$ac_cv_lib_avutil_av_free" >&6; }
-if test "x$ac_cv_lib_avutil_av_free" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVUTIL 1
-_ACEOF
-
-  LIBS="-lavutil $LIBS"
-
-fi
-
-for ac_func in img_convert
-do :
-  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
-if test "x$ac_cv_func_img_convert" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_IMG_CONVERT 1
-_ACEOF
-
-fi
-done
 
 

branches/blt4/packages/vizservers/configure.in

@@ -275 +275 @@
 
 AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
-#define SIZEOF_LONG ${ac_cv_sizeof_long}
-#if SIZEOF_LONG == 8
-#  define INT64_C(c)  c ## L
-#  define UINT64_C(c) c ## UL
-#else
-#  define INT64_C(c)  c ## LL
-#  define UINT64_C(c) c ## ULL
-#endif
+#define __STDC_CONSTANT_MACROS 1
 ])
 CPPFLAGS=$save_CPPFLAGS
+
+AC_CHECK_LIB(avcodec, main,,AC_MSG_ERROR(requires libavcodec))
+AC_CHECK_LIB(avutil, main,,AC_MSG_ERROR(requires libavutil))
+AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(requires libavformat))
+AC_CHECK_LIB(swscale, main)
+AC_CHECK_FUNCS(avcodec_decode_video2)
+AC_CHECK_FUNCS(avcodec_decode_video)
+AC_CHECK_FUNCS(avformat_open_input)
+AC_CHECK_FUNCS(av_open_input_file)
+AC_CHECK_FUNCS(av_guess_format)
+AC_CHECK_FUNCS(guess_format)
+AC_CHECK_FUNCS(av_dump_format)
+AC_CHECK_FUNCS(dump_format)
+AC_CHECK_FUNCS(avio_open)
+AC_CHECK_FUNCS(url_fopen)
+AC_CHECK_FUNCS(avio_close)
+AC_CHECK_FUNCS(url_fclose)
+AC_CHECK_FUNCS(avformat_alloc_context)
+AC_CHECK_FUNCS(av_alloc_format_context)
+AC_CHECK_FUNCS(av_set_parameters)
+AC_CHECK_FUNCS(avformat_write_header)
+AC_CHECK_FUNCS(av_write_header)
+AC_CHECK_FUNC(av_write_trailer,, 
+  AC_MSG_ERROR(oops! no av_write_trailer?!?))
+AC_CHECK_FUNC(av_freep,, AC_MSG_ERROR(oops! no av_freep ?!?))
+AC_CHECK_FUNC(av_free,,AC_MSG_ERROR(oops! no av_free ?!?))
+AC_CHECK_FUNC(av_new_stream,,AC_MSG_ERROR(oops! av_new_stream ?!?))
+AC_CHECK_FUNC(av_malloc,, AC_MSG_ERROR(oops! no av_malloc ?!?))
+AC_CHECK_FUNC(av_init_packet,,AC_MSG_ERROR(oops! no av_init_packet ?!?))
+AC_CHECK_FUNC(av_rescale_q,,AC_MSG_ERROR(oops! no av_rescale_q ?!?))
+AC_CHECK_FUNC(av_write_frame,,AC_MSG_ERROR(oops! av_write_frame ?!?))
+AC_CHECK_FUNC(avformat_alloc_context,,
+  AC_MSG_ERROR(oops! avformat_alloc_context ?!?))
+AC_CHECK_FUNCS(img_convert)
+AC_CHECK_FUNCS(sws_scale)
+AC_TRY_COMPILE([
+#define __STDC_CONSTANT_MACROS 1
+#include <stdlib.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <ffmpeg/avcodec.h>
+#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#endif
+int x = AVMEDIA_TYPE_VIDEO;
+],, ac_avmedia_type_video="yes", ac_avmedia_type_video="no")
+if test "$ac_avmedia_type_video" == "yes" ; then
+  AC_DEFINE(HAVE_AVMEDIA_TYPE_VIDEO,1,[Define if AVMEDIA_TYPE_VIDEO enum exists. ])
+fi
 
 AC_CHECK_LIB([avcodec], [avcodec_alloc_frame])
@@ -291 +333 @@
     AC_CHECK_LIB([avformat], [av_alloc_format_context], [], 
         [AC_MSG_WARN([libavformat not usable])]))
-AC_CHECK_FUNCS([avformat_alloc_context])
-AC_CHECK_LIB([avutil], [av_free])
-AC_CHECK_FUNCS([img_convert])
 
 

branches/blt4/packages/vizservers/nanovis/Command.cpp

@@ -1215 +1215 @@
 #endif  /*__TEST_CODE__*/
     } else {
+        if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) {
+            bytes += 5;
+            nBytes -= 5;
+        }
         TRACE("DX loading...\n");
         std::stringstream fdata;

branches/blt4/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -34 +34 @@
 
 #include "RpAVTranslate.h"
+
+#ifndef HAVE_AVMEDIA_TYPE_VIDEO
+#define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
+#endif  /* HAVE_AVMEDIA_TYPE_VIDEO */
+
+#ifndef AV_PKT_FLAG_KEY
+#define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
+#endif
+
+#ifndef HAVE_AV_GUESS_FORMAT
+#define av_guess_format         guess_format
+#endif  /*HAVE_AV_GUESS_FORMAT*/
+
+#ifndef HAVE_AV_DUMP_FORMAT
+#define av_dump_format          dump_format
+#endif  /*HAVE_AV_DUMP_FORMAT*/
+
+#ifndef HAVE_AVIO_OPEN
+#define avio_open               url_fopen       
+#endif  /*HAVE_AVIO_OPEN*/
+
+#ifndef HAVE_AVIO_CLOSE
+#define avio_close              url_fclose      
+#endif  /*HAVE_AVIO_CLOSE*/
 
 #ifndef M_PI
@@ -101 +125 @@
 
     /* Auto detect the output format from the name. default is mpeg. */
-    _fmtPtr = guess_format(NULL, filename, NULL);
+    _fmtPtr = av_guess_format(NULL, filename, NULL);
     if (_fmtPtr == NULL) {
         /*
@@ -107 +131 @@
                  "file extension: using MPEG.\n");
         */
-        _fmtPtr = guess_format("mpeg", NULL, NULL);
+        _fmtPtr = av_guess_format("mpeg", NULL, NULL);
     }
     if (_fmtPtr == NULL) {
@@ -136 +160 @@
     }
 
+#if defined(HAVE_AV_SET_PARAMETERS) && !defined(HAVE_AVFORMAT_WRITE_HEADER)
     /* Set the output parameters (must be done even if no parameters). */
     if (av_set_parameters(_ocPtr, NULL) < 0) {
@@ -141 +166 @@
         return false;
     }
-
-    dump_format(_ocPtr, 0, filename, 1);
+#endif
+    av_dump_format(_ocPtr, 0, filename, 1);
 
     /* Now that all the parameters are set, we can open the video codec and
@@ -154 +179 @@
     /* Open the output file, if needed. */
     if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
-        if (url_fopen(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
+        if (avio_open(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
             status.addError("Could not open '%s'", filename);
             return false;
@@ -161 +186 @@
 
     /* write the stream header, if any */
+#ifdef HAVE_AVFORMAT_WRITE_HEADER
+    avformat_write_header(_ocPtr, NULL);
+#else
     av_write_header(_ocPtr);
+#endif
     return true;
 }
@@ -226 +255 @@
     if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
         /* close the output file */
-        url_fclose(_ocPtr->pb);
+        avio_close(_ocPtr->pb);
     }
 
@@ -257 +286 @@
     codecPtr = streamPtr->codec;
     codecPtr->codec_id = codec_id;
-    codecPtr->codec_type = CODEC_TYPE_VIDEO;
+    codecPtr->codec_type = AVMEDIA_TYPE_VIDEO;
 
     /* Put sample parameters */
@@ -393 +422 @@
                            _avStreamPtr->time_base);
     if (codecPtr->coded_frame->key_frame) {
-        pkt.flags |= PKT_FLAG_KEY;
+        pkt.flags |= AV_PKT_FLAG_KEY;
     }
     pkt.stream_index = _avStreamPtr->index;

branches/blt4/packages/vizservers/nanovis/config.h

@@ -45 +45 @@
  * runtime if mesh decimation is required]
  */
-#define ISO_TEST                1
+#define ISO_TEST                0
 
 /* 

branches/blt4/packages/vizservers/nanovis/nanovis.cpp

@@ -754 +754 @@
 
     if(lastError) {
-        const char *listing = cgGetLastListing(g_context);
         TRACE("\n---------------------------------------------------\n");
         TRACE("%s\n\n", cgGetErrorString(lastError));
-        TRACE("%s\n", listing);
+        TRACE("%s\n", cgGetLastListing(g_context));
         TRACE("-----------------------------------------------------\n");
         TRACE("Cg error, exiting...\n");
@@ -2249 +2248 @@
     char *newPath;
     struct timeval tv;
-        int n, i;
     newPath = NULL;
     path = NULL;

branches/blt4/packages/vizservers/nanovis/nvconf.h.in

@@ -10 +10 @@
 #undef HAVE_ARPA_INET_H
 
+/* Define to 1 if you have the `avcodec_decode_video' function. */
+#undef HAVE_AVCODEC_DECODE_VIDEO
+
+/* Define to 1 if you have the `avcodec_decode_video2' function. */
+#undef HAVE_AVCODEC_DECODE_VIDEO2
+
 /* Define to 1 if you have the `avformat_alloc_context' function. */
 #undef HAVE_AVFORMAT_ALLOC_CONTEXT
 
+/* Define to 1 if you have the `avformat_open_input' function. */
+#undef HAVE_AVFORMAT_OPEN_INPUT
+
+/* Define to 1 if you have the `avformat_write_header' function. */
+#undef HAVE_AVFORMAT_WRITE_HEADER
+
+/* Define to 1 if you have the `avio_close' function. */
+#undef HAVE_AVIO_CLOSE
+
+/* Define to 1 if you have the `avio_open' function. */
+#undef HAVE_AVIO_OPEN
+
+/* Define if AVMEDIA_TYPE_VIDEO enum exists. */
+#undef HAVE_AVMEDIA_TYPE_VIDEO
+
+/* Define to 1 if you have the `av_alloc_format_context' function. */
+#undef HAVE_AV_ALLOC_FORMAT_CONTEXT
+
+/* Define to 1 if you have the `av_dump_format' function. */
+#undef HAVE_AV_DUMP_FORMAT
+
+/* Define to 1 if you have the `av_guess_format' function. */
+#undef HAVE_AV_GUESS_FORMAT
+
+/* Define to 1 if you have the `av_open_input_file' function. */
+#undef HAVE_AV_OPEN_INPUT_FILE
+
+/* Define to 1 if you have the `av_set_parameters' function. */
+#undef HAVE_AV_SET_PARAMETERS
+
+/* Define to 1 if you have the `av_write_header' function. */
+#undef HAVE_AV_WRITE_HEADER
+
 /* Define to 1 if you have the <Cg/cgGL.h> header file. */
 #undef HAVE_CG_CGGL_H
 
+/* Define to 1 if you have the `dump_format' function. */
+#undef HAVE_DUMP_FORMAT
+
 /* Define to 1 if you have the <dx/dx.h> header file. */
 #undef HAVE_DX_DX_H
@@ -28 +70 @@
 #undef HAVE_FFMPEG_AVUTIL_H
 
+/* Define to 1 if you have the `guess_format' function. */
+#undef HAVE_GUESS_FORMAT
+
 /* Define to 1 if you have the `img_convert' function. */
 #undef HAVE_IMG_CONVERT
@@ -55 +100 @@
 #undef HAVE_LIBHIGHGUI
 
+/* Define to 1 if you have the `swscale' library (-lswscale). */
+#undef HAVE_LIBSWSCALE
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
@@ -88 +136 @@
 #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 <sys/socket.h> header file. */
 #undef HAVE_SYS_SOCKET_H
@@ -102 +153 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `url_fclose' function. */
+#undef HAVE_URL_FCLOSE
+
+/* Define to 1 if you have the `url_fopen' function. */
+#undef HAVE_URL_FOPEN
 
 /* Define to 1 if you have the <vtkSmartPointer.h> header file. */

branches/blt4/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -1100 +1100 @@
                               double range[2],
                               int width, int height,
+                              bool opaque,
                               int numLabels,
                               vtkUnsignedCharArray *imgData)
@@ -1110 +1111 @@
                                   NULL,
                                   DataSet::POINT_DATA,
-                                  title, range, width, height, numLabels, imgData);
+                                  title, range, width, height, opaque, numLabels, imgData);
         } else {
             dataSet = _dataSets.begin()->second;
@@ -1126 +1127 @@
                               dataSet->getActiveScalarsName(),
                               dataSet->getActiveScalarsType(),
-                              title, range, width, height, numLabels, imgData);
+                              title, range, width, height, opaque, numLabels, imgData);
     } else {
         return renderColorMap(id, dataSetID, legendType,
                               dataSet->getActiveVectorsName(),
                               dataSet->getActiveVectorsType(),
-                              title, range, width, height, numLabels, imgData);
+                              title, range, width, height, opaque, numLabels, imgData);
     }
 }
@@ -1166 +1167 @@
                               double range[2],
                               int width, int height,
+                              bool opaque,
                               int numLabels,
                               vtkUnsignedCharArray *imgData)
@@ -1176 +1178 @@
                                   NULL,
                                   DataSet::POINT_DATA,
-                                  title, range, width, height, numLabels, imgData);
+                                  title, range, width, height, opaque, numLabels, imgData);
         } else {
             dataSet = _dataSets.begin()->second;
@@ -1196 +1198 @@
                           fieldName,
                           attrType,
-                          title, range, width, height, numLabels, imgData);
+                          title, range, width, height, opaque, numLabels, imgData);
 }
 
@@ -1229 +1231 @@
                               double range[2],
                               int width, int height,
+                              bool opaque,
                               int numLabels,
                               vtkUnsignedCharArray *imgData)
@@ -1259 +1262 @@
     if (_scalarBarActor == NULL) {
         _scalarBarActor = vtkSmartPointer<vtkScalarBarActor>::New();
+        _legendRenderer->AddViewProp(_scalarBarActor);
+    }
+
+    if (opaque) {
+        _scalarBarActor->UseOpacityOff();
+    } else {
         _scalarBarActor->UseOpacityOn();
-        _legendRenderer->AddViewProp(_scalarBarActor);
     }
 

branches/blt4/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -269 +269 @@
                         double range[2],
                         int width, int height,
+                        bool opaque,
                         int numLabels,
                         vtkUnsignedCharArray *imgData);
@@ -279 +280 @@
                         double range[2],
                         int width, int height,
+                        bool opaque,
                         int numLabels,
                         vtkUnsignedCharArray *imgData);
@@ -288 +290 @@
                         double range[2],
                         int width, int height,
+                        bool opaque,
                         int numLabels,
                         vtkUnsignedCharArray *imgData);

branches/blt4/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -3075 +3075 @@
         const char *dataSetName = Tcl_GetString(objv[8]);
         if (!g_renderer->renderColorMap(colorMapName, dataSetName, legendType, fieldName, title,
-                                        range, width, height, numLabels, imgData)) {
+                                        range, width, height, true, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
                              colorMapName, "\" or dataset \"",
@@ -3083 +3083 @@
     } else {
         if (!g_renderer->renderColorMap(colorMapName, "all", legendType, fieldName, title,
-                                        range, width, height, numLabels, imgData)) {
+                                        range, width, height, true, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
                              colorMapName, "\" was not found", (char*)NULL);

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

@@ -13 +13 @@
 #undef HAVE_ASSERT_H
 
+/* Define to 1 if you have the `avcodec_decode_video' function. */
+#undef HAVE_AVCODEC_DECODE_VIDEO
+
+/* Define to 1 if you have the `avcodec_decode_video2' function. */
+#undef HAVE_AVCODEC_DECODE_VIDEO2
+
+/* Define to 1 if you have the `avformat_open_input' function. */
+#undef HAVE_AVFORMAT_OPEN_INPUT
+
+/* Define to 1 if you have the `avio_close' function. */
+#undef HAVE_AVIO_CLOSE
+
+/* Define if AVMEDIA_TYPE_VIDEO enum exists. */
+#undef HAVE_AVMEDIA_TYPE_VIDEO
+
+/* Define to 1 if you have the `av_open_input_file' function. */
+#undef HAVE_AV_OPEN_INPUT_FILE
+
 /* Define to 1 if you have the <cctype> header file. */
 #undef HAVE_CCTYPE
@@ -46 +64 @@
 #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
@@ -67 +82 @@
 #undef HAVE_ITERATOR
 
+/* Define to 1 if you have the `avcodec' library (-lavcodec). */
+#undef HAVE_LIBAVCODEC
+
 /* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
 #undef HAVE_LIBAVCODEC_AVCODEC_H
 
+/* Define to 1 if you have the `avformat' library (-lavformat). */
+#undef HAVE_LIBAVFORMAT
+
 /* Define to 1 if you have the <libavformat/avformat.h> header file. */
 #undef HAVE_LIBAVFORMAT_AVFORMAT_H
 
+/* Define to 1 if you have the `avutil' library (-lavutil). */
+#undef HAVE_LIBAVUTIL
+
 /* Define to 1 if you have the <libavutil/avutil.h> header file. */
 #undef HAVE_LIBAVUTIL_AVUTIL_H
@@ -85 +109 @@
 #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 `swscale' library (-lswscale). */
+#undef HAVE_LIBSWSCALE
 
 /* Define to 1 if you have the <limits.h> header file. */
@@ -133 +157 @@
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `sws_getCachedContext' function. */
+#undef HAVE_SWS_GETCACHEDCONTEXT
+
 /* Define to 1 if you have the `sws_scale' function. */
 #undef HAVE_SWS_SCALE
@@ -150 +177 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `url_close' function. */
+#undef HAVE_URL_CLOSE
 
 /* Define to 1 if you have the <vector> header file. */

branches/blt4/src/objects/RpVideo.c

@@ -55 +55 @@
 #include "RpVideo.h"
 
-#if LIBAVUTIL_VERSION_MAJOR < 51
+#ifndef HAVE_AVMEDIA_TYPE_VIDEO
 #define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
+#endif  /* HAVE_AVMEDIA_TYPE_VIDEO */
+
+#ifndef AV_PKT_FLAG_KEY
 #define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
-#endif  /* LIBAVUTIL_VERSION_MAJOR */
-
+#endif
+
+#ifndef HAVE_AVIO_CLOSE
+#define avio_close              url_fclose
+#endif
 
 /*
@@ -341 +347 @@
      * Open the video stream from that file.
      */
+#ifdef HAVE_AVFORMAT_OPEN_INPUT
+    if (avformat_open_input(&vidPtr->pFormatCtx, vidPtr->fileName, NULL, 
+        NULL) != 0) {
+        return -3;
+    }
+#else
     if (av_open_input_file(&vidPtr->pFormatCtx, vidPtr->fileName,
             NULL, 0, NULL) != 0) {
-        // Tcl_AppendResult(interp, "couldn't open file \"",
-        //     fileName, "\"", (char*)NULL);
-        // return TCL_ERROR;
-
-        // couldn't open file
         return -3;
     }
+#endif
     if (av_find_stream_info(vidPtr->pFormatCtx) < 0) {
         // Tcl_AppendResult(interp, "couldn't find streams in file \"",
@@ -711 +719 @@
                     global_video_pkt_pts = packet.pts;
 
-#ifdef FFMPEG_AVCODEC_H
+#ifdef HAVE_AVCODEC_DECODE_VIDEO2
+                    // new avcodec decode video function
+                    avcodec_decode_video2(vcodecCtx, vidPtr->pFrameYUV,
+                        &frameFinished, &packet);
+#else
                     // old avcodec decode video function
                     avcodec_decode_video(vcodecCtx, vidPtr->pFrameYUV,
                         &frameFinished, packet.data, packet.size);
-#else
-                    // new avcodec decode video function
-                    avcodec_decode_video2(vcodecCtx, vidPtr->pFrameYUV,
-                        &frameFinished, &packet);
 #endif
-
                     if (packet.dts == AV_NOPTS_VALUE
                           && vidPtr->pFrameYUV->opaque
@@ -1668 +1675 @@
 
         if (vidPtr->outFormatCtx->pb) {
-            url_fclose(vidPtr->outFormatCtx->pb);
+            avio_close(vidPtr->outFormatCtx->pb);
         }