Changeset 1680 for branches/blt4

Timestamp:

Mar 31, 2010, 9:17:51 AM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• configure (modified) (8 diffs)
• configure.in (modified) (3 diffs)
• examples/zoo/filechoice/filechoice.tcl (modified) (1 diff)
• gui/apps/rappture-csh.env.in (modified) (3 diffs)
• gui/apps/rappture.env.in (modified) (1 diff)
• gui/apps/rappture.use.in (modified) (1 diff)
• gui/scripts/filelistentry.tcl (modified) (8 diffs)

branches/blt4/configure

@@ -646 +646 @@
 MEX
 MATLAB
+VTKDIR
 TCL_LIB_SPEC
 TCL_INC_SPEC
@@ -683 +684 @@
 FFLAGS
 F77
-MKDIR_P
-LN_S
-RANLIB
 ac_ct_CXX
 CXXFLAGS
@@ -697 +695 @@
 CC
 SET_MAKE
+MKDIR_P
+LN_S
+RANLIB
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -748 +749 @@
 enable_gui
 with_tclsh
+with_vtk
 with_matlab
 with_octave
@@ -1394 +1396 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-tclsh=DIR        location of tclsh [default=yes]
+  --with-vtk=DIR          location of vtk library [default=yes]
   --with-matlab=DIR       location of matlab and mex compiler [default=yes]
   --with-octave=DIR       location of octave compiler MKOCTFILE [default=yes]
@@ -2783 +2786 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+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_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $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
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+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_prog_ac_ct_RANLIB="ranlib"
+    $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
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+         for ac_exec_ext in '' $ac_executable_extensions; do
+           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+             'mkdir (GNU coreutils) '* | \
+             'mkdir (coreutils) '* | \
+             'mkdir (fileutils) '4.1*)
+               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+               break 3;;
+           esac
+         done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
@@ -3865 +4014 @@
 
 # Avoid g95
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-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_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $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
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-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_prog_ac_ct_RANLIB="ranlib"
-    $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
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-         for ac_exec_ext in '' $ac_executable_extensions; do
-           { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-             'mkdir (GNU coreutils) '* | \
-             'mkdir (coreutils) '* | \
-             'mkdir (fileutils) '4.1*)
-               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-               break 3;;
-           esac
-         done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -7254 +7256 @@
 
 
+
+
+
+# Check whether --with-vtk was given.
+if test "${with_vtk+set}" = set; then :
+  withval=$with_vtk; with_vtk=$withval
+else
+  with_vtk=yes
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk" >&5
+$as_echo_n "checking for vtk... " >&6; }
+VTKDIR=""
+
+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
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTKDIR" >&5
+$as_echo "$VTKDIR" >&6; }
 
 

branches/blt4/configure.in

@@ -24 +24 @@
 
 AC_PROG_INSTALL
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
 AC_PROG_MAKE_SET
 
@@ -30 +34 @@
 AC_PROG_CXX
 # Avoid g95 
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_LN_S
-AC_PROG_MKDIR_P
-
 AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32])
 
@@ -169 +168 @@
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
+
+AC_ARG_WITH(
+    [vtk],
+    [AS_HELP_STRING([--with-vtk[=DIR]],
+        [location of vtk library @<:@default=yes@:>@])],
+    [with_vtk=$withval], [with_vtk=yes])
+
+AC_MSG_CHECKING([for vtk])
+VTKDIR=""
+
+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
+AC_SUBST(VTKDIR)
+AC_MSG_RESULT([$VTKDIR])
+
 
 AC_ARG_WITH(

branches/blt4/examples/zoo/filechoice/filechoice.tcl

@@ -15 +15 @@
 $driver put output.string(stats).about.label "Echo of choice"
 set choice [$driver get input.filelist(stats).current]
+set choice [join [split $choice ,] \n]
 $driver put output.string(stats).current $choice
 

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

@@ -21 +21 @@
 set bindir=@bindir@
 set libdir=@libdir@
+set vtkdir=@VTKDIR@
+set python_version=@PYTHON_VERSION@
+set tcl_version=@TCL_VERSION@
 
 set path = ( $bindir $path )
 
-if ( $?TCLLIBPATH ) then
-  setenv TCLLIBPATH "${libdir}/vtk $TCLLIBPATH"
+if ( $?LD_LIBRARY_PATH ) then
+  setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:$LD_LIBRARY_PATH"
 else
-  setenv TCLLIBPATH "${libdir}/vtk"
-endif
-
-if ( $?LD_LIBRARY_PATH ) then
-  setenv LD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2:${libdir}/vtk:$LD_LIBRARY_PATH"
-else
-  setenv LD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2:${libdir}/vtk"
+  setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:${libdir}/vtk"
 endif
 
 if ( $?DYLD_LIBRARY_PATH ) then
-  setenv DYLD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2/${libdir}/vtk:$DYLD_LIBRARY_PATH"
+  setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}:$DYLD_LIBRARY_PATH"
 else
