Commit b21e77f1 authored by hrchilds's avatar hrchilds

Update from June 2, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@254 18c085ea-50e0-402c-830e-de6fd14e8384
parent b062997a
This diff is collapsed.
......@@ -24,6 +24,9 @@ Definition:
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Support multiple types of coordinates.
//
// Kathleen Bonnell, Tue Jun 1 16:44:44 PDT 2004
// Support new pick types 'DomainNode', 'DomainZone'.
//
// ****************************************************************************
void
PickAttributes::PrintSelf(ostream &os)
......@@ -86,7 +89,7 @@ PickAttributes::PrintSelf(ostream &os)
<< cellPoint[2] << ">\n";
}
}
if (pickType == Zone)
if (pickType == Zone || pickType == DomainZone)
{
os << "Zone " ;
if (showZoneId)
......@@ -101,7 +104,7 @@ PickAttributes::PrintSelf(ostream &os)
}
os << "\n";
}
else if (pickType == Node)
else if (pickType == Node || pickType == DomainNode)
{
os << "Node ";
if (showNodeId)
......@@ -123,12 +126,12 @@ PickAttributes::PrintSelf(ostream &os)
if (displayIncidentElements)
{
bool showId;
if (pickType == Zone)
if (pickType == Zone || pickType == DomainZone)
{
os << "Incident Nodes " ;
showId = showNodeId;
}
else if (pickType == Node)
else if (pickType == Node || pickType == DomainNode)
{
os << "Incident Zones " ;
showId = showZoneId;
......@@ -137,7 +140,7 @@ PickAttributes::PrintSelf(ostream &os)
{
if (showId)
os << incidentElements[i] << " ";
if (pickType == Zone)
if (pickType == Zone || pickType == DomainZone)
{
if (showNodePhysicalCoords && !pnodeCoords.empty())
os << " " << pnodeCoords[i].c_str() << "\n";
......@@ -146,7 +149,7 @@ PickAttributes::PrintSelf(ostream &os)
if (showNodeBlockLogicalCoords && !bnodeCoords.empty())
os << " block " << bnodeCoords[i].c_str() << "\n";
}
else if (pickType == Node)
else if (pickType == Node || pickType == DomainNode)
{
if (showZoneDomainLogicalCoords && !dzoneCoords.empty())
os << " domain " << dzoneCoords[i].c_str() << "\n";
......@@ -205,6 +208,9 @@ Definition:
// Kathleen Bonnell, Tue Mar 16 16:02:05 PST 2004
// Create message regarding invalid variables.
//
// Kathleen Bonnell, Tue Jun 1 16:44:44 PDT 2004
// Support new pick types 'DomainNode', 'DomainZone'.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -299,7 +305,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
bool showNodeCoords = (showNodePhysicalCoords && !pnodeCoords.empty())||
(showNodeDomainLogicalCoords && !dnodeCoords.empty())||
(showNodeBlockLogicalCoords && !bnodeCoords.empty());
if (pickType == Zone)
if (pickType == Zone || pickType == DomainZone)
{
if (showZoneId || showZoneCoords)
os += "Zone: ";
......@@ -321,7 +327,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
if (showZoneId || showZoneCoords)
os += "\n";
}
else if (pickType == Node)
else if (pickType == Node || pickType == DomainNode)
{
if (showNodeId || showNodeCoords)
os += "Node: ";
......@@ -351,7 +357,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
if (displayIncidentElements)
{
bool showId;
if (pickType == Zone)
if (pickType == Zone || pickType == DomainZone)
{
os += "Incident Nodes: " ;
if (showNodeCoords)
......@@ -360,7 +366,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
}
showId = showNodeId;
}
else if (pickType == Node)
else if (pickType == Node || pickType == DomainNode)
{
os += "Incident zones: " ;
if (showZoneCoords)
......@@ -377,7 +383,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
os += buff;
}
if (pickType == Zone)
if (pickType == Zone || pickType == DomainZone)
{
if (showNodePhysicalCoords & !pnodeCoords.empty())
{
......@@ -399,7 +405,7 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += "\n ";
}
}
else if (pickType == Node)
else if (pickType == Node || pickType == DomainNode)
{
if (showZoneDomainLogicalCoords & !dzoneCoords.empty())
{
......@@ -471,6 +477,9 @@ Definition:
// Kathleen Bonnell, Tue Mar 16 16:02:05 PST 2004
// Clear invalidVars.
//
// Kathleen Bonnell, Tue Jun 1 16:44:44 PDT 2004
// Reset matSelected and needActualCoords.
//
// ****************************************************************************
void
......@@ -519,6 +528,10 @@ PickAttributes::PrepareForNewPick()
errorMessage = "";
error = false;
matSelected = false;
needActualCoords = false;
}
Function: SetFromNode
......
......@@ -15,7 +15,7 @@ class PickVarInfo;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 4 13:33:25 PST 2004
// Creation: Tue Jun 1 16:47:03 PST 2004
//
// Modifications:
//
......@@ -29,7 +29,9 @@ public:
Zone,
Node,
CurveZone,
CurveNode
CurveNode,
DomainZone,
DomainNode
};
PickAttributes();
......@@ -110,6 +112,8 @@ public:
void SetDoTimeCurve(bool doTimeCurve_);
void SetErrorMessage(const std::string &errorMessage_);
void SetError(bool error_);
void SetMatSelected(bool matSelected_);
void SetNeedActualCoords(bool needActualCoords_);
// Property getting methods
const stringVector &GetVariables() const;
......@@ -173,6 +177,8 @@ public:
const std::string &GetErrorMessage() const;
std::string &GetErrorMessage();
bool GetError() const;
bool GetMatSelected() const;
bool GetNeedActualCoords() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -250,6 +256,8 @@ private:
bool doTimeCurve;
std::string errorMessage;
bool error;
bool matSelected;
bool needActualCoords;
};
#endif
......@@ -5,6 +5,8 @@
Node
CurveZone
CurveNode
DomainZone
DomainNode
</Enum>
<Field name="variables" label="variables" type="stringVector">
default
......@@ -127,6 +129,12 @@
<Field name="error" label="error" type="bool" internal="true">
false
</Field>
<Field name="matSelected" label="matSelected" type="bool" internal="true">
false
</Field>
<Field name="needActualCoords" label="needActualCoords" type="bool" internal="true">
false
</Field>
<Function name="PrintSelf" user="true" member="true">
</Function>
<Function name="CreateOutputString" user="true" member="true">
......
......@@ -49,7 +49,7 @@ PickVarInfo::Centering_FromString(const std::string &s, PickVarInfo::Centering &
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -70,7 +70,7 @@ PickVarInfo::PickVarInfo() : AttributeSubject("sss*d*s*d*bisi*s*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -103,7 +103,7 @@ PickVarInfo::PickVarInfo(const PickVarInfo &obj) : AttributeSubject("sss*d*s*d*b
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -123,7 +123,7 @@ PickVarInfo::~PickVarInfo()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -157,7 +157,7 @@ PickVarInfo::operator = (const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -190,7 +190,7 @@ PickVarInfo::operator == (const PickVarInfo &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -211,7 +211,7 @@ PickVarInfo::operator != (const PickVarInfo &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -232,7 +232,7 @@ PickVarInfo::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -260,7 +260,7 @@ PickVarInfo::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -286,7 +286,7 @@ PickVarInfo::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -313,7 +313,7 @@ PickVarInfo::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -637,7 +637,7 @@ PickVarInfo::SelectNumSpecsPerMat()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -673,7 +673,7 @@ PickVarInfo::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -709,7 +709,7 @@ PickVarInfo::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -745,7 +745,7 @@ PickVarInfo::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......@@ -969,6 +969,9 @@ PickVarInfo::PrintSelf(ostream &os)
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Added arg 'type' indicating the type of pick that generated this info.
//
// Kathleen Bonnell, Tue Jun 1 16:42:46 PDT 2004
// Added DomainNode and DomainZone as pick types.
//
// ****************************************************************************
void
PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
......@@ -983,11 +986,11 @@ PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
switch (centering)
{
case Nodal: os += "<nodal> " ;
if (strcmp(type.c_str(), "Node") == 0)
if (type == "Node" || type == "DomainNode")
centeringsMatch = true;
break;
case Zonal: os += "<zonal> " ;
if (strcmp(type.c_str(), "Zone") == 0)
if (type == "Zone" || type == "DomainZone")
centeringsMatch = true;
break;
case None : os += "\n"; break;
......
......@@ -145,6 +145,9 @@ Definition:
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Added arg 'type' indicating the type of pick that generated this info.
//
// Kathleen Bonnell, Tue Jun 1 16:42:46 PDT 2004
// Added DomainNode and DomainZone as pick types.
//
// ****************************************************************************
void
PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
......@@ -159,11 +162,11 @@ PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
switch (centering)
{
case Nodal: os += "<nodal> " ;
if (strcmp(type.c_str(), "Node") == 0)
if (type == "Node" || type == "DomainNode")
centeringsMatch = true;
break;
case Zonal: os += "<zonal> " ;
if (strcmp(type.c_str(), "Zone") == 0)
if (type == "Zone" || type == "DomainZone")
centeringsMatch = true;
break;
case None : os += "\n"; break;
......
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 2 14:36:41 PST 2004
// Creation: Tue Jun 1 16:43:29 PST 2004
//
// Modifications:
//
......
......@@ -41,10 +41,13 @@ inline void Indent(ostream &, int);
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Initialized containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Initialized containsOriginalNodes.
//
// ****************************************************************************
avtMeshMetaData::avtMeshMetaData()
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibb")
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibbb")
{
blockTitle = "domains";
blockPieceName = "domain";
......@@ -61,6 +64,7 @@ avtMeshMetaData::avtMeshMetaData()
disjointElements = false;
containsGhostZones = AVT_MAYBE_GHOSTS;
containsOriginalCells = false;
containsOriginalNodes = false;
validVariable = true;
}
......@@ -102,11 +106,14 @@ avtMeshMetaData::avtMeshMetaData()
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Initialized containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Initialized containsOriginalNodes.
//
// ****************************************************************************
avtMeshMetaData::avtMeshMetaData(const float *extents, std::string s, int nb,
int bo, int co,int sd, int td, avtMeshType mt)
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibb")
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibbb")
{
name = s;
numBlocks = nb;
......@@ -124,6 +131,7 @@ avtMeshMetaData::avtMeshMetaData(const float *extents, std::string s, int nb,
disjointElements = false;
containsGhostZones = AVT_MAYBE_GHOSTS;
containsOriginalCells = false;
containsOriginalNodes = false;
validVariable = true;
}
......@@ -165,11 +173,14 @@ avtMeshMetaData::avtMeshMetaData(const float *extents, std::string s, int nb,
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Initialized containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Initialized containsOriginalNodes.
//
// ****************************************************************************
avtMeshMetaData::avtMeshMetaData(std::string s, int nb, int bo, int co, int sd,
int td, avtMeshType mt)
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibb")
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibbb")
{
name = s;
numBlocks = nb;
......@@ -188,6 +199,7 @@ avtMeshMetaData::avtMeshMetaData(std::string s, int nb, int bo, int co, int sd,
disjointElements = false;
containsGhostZones = AVT_MAYBE_GHOSTS;
containsOriginalCells = false;
containsOriginalNodes = false;
validVariable = true;
}
......@@ -230,10 +242,13 @@ avtMeshMetaData::avtMeshMetaData(std::string s, int nb, int bo, int co, int sd,
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Copied over containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Copied over containsOriginalNodes.
//
// ****************************************************************************
avtMeshMetaData::avtMeshMetaData(const avtMeshMetaData &rhs)
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibb")
: AttributeSubject("sssiiiiiibFFs*ii*ssbsssibbb")
{
name = rhs.name;
numBlocks = rhs.numBlocks;
......@@ -258,6 +273,7 @@ avtMeshMetaData::avtMeshMetaData(const avtMeshMetaData &rhs)
disjointElements = rhs.disjointElements;
containsGhostZones = rhs.containsGhostZones;
containsOriginalCells = rhs.containsOriginalCells;
containsOriginalNodes = rhs.containsOriginalNodes;
xUnits = rhs.xUnits;
yUnits = rhs.yUnits;
zUnits = rhs.zUnits;
......@@ -317,6 +333,9 @@ avtMeshMetaData::~avtMeshMetaData()
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Copied containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Copied containsOriginalNodes.
//
// ****************************************************************************
const avtMeshMetaData &
......@@ -345,6 +364,7 @@ avtMeshMetaData::operator=(const avtMeshMetaData &rhs)
disjointElements = rhs.disjointElements;
containsGhostZones = rhs.containsGhostZones;
containsOriginalCells = rhs.containsOriginalCells;
containsOriginalNodes = rhs.containsOriginalNodes;
xUnits = rhs.xUnits;
yUnits = rhs.yUnits;
zUnits = rhs.zUnits;
......@@ -386,6 +406,9 @@ avtMeshMetaData::operator=(const avtMeshMetaData &rhs)
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Add containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Add containsOriginalNodes.
//
// ****************************************************************************
void
......@@ -414,7 +437,8 @@ avtMeshMetaData::SelectAll()
Select(20, (void*)&zUnits);
Select(21, (void*)&containsGhostZones);
Select(22, (void*)&containsOriginalCells);
Select(23, (void*)&validVariable);
Select(23, (void*)&containsOriginalNodes);
Select(24, (void*)&validVariable);
}
......@@ -501,6 +525,9 @@ avtMeshMetaData::SetExtents(const float *extents)
// Kathleen Bonnell, Wed Mar 26 13:03:54 PST 2003
// Added containsOriginalCells.
//
// Kathleen Bonnell, Fri May 28 18:16:48 PDT 2004
// Added containsOriginalNodes.
//
// ****************************************************************************
void
......@@ -617,6 +644,9 @@ avtMeshMetaData::Print(ostream &out, int indent) const
Indent(out, indent);
out << "Contains original cells " << containsOriginalCells << endl;
Indent(out, indent);
out << "Contains original nodes " << containsOriginalNodes << endl;
Indent(out, indent);
out << "Units = x: \"" << xUnits.c_str()
<< "\", y: \"" << yUnits.c_str()
......@@ -5456,7 +5486,7 @@ avtDatabaseMetaData::SetContainsGhostZones(std::string name, avtGhostType val)
//
// Arguments:
// name The name of a mesh.
// val True if it has ghost zones, false otherwise.
// val True if it has original cells, false otherwise.
//
// Programmer: Kathleen Bonnell
// Creation: March 25, 2003
......@@ -5482,6 +5512,37 @@ avtDatabaseMetaData::SetContainsOriginalCells(std::string name, bool val)
}
// ****************************************************************************
// Method: avtDatabaseMetaData::SetContainsOriginalNodes
//
// Purpose:
// Sets whether a particular mesh has original nodes array.
//
// Arguments:
// name The name of a mesh.
// val True if it has origina nodes, false otherwise.
//
// Programmer: Kathleen Bonnell
// Creation: May 28, 2004
//
// Modifications:
//
// ****************************************************************************
void
avtDatabaseMetaData::SetContainsOriginalNodes(std::string name, bool val)
{
for (int i = 0 ; i < GetNumMeshes() ; i++)
{
if (meshes[i]->name == name)
{
meshes[i]->containsOriginalNodes = val;
return;
}
}
}
// ****************************************************************************
// Method: avtDatabaseMetaData::AddGroupInformation
//
......
......@@ -38,6 +38,7 @@ struct DBATTS_API avtMeshMetaData : public AttributeSubject
bool disjointElements; // A mesh of disjoint cubes, etc.
avtGhostType containsGhostZones;
bool containsOriginalCells;
bool containsOriginalNodes;
bool hasSpatialExtents;
float minSpatialExtents[3];
......@@ -489,6 +490,7 @@ public:
void SetBlocksForMesh(int index, int nBlocks);
void SetContainsGhostZones(std::string name, avtGhostType);
void SetContainsOriginalCells(std::string name, bool);
void SetContainsOriginalNodes(std::string name, bool);
void AddGroupInformation(int nGroups, int nBlocks,
intVector &blockIds);
void UnsetExtents();
......
......@@ -784,3 +784,59 @@ avtSILRestrictionTraverser::UsesSetData(int setId) const
}
// ****************************************************************************
// Method: avtSILRestrictionTraverser::UsesAllMaterials
//
// Purpose:
// Determines if all materials are used.
//
// Returns: True if all materials are selected or there are no materials,
// false otherwise.
//
// Programmer: Kathleen Bonnell
// Creation: May 12, 2004
//
// Modifications:
//
// ****************************************************************************
bool
avtSILRestrictionTraverser::UsesAllMaterials()
{
if (preparedForMaterialSearches && materialListForChunk.size() == 0)
{
// no materials
return true;
}
int i, j;
avtSILSet_p set = silr->GetSILSet(silr->topSet);
const vector<int> &mapsOut = set->GetMapsOut();
//
// Identify the collection that has role "material"
//
const vector<unsigned char> &useSet = silr->useSet;
bool allUsed = true;
for (i = 0 ; i < mapsOut.size() && allUsed; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_MATERIAL)
{
//
// Now that we have found the material collection, look at each
// of the material subsets and determine if it is on or off.
//
const vector<int> &setList = coll->GetSubsetList();
for (j = 0 ; j < setList.size() && allUsed; j++)
{
allUsed = (useSet[setList[j]] != NoneUsed);
}
}
}
return allUsed;
}
......@@ -23,6 +23,10 @@
// Programmer: Hank Childs
// Creation: November 22, 2002
//
// Modifications:
// Kathleen Bonnell, Tue Jun 1 17:00:17 PDT 2004
// Added method 'UsesAllMaterials'.
//
// ****************************************************************************
class DBATTS_API avtSILRestrictionTraverser
......@@ -43,6 +47,7 @@ class DBATTS_API avtSILRestrictionTraverser
const std::vector<std::string> &
GetMaterials(int, bool &);
bool GetSpecies(std::vector<bool> &);
bool UsesAllMaterials(void);
protected:
......
......@@ -250,6 +250,9 @@ avtDatabase::GetOutput(const char *var, int ts)
// Kathleen Bonnell, Thu Mar 11 11:17:58 PST 2004
// DataExtents now always has only 2 componnts.
//
// Kathleen Bonnell, Fri May 28 18:26:09 PDT 2004
// Pass on containsOriginalNodes.
//
// ****************************************************************************
void
......@@ -278,6 +281,7 @@ avtDatabase::PopulateDataObjectInformation(avtDataObject_p &dob,
atts.SetZUnits(mmd->zUnits);
atts.SetContainsGhostZones(mmd->containsGhostZones);
atts.SetContainsOriginalCells(mmd->containsOriginalCells);
atts.SetContainsOriginalNodes(mmd->containsOriginalNodes);
validity.SetDisjointElements(mmd->disjointElements);
//
......@@ -1066,6 +1070,9 @@ avtDatabase::GetFileListFromTextFile(const char *textfile,
// Kathleen Bonnell, Mon Apr 19 15:49:05 PDT 2004
// Ensure that the timestep being queried is the active one.
//
// Kathleen Bonnell, Fri May 28 18:26:09 PDT 2004
// Account for pick type of DomainZone.
//
// ****************************************************************************
void
......@@ -1074,7 +1081,8 @@ avtDatabase::Query(PickAttributes *pa)
int ts = pa->GetTimeStep();
int foundDomain = pa->GetDomain();
int foundEl = pa->GetElementNumber();
int zonePick = pa->GetPickType() == PickAttributes::Zone;
int zonePick = pa->GetPickType() == PickAttributes::Zone ||
pa->GetPickType() == PickAttributes::DomainZone;
float *PPT, *CPT, ppt[3], cpt[3];
std::vector<int> incEls = pa->GetIncidentElements();
std::vector<std::string> pnodeCoords = pa->GetPnodeCoords();
......
......@@ -234,6 +234,10 @@ avtGenericDatabase::SetDatabaseMetaData(avtDatabaseMetaData *md, int timeState)
// Hank Childs, Fri Jan 9 13:46:43 PST 2004
// Use a dataset verifier before passing data into routines like the MIR.
</