Commit b467bad9 authored by hrchilds's avatar hrchilds
Browse files

Update from December 16, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@380 18c085ea-50e0-402c-830e-de6fd14e8384
parent 12436d66
......@@ -52,13 +52,13 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*")
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*b")
{
variables.push_back("default");
displayIncidentElements = true;
......@@ -112,6 +112,7 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
locationSuccessful = false;
displayGlobalIds = false;
globalElement = -1;
elementIsGlobal = false;
}
// ****************************************************************************
......@@ -123,13 +124,13 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*")
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*b")
{
AttributeGroupVector::const_iterator pos;
int i;
......@@ -220,6 +221,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
displayGlobalIds = obj.displayGlobalIds;
globalElement = obj.globalElement;
globalIncidentElements = obj.globalIncidentElements;
elementIsGlobal = obj.elementIsGlobal;
SelectAll();
}
......@@ -233,7 +235,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -257,7 +259,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -356,6 +358,7 @@ PickAttributes::operator = (const PickAttributes &obj)
displayGlobalIds = obj.displayGlobalIds;
globalElement = obj.globalElement;
globalIncidentElements = obj.globalIncidentElements;
elementIsGlobal = obj.elementIsGlobal;
SelectAll();
return *this;
......@@ -370,7 +373,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -475,7 +478,8 @@ PickAttributes::operator == (const PickAttributes &obj) const
(locationSuccessful == obj.locationSuccessful) &&
(displayGlobalIds == obj.displayGlobalIds) &&
(globalElement == obj.globalElement) &&
(globalIncidentElements == obj.globalIncidentElements));
(globalIncidentElements == obj.globalIncidentElements) &&
(elementIsGlobal == obj.elementIsGlobal));
}
// ****************************************************************************
......@@ -487,7 +491,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -508,7 +512,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -529,7 +533,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -557,7 +561,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -583,7 +587,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -610,7 +614,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -674,6 +678,7 @@ PickAttributes::SelectAll()
Select(52, (void *)&displayGlobalIds);
Select(53, (void *)&globalElement);
Select(54, (void *)&globalIncidentElements);
Select(55, (void *)&elementIsGlobal);
}
// ****************************************************************************
......@@ -685,7 +690,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -1280,6 +1285,13 @@ PickAttributes::SetGlobalIncidentElements(const intVector &globalIncidentElement
Select(54, (void *)&globalIncidentElements);
}
void
PickAttributes::SetElementIsGlobal(bool elementIsGlobal_)
{
elementIsGlobal = elementIsGlobal_;
Select(55, (void *)&elementIsGlobal);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1764,6 +1776,12 @@ PickAttributes::GetGlobalIncidentElements()
return globalIncidentElements;
}
bool
PickAttributes::GetElementIsGlobal() const
{
return elementIsGlobal;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1931,7 +1949,7 @@ PickAttributes::SelectGlobalIncidentElements()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -1956,7 +1974,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -1984,7 +2002,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2019,7 +2037,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2040,7 +2058,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2061,7 +2079,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2082,7 +2100,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2103,7 +2121,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2128,7 +2146,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2194,6 +2212,7 @@ PickAttributes::GetFieldName(int index) const
case 52: return "displayGlobalIds";
case 53: return "globalElement";
case 54: return "globalIncidentElements";
case 55: return "elementIsGlobal";
default: return "invalid index";
}
}
......@@ -2207,7 +2226,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2273,6 +2292,7 @@ PickAttributes::GetFieldType(int index) const
case 52: return FieldType_bool;
case 53: return FieldType_int;
case 54: return FieldType_intVector;
case 55: return FieldType_bool;
default: return FieldType_unknown;
}
}
......@@ -2286,7 +2306,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2352,6 +2372,7 @@ PickAttributes::GetFieldTypeName(int index) const
case 52: return "bool";
case 53: return "int";
case 54: return "intVector";
case 55: return "bool";
default: return "invalid index";
}
}
......@@ -2365,7 +2386,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -2694,6 +2715,11 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (globalIncidentElements == obj.globalIncidentElements);
}
break;
case 55:
{ // new scope
retval = (elementIsGlobal == obj.elementIsGlobal);
}
break;
default: retval = false;
}
......
......@@ -15,7 +15,7 @@ class PickVarInfo;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Dec 15 10:34:14 PDT 2004
// Creation: Wed Dec 15 16:57:57 PST 2004
//
// Modifications:
//
......@@ -130,6 +130,7 @@ public:
void SetDisplayGlobalIds(bool displayGlobalIds_);
void SetGlobalElement(int globalElement_);
void SetGlobalIncidentElements(const intVector &globalIncidentElements_);
void SetElementIsGlobal(bool elementIsGlobal_);
// Property getting methods
const stringVector &GetVariables() const;
......@@ -212,6 +213,7 @@ public:
int GetGlobalElement() const;
const intVector &GetGlobalIncidentElements() const;
intVector &GetGlobalIncidentElements();
bool GetElementIsGlobal() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -305,6 +307,7 @@ private:
bool displayGlobalIds;
int globalElement;
intVector globalIncidentElements;
bool elementIsGlobal;
};
#endif
......@@ -170,6 +170,9 @@
</Field>
<Field name="globalIncidentElements" label="globalIncidentElements" type="intVector" internal="true">
</Field>
<Field name="elementIsGlobal" label="elementIsGlobal" type="bool" internal="true">
false
</Field>
<Function name="PrintSelf" user="true" member="true">
</Function>
<Function name="CreateOutputString" user="true" member="true">
......
......@@ -125,13 +125,13 @@ QueryAttributes::DataType_FromString(const std::string &s, QueryAttributes::Data
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
// ****************************************************************************
QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiid*iii*ii")
QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiid*iii*iib")
{
variables.push_back("default");
worldPoint[0] = 0;
......@@ -144,6 +144,7 @@ QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiid*iii*ii")
timeStep = 0;
dataType = ActualData;
pipeIndex = -1;
useGlobalId = false;
}
// ****************************************************************************
......@@ -155,13 +156,13 @@ QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiid*iii*ii")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
// ****************************************************************************
QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject("ss*sFiid*iii*ii")
QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject("ss*sFiid*iii*iib")
{
name = obj.name;
variables = obj.variables;
......@@ -178,6 +179,7 @@ QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject(
varTypes = obj.varTypes;
dataType = obj.dataType;
pipeIndex = obj.pipeIndex;
useGlobalId = obj.useGlobalId;
SelectAll();
}
......@@ -191,7 +193,7 @@ QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject(
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -211,15 +213,16 @@ QueryAttributes::~QueryAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
// ****************************************************************************
void
QueryAttributes&
QueryAttributes::operator = (const QueryAttributes &obj)
{
if (this == &obj) return *this;
name = obj.name;
variables = obj.variables;
resultsMessage = obj.resultsMessage;
......@@ -235,8 +238,10 @@ QueryAttributes::operator = (const QueryAttributes &obj)
varTypes = obj.varTypes;
dataType = obj.dataType;
pipeIndex = obj.pipeIndex;
useGlobalId = obj.useGlobalId;
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -248,7 +253,7 @@ QueryAttributes::operator = (const QueryAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -276,7 +281,8 @@ QueryAttributes::operator == (const QueryAttributes &obj) const
(timeStep == obj.timeStep) &&
(varTypes == obj.varTypes) &&
(dataType == obj.dataType) &&
(pipeIndex == obj.pipeIndex));
(pipeIndex == obj.pipeIndex) &&
(useGlobalId == obj.useGlobalId));
}
// ****************************************************************************
......@@ -288,7 +294,7 @@ QueryAttributes::operator == (const QueryAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -309,7 +315,7 @@ QueryAttributes::operator != (const QueryAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -330,7 +336,7 @@ QueryAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -358,7 +364,7 @@ QueryAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -384,7 +390,7 @@ QueryAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -411,7 +417,7 @@ QueryAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -432,6 +438,7 @@ QueryAttributes::SelectAll()
Select(9, (void *)&varTypes);
Select(10, (void *)&dataType);
Select(11, (void *)&pipeIndex);
Select(12, (void *)&useGlobalId);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -447,7 +454,7 @@ QueryAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -536,6 +543,12 @@ QueryAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceA
node->AddNode(new DataNode("pipeIndex", pipeIndex));
}
if(completeSave || !FieldsEqual(12, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("useGlobalId", useGlobalId));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -555,7 +568,7 @@ QueryAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceA
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -625,6 +638,8 @@ QueryAttributes::SetFromNode(DataNode *parentNode)
}
if((node = searchNode->GetNode("pipeIndex")) != 0)
SetPipeIndex(node->AsInt());
if((node = searchNode->GetNode("useGlobalId")) != 0)
SetUseGlobalId(node->AsBool());
}
///////////////////////////////////////////////////////////////////////////////
......@@ -717,6 +732,13 @@ QueryAttributes::SetPipeIndex(int pipeIndex_)
Select(11, (void *)&pipeIndex);
}
void
QueryAttributes::SetUseGlobalId(bool useGlobalId_)
{
useGlobalId = useGlobalId_;
Select(12, (void *)&useGlobalId);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -829,6 +851,12 @@ QueryAttributes::GetPipeIndex() const
return pipeIndex;
}
bool
QueryAttributes::GetUseGlobalId() const
{
return useGlobalId;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -882,7 +910,7 @@ QueryAttributes::SelectVarTypes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -905,6 +933,7 @@ QueryAttributes::GetFieldName(int index) const
case 9: return "varTypes";
case 10: return "dataType";
case 11: return "pipeIndex";
case 12: return "useGlobalId";
default: return "invalid index";
}
}
......@@ -918,7 +947,7 @@ QueryAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -941,6 +970,7 @@ QueryAttributes::GetFieldType(int index) const
case 9: return FieldType_intVector;
case 10: return FieldType_enum;
case 11: return FieldType_int;
case 12: return FieldType_bool;
default: return FieldType_unknown;
}
}
......@@ -954,7 +984,7 @@ QueryAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -977,6 +1007,7 @@ QueryAttributes::GetFieldTypeName(int index) const
case 9: return "intVector";
case 10: return "enum";
case 11: return "int";
case 12: return "bool";
default: return "invalid index";
}
}
......@@ -990,7 +1021,7 @@ QueryAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 20 15:56:07 PST 2004
// Creation: Wed Dec 15 17:00:43 PST 2004
//
// Modifications:
//
......@@ -1070,6 +1101,11 @@ QueryAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (pipeIndex == obj.pipeIndex);
}