-  setenv DYLD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2/${libdir}/vtk"
+  setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}"
 endif
 
@@ -66 +63 @@
 endif
 
+if ( $?PYTHONPATH ) then
+  setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages:$PYTHONPATH"
+else
+  setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages"
+endif
+
 if ( $?RUBYLIB ) then
   setenv RUBYLIB "${libdir}/ruby:$RUBYLIB"
@@ -73 +76 @@
 
 if ( $?TCL_LIBRARY ) then
-  setenv TCL_LIBRARY "${libdir}/tcl8.4:$TCL_LIBRARY"
+  setenv TCL_LIBRARY "${libdir}/tcl${tcl_version}:$TCL_LIBRARY"
 else
-  setenv TCL_LIBRARY "${libdir}/tcl8.4"
+  setenv TCL_LIBRARY "${libdir}/tcl${tcl_version}"
 endif
 
 if ( $?TK_LIBRARY ) then
-  setenv TK_LIBRARY "${libdir}/tk8.4:$TK_LIBRARY"
+  setenv TK_LIBRARY "${libdir}/tk${tcl_version}:$TK_LIBRARY"
 else
-  setenv TK_LIBRARY "${libdir}/tk8.4"
+  setenv TK_LIBRARY "${libdir}/tk${tcl_version}"
 endif
 
-set python_version=@PYTHON_VERSION@
-
-if ( $?PYTHONPATH ) then
-  setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages:$PYTHONPATH"
+if ( $?TCLLIBPATH ) then
+  setenv TCLLIBPATH "${vtkdir} $TCLLIBPATH"
 else
-  setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages"
+  setenv TCLLIBPATH "${vtkdir}"
 endif

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

@@ -20 +20 @@
 libdir=@libdir@
 bindir=@bindir@
+vtkdir=@VTKDIR@
+python_version=@PYTHON_VERSION@
+tcl_version=@TCL_VERSION@
 
-# no need to edit the rest...
-export PATH=${bindir}:$PATH
+# No need to edit anything else
+PATH=${bindir}:$PATH
 
-export TCLLIBPATH="${libdir}/vtk $TCLLIBPATH"
+LD_LIBRARY_PATH=${libdir}:${vtkdir}:$LD_LIBRARY_PATH
 
-vtk_library_path=${libdir}/vtk-5.2:${libdir}/vtk
+# For MacOS X
+DYLD_LIBRARY_PATH=${libdir}:${vtkdir}:$DYLD_LIBRARY_PATH
 
-export LD_LIBRARY_PATH=${libdir}:$vtk_library_path:$LD_LIBRARY_PATH
-
-export DYLD_LIBRARY_PATH=${libdir}:${libdir}/vtk:$DYLD_LIBRARY_PATH
+export PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
 
 MATLABPATH=${libdir}/matlab:$MATLABPATH
+OCTAVE_LOADPATH=:${libdir}/octave:$OCTAVE_LOADPATH
 OCTAVE_PATH=:${libdir}/octave:$OCTAVE_PATH
-OCTAVE_LOADPATH=:${libdir}/octave:$OCTAVE_LOADPATH
-PERL5LIB=${libdir}/perl:$PERL5LIB
-RUBYLIB=${libdir}/ruby:$RUBYLIB
-TCL_LIBRARY=${libdir}/tcl8.4:$TCL_LIBRARY
-TK_LIBRARY=${libdir}/tk8.4:$TK_LIBRARY
 
 export MATLABPATH OCTAVE_PATH OCTAVE_LOADPATH
-export PERL5LIB RUBYLIB TCL_LIBRARY TK_LIBRARY PYTHONPATH
 
-# This is done specifically for python right now.
-python_version="@PYTHON_VERSION@"
+PERL5LIB=${libdir}/perl:$PERL5LIB
 PYTHONPATH=${libdir}/python${python_version}/site-packages:${PYTHONPATH}
+RUBYLIB=${libdir}/ruby:$RUBYLIB
 
+export PERL5LIB RUBYLIB PYTHONPATH
+
+TCLLIBPATH="${vtkdir} $TCLLIBPATH"
+TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
+TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY
+
+export TCL_LIBRARY TK_LIBRARY TCLLIBPATH
+

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

@@ -11 +11 @@
 libdir=@libdir@
 bindir=@bindir@
+vtkdir=@VTKDIR@
+python_version=@PYTHON_VERSION@
+tcl_version=@TCL_VERSION@
 
-destdir=@bindir@
+prepend PATH ${bindir}/bin
 
