Commit 188ba770 authored by hrchilds's avatar hrchilds
Browse files

Update from July 21, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@284 18c085ea-50e0-402c-830e-de6fd14e8384
parent b662d50a
......@@ -35,11 +35,11 @@ die "\nError running xml2atts... aborting!\n\n" if ($?);
print "********* running: xml2window $xmlfile *********\n";
print `xml2window @ARGV -noprint $xmlfile`;
die "\nError runnin xml2window... aborting!\n\n" if ($?);
die "\nError running xml2window... aborting!\n\n" if ($?);
print "********* running: xml2info $xmlfile *********\n";
print `xml2info @ARGV -noprint $xmlfile`;
die "\nError runnin xml2info... aborting!\n\n" if ($?);
die "\nError running xml2info... aborting!\n\n" if ($?);
print "********* running: xml2makefile $xmlfile *********\n";
print `xml2makefile @ARGV -noprint $xmlfile`;
......
......@@ -4632,6 +4632,9 @@ avtDatabaseMetaData::GetSpeciesOnMesh(std::string mesh) const
// Mark C. Miller, Tue Mar 30 14:36:17 PST 2004
// Added useCatchAllMesh
//
// Jeremy Meredith, Wed Jul 21 14:23:12 PDT 2004
// Removed the exclamation point from unknown.
//
// ****************************************************************************
void
......@@ -4833,7 +4836,7 @@ avtDatabaseMetaData::Print(ostream &out, int indent) const
vartype = "species";
break;
case Expression::Unknown:
vartype = "unknown!";
vartype = "unknown";
break;
}
out << exprList[i].GetName().c_str()
......
......@@ -66,19 +66,27 @@ avtCallback::RegisterWarningCallback(WarningCallback wc, void *args)
// Programmer: Hank Childs
// Creation: October 18, 2001
//
// Modifications:
//
// Mark C. Miller, Wed Jul 21 09:51:18 PDT 2004
// Made it return true if it was able to issue the warning and false
// otherwise
//
// ****************************************************************************
void
bool
avtCallback::IssueWarning(const char *msg)
{
if (warningCallback != NULL)
{
warningCallback(warningCallbackArgs, msg);
return true;
}
else
{
debug1 << "Would like to have issued warning \"" << msg
<< "\", but no callback was registered." << endl;
return false;
}
}
......
......@@ -43,6 +43,9 @@ typedef void (*UpdatePlotAttributesCallback)(void *, const std::string &,
// Jeremy Meredith, Thu Oct 2 09:49:48 PDT 2003
// Added support for lights.
//
// Mark C. Miller, Wed Jul 21 09:51:18 PDT 2004
// Changed return value of IssueWarning to bool
//
// ****************************************************************************
class PIPELINE_API avtCallback
......@@ -50,7 +53,7 @@ class PIPELINE_API avtCallback
public:
static void RegisterWarningCallback(WarningCallback,
void *);
static void IssueWarning(const char *);
static bool IssueWarning(const char *);
static void RegisterImageCallback(ImageCallback, void *);
static void GetImage(int, avtDataObject_p &);
......
......@@ -38,6 +38,9 @@
// Eric Brugger, Thu Oct 23 15:12:04 PDT 2003
// Added navigateCurve.
//
// Hank Childs, Wed Jul 21 08:16:10 PDT 2004
// Initialize currentInteractor.
//
// ****************************************************************************
VisitHotPointInteractor::VisitHotPointInteractor(VisWindowInteractorProxy &v) :
......@@ -53,6 +56,7 @@ VisitHotPointInteractor::VisitHotPointInteractor(VisWindowInteractorProxy &v) :
zoom3D = NULL;
zoomCurve = NULL;
nullInteractor = new NullInteractor(proxy);
currentInteractor = NULL;
SetInteractor(nullInteractor);
hotPointMode = false;
......
......@@ -6003,6 +6003,14 @@ if test "$HDF5_LIB" != "" ; then
HDF5="$""(HDF5)"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define HAVE_HDF5_H 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBHDF5 1
_ACEOF
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
......
......@@ -1463,6 +1463,8 @@ if test "$HDF5_LIB" != "" ; then
if test "$HDF5_INCLUDE" != "" ; then
HDF5="$""(HDF5)"
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_HDF5_H)
AC_DEFINE(HAVE_LIBHDF5)
else
AC_MSG_RESULT(no)
fi
......
<?xml version="1.0"?>
<Plugin name="Lines" label="Lines" type="database" dbtype="STMD" version="1.0">
<Extensions> dat </Extensions>
<Extensions> </Extensions>
</Plugin>
......@@ -10,7 +10,7 @@
// Returns the type of a Lines database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
DatabaseType
......@@ -26,18 +26,35 @@ LinesCommonPluginInfo::GetDatabaseType()
// Returns the default extensions for a Lines database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
std::vector<std::string>
LinesCommonPluginInfo::GetDefaultExtensions()
{
std::vector<std::string> defaultExtensions;
defaultExtensions.push_back("dat");
return defaultExtensions;
}
// ****************************************************************************
// Method: LinesCommonPluginInfo::GetWriter
//
// Purpose:
// Sets up a Lines writer.
//
// Returns: A Lines writer.
//
// Programmer: meredith -- generated by xml2info
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
avtDatabaseWriter *
LinesCommonPluginInfo::GetWriter(void)
{
return NULL;
}
// ****************************************************************************
// Method: LinesCommonPluginInfo::SetUpLinesDatabase
//
......@@ -52,7 +69,7 @@ LinesCommonPluginInfo::GetDefaultExtensions()
// Returns: A Lines database from list.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
avtDatabase *
......
#include <LinesPluginInfo.h>
#if defined(__APPLE__)
#define GetEngineInfo Makefile.in_GetEngineInfo
#endif
#if defined(__APPLE__)
#define GetEngineInfo Lines_GetEngineInfo
#endif
......@@ -15,7 +11,7 @@
// Return a new EnginePluginInfo for the Lines database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
......
......@@ -11,7 +11,7 @@
// Return a new MDServerPluginInfo for the Lines database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
......
......@@ -15,7 +15,7 @@
// Return a new GeneralPluginInfo for the Lines database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
......@@ -32,7 +32,7 @@ extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
// Returns: A pointer to the name of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
......@@ -51,7 +51,7 @@ LinesGeneralPluginInfo::GetName() const
// Returns: A pointer to the version of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
......@@ -70,7 +70,7 @@ LinesGeneralPluginInfo::GetVersion() const
// Returns: A pointer to the id of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
......@@ -79,3 +79,21 @@ LinesGeneralPluginInfo::GetID() const
{
return "Lines_1.0";
}
// ****************************************************************************
// Method: LinesGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
//
// Returns: true/false
//
// Programmer: meredith -- generated by xml2info
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// ****************************************************************************
bool
LinesGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
......@@ -8,6 +8,7 @@
#include <database_plugin_exports.h>
class avtDatabase;
class avtDatabaseWriter;
// ****************************************************************************
// Class: LinesDatabasePluginInfo
......@@ -18,7 +19,7 @@ class avtDatabase;
// components of VisIt.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Aug 27 17:01:43 PST 2002
// Creation: Wed Jul 21 16:17:49 PST 2004
//
// Modifications:
//
......@@ -30,6 +31,7 @@ class LinesGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
virtual char *GetName() const;
virtual char *GetVersion() const;
virtual char *GetID() const;
virtual bool EnabledByDefault() const;
};
class LinesCommonPluginInfo : public virtual CommonDatabasePluginInfo, public virtual LinesGeneralPluginInfo
......@@ -39,6 +41,7 @@ class LinesCommonPluginInfo : public virtual CommonDatabasePluginInfo, public vi
virtual std::vector<std::string> GetDefaultExtensions();
virtual avtDatabase *SetupDatabase(const char * const *list,
int nList, int nBlock);
virtual avtDatabaseWriter *GetWriter(void);
};
class LinesMDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual LinesCommonPluginInfo
......
......@@ -100,6 +100,14 @@
# Hank Childs, Thu Jun 24 12:46:07 PDT 2004
# Remove Vista from the required format list to the HDF5 list.
#
# Mark C. Miller, Wed Jul 21 11:19:15 PDT 2004
# Added Vista back to required format list since it no longer
# requires HDF5 in order to build. It can now be built with Silo AND HDF5
# or with Silo only
#
# Jeremy Meredith, Wed Jul 21 17:44:55 PDT 2004
# Added OVERFLOW. It depends on no other libraries.
#
##############################################################################
@SET_MAKE@
......@@ -111,12 +119,13 @@ BOXLIB2D=Boxlib2D
BOXLIB3D=Boxlib3D
EXODUS=Exodus TimeVaryingExodus
HDF4=Cosmos
HDF5=Tetrad SAMRAI CosmosPP Vista
HDF5=Tetrad SAMRAI CosmosPP
MILI=Mili
PDB=KullLite PDB
SAF=SAF
SAMPLES=Rect Hex
REQUIRED=ANALYZE BOV Curve2D EnSight Image Lines PLOT2D PLOT3D Point3D STL Silo Spheral VTK WavefrontOBJ
REQUIRED=ANALYZE BOV Curve2D EnSight Image Lines OVERFLOW \
PLOT2D PLOT3D Point3D STL Silo Spheral Vista VTK WavefrontOBJ
OPTIONAL=
......
<?xml version="1.0"?>
<Plugin name="OVERFLOW" type="database" label="OVERFLOW" version="1.0" enabled="true" mdspecificcode="false" dbtype="STMD" haswriter="false">
<Extensions>
dat
save
</Extensions>
<Attribute name="" purpose="" persistent="false" exportAPI="" exportInclude="">
</Attribute>
</Plugin>
#include <OVERFLOWPluginInfo.h>
#include <avtOVERFLOWFileFormat.h>
#include <avtSTMDFileFormatInterface.h>
#include <avtGenericDatabase.h>
// ****************************************************************************
// Method: OVERFLOWCommonPluginInfo::GetDatabaseType
//
// Purpose:
// Returns the type of a OVERFLOW database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
DatabaseType
OVERFLOWCommonPluginInfo::GetDatabaseType()
{
return DB_TYPE_STMD;
}
// ****************************************************************************
// Method: OVERFLOWCommonPluginInfo::GetDefaultExtensions
//
// Purpose:
// Returns the default extensions for a OVERFLOW database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
std::vector<std::string>
OVERFLOWCommonPluginInfo::GetDefaultExtensions()
{
std::vector<std::string> defaultExtensions;
defaultExtensions.push_back("dat");
defaultExtensions.push_back("save");
return defaultExtensions;
}
// ****************************************************************************
// Method: OVERFLOWCommonPluginInfo::GetWriter
//
// Purpose:
// Sets up a OVERFLOW writer.
//
// Returns: A OVERFLOW writer.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
avtDatabaseWriter *
OVERFLOWCommonPluginInfo::GetWriter(void)
{
return NULL;
}
// ****************************************************************************
// Method: OVERFLOWCommonPluginInfo::SetUpOVERFLOWDatabase
//
// Purpose:
// Sets up a OVERFLOW database.
//
// Arguments:
// list A list of file names.
// nList The number of timesteps in list.
// nBlocks The number of blocks in the list.
//
// Returns: A OVERFLOW database from list.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
avtDatabase *
OVERFLOWCommonPluginInfo::SetupDatabase(const char *const *list,
int nList, int nBlock)
{
avtSTMDFileFormat **ffl = new avtSTMDFileFormat*[nList];
for (int i = 0 ; i < nList ; i++)
{
ffl[i] = new avtOVERFLOWFileFormat(list[i]);
}
avtSTMDFileFormatInterface *inter
= new avtSTMDFileFormatInterface(ffl, nList);
return new avtGenericDatabase(inter);
}
#include <OVERFLOWPluginInfo.h>
#if defined(__APPLE__)
#define GetEngineInfo OVERFLOW_GetEngineInfo
#endif
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the OVERFLOW database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:49 PST 2004
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
{
return new OVERFLOWEnginePluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void OVERFLOWEnginePluginInfo::dummy()
{
}
#include <OVERFLOWPluginInfo.h>
#if defined(__APPLE__)
#define GetMDServerInfo OVERFLOW_GetMDServerInfo
#endif
// ****************************************************************************
// Function: GetMDServerInfo
//
// Purpose:
// Return a new MDServerPluginInfo for the OVERFLOW database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:49 PST 2004
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
{
return new OVERFLOWMDServerPluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void OVERFLOWMDServerPluginInfo::dummy()
{
}
// ************************************************************************* //
// File: OVERFLOWPluginInfo.C
// ************************************************************************* //
#include <OVERFLOWPluginInfo.h>
#if defined(__APPLE__)
#define GetGeneralInfo OVERFLOW_GetGeneralInfo
#endif
// ****************************************************************************
// Function: GetGeneralInfo
//
// Purpose:
// Return a new GeneralPluginInfo for the OVERFLOW database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
{
return new OVERFLOWGeneralPluginInfo;
}
// ****************************************************************************
// Method: OVERFLOWGeneralPluginInfo::GetName
//
// Purpose:
// Return the name of the database plugin.
//
// Returns: A pointer to the name of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
char *
OVERFLOWGeneralPluginInfo::GetName() const
{
return "OVERFLOW";
}
// ****************************************************************************
// Method: OVERFLOWGeneralPluginInfo::GetVersion
//
// Purpose:
// Return the version of the database plugin.
//
// Returns: A pointer to the version of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
char *
OVERFLOWGeneralPluginInfo::GetVersion() const
{
return "1.0";
}
// ****************************************************************************
// Method: OVERFLOWGeneralPluginInfo::GetID
//
// Purpose:
// Return the id of the database plugin.
//
// Returns: A pointer to the id of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
char *
OVERFLOWGeneralPluginInfo::GetID() const
{
return "OVERFLOW_1.0";
}
// ****************************************************************************
// Method: OVERFLOWGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
//
// Returns: true/false
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// ****************************************************************************
bool
OVERFLOWGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
// ****************************************************************************
// OVERFLOWPluginInfo.h
// ****************************************************************************
#ifndef OVERFLOW_PLUGIN_INFO_H
#define OVERFLOW_PLUGIN_INFO_H
#include <DatabasePluginInfo.h>
#include <database_plugin_exports.h>
class avtDatabase;
class avtDatabaseWriter;
// ****************************************************************************
// Class: OVERFLOWDatabasePluginInfo
//
// Purpose:
// Classes that provide all the information about the OVERFLOW plugin.
// Portions are separated into pieces relevant to the appropriate
// components of VisIt.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Jul 20 13:19:48 PST 2004
//
// Modifications:
//
// ****************************************************************************
class OVERFLOWGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
{
public:
virtual char *GetName() const;
virtual