Commit e8656d78 authored by hrchilds's avatar hrchilds

Update from February 3, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@613 18c085ea-50e0-402c-830e-de6fd14e8384
parent ea8dc4e1
......@@ -97,6 +97,10 @@ int ReadKey(const char *key, char **keyval);
* Brad Whitlock, Wed Jun 22 17:24:08 PST 2005
* Added support for -newconsole.
*
* Brad Whitlock, Thu Feb 2 14:48:18 PST 2006
* I changed makemovie.py to makemoviemain.py so right-click movies and
* the "visit -movie" commands work again.
*
*****************************************************************************/
int
......@@ -231,7 +235,7 @@ main(int argc, char *argv[])
if(addMovieArguments)
{
size += strlen("-s") + 1;
size += 1 + strlen(visitpath) + 1 + strlen("makemovie.py") + 2;
size += 1 + strlen(visitpath) + 1 + strlen("makemoviemain.py") + 2;
size += strlen("-nowin") + 1;
}
if(addVISITARGS)
......@@ -279,8 +283,8 @@ main(int argc, char *argv[])
}
if(addMovieArguments)
{
sprintf(cptr, " -s \"%s\\makemovie.py\" -nowin", visitpath);
sprintf(cptr2, " -s \"%s\\makemovie.py\" -nowin", visitpath);
sprintf(cptr, " -s \"%s\\makemoviemain.py\" -nowin", visitpath);
sprintf(cptr2, " -s \"%s\\makemoviemain.py\" -nowin", visitpath);
}
command[size-1] = '\0';
printCommand[size-1] = '\0';
......
......@@ -220,6 +220,9 @@
# I added the -make argument, which allows the user to specify the make
# command.
#
# Brad Whitlock, Fri Feb 3 08:30:30 PDT 2006
# I added Qt's qui library to the distribution.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -404,8 +407,10 @@ endif
#
if ("$os" == "darwin") then
set QtLibName = `cd $VisItDir/lib && ls libqt.$SHLIB_SOEXT`
set QUILibName = `cd $VisItDir/lib && ls libqui.$SHLIB_SOEXT`
else
set QtLibName = `cd $VisItDir/lib && ls libqt.$SHLIB_SOEXT.?.?.?`
set QUILibName = `cd $VisItDir/lib && ls libqui.$SHLIB_SOEXT.?.?.?`
endif
#
......@@ -417,6 +422,12 @@ if (("$QtLibs" == "TRUE") && (! -e $VisItDir/lib/$QtLibName)) then
echo " "
exit (1)
endif
if (("$QtLibs" == "TRUE") && (! -e $VisItDir/lib/$QUILibName)) then
echo " "
echo "Error: The file $VisItDir/lib/$QUILibName does not exist. aborting ..."
echo " "
exit (1)
endif
#
# Determine the names of the Mesa shared libraries.
......@@ -769,6 +780,14 @@ if ("$os" != "darwin") then
ln -s $QtLibName $libdir/libqt.$SHLIB_SOEXT.$majorVersion
ln -s $QtLibName $libdir/libqt.$SHLIB_SOEXT
endif
cp $VisItDir/lib/$QUILibName $libdir/$QUILibName
set majorVersion = `echo $QUILibName | awk '{printf substr($1, 10, 1)}'`
set minorVersion = `echo $QUILibName | awk '{printf substr($1, 12, 1)}'`
if ("$os" != "darwin") then
ln -s $QUILibName $libdir/libqui.$SHLIB_SOEXT.$majorVersion.$minorVersion
ln -s $QUILibName $libdir/libqui.$SHLIB_SOEXT.$majorVersion
ln -s $QUILibName $libdir/libqui.$SHLIB_SOEXT
endif
#
# Copy the Mesa libraries to the distribution.
......
......@@ -186,10 +186,10 @@ else
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## HDF5
......
......@@ -186,10 +186,10 @@ else
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## HDF5
......
......@@ -44,10 +44,10 @@ PYVERSION=python2.1
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_rhel3_gcc_2.96/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_rhel3_gcc_2.96/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_rhel3_gcc_2.96/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_rhel3_gcc_2.96/lib
##
## Exodus
......
......@@ -83,10 +83,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## Exodus
......
......@@ -80,10 +80,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/lib -L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -l
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## HDF5
......
......@@ -80,10 +80,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/lib -L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -l
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## HDF5
......
......@@ -80,10 +80,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/lib -L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -l
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## HDF5
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -186,10 +186,10 @@ else
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## HDF5
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -79,10 +79,10 @@ fi
##
## Boxlib
##
##DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
##DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
##DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
##DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
##
## HDF5
......
......@@ -79,10 +79,10 @@ fi
##
## Boxlib
##
##DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
##DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
##DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
##DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
##
## HDF5
......
......@@ -79,10 +79,10 @@ fi
##
## Boxlib
##
##DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
##DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
##DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
##DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
##
## HDF5
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -80,10 +80,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/chaos_3_x86_elan3_gcc_3.2.3/lib
##
## CGNS
......
......@@ -65,10 +65,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -L/usr/lib/mpi/mpi_gnu/lib -lmpi"
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
##
## CGNS
......
......@@ -65,10 +65,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -L/usr/lib/mpi/mpi_gnu/lib -lmpi"
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
##
## CGNS
......
......@@ -65,10 +65,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -L/usr/lib/mpi/mpi_gnu/lib -lmpi"
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
##
## CGNS
......
......@@ -65,10 +65,10 @@ MPI_LIBS="-Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -L/usr/lib/mpi/mpi_gnu/lib -lmpi"
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux_ia64_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/chaos_3_ia64_elan4_gcc_3.2.3/lib
##
## CGNS
......
......@@ -79,10 +79,10 @@ fi
##
## Boxlib
##
##DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
##DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
##DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
##DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_xlc_64/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_xlc_64/lib
##
## HDF5
......
......@@ -83,10 +83,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## Exodus
......
......@@ -83,10 +83,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## Exodus
......
......@@ -83,10 +83,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## Exodus
......
......@@ -83,10 +83,10 @@ fi
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_5_ll_gcc_3.1/lib
##
## Exodus
......
......@@ -50,6 +50,7 @@
#include <AnnotationObjectList.h>
#include <AppearanceAttributes.h>
#include <HostProfile.h>
#include <GlobalAttributes.h>
#include <GlobalLineoutAttributes.h>
#include <InteractorAttributes.h>
#include <MovieAttributes.h>
......@@ -133,6 +134,7 @@
#define SET_FILE_HIGHLIGHT_TAG 101
#define LOAD_ACTIVESOURCE_TAG 102
#define INTERPRETER_SYNC_TAG 103
#define SAVE_MOVIE_SYNC_TAG 104
#define WINDOW_FILE_SELECTION 0
#define WINDOW_FILE_INFORMATION 1
......@@ -949,6 +951,9 @@ QvisGUIApplication::Synchronize(int tag)
// Brad Whitlock, Fri May 6 11:17:04 PDT 2005
// Added a tag to make the interpreter execute some commands.
//
// Brad Whitlock, Thu Feb 2 18:55:30 PST 2006
// Added a tag to open up the "Save movie" wizard.
//
// ****************************************************************************
void
......@@ -975,6 +980,10 @@ QvisGUIApplication::HandleSynchronize(int val)
{
QTimer::singleShot(10, interpreter, SLOT(ProcessCommands()));
}
else if(val == SAVE_MOVIE_SYNC_TAG)
{
QTimer::singleShot(10, this, SLOT(SaveMovieMain()));
}
}
// ****************************************************************************
......@@ -6028,6 +6037,47 @@ MakeCodeSlashes(const QString &s)
// Method: QvisGUIApplication::SaveMovie
//
// Purpose:
// This is a Qt slot function that gets the current vis window size and
// initiates a set of events that eventually calls the SendMovieMain
// slot, which opens the Save movie wizard.
//
// Notes: The code to stimulate the viewer to send its window size should
// be replaced with a new RPC that does the job.
//
// Programmer: Brad Whitlock
// Creation: Thu Feb 2 18:58:55 PST 2006
//
// Modifications:
//