-prepend PATH $destdir/bin
-
-prepend TCLLIBPATH $destdir/lib/vtk
-
-prepend LD_LIBRARY_PATH ${libdir}/vtk
-prepend LD_LIBRARY_PATH ${libdir}/vtk-5.2
+prepend LD_LIBRARY_PATH ${vtkdir}
 prepend LD_LIBRARY_PATH ${libdir}
-
-prepend DYLD_LIBRARY_PATH ${libdir}/vtk
-prepend DYLD_LIBRARY_PATH ${libdir}/vtk-5.2
+prepend DYLD_LIBRARY_PATH ${vtkdir}
 prepend DYLD_LIBRARY_PATH ${libdir}
 
 prepend MATLABPATH ${libdir}/matlab
-
 prepend OCTAVE_PATH :${libdir}/octave:
 prepend OCTAVE_LOADPATH :${libdir}/octave:
 
 prepend PERL5LIB ${libdir}/perl
-
 prepend RUBYLIB ${libdir}/ruby
-
-prepend TCL_LIBRARY ${libdir}/tcl8.4
-
-prepend TK_LIBRARY ${libdir}/tk8.4
-
-python_version="@PYTHON_VERSION@"
 prepend PYTHONPATH ${libdir}/python${python_version}/site-packages
 
+prepend TCLLIBPATH ${vtkdir}
+prepend TCL_LIBRARY ${libdir}/tcl${tcl_version}
+prepend TK_LIBRARY ${libdir}/tk${tcl_version}
+
+

branches/blt4/gui/scripts/filelistentry.tcl

@@ -39 +39 @@
     public method tooltip {}
 
+    private method Toggle { id }
     protected method _rebuild {}
-    protected method _newValue {}
+    protected method _newValue { args }
     protected method _tooltip {}
     protected method _whenidle {}
@@ -81 +82 @@
     itk_component add tree {
         blt::treeview $itk_component(scrollset).tree -linewidth 0 \
+            -alternatebackground "" \
             -bg white -selectmode multiple \
             -highlightthickness 0 \
@@ -94 +96 @@
         -weight 1.0 -text "" -pad 0 -borderwidth 0 -edit no
     $itk_component(tree) column configure "show" -style "check" -pad {0 0} \
-        -edit yes
+        -edit no
     pack $itk_component(scrollset) -fill both -expand yes
 
     blt::table $itk_interior \
         0,0 $itk_component(scrollset) -fill both  
-
+    $_tree trace create all "show" w [itcl::code $this _newValue]
     bind $itk_component(tree) <<Value>> [itcl::code $this _newValue]
+    $itk_component(tree) bin Entry <Double-ButtonPress-1> \
+        +[itcl::code $this Toggle current]
 
     # First time, parse the <pattern> elements to generate notify callbacks
@@ -230 +234 @@
         set glob [string trim [$_owner xml get $_path.$cname]]
         # Successively replace each template with its value.
-        puts stderr "before glob=$glob"
         while { [regexp -indices {@@[^@]*@@} $glob range] } {
             foreach {first last} $range break
@@ -237 +240 @@
             set cpath [string range $glob $i1 $i2]
             set value [$_owner xml get $cpath.current]
-            puts stderr "$cpath.current: value=$value"
             if { $value == "" } {
-                puts stderr "$_owner xml get $cpath.default"
                 set value [$_owner xml get $cpath.default]
-                puts stderr "$cpath.default: value=$value"
             }
             set glob [string replace $glob $first $last $value]
@@ -260 +260 @@
             set data [list path $file show 0]
             set id [$_tree insert root -label $tail -data $data -tag ""]
-            puts stderr "1. tags $id=[$_tree tag names $id]"
         } else {
-            $_tree tag delete $id unused
-            puts stderr "2. tags $id=[$_tree tag names $id]"
+            $_tree tag delete unused $id
         }
         set len [string length $tail]
         if {$len > $max} { set max $len }
     }
-    puts stderr ids=[$_tree tag nodes unused]
     eval $_tree delete [$_tree tag nodes unused]
     $itk_component(tree) configure -width $max
@@ -280 +277 @@
 # Sends a <<Value>> event to notify clients of the change.
 # ----------------------------------------------------------------------
-itcl::body Rappture::FileListEntry::_newValue {} {
+itcl::body Rappture::FileListEntry::_newValue { args } {
     event generate $itk_component(hull) <<Value>>
 }
@@ -324 +321 @@
     }
 }
+
+itcl::body Rappture::FileListEntry::Toggle { index } {
+    set id [$itk_component(tree) index $index]
+    set show [$_tree get $id "show" 0]
+    set show [expr $show==0]
+    $_tree set $id "show" $show
+}