Commit 6e11b58c authored by hkrishna's avatar hkrishna

Merge branch 'Remote-VisIt'

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23079 18c085ea-50e0-402c-830e-de6fd14e8384
parent abf57119
......@@ -401,6 +401,126 @@ avtArrayMetaData::SelectAll()
// Get property methods
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
// ****************************************************************************
// Method: avtArrayMetaData::GetFieldName
//
// Purpose:
// This method returns the name of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtArrayMetaData::GetFieldName(int index) const
{
switch (index)
{
case ID_nVars: return "nVars";
case ID_compNames: return "compNames";
default: return avtVarMetaData::GetFieldName(index);
}
}
// ****************************************************************************
// Method: avtArrayMetaData::GetFieldType
//
// Purpose:
// This method returns the type of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AttributeGroup::FieldType
avtArrayMetaData::GetFieldType(int index) const
{
switch (index)
{
case ID_nVars: return FieldType_int;
case ID_compNames: return FieldType_stringVector;
default: return avtVarMetaData::GetFieldType(index);
}
}
// ****************************************************************************
// Method: avtArrayMetaData::GetFieldTypeName
//
// Purpose:
// This method returns the name of a field type given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtArrayMetaData::GetFieldTypeName(int index) const
{
switch (index)
{
case ID_nVars: return "int";
case ID_compNames: return "stringVector";
default: return avtVarMetaData::GetFieldTypeName(index);
}
}
// ****************************************************************************
// Method: avtArrayMetaData::FieldsEqual
//
// Purpose:
// This method compares two fields and return true if they are equal.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
bool
avtArrayMetaData::FieldsEqual(int index_, const AttributeGroup *rhs) const
{
const avtArrayMetaData &obj = *((const avtArrayMetaData*)rhs);
bool retval = false;
switch (index_)
{
case ID_nVars:
{ // new scope
retval = (nVars == obj.nVars);
}
break;
case ID_compNames:
{ // new scope
retval = (compNames == obj.compNames);
}
break;
default: retval = avtVarMetaData::FieldsEqual(index_, rhs);
}
return retval;
}
///////////////////////////////////////////////////////////////////////////////
// User-defined methods.
///////////////////////////////////////////////////////////////////////////////
......
......@@ -87,6 +87,13 @@ public:
// Property selection methods
virtual void SelectAll();
// Keyframing methods
virtual std::string GetFieldName(int index) const;
virtual AttributeGroup::FieldType GetFieldType(int index) const;
virtual std::string GetFieldTypeName(int index) const;
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
// User-defined methods
avtArrayMetaData(std::string, std::string, avtCentering, int);
avtArrayMetaData(std::string, std::string, avtCentering, int, const stringVector &);
......
<?xml version="1.0"?>
<Attribute name="avtArrayMetaData" purpose="Contains array metadata attributes" persistent="false" keyframe="false" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtArrayMetaData.code" baseClass="avtVarMetaData">
<Attribute name="avtArrayMetaData" purpose="Contains array metadata attributes" persistent="false" keyframe="true" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtArrayMetaData.code" baseClass="avtVarMetaData">
<Field name="nVars" label="Number of variables" type="int" access="public">
0
</Field>
......
......@@ -407,6 +407,150 @@ avtBaseVarMetaData::SelectAll()
// Get property methods
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
// ****************************************************************************
// Method: avtBaseVarMetaData::GetFieldName
//
// Purpose:
// This method returns the name of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtBaseVarMetaData::GetFieldName(int index) const
{
switch (index)
{
case ID_name: return "name";
case ID_originalName: return "originalName";
case ID_meshName: return "meshName";
case ID_validVariable: return "validVariable";
case ID_hideFromGUI: return "hideFromGUI";
default: return "invalid index";
}
}
// ****************************************************************************
// Method: avtBaseVarMetaData::GetFieldType
//
// Purpose:
// This method returns the type of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AttributeGroup::FieldType
avtBaseVarMetaData::GetFieldType(int index) const
{
switch (index)
{
case ID_name: return FieldType_string;
case ID_originalName: return FieldType_string;
case ID_meshName: return FieldType_string;
case ID_validVariable: return FieldType_bool;
case ID_hideFromGUI: return FieldType_bool;
default: return FieldType_unknown;
}
}
// ****************************************************************************
// Method: avtBaseVarMetaData::GetFieldTypeName
//
// Purpose:
// This method returns the name of a field type given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtBaseVarMetaData::GetFieldTypeName(int index) const
{
switch (index)
{
case ID_name: return "string";
case ID_originalName: return "string";
case ID_meshName: return "string";
case ID_validVariable: return "bool";
case ID_hideFromGUI: return "bool";
default: return "invalid index";
}
}
// ****************************************************************************
// Method: avtBaseVarMetaData::FieldsEqual
//
// Purpose:
// This method compares two fields and return true if they are equal.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
bool
avtBaseVarMetaData::FieldsEqual(int index_, const AttributeGroup *rhs) const
{
const avtBaseVarMetaData &obj = *((const avtBaseVarMetaData*)rhs);
bool retval = false;
switch (index_)
{
case ID_name:
{ // new scope
retval = (name == obj.name);
}
break;
case ID_originalName:
{ // new scope
retval = (originalName == obj.originalName);
}
break;
case ID_meshName:
{ // new scope
retval = (meshName == obj.meshName);
}
break;
case ID_validVariable:
{ // new scope
retval = (validVariable == obj.validVariable);
}
break;
case ID_hideFromGUI:
{ // new scope
retval = (hideFromGUI == obj.hideFromGUI);
}
break;
default: retval = false;
}
return retval;
}
///////////////////////////////////////////////////////////////////////////////
// User-defined methods.
///////////////////////////////////////////////////////////////////////////////
......
......@@ -88,6 +88,13 @@ public:
// Property selection methods
virtual void SelectAll();
// Keyframing methods
virtual std::string GetFieldName(int index) const;
virtual AttributeGroup::FieldType GetFieldType(int index) const;
virtual std::string GetFieldTypeName(int index) const;
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
// User-defined methods
avtBaseVarMetaData(private_tmfs_t, std::string, std::string);
void Print(ostream &, int = 0) const;
......
<?xml version="1.0"?>
<Attribute name="avtBaseVarMetaData" purpose="Contains metadata attributes associated with all mesh variables" persistent="false" keyframe="false" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtBaseVarMetaData.code">
<Attribute name="avtBaseVarMetaData" purpose="Contains metadata attributes associated with all mesh variables" persistent="false" keyframe="true" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtBaseVarMetaData.code">
<Field name="name" label="Name" type="string" access="public">
scalar
</Field>
......
......@@ -422,6 +422,174 @@ avtCurveMetaData::SelectAll()
// Get property methods
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
// ****************************************************************************
// Method: avtCurveMetaData::GetFieldName
//
// Purpose:
// This method returns the name of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtCurveMetaData::GetFieldName(int index) const
{
switch (index)
{
case ID_xUnits: return "xUnits";
case ID_xLabel: return "xLabel";
case ID_yUnits: return "yUnits";
case ID_yLabel: return "yLabel";
case ID_hasSpatialExtents: return "hasSpatialExtents";
case ID_minSpatialExtents: return "minSpatialExtents";
case ID_maxSpatialExtents: return "maxSpatialExtents";
case ID_from1DScalarName: return "from1DScalarName";
default: return avtVarMetaData::GetFieldName(index);
}
}
// ****************************************************************************
// Method: avtCurveMetaData::GetFieldType
//
// Purpose:
// This method returns the type of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AttributeGroup::FieldType
avtCurveMetaData::GetFieldType(int index) const
{
switch (index)
{
case ID_xUnits: return FieldType_string;
case ID_xLabel: return FieldType_string;
case ID_yUnits: return FieldType_string;
case ID_yLabel: return FieldType_string;
case ID_hasSpatialExtents: return FieldType_bool;
case ID_minSpatialExtents: return FieldType_double;
case ID_maxSpatialExtents: return FieldType_double;
case ID_from1DScalarName: return FieldType_string;
default: return avtVarMetaData::GetFieldType(index);
}
}
// ****************************************************************************
// Method: avtCurveMetaData::GetFieldTypeName
//
// Purpose:
// This method returns the name of a field type given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtCurveMetaData::GetFieldTypeName(int index) const
{
switch (index)
{
case ID_xUnits: return "string";
case ID_xLabel: return "string";
case ID_yUnits: return "string";
case ID_yLabel: return "string";
case ID_hasSpatialExtents: return "bool";
case ID_minSpatialExtents: return "double";
case ID_maxSpatialExtents: return "double";
case ID_from1DScalarName: return "string";
default: return avtVarMetaData::GetFieldTypeName(index);
}
}
// ****************************************************************************
// Method: avtCurveMetaData::FieldsEqual
//
// Purpose:
// This method compares two fields and return true if they are equal.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
bool
avtCurveMetaData::FieldsEqual(int index_, const AttributeGroup *rhs) const
{
const avtCurveMetaData &obj = *((const avtCurveMetaData*)rhs);
bool retval = false;
switch (index_)
{
case ID_xUnits:
{ // new scope
retval = (xUnits == obj.xUnits);
}
break;
case ID_xLabel:
{ // new scope
retval = (xLabel == obj.xLabel);
}
break;
case ID_yUnits:
{ // new scope
retval = (yUnits == obj.yUnits);
}
break;
case ID_yLabel:
{ // new scope
retval = (yLabel == obj.yLabel);
}
break;
case ID_hasSpatialExtents:
{ // new scope
retval = (hasSpatialExtents == obj.hasSpatialExtents);
}
break;
case ID_minSpatialExtents:
{ // new scope
retval = (minSpatialExtents == obj.minSpatialExtents);
}
break;
case ID_maxSpatialExtents:
{ // new scope
retval = (maxSpatialExtents == obj.maxSpatialExtents);
}
break;
case ID_from1DScalarName:
{ // new scope
retval = (from1DScalarName == obj.from1DScalarName);
}
break;
default: retval = avtVarMetaData::FieldsEqual(index_, rhs);
}
return retval;
}
///////////////////////////////////////////////////////////////////////////////
// User-defined methods.
///////////////////////////////////////////////////////////////////////////////
......
......@@ -87,6 +87,13 @@ public:
// Property selection methods
virtual void SelectAll();
// Keyframing methods
virtual std::string GetFieldName(int index) const;
virtual AttributeGroup::FieldType GetFieldType(int index) const;
virtual std::string GetFieldTypeName(int index) const;
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
// User-defined methods
avtCurveMetaData(const std::string &n);
avtCurveMetaData(const std::string &n, double minS, double maxS, double minE, double maxE);
......
<?xml version="1.0"?>
<Attribute name="avtCurveMetaData" purpose="Contains curve metadata attributes" persistent="false" keyframe="false" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtCurveMetaData.code" baseClass="avtVarMetaData">
<Attribute name="avtCurveMetaData" purpose="Contains curve metadata attributes" persistent="false" keyframe="true" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtCurveMetaData.code" baseClass="avtVarMetaData">
<Field name="xUnits" label="X units" type="string" access="public">
</Field>
<Field name="xLabel" label="X label" type="string" access="public">
......
This diff is collapsed.
......@@ -161,6 +161,7 @@ avtDatabaseMetaData::SetFormatCanDoMultires(bool can)
}
formatCanDoMultires = can;
Select(ID_formatCanDoMultires, (void *)&formatCanDoMultires);
}
Function: SetCycle
......
......@@ -314,6 +314,13 @@ public:
avtDefaultPlotMetaData &GetDefaultPlots(int i);
const avtDefaultPlotMetaData &GetDefaultPlots(int i) const;
// Keyframing methods
virtual std::string GetFieldName(int index) const;
virtual AttributeGroup::FieldType GetFieldType(int index) const;
virtual std::string GetFieldTypeName(int index) const;
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
// User-defined methods
void SetTemporalExtents(double, double);
void SetCycle(int, int);
......
<?xml version="1.0"?>
<Attribute name="avtDatabaseMetaData" purpose="Contains database metadata attributes" persistent="false" keyframe="false" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtDatabaseMetaData.code">
<Attribute name="avtDatabaseMetaData" purpose="Contains database metadata attributes" persistent="false" keyframe="true" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h" codefile="avtDatabaseMetaData.code">
<Field name="hasTemporalExtents" label="Has temporal extents" type="bool">
false
</Field>
......
......@@ -397,6 +397,134 @@ avtDefaultPlotMetaData::SelectAll()
// Get property methods
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
// ****************************************************************************
// Method: avtDefaultPlotMetaData::GetFieldName
//
// Purpose:
// This method returns the name of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtDefaultPlotMetaData::GetFieldName(int index) const
{
switch (index)
{
case ID_pluginID: return "pluginID";
case ID_plotVar: return "plotVar";
case ID_plotAttributes: return "plotAttributes";
default: return "invalid index";
}
}
// ****************************************************************************
// Method: avtDefaultPlotMetaData::GetFieldType
//
// Purpose:
// This method returns the type of a field given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AttributeGroup::FieldType
avtDefaultPlotMetaData::GetFieldType(int index) const
{
switch (index)
{
case ID_pluginID: return FieldType_string;
case ID_plotVar: return FieldType_string;
case ID_plotAttributes: return FieldType_stringVector;
default: return FieldType_unknown;
}
}
// ****************************************************************************
// Method: avtDefaultPlotMetaData::GetFieldTypeName
//
// Purpose:
// This method returns the name of a field type given its index.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
std::string
avtDefaultPlotMetaData::GetFieldTypeName(int index) const
{
switch (index)
{
case ID_pluginID: return "string";
case ID_plotVar: return "string";
case ID_plotAttributes: return "stringVector";
default: return "invalid index";
}
}
// ****************************************************************************
// Method: avtDefaultPlotMetaData::FieldsEqual
//
// Purpose:
// This method compares two fields and return true if they are equal.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
bool
avtDefaultPlotMetaData::FieldsEqual(int index_, const AttributeGroup *rhs) const
{
const avtDefaultPlotMetaData &obj = *((const avtDefaultPlotMetaData*)rhs);
bool retval = false;
switch (index_)
{
case ID_pluginID:
{ // new scope
retval = (pluginID == obj.pluginID);
}
break;
case ID_plotVar:
{ // new scope
retval = (plotVar == obj.plotVar);
}
break;
case ID_plotAttributes:
{ // new scope
retval = (plotAttributes == obj.plotAttributes);
}
break;
default: retval = false;
}
return retval;
}
///////////////////////////////////////////////////////////////////////////////
// User-defined methods.
///////////////////////////////////////////////////////////////////////////////
......
......@@ -89,3 +89,4 @@ avtDefaultPlotMetaData::Print(ostream &out, int indent) const
out << "\t" << plotAttributes[i].c_str() << endl;
out << endl;
}
......@@ -87,6 +87,13 @@ public:
// Property selection methods
virtual void SelectAll();