Commit 103c6df1 authored by bonnell's avatar bonnell
Browse files

Update atts generator to remove unreferenced 'DataNode *node' and 'DataNode...

Update atts generator to remove unreferenced 'DataNode *node' and 'DataNode **children' where appropriate, regenerate atts.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21590 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4dba8546
......@@ -506,7 +506,6 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode)
if(searchNode == 0)
return;
DataNode *node;
DataNode **children;
// Clear all the AnnotationObjects if we got any.
......
......@@ -505,7 +505,6 @@ ColorAttributeList::SetFromNode(DataNode *parentNode)
if(searchNode == 0)
return;
DataNode *node;
DataNode **children;
// Clear all the ColorAttributes if we got any.
......
......@@ -511,7 +511,6 @@ ExpressionList::SetFromNode(DataNode *parentNode)
if(searchNode == 0)
return;
DataNode *node;
DataNode **children;
// Clear all the Expressions if we got any.
......
......@@ -505,7 +505,6 @@ GaussianControlPointList::SetFromNode(DataNode *parentNode)
if(searchNode == 0)
return;
DataNode *node;
DataNode **children;
// Clear all the GaussianControlPoints if we got any.
......
......@@ -505,7 +505,6 @@ HostProfileList::SetFromNode(DataNode *parentNode)
if(searchNode == 0)
return;
DataNode *node;
DataNode **children;
// Clear all the MachineProfiles if we got any.
......
......@@ -1081,7 +1081,6 @@ PickAttributes::SetFromNode(DataNode *parentNode)
return;
DataNode *node;
DataNode **children;
if((node = searchNode->GetNode("variables")) != 0)
SetVariables(node->AsStringVector());
if((node = searchNode->GetNode("showIncidentElements")) != 0)
......
......@@ -505,7 +505,6 @@ PlotList::SetFromNode(DataNode *parentNode)
if(searchNode == 0)
return;
DataNode *node;
DataNode **children;
// Clear all the Plots if we got any.
......
......@@ -55,7 +55,7 @@
// Creation: omitted
//
// Modifications:
//
//
// ****************************************************************************
class STATE_API WindowInformation : public AttributeSubject
......
......@@ -45,7 +45,7 @@
// Class: StaggerAttributes
//
// Purpose:
// This class contains attributes for the Stagger operator.
// This class contains attributes for the stagger operator.
//
// Notes: Autogenerated by xml2atts.
//
......
......@@ -2270,6 +2270,15 @@ private:
}
return false;
}
bool HavePersistentAGVectors()
{
for (size_t i=0; i<fields.size(); i++)
{
if (fields[i]->type=="attVector" && fields[i]->persistent)
return true;
}
return false;
}
bool HaveSoloAGVector()
{
int count = 0;
......@@ -2936,8 +2945,9 @@ private:
c << " if(searchNode == 0)" << Endl;
c << " return;" << Endl;
c << Endl;
c << " DataNode *node;" << Endl;
if (HaveAGVectors())
if (!(fields.size() == 1 && fields[0]->type=="attVector"))
c << " DataNode *node;" << Endl;
if (HavePersistentAGVectors())
c << " DataNode **children;" << Endl;
if(HasCode(mName, 0))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment