Commit d4249c5b authored by miller86's avatar miller86

adding enhanced subsetting functionality - phase 1 - using enumerated scalars;...

adding enhanced subsetting functionality - phase 1 - using enumerated scalars; new binary and expression ; fixed overwrite of header files during code gen; hide-from-gui feature on md objects; support for nodelists

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3848 18c085ea-50e0-402c-830e-de6fd14e8384
parent d8b29ed5
......@@ -41,7 +41,7 @@
#include <snprintf.h>
// Type map format string
const char *avtArrayMetaData::TypeMapFormatString = "ssbsibsis*";
const char *avtArrayMetaData::TypeMapFormatString = "ssbsibsis*b";
// ****************************************************************************
// Method: avtArrayMetaData::avtArrayMetaData
......@@ -52,7 +52,7 @@ const char *avtArrayMetaData::TypeMapFormatString = "ssbsibsis*";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -67,6 +67,7 @@ avtArrayMetaData::avtArrayMetaData() :
centering = AVT_UNKNOWN_CENT;
hasUnits = false;
nVars = 0;
hideFromGUI = false;
}
// ****************************************************************************
......@@ -78,7 +79,7 @@ avtArrayMetaData::avtArrayMetaData() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -96,6 +97,7 @@ avtArrayMetaData::avtArrayMetaData(const avtArrayMetaData &obj) :
units = obj.units;
nVars = obj.nVars;
compNames = obj.compNames;
hideFromGUI = obj.hideFromGUI;
SelectAll();
}
......@@ -109,7 +111,7 @@ avtArrayMetaData::avtArrayMetaData(const avtArrayMetaData &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -129,7 +131,7 @@ avtArrayMetaData::~avtArrayMetaData()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -148,6 +150,7 @@ avtArrayMetaData::operator = (const avtArrayMetaData &obj)
units = obj.units;
nVars = obj.nVars;
compNames = obj.compNames;
hideFromGUI = obj.hideFromGUI;
SelectAll();
return *this;
......@@ -162,7 +165,7 @@ avtArrayMetaData::operator = (const avtArrayMetaData &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -180,7 +183,8 @@ avtArrayMetaData::operator == (const avtArrayMetaData &obj) const
(hasUnits == obj.hasUnits) &&
(units == obj.units) &&
(nVars == obj.nVars) &&
(compNames == obj.compNames));
(compNames == obj.compNames) &&
(hideFromGUI == obj.hideFromGUI));
}
// ****************************************************************************
......@@ -192,7 +196,7 @@ avtArrayMetaData::operator == (const avtArrayMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -213,7 +217,7 @@ avtArrayMetaData::operator != (const avtArrayMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -234,7 +238,7 @@ avtArrayMetaData::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -262,7 +266,7 @@ avtArrayMetaData::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -288,7 +292,7 @@ avtArrayMetaData::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -315,7 +319,7 @@ avtArrayMetaData::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -324,15 +328,16 @@ avtArrayMetaData::NewInstance(bool copy) const
void
avtArrayMetaData::SelectAll()
{
Select(0, (void *)&name);
Select(1, (void *)&originalName);
Select(2, (void *)&validVariable);
Select(3, (void *)&meshName);
Select(4, (void *)&centering);
Select(5, (void *)&hasUnits);
Select(6, (void *)&units);
Select(7, (void *)&nVars);
Select(8, (void *)&compNames);
Select(ID_name, (void *)&name);
Select(ID_originalName, (void *)&originalName);
Select(ID_validVariable, (void *)&validVariable);
Select(ID_meshName, (void *)&meshName);
Select(ID_centering, (void *)&centering);
Select(ID_hasUnits, (void *)&hasUnits);
Select(ID_units, (void *)&units);
Select(ID_nVars, (void *)&nVars);
Select(ID_compNames, (void *)&compNames);
Select(ID_hideFromGUI, (void *)&hideFromGUI);
}
///////////////////////////////////////////////////////////////////////////////
......
......@@ -52,7 +52,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -81,6 +81,21 @@ public:
avtArrayMetaData(std::string, std::string, avtCentering, int);
avtArrayMetaData(std::string, std::string, avtCentering, int, const stringVector &);
void Print(ostream &, int = 0) const;
// IDs that can be used to identify fields in case statements
enum {
ID_name = 0,
ID_originalName,
ID_validVariable,
ID_meshName,
ID_centering,
ID_hasUnits,
ID_units,
ID_nVars,
ID_compNames,
ID_hideFromGUI
};
public:
std::string name;
std::string originalName;
......@@ -91,6 +106,7 @@ public:
std::string units;
int nVars;
stringVector compNames;
bool hideFromGUI;
private:
// Static class format string for type map.
......
......@@ -24,6 +24,9 @@
</Field>
<Field name="compNames" label="Component names" type="stringVector" access="public">
</Field>
<Field name="hideFromGUI" label="hideFromGUI" type="bool" access="public">
false
</Field>
<Function name="avtArrayMetaData2" user="true" member="true">
</Function>
<Function name="avtArrayMetaData3" user="true" member="true">
......
......@@ -40,7 +40,7 @@
#include <DataNode.h>
// Type map format string
const char *avtCurveMetaData::TypeMapFormatString = "ssbissssbdd";
const char *avtCurveMetaData::TypeMapFormatString = "ssbissssbddb";
// ****************************************************************************
// Method: avtCurveMetaData::avtCurveMetaData
......@@ -51,7 +51,7 @@ const char *avtCurveMetaData::TypeMapFormatString = "ssbissssbdd";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -68,6 +68,7 @@ avtCurveMetaData::avtCurveMetaData() :
hasDataExtents = false;
minDataExtents = 0;
maxDataExtents = 0;
hideFromGUI = false;
}
// ****************************************************************************
......@@ -79,7 +80,7 @@ avtCurveMetaData::avtCurveMetaData() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -99,6 +100,7 @@ avtCurveMetaData::avtCurveMetaData(const avtCurveMetaData &obj) :
hasDataExtents = obj.hasDataExtents;
minDataExtents = obj.minDataExtents;
maxDataExtents = obj.maxDataExtents;
hideFromGUI = obj.hideFromGUI;
SelectAll();
}
......@@ -112,7 +114,7 @@ avtCurveMetaData::avtCurveMetaData(const avtCurveMetaData &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -132,7 +134,7 @@ avtCurveMetaData::~avtCurveMetaData()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -153,6 +155,7 @@ avtCurveMetaData::operator = (const avtCurveMetaData &obj)
hasDataExtents = obj.hasDataExtents;
minDataExtents = obj.minDataExtents;
maxDataExtents = obj.maxDataExtents;
hideFromGUI = obj.hideFromGUI;
SelectAll();
return *this;
......@@ -167,7 +170,7 @@ avtCurveMetaData::operator = (const avtCurveMetaData &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -187,7 +190,8 @@ avtCurveMetaData::operator == (const avtCurveMetaData &obj) const
(yLabel == obj.yLabel) &&
(hasDataExtents == obj.hasDataExtents) &&
(minDataExtents == obj.minDataExtents) &&
(maxDataExtents == obj.maxDataExtents));
(maxDataExtents == obj.maxDataExtents) &&
(hideFromGUI == obj.hideFromGUI));
}
// ****************************************************************************
......@@ -199,7 +203,7 @@ avtCurveMetaData::operator == (const avtCurveMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -220,7 +224,7 @@ avtCurveMetaData::operator != (const avtCurveMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -241,7 +245,7 @@ avtCurveMetaData::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -269,7 +273,7 @@ avtCurveMetaData::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -295,7 +299,7 @@ avtCurveMetaData::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -322,7 +326,7 @@ avtCurveMetaData::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -331,17 +335,18 @@ avtCurveMetaData::NewInstance(bool copy) const
void
avtCurveMetaData::SelectAll()
{
Select(0, (void *)&name);
Select(1, (void *)&originalName);
Select(2, (void *)&validVariable);
Select(3, (void *)&centering);
Select(4, (void *)&xUnits);
Select(5, (void *)&xLabel);
Select(6, (void *)&yUnits);
Select(7, (void *)&yLabel);
Select(8, (void *)&hasDataExtents);
Select(9, (void *)&minDataExtents);
Select(10, (void *)&maxDataExtents);
Select(ID_name, (void *)&name);
Select(ID_originalName, (void *)&originalName);
Select(ID_validVariable, (void *)&validVariable);
Select(ID_centering, (void *)&centering);
Select(ID_xUnits, (void *)&xUnits);
Select(ID_xLabel, (void *)&xLabel);
Select(ID_yUnits, (void *)&yUnits);
Select(ID_yLabel, (void *)&yLabel);
Select(ID_hasDataExtents, (void *)&hasDataExtents);
Select(ID_minDataExtents, (void *)&minDataExtents);
Select(ID_maxDataExtents, (void *)&maxDataExtents);
Select(ID_hideFromGUI, (void *)&hideFromGUI);
}
///////////////////////////////////////////////////////////////////////////////
......
......@@ -52,7 +52,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:15 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -83,6 +83,23 @@ public:
void SetExtents(const double *);
void UnsetExtents();
void Print(ostream &, int = 0) const;
// IDs that can be used to identify fields in case statements
enum {
ID_name = 0,
ID_originalName,
ID_validVariable,
ID_centering,
ID_xUnits,
ID_xLabel,
ID_yUnits,
ID_yLabel,
ID_hasDataExtents,
ID_minDataExtents,
ID_maxDataExtents,
ID_hideFromGUI
};
public:
std::string name;
std::string originalName;
......@@ -95,6 +112,7 @@ public:
bool hasDataExtents;
double minDataExtents;
double maxDataExtents;
bool hideFromGUI;
private:
// Static class format string for type map.
......
......@@ -25,10 +25,13 @@
false
</Field>
<Field name="minDataExtents" label="Minimum data extents" type="double" access="public">
0.
0.000000
</Field>
<Field name="maxDataExtents" label="Maximum data extents" type="double" access="public">
0.
0.000000
</Field>
<Field name="hideFromGUI" label="hideFromGUI" type="bool" access="public">
false
</Field>
<Function name="avtCurveMetaData2" user="true" member="true">
</Function>
......
This diff is collapsed.
......@@ -2300,6 +2300,9 @@ Definition:
// Jeremy Meredith, Wed Aug 23 18:23:16 EDT 2006
// Find enumerated scalar type subsets.
//
// Mark C. Miller, Mon Apr 14 15:17:17 PDT 2008
// Changed interface to enum scalar
//
// ****************************************************************************
avtSubsetType
......@@ -2359,7 +2362,7 @@ avtDatabaseMetaData::DetermineSubsetType(const std::string &inVar) const
// Check enumerated scalars next
//
const avtScalarMetaData *smd = GetScalar(category);
if (smd != NULL && smd->isEnumeration)
if (smd != NULL && smd->GetEnumerationType() != avtScalarMetaData::None)
return AVT_ENUMSCALAR_SUBSET;
//
......
......@@ -81,7 +81,7 @@ class avtSILMetaData;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 7 14:15:32 PST 2008
// Creation: omitted
//
// Modifications:
//
......
......@@ -40,7 +40,7 @@
#include <DataNode.h>
// Type map format string
const char *avtLabelMetaData::TypeMapFormatString = "ssbsi";
const char *avtLabelMetaData::TypeMapFormatString = "ssbsib";
// ****************************************************************************
// Method: avtLabelMetaData::avtLabelMetaData
......@@ -51,7 +51,7 @@ const char *avtLabelMetaData::TypeMapFormatString = "ssbsi";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -64,6 +64,7 @@ avtLabelMetaData::avtLabelMetaData() :
validVariable = true;
meshName = "mesh";
centering = AVT_UNKNOWN_CENT;
hideFromGUI = false;
}
// ****************************************************************************
......@@ -75,7 +76,7 @@ avtLabelMetaData::avtLabelMetaData() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -89,6 +90,7 @@ avtLabelMetaData::avtLabelMetaData(const avtLabelMetaData &obj) :
validVariable = obj.validVariable;
meshName = obj.meshName;
centering = obj.centering;
hideFromGUI = obj.hideFromGUI;
SelectAll();
}
......@@ -102,7 +104,7 @@ avtLabelMetaData::avtLabelMetaData(const avtLabelMetaData &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -122,7 +124,7 @@ avtLabelMetaData::~avtLabelMetaData()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -137,6 +139,7 @@ avtLabelMetaData::operator = (const avtLabelMetaData &obj)
validVariable = obj.validVariable;
meshName = obj.meshName;
centering = obj.centering;
hideFromGUI = obj.hideFromGUI;
SelectAll();
return *this;
......@@ -151,7 +154,7 @@ avtLabelMetaData::operator = (const avtLabelMetaData &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -165,7 +168,8 @@ avtLabelMetaData::operator == (const avtLabelMetaData &obj) const
(originalName == obj.originalName) &&
(validVariable == obj.validVariable) &&
(meshName == obj.meshName) &&
(centering == obj.centering));
(centering == obj.centering) &&
(hideFromGUI == obj.hideFromGUI));
}
// ****************************************************************************
......@@ -177,7 +181,7 @@ avtLabelMetaData::operator == (const avtLabelMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -198,7 +202,7 @@ avtLabelMetaData::operator != (const avtLabelMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -219,7 +223,7 @@ avtLabelMetaData::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -247,7 +251,7 @@ avtLabelMetaData::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -273,7 +277,7 @@ avtLabelMetaData::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -300,7 +304,7 @@ avtLabelMetaData::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -309,11 +313,12 @@ avtLabelMetaData::NewInstance(bool copy) const
void
avtLabelMetaData::SelectAll()
{
Select(0, (void *)&name);
Select(1, (void *)&originalName);
Select(2, (void *)&validVariable);
Select(3, (void *)&meshName);
Select(4, (void *)&centering);
Select(ID_name, (void *)&name);
Select(ID_originalName, (void *)&originalName);
Select(ID_validVariable, (void *)&validVariable);
Select(ID_meshName, (void *)&meshName);
Select(ID_centering, (void *)&centering);
Select(ID_hideFromGUI, (void *)&hideFromGUI);
}
///////////////////////////////////////////////////////////////////////////////
......
......@@ -76,3 +76,4 @@ avtLabelMetaData::Print(ostream &out, int indent) const
out << "THIS IS NOT A VALID VARIABLE." << endl;
}
}
......@@ -52,7 +52,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:16 PST 2007
// Creation: omitted
//
// Modifications:
//
......@@ -80,12 +80,24 @@ public:
// User-defined methods
avtLabelMetaData(const std::string &, const std::string &, avtCentering);
void Print(ostream &, int = 0) const;
// IDs that can be used to identify fields in case statements
enum {
ID_name = 0,
ID_originalName,
ID_validVariable,
ID_meshName,
ID_centering,
ID_hideFromGUI
};
public:
std::string name;
std::string originalName;
bool validVariable;
std::string meshName;
avtCentering centering;
bool hideFromGUI;
private:
// Static class format string for type map.
......
......@@ -14,6 +14,9 @@
<Field name="centering" label="Variable centering" type="avtCentering" access="public">
AVT_UNKNOWN_CENT
</Field>
<Field name="hideFromGUI" label="hideFromGUI" type="bool" access="public">
false
</Field>
<Function name="avtLabelMetaData2" user="true" member="true">
</Function>
<Function name="Print" user="true" member="true">
......
......@@ -40,7 +40,7 @@
#include <DataNode.h>
// Type map format string
const char *avtMeshMetaData::TypeMapFormatString = "ssbiiiiissssssbDDiisss*iissi*bibbbbibFbDib";
const char *avtMeshMetaData::TypeMapFormatString = "ssbiiiiissssssbDDiisss*iissi*bibbbbibFbDibb";
// ****************************************************************************
// Method: avtMeshMetaData::avtMeshMetaData
......@@ -51,7 +51,7 @@ const char *avtMeshMetaData::TypeMapFormatString = "ssbiiiiissssssbDDiisss*iissi
// Note: Autogenerated by xml2atts.
//