Commit bf10c897 authored by hrchilds's avatar hrchilds

Update from December 19, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@147 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3f8a09c2
......@@ -48,7 +48,7 @@ AnimationAttributes::PlaybackMode_FromString(const std::string &s, AnimationAttr
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -70,7 +70,7 @@ AnimationAttributes::AnimationAttributes() : AttributeSubject("bii")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -94,7 +94,7 @@ AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) : Attri
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -114,7 +114,7 @@ AnimationAttributes::~AnimationAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -139,7 +139,7 @@ AnimationAttributes::operator = (const AnimationAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -163,7 +163,7 @@ AnimationAttributes::operator == (const AnimationAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -184,7 +184,7 @@ AnimationAttributes::operator != (const AnimationAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -205,7 +205,7 @@ AnimationAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -233,7 +233,7 @@ AnimationAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -259,7 +259,7 @@ AnimationAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -286,7 +286,7 @@ AnimationAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -313,14 +313,14 @@ AnimationAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
// ****************************************************************************
bool
AnimationAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
AnimationAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
{
if(parentNode == 0)
return false;
......@@ -330,19 +330,19 @@ AnimationAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Create a node for AnimationAttributes.
DataNode *node = new DataNode("AnimationAttributes");
if(!FieldsEqual(0, &defaultObject))
if(completeSave || !FieldsEqual(0, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("pipelineCachingMode", pipelineCachingMode));
}
if(!FieldsEqual(1, &defaultObject))
if(completeSave || !FieldsEqual(1, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("timeout", timeout));
}
if(!FieldsEqual(2, &defaultObject))
if(completeSave || !FieldsEqual(2, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("playbackMode", PlaybackMode_ToString(playbackMode)));
......@@ -367,7 +367,7 @@ AnimationAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -467,7 +467,7 @@ AnimationAttributes::GetPlaybackMode() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -494,7 +494,7 @@ AnimationAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -521,7 +521,7 @@ AnimationAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -548,7 +548,7 @@ AnimationAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Oct 7 10:45:40 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -56,7 +56,7 @@ public:
PlaybackMode GetPlaybackMode() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool forceAdd);
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
virtual void SetFromNode(DataNode *node);
// Enum conversion functions
......
This diff is collapsed.
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 16 12:00:58 PDT 2003
// Creation: Thu Dec 18 11:23:54 PDT 2003
//
// Modifications:
//
......@@ -238,7 +238,7 @@ public:
bool GetLegendInfoFlag() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool forceAdd);
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
virtual void SetFromNode(DataNode *node);
// Enum conversion functions
......
......@@ -87,7 +87,7 @@ AnnotationObject::FontFamily_FromString(const std::string &s, AnnotationObject::
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -124,7 +124,7 @@ AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfi"),
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -167,7 +167,7 @@ AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubje
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -187,7 +187,7 @@ AnnotationObject::~AnnotationObject()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -231,7 +231,7 @@ AnnotationObject::operator = (const AnnotationObject &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -280,7 +280,7 @@ AnnotationObject::operator == (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -301,7 +301,7 @@ AnnotationObject::operator != (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -322,7 +322,7 @@ AnnotationObject::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -350,7 +350,7 @@ AnnotationObject::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -376,7 +376,7 @@ AnnotationObject::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -403,7 +403,7 @@ AnnotationObject::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -443,14 +443,14 @@ AnnotationObject::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
// ****************************************************************************
bool
AnnotationObject::CreateNode(DataNode *parentNode, bool forceAdd)
AnnotationObject::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
{
if(parentNode == 0)
return false;
......@@ -460,52 +460,52 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool forceAdd)
// Create a node for AnnotationObject.
DataNode *node = new DataNode("AnnotationObject");
if(!FieldsEqual(0, &defaultObject))
if(completeSave || !FieldsEqual(0, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("objectType", AnnotationType_ToString(objectType)));
}
if(!FieldsEqual(1, &defaultObject))
if(completeSave || !FieldsEqual(1, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("visible", visible));
}
if(!FieldsEqual(2, &defaultObject))
if(completeSave || !FieldsEqual(2, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("active", active));
}
if(!FieldsEqual(3, &defaultObject))
if(completeSave || !FieldsEqual(3, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("position", position, 3));
}
if(!FieldsEqual(4, &defaultObject))
if(completeSave || !FieldsEqual(4, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("position2", position2, 3));
}
DataNode *textColorNode = new DataNode("textColor");
if(textColor.CreateNode(textColorNode, true))
if(textColor.CreateNode(textColorNode, completeSave, true))
{
addToParent = true;
node->AddNode(textColorNode);
}
else
delete textColorNode;
if(!FieldsEqual(6, &defaultObject))
if(completeSave || !FieldsEqual(6, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("useForegroundForTextColor", useForegroundForTextColor));
}
DataNode *color1Node = new DataNode("color1");
if(color1.CreateNode(color1Node, true))
if(color1.CreateNode(color1Node, completeSave, true))
{
addToParent = true;
node->AddNode(color1Node);
......@@ -513,50 +513,50 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool forceAdd)
else
delete color1Node;
DataNode *color2Node = new DataNode("color2");
if(color2.CreateNode(color2Node, true))
if(color2.CreateNode(color2Node, completeSave, true))
{
addToParent = true;
node->AddNode(color2Node);
}
else
delete color2Node;
if(!FieldsEqual(9, &defaultObject))
if(completeSave || !FieldsEqual(9, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("text", text));
}
if(!FieldsEqual(10, &defaultObject))
if(completeSave || !FieldsEqual(10, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("fontFamily", FontFamily_ToString(fontFamily)));
}
if(!FieldsEqual(11, &defaultObject))
if(completeSave || !FieldsEqual(11, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("fontBold", fontBold));
}
if(!FieldsEqual(12, &defaultObject))
if(completeSave || !FieldsEqual(12, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("fontItalic", fontItalic));
}
if(!FieldsEqual(13, &defaultObject))
if(completeSave || !FieldsEqual(13, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("fontShadow", fontShadow));
}
if(!FieldsEqual(14, &defaultObject))
if(completeSave || !FieldsEqual(14, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("floatAttribute1", floatAttribute1));
}
if(!FieldsEqual(15, &defaultObject))
if(completeSave || !FieldsEqual(15, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("intAttribute1", intAttribute1));
......@@ -581,7 +581,7 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -970,7 +970,7 @@ AnnotationObject::SelectText()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -1010,7 +1010,7 @@ AnnotationObject::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -1050,7 +1050,7 @@ AnnotationObject::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -1090,7 +1090,7 @@ AnnotationObject::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Nov 10 09:20:12 PDT 2003
// Creation: Thu Dec 18 11:23:55 PDT 2003
//
// Modifications:
//
......@@ -105,7 +105,7 @@ public:
int GetIntAttribute1() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool forceAdd);
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
virtual void SetFromNode(DataNode *node);
// Enum conversion functions
......
......@@ -11,7 +11,7 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -30,7 +30,7 @@ AnnotationObjectList::AnnotationObjectList() : AttributeSubject("a*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -68,7 +68,7 @@ AnnotationObjectList::AnnotationObjectList(const AnnotationObjectList &obj) : At
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -92,7 +92,7 @@ AnnotationObjectList::~AnnotationObjectList()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -131,7 +131,7 @@ AnnotationObjectList::operator = (const AnnotationObjectList &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -164,7 +164,7 @@ AnnotationObjectList::operator == (const AnnotationObjectList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -185,7 +185,7 @@ AnnotationObjectList::operator != (const AnnotationObjectList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -206,7 +206,7 @@ AnnotationObjectList::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -234,7 +234,7 @@ AnnotationObjectList::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -260,7 +260,7 @@ AnnotationObjectList::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -287,7 +287,7 @@ AnnotationObjectList::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -308,7 +308,7 @@ AnnotationObjectList::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -333,14 +333,14 @@ AnnotationObjectList::CreateSubAttributeGroup(int)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
// ****************************************************************************
bool
AnnotationObjectList::CreateNode(DataNode *parentNode, bool forceAdd)
AnnotationObjectList::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
{
if(parentNode == 0)
return false;
......@@ -350,11 +350,11 @@ AnnotationObjectList::CreateNode(DataNode *parentNode, bool forceAdd)
// Create a node for AnnotationObjectList.
DataNode *node = new DataNode("AnnotationObjectList");
if(!FieldsEqual(0, &defaultObject))
if(completeSave || !FieldsEqual(0, &defaultObject))
{
addToParent = true;
for(int i = 0; i < annotation.size(); ++i)
annotation[i]->CreateNode(node, true);
annotation[i]->CreateNode(node, completeSave, true);
}
......@@ -376,7 +376,7 @@ AnnotationObjectList::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -446,7 +446,7 @@ AnnotationObjectList::GetAnnotation()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Oct 29 10:20:58 PDT 2003
// Creation: Thu Dec 18 11:23:56 PDT 2003
//
// Modifications:
//
......@@ -471,7 +471,7 @@ AnnotationObjectList::AddAnnotationObject(const AnnotationObject &obj)
// Note: Autogenerated by xml2atts.