Commit 882a83f1 authored by whitlocb's avatar whitlocb
Browse files

Renamed XDB plugin FieldView XDB

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23553 18c085ea-50e0-402c-830e-de6fd14e8384
parent eaa2a327
......@@ -306,7 +306,7 @@ ENDIF(VISIT_STATIC)
# If we're not building statically, add XDB -- if we enabled it.
IF(NOT VISIT_STATIC)
IF(VISIT_ENABLE_XDB)
SET(XDBPLUGIN XDB)
SET(XDBPLUGIN FieldViewXDB)
ENDIF(VISIT_ENABLE_XDB)
ENDIF(NOT VISIT_STATIC)
......
......@@ -30,42 +30,7 @@ MACRO(PATCH_VTK_AND_MPICH_PATHS target libfile)
IF(APPLE)
ADD_CUSTOM_TARGET(${target} ALL
COMMAND ${CMAKE_COMMAND} -E echo "Fixing VTK and MPICH paths in ${libfile}"
COMMAND install_name_tool -change @rpath/lib/libvtkCommonComputationalGeometry-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonComputationalGeometry-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonCore-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonCore-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonDataModel-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonDataModel-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonExecutionModel-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonExecutionModel-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonMath-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonMath-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonMisc-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonMisc-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonSystem-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonSystem-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkCommonTransforms-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkCommonTransforms-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersCore-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersCore-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersExtraction-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersExtraction-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersFlowPaths-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersFlowPaths-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersGeneral-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersGeneral-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersGeometry-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersGeometry-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersSources-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersSources-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkFiltersStatistics-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkFiltersStatistics-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkIOCore-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkIOCore-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkIOImage-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkIOImage-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkIOLegacy-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkIOLegacy-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkImagingCore-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkImagingCore-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkImagingFourier-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkImagingFourier-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkImagingHybrid-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkImagingHybrid-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkInteractionStyle-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkInteractionStyle-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkRenderingCore-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkRenderingCore-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkRenderingFreeType-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkRenderingFreeType-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkRenderingFreeTypeOpenGL-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkRenderingFreeTypeOpenGL-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkRenderingOpenGL-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkRenderingOpenGL-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkalglib-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkalglib-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkfreetype-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkfreetype-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkftgl-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkftgl-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkjpeg-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkjpeg-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtktiff-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtktiff-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libvtkzlib-6.1.dylib ${VTK_LIBRARY_DIRS}/libvtkzlib-6.1.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libpmpich.dylib ${VISIT_MPICH_DIR}/lib/libpmpich.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libmpich.dylib ${VISIT_MPICH_DIR}/lib/libmpich.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libopa.dylib ${VISIT_MPICH_DIR}/lib/libopa.dylib ${libfile}
COMMAND install_name_tool -change @rpath/lib/libmpl.dylib ${VISIT_MPICH_DIR}/lib/libmpl.dylib ${libfile}
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/vxdbfixup.py -from-rpath ${libfile} ${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${VISIT_MPICH_DIR}/lib
)
ADD_DEPENDENCIES(${target} copy_vxdb_binaries_to_lib)
ENDIF(APPLE)
......@@ -107,9 +72,9 @@ IF(XDB_PLATFORM)
SET(XDBLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/XDBLib)
SET(XDBLIB_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/${XDB_PLATFORM})
# Build the XDB plugin.
MESSAGE(STATUS "The XDB database plugin will be built.")
ADD_SUBDIRECTORY(XDB)
# Build the FieldView XDB plugin.
MESSAGE(STATUS "The FieldView XDB database plugin will be built.")
ADD_SUBDIRECTORY(FieldViewXDB)
IF(WIN32)
SET(XDB_LIB_DEST ${VISIT_EXECUTABLE_DIR})
......
# DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake
PROJECT(XDB)
PROJECT(FieldViewXDB)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/PluginMacros.cmake)
SET(COMMON_SOURCES
XDBPluginInfo.C
XDBCommonPluginInfo.C
FieldViewXDBPluginInfo.C
FieldViewXDBCommonPluginInfo.C
)
SET(LIBI_SOURCES
XDBPluginInfo.C
FieldViewXDBPluginInfo.C
)
SET(LIBM_SOURCES
XDBMDServerPluginInfo.C
FieldViewXDBMDServerPluginInfo.C
${COMMON_SOURCES}
avtXDBFileFormat.C
avtFieldViewXDBFileFormat.C
)
SET(LIBE_SOURCES
XDBEnginePluginInfo.C
FieldViewXDBEnginePluginInfo.C
${COMMON_SOURCES}
avtXDBFileFormat.C
avtXDBWriter.C
avtFieldViewXDBFileFormat.C
avtFieldViewXDBWriter.C
)
INCLUDE_DIRECTORIES(
......@@ -55,30 +55,30 @@ ${VTK_INCLUDE_DIRS}
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${VXDB_LIBRARY_DIR} ${XDBLIB_LIBRARY_DIR} )
ADD_LIBRARY(IXDBDatabase ${LIBI_SOURCES})
TARGET_LINK_LIBRARIES(IXDBDatabase visitcommon)
SET(INSTALLTARGETS IXDBDatabase)
ADD_LIBRARY(IFieldViewXDBDatabase ${LIBI_SOURCES})
TARGET_LINK_LIBRARIES(IFieldViewXDBDatabase visitcommon)
SET(INSTALLTARGETS IFieldViewXDBDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MXDBDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MXDBDatabase visitcommon avtdbatts avtdatabase_ser ${VXDB_LIB_SER} ${XDBLIB_LIB} )
ADD_TARGET_DEFINITIONS(MXDBDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MXDBDatabase)
ADD_LIBRARY(MFieldViewXDBDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MFieldViewXDBDatabase visitcommon avtdbatts avtdatabase_ser ${VXDB_LIB_SER} ${XDBLIB_LIB} )
ADD_TARGET_DEFINITIONS(MFieldViewXDBDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MFieldViewXDBDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EXDBDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EXDBDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${VXDB_LIB_SER} ${XDBLIB_LIB} )
ADD_TARGET_DEFINITIONS(EXDBDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EXDBDatabase_ser)
ADD_LIBRARY(EFieldViewXDBDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EFieldViewXDBDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${VXDB_LIB_SER} ${XDBLIB_LIB} )
ADD_TARGET_DEFINITIONS(EFieldViewXDBDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EFieldViewXDBDatabase_ser)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EXDBDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EXDBDatabase_par visitcommon avtdatabase_par avtpipeline_par ${VXDB_LIB_PAR} ${XDBLIB_LIB} )
ADD_TARGET_DEFINITIONS(EXDBDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EXDBDatabase_par)
ADD_PARALLEL_LIBRARY(EFieldViewXDBDatabase_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EFieldViewXDBDatabase_par visitcommon avtdatabase_par avtpipeline_par ${VXDB_LIB_PAR} ${XDBLIB_LIB} )
ADD_TARGET_DEFINITIONS(EFieldViewXDBDatabase_par ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EFieldViewXDBDatabase_par)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_RTOD(databases ${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_FOLDER(databases XDB ${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_FOLDER(databases FieldViewXDB ${INSTALLTARGETS})
Target: xml2info
Function: XDBCommonPluginInfo::GetLicense
Declaration: virtual std::string XDBCommonPluginInfo::GetLicense() const;
Function: FieldViewXDBCommonPluginInfo::GetLicense
Declaration: virtual std::string FieldViewXDBCommonPluginInfo::GetLicense() const;
Definition:
// ****************************************************************************
// Method: XDBCommonPluginInfo::GetLicense
// Method: FieldViewXDBCommonPluginInfo::GetLicense
//
// Purpose: Get the copyright for the library.
//
......@@ -11,10 +11,10 @@ Definition:
// Creation: Tue Apr 8 16:07:39 PDT 2014
//
// ****************************************************************************
#include <avtXDBWriterInternal.h>
#include <avtFieldViewXDBWriterInternal.h>
std::string
XDBCommonPluginInfo::GetLicense() const
FieldViewXDBCommonPluginInfo::GetLicense() const
{
return avtXDBWriterInternal::GetCopyright();
return avtFieldViewXDBWriterInternal::GetCopyright();
}
<?xml version="1.0"?>
<Plugin name="XDB" type="database" label="XDB" version="1.0" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="true" hasoptions="false">
<Plugin name="FieldViewXDB" type="database" label="FieldView XDB" version="1.0" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="true" hasoptions="false">
<CXXFLAGS>
${VXDB_INCLUDE_DIR}
${XDBLIB_INCLUDE_DIR}
......
......@@ -4,46 +4,46 @@
* FieldView XDB Export is provided expressly for use within VisIt.
* All other uses are strictly forbidden.
*****************************************************************************/
#include <XDBPluginInfo.h>
#include <avtXDBFileFormat.h>
#include <FieldViewXDBPluginInfo.h>
#include <avtFieldViewXDBFileFormat.h>
#include <avtMTMDFileFormatInterface.h>
#include <avtGenericDatabase.h>
// ****************************************************************************
// Method: XDBCommonPluginInfo::GetDatabaseType
// Method: FieldViewXDBCommonPluginInfo::GetDatabaseType
//
// Purpose:
// Returns the type of a XDB database.
// Returns the type of a FieldViewXDB database.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
DatabaseType
XDBCommonPluginInfo::GetDatabaseType()
FieldViewXDBCommonPluginInfo::GetDatabaseType()
{
return DB_TYPE_MTMD;
}
// ****************************************************************************
// Method: XDBCommonPluginInfo::SetupDatabase
// Method: FieldViewXDBCommonPluginInfo::SetupDatabase
//
// Purpose:
// Sets up a XDB database.
// Sets up a FieldViewXDB 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 XDB database from list.
// Returns: A FieldViewXDB database from list.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
avtDatabase *
XDBCommonPluginInfo::SetupDatabase(const char *const *list,
FieldViewXDBCommonPluginInfo::SetupDatabase(const char *const *list,
int nList, int nBlock)
{
// ignore any nBlocks past 1
......@@ -51,14 +51,14 @@ XDBCommonPluginInfo::SetupDatabase(const char *const *list,
avtMTMDFileFormat **ffl = new avtMTMDFileFormat*[nTimestepGroups];
for (int i = 0 ; i < nTimestepGroups ; i++)
{
ffl[i] = new avtXDBFileFormat(list[i*nBlock]);
ffl[i] = new avtFieldViewXDBFileFormat(list[i*nBlock]);
}
avtMTMDFileFormatInterface *inter
= new avtMTMDFileFormatInterface(ffl, nTimestepGroups);
return new avtGenericDatabase(inter);
}
// ****************************************************************************
// Method: XDBCommonPluginInfo::GetLicense
// Method: FieldViewXDBCommonPluginInfo::GetLicense
//
// Purpose: Get the copyright for the library.
//
......@@ -66,11 +66,11 @@ XDBCommonPluginInfo::SetupDatabase(const char *const *list,
// Creation: Tue Apr 8 16:07:39 PDT 2014
//
// ****************************************************************************
#include <avtXDBWriterInternal.h>
#include <avtFieldViewXDBWriterInternal.h>
std::string
XDBCommonPluginInfo::GetLicense() const
FieldViewXDBCommonPluginInfo::GetLicense() const
{
return avtXDBWriterInternal::GetCopyright();
return avtFieldViewXDBWriterInternal::GetCopyright();
}
......@@ -4,39 +4,39 @@
* FieldView XDB Export is provided expressly for use within VisIt.
* All other uses are strictly forbidden.
*****************************************************************************/
#include <XDBPluginInfo.h>
#include <avtXDBWriter.h>
#include <FieldViewXDBPluginInfo.h>
#include <avtFieldViewXDBWriter.h>
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the XDB database.
// Return a new EnginePluginInfo for the FieldViewXDB database.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
extern "C" DBP_EXPORT EngineDatabasePluginInfo* XDB_GetEngineInfo()
extern "C" DBP_EXPORT EngineDatabasePluginInfo* FieldViewXDB_GetEngineInfo()
{
return new XDBEnginePluginInfo;
return new FieldViewXDBEnginePluginInfo;
}
// ****************************************************************************
// Method: XDBEnginePluginInfo::GetWriter
// Method: FieldViewXDBEnginePluginInfo::GetWriter
//
// Purpose:
// Sets up a XDB writer.
// Sets up a FieldViewXDB writer.
//
// Returns: A XDB writer.
// Returns: A FieldViewXDB writer.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
avtDatabaseWriter *
XDBEnginePluginInfo::GetWriter(void)
FieldViewXDBEnginePluginInfo::GetWriter(void)
{
return new avtXDBWriter;
return new avtFieldViewXDBWriter;
}
......@@ -5,7 +5,7 @@
* All other uses are strictly forbidden.
*****************************************************************************/
#include <XDBPluginInfo.h>
#include <FieldViewXDBPluginInfo.h>
// ****************************************************************************
// Function: GetMDServerInfo
......@@ -17,13 +17,13 @@
// Creation: omitted
//
// ****************************************************************************
extern "C" DBP_EXPORT MDServerDatabasePluginInfo* XDB_GetMDServerInfo()
extern "C" DBP_EXPORT MDServerDatabasePluginInfo* FieldViewXDB_GetMDServerInfo()
{
return new XDBMDServerPluginInfo;
return new FieldViewXDBMDServerPluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void XDBMDServerPluginInfo::dummy()
void FieldViewXDBMDServerPluginInfo::dummy()
{
}
......@@ -6,31 +6,31 @@
*****************************************************************************/
// ************************************************************************* //
// File: XDBPluginInfo.C
// File: FieldViewXDBPluginInfo.C
// ************************************************************************* //
#include <XDBPluginInfo.h>
#include <FieldViewXDBPluginInfo.h>
#include <visit-config.h>
VISIT_PLUGIN_VERSION(XDB,DBP_EXPORT)
VISIT_PLUGIN_VERSION(FieldViewXDB,DBP_EXPORT)
// ****************************************************************************
// Function: GetGeneralInfo
//
// Purpose:
// Return a new GeneralPluginInfo for the XDB database.
// Return a new GeneralPluginInfo for the FieldViewXDB database.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
extern "C" DBP_EXPORT GeneralDatabasePluginInfo* XDB_GetGeneralInfo()
extern "C" DBP_EXPORT GeneralDatabasePluginInfo* FieldViewXDB_GetGeneralInfo()
{
return new XDBGeneralPluginInfo;
return new FieldViewXDBGeneralPluginInfo;
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::GetName
// Method: FieldViewXDBGeneralPluginInfo::GetName
//
// Purpose:
// Return the name of the database plugin.
......@@ -43,13 +43,13 @@ extern "C" DBP_EXPORT GeneralDatabasePluginInfo* XDB_GetGeneralInfo()
// ****************************************************************************
const char *
XDBGeneralPluginInfo::GetName() const
FieldViewXDBGeneralPluginInfo::GetName() const
{
return "XDB";
return "FieldView XDB";
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::GetVersion
// Method: FieldViewXDBGeneralPluginInfo::GetVersion
//
// Purpose:
// Return the version of the database plugin.
......@@ -62,13 +62,13 @@ XDBGeneralPluginInfo::GetName() const
// ****************************************************************************
const char *
XDBGeneralPluginInfo::GetVersion() const
FieldViewXDBGeneralPluginInfo::GetVersion() const
{
return "1.0";
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::GetID
// Method: FieldViewXDBGeneralPluginInfo::GetID
//
// Purpose:
// Return the id of the database plugin.
......@@ -81,12 +81,12 @@ XDBGeneralPluginInfo::GetVersion() const
// ****************************************************************************
const char *
XDBGeneralPluginInfo::GetID() const
FieldViewXDBGeneralPluginInfo::GetID() const
{
return "XDB_1.0";
return "FIELDVIEWFieldViewXDB_1.0";
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::EnabledByDefault
// Method: FieldViewXDBGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
......@@ -99,12 +99,12 @@ XDBGeneralPluginInfo::GetID() const
// ****************************************************************************
bool
XDBGeneralPluginInfo::EnabledByDefault() const
FieldViewXDBGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::HasWriter
// Method: FieldViewXDBGeneralPluginInfo::HasWriter
//
// Purpose:
// Return true if this plugin has a database writer.
......@@ -117,22 +117,22 @@ XDBGeneralPluginInfo::EnabledByDefault() const
// ****************************************************************************
bool
XDBGeneralPluginInfo::HasWriter() const
FieldViewXDBGeneralPluginInfo::HasWriter() const
{
return true;
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::GetDefaultFilePatterns
// Method: FieldViewXDBGeneralPluginInfo::GetDefaultFilePatterns
//
// Purpose:
// Returns the default patterns for a XDB database.
// Returns the default patterns for a FieldViewXDB database.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
std::vector<std::string>
XDBGeneralPluginInfo::GetDefaultFilePatterns() const
FieldViewXDBGeneralPluginInfo::GetDefaultFilePatterns() const
{
std::vector<std::string> defaultPatterns;
defaultPatterns.push_back("*.xdb");
......@@ -141,10 +141,10 @@ XDBGeneralPluginInfo::GetDefaultFilePatterns() const
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::AreDefaultFilePatternsStrict
// Method: FieldViewXDBGeneralPluginInfo::AreDefaultFilePatternsStrict
//
// Purpose:
// Returns if the file patterns for a XDB database are
// Returns if the file patterns for a FieldViewXDB database are
// intended to be interpreted strictly by default.
//
// Programmer: generated by xml2info
......@@ -152,16 +152,16 @@ XDBGeneralPluginInfo::GetDefaultFilePatterns() const
//
// ****************************************************************************
bool
XDBGeneralPluginInfo::AreDefaultFilePatternsStrict() const
FieldViewXDBGeneralPluginInfo::AreDefaultFilePatternsStrict() const
{
return false;
}
// ****************************************************************************
// Method: XDBGeneralPluginInfo::OpensWholeDirectory
// Method: FieldViewXDBGeneralPluginInfo::OpensWholeDirectory
//
// Purpose:
// Returns if the XDB plugin opens a whole directory name
// Returns if the FieldViewXDB plugin opens a whole directory name
// instead of a single file.
//
// Programmer: generated by xml2info
......@@ -169,7 +169,7 @@ XDBGeneralPluginInfo::AreDefaultFilePatternsStrict() const
//
// ****************************************************************************
bool
XDBGeneralPluginInfo::OpensWholeDirectory() const
FieldViewXDBGeneralPluginInfo::OpensWholeDirectory() const
{
return false;
}
/*****************************************************************************
* Copyright (c) 2014 Intelligent Light. All rights reserved.
* Work partially supported by DOE Grant SC0007548.
* FieldView XDB Export is provided expressly for use within VisIt.
* FieldView FieldViewXDB Export is provided expressly for use within VisIt.
* All other uses are strictly forbidden.
*****************************************************************************/
// ****************************************************************************
// XDBPluginInfo.h
// FieldViewXDBPluginInfo.h
// ****************************************************************************
#ifndef XDB_PLUGIN_INFO_H
#define XDB_PLUGIN_INFO_H
#ifndef FIELDVIEWXDB_PLUGIN_INFO_H
#define FIELDVIEWXDB_PLUGIN_INFO_H
#include <DatabasePluginInfo.h>
#include <database_plugin_exports.h>
......@@ -18,10 +18,10 @@ class avtDatabase;
class avtDatabaseWriter;
// ****************************************************************************
// Class: XDBDatabasePluginInfo
// Class: FieldViewXDBDatabasePluginInfo
//
// Purpose:
// Classes that provide all the information about the XDB plugin.
// Classes that provide all the information about the FieldViewXDB plugin.
// Portions are separated into pieces relevant to the appropriate
// components of VisIt.
//
......@@ -32,7 +32,7 @@ class avtDatabaseWriter;
//
// ****************************************************************************
class XDBGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
class FieldViewXDBGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
{
public:
virtual const char *GetName() const;
......@@ -45,7 +45,7 @@ class XDBGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
virtual bool OpensWholeDirectory() const;
};
class XDBCommonPluginInfo : public virtual CommonDatabasePluginInfo, public virtual XDBGeneralPluginInfo
class FieldViewXDBCommonPluginInfo : public virtual CommonDatabasePluginInfo, public virtual FieldViewXDBGeneralPluginInfo
{
public:
virtual DatabaseType GetDatabaseType();
......@@ -54,14 +54,14 @@ class XDBCommonPluginInfo : public virtual CommonDatabasePluginInfo, public virt
virtual std::string GetLicense() const;
};
class XDBMDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual XDBCommonPluginInfo
class FieldViewXDBMDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual FieldViewXDBCommonPluginInfo
{
public:
// this makes compilers happy... remove if we ever have functions here
virtual void dummy();
};
class XDBEnginePluginInfo : public virtual EngineDatabasePluginInfo, public virtual XDBCommonPluginInfo
class FieldViewXDBEnginePluginInfo : public virtual EngineDatabasePluginInfo, public virtual FieldViewXDBCommonPluginInfo
{
public:
virtual avtDatabaseWriter *GetWriter(void);
......
......@@ -4,32 +4,32 @@
* FieldView XDB Export is provided expressly for use within VisIt.
* All other uses are strictly forbidden.
*****************************************************************************/
#include <avtXDBFileFormat.h>
#include <avtFieldViewXDBFileFormat.h>
#include <avtDatabaseMetaData.h>
// ****************************************************************************
// Method: avtXDBFileFormat constructor
// Method: avtFieldViewXDBFileFormat constructor
//
// Programmer: Brad Whitlock
// Creation: Tue Jan 14 17:29:14 PST 2014
//
// ****************************************************************************
avtXDBFileFormat::avtXDBFileFormat(const char *filename)
avtFieldViewXDBFileFormat::avtFieldViewXDBFileFormat(const char *filename)
: avtMTMDFileFormat(filename)
{
// INITIALIZE DATA MEMBERS
}
// ****************************************************************************
// Method: avtXDBFileFormat destructor