Commit fda04549 authored by bonnell's avatar bonnell

Regenerate atts

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13709 18c085ea-50e0-402c-830e-de6fd14e8384
parent fbf798fa
......@@ -115,14 +115,11 @@ AnimationAttributes::PlaybackMode_FromString(const std::string &s, AnimationAttr
return false;
}
// Type map format string
const char *AnimationAttributes::TypeMapFormatString = "ibiii";
// ****************************************************************************
// Method: AnimationAttributes::AnimationAttributes
//
// Purpose:
// Constructor for the AnimationAttributes class.
// Init utility for the AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
......@@ -133,21 +130,22 @@ const char *AnimationAttributes::TypeMapFormatString = "ibiii";
//
// ****************************************************************************
AnimationAttributes::AnimationAttributes() :
AttributeSubject(AnimationAttributes::TypeMapFormatString)
void AnimationAttributes::Init()
{
animationMode = StopMode;
pipelineCachingMode = false;
frameIncrement = 1;
timeout = 1;
playbackMode = Looping;
AnimationAttributes::SelectAll();
}
// ****************************************************************************
// Method: AnimationAttributes::AnimationAttributes
//
// Purpose:
// Copy constructor for the AnimationAttributes class.
// Copy utility for the AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
......@@ -158,8 +156,7 @@ AnimationAttributes::AnimationAttributes() :
//
// ****************************************************************************
AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) :
AttributeSubject(AnimationAttributes::TypeMapFormatString)
void AnimationAttributes::Copy(const AnimationAttributes &obj)
{
animationMode = obj.animationMode;
pipelineCachingMode = obj.pipelineCachingMode;
......@@ -167,7 +164,96 @@ AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) :
timeout = obj.timeout;
playbackMode = obj.playbackMode;
SelectAll();
AnimationAttributes::SelectAll();
}
// Type map format string
const char *AnimationAttributes::TypeMapFormatString = ANIMATIONATTRIBUTES_TMFS;
const AttributeGroup::private_tmfs_t AnimationAttributes::TmfsStruct = {ANIMATIONATTRIBUTES_TMFS};
// ****************************************************************************
// Method: AnimationAttributes::AnimationAttributes
//
// Purpose:
// Default constructor for the AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnimationAttributes::AnimationAttributes() :
AttributeSubject(AnimationAttributes::TypeMapFormatString)
{
AnimationAttributes::Init();
}
// ****************************************************************************
// Method: AnimationAttributes::AnimationAttributes
//
// Purpose:
// Constructor for the derived classes of AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnimationAttributes::AnimationAttributes(private_tmfs_t tmfs) :
AttributeSubject(tmfs.tmfs)
{
AnimationAttributes::Init();
}
// ****************************************************************************
// Method: AnimationAttributes::AnimationAttributes
//
// Purpose:
// Copy constructor for the AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) :
AttributeSubject(AnimationAttributes::TypeMapFormatString)
{
AnimationAttributes::Copy(obj);
}
// ****************************************************************************
// Method: AnimationAttributes::AnimationAttributes
//
// Purpose:
// Copy constructor for derived classes of the AnimationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj, private_tmfs_t tmfs) :
AttributeSubject(tmfs.tmfs)
{
AnimationAttributes::Copy(obj);
}
// ****************************************************************************
......@@ -209,13 +295,9 @@ AnimationAttributes&
AnimationAttributes::operator = (const AnimationAttributes &obj)
{
if (this == &obj) return *this;
animationMode = obj.animationMode;
pipelineCachingMode = obj.pipelineCachingMode;
frameIncrement = obj.frameIncrement;
timeout = obj.timeout;
playbackMode = obj.playbackMode;
SelectAll();
AnimationAttributes::Copy(obj);
return *this;
}
......
......@@ -42,6 +42,7 @@
#include <string>
#include <AttributeSubject.h>
// ****************************************************************************
// Class: AnimationAttributes
//
......@@ -73,13 +74,23 @@ public:
Swing
};
// These constructors are for objects of this class
AnimationAttributes();
AnimationAttributes(const AnimationAttributes &obj);
protected:
// These constructors are for objects derived from this class
AnimationAttributes(private_tmfs_t tmfs);
AnimationAttributes(const AnimationAttributes &obj, private_tmfs_t tmfs);
public:
virtual ~AnimationAttributes();
virtual AnimationAttributes& operator = (const AnimationAttributes &obj);
virtual bool operator == (const AnimationAttributes &obj) const;
virtual bool operator != (const AnimationAttributes &obj) const;
private:
void Init();
void Copy(const AnimationAttributes &obj);
public:
virtual const std::string TypeName() const;
virtual bool CopyAttributes(const AttributeGroup *);
......@@ -134,7 +145,8 @@ public:
ID_pipelineCachingMode,
ID_frameIncrement,
ID_timeout,
ID_playbackMode
ID_playbackMode,
ID__LAST
};
private:
......@@ -146,6 +158,8 @@ private:
// Static class format string for type map.
static const char *TypeMapFormatString;
static const private_tmfs_t TmfsStruct;
};
#define ANIMATIONATTRIBUTES_TMFS "ibiii"
#endif
......@@ -153,14 +153,11 @@ AnnotationAttributes::PathExpansionMode_FromString(const std::string &s, Annotat
return false;
}
// Type map format string
const char *AnnotationAttributes::TypeMapFormatString = "aababaiddbaaiaaisiia";
// ****************************************************************************
// Method: AnnotationAttributes::AnnotationAttributes
//
// Purpose:
// Constructor for the AnnotationAttributes class.
// Init utility for the AnnotationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
......@@ -171,10 +168,7 @@ const char *AnnotationAttributes::TypeMapFormatString = "aababaiddbaaiaaisiia";
//
// ****************************************************************************
AnnotationAttributes::AnnotationAttributes() :
AttributeSubject(AnnotationAttributes::TypeMapFormatString),
backgroundColor(255, 255, 255), foregroundColor(0, 0, 0),
gradientColor1(0, 0, 255), gradientColor2(0, 0, 0)
void AnnotationAttributes::Init()
{
userInfoFlag = true;
databaseInfoFlag = true;
......@@ -186,13 +180,15 @@ AnnotationAttributes::AnnotationAttributes() :
backgroundMode = Solid;
imageRepeatX = 1;
imageRepeatY = 1;
AnnotationAttributes::SelectAll();
}
// ****************************************************************************
// Method: AnnotationAttributes::AnnotationAttributes
//
// Purpose:
// Copy constructor for the AnnotationAttributes class.
// Copy utility for the AnnotationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
......@@ -203,8 +199,7 @@ AnnotationAttributes::AnnotationAttributes() :
//
// ****************************************************************************
AnnotationAttributes::AnnotationAttributes(const AnnotationAttributes &obj) :
AttributeSubject(AnnotationAttributes::TypeMapFormatString)
void AnnotationAttributes::Copy(const AnnotationAttributes &obj)
{
axes2D = obj.axes2D;
axes3D = obj.axes3D;
......@@ -227,7 +222,100 @@ AnnotationAttributes::AnnotationAttributes(const AnnotationAttributes &obj) :
imageRepeatY = obj.imageRepeatY;
axesArray = obj.axesArray;
SelectAll();
AnnotationAttributes::SelectAll();
}
// Type map format string
const char *AnnotationAttributes::TypeMapFormatString = ANNOTATIONATTRIBUTES_TMFS;
const AttributeGroup::private_tmfs_t AnnotationAttributes::TmfsStruct = {ANNOTATIONATTRIBUTES_TMFS};
// ****************************************************************************
// Method: AnnotationAttributes::AnnotationAttributes
//
// Purpose:
// Default constructor for the AnnotationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnnotationAttributes::AnnotationAttributes() :
AttributeSubject(AnnotationAttributes::TypeMapFormatString),
backgroundColor(255, 255, 255), foregroundColor(0, 0, 0),
gradientColor1(0, 0, 255), gradientColor2(0, 0, 0)
{
AnnotationAttributes::Init();
}
// ****************************************************************************
// Method: AnnotationAttributes::AnnotationAttributes
//
// Purpose:
// Constructor for the derived classes of AnnotationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnnotationAttributes::AnnotationAttributes(private_tmfs_t tmfs) :
AttributeSubject(tmfs.tmfs),
backgroundColor(255, 255, 255), foregroundColor(0, 0, 0),
gradientColor1(0, 0, 255), gradientColor2(0, 0, 0)
{
AnnotationAttributes::Init();
}
// ****************************************************************************
// Method: AnnotationAttributes::AnnotationAttributes
//
// Purpose:
// Copy constructor for the AnnotationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnnotationAttributes::AnnotationAttributes(const AnnotationAttributes &obj) :
AttributeSubject(AnnotationAttributes::TypeMapFormatString)
{
AnnotationAttributes::Copy(obj);
}
// ****************************************************************************
// Method: AnnotationAttributes::AnnotationAttributes
//
// Purpose:
// Copy constructor for derived classes of the AnnotationAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AnnotationAttributes::AnnotationAttributes(const AnnotationAttributes &obj, private_tmfs_t tmfs) :
AttributeSubject(tmfs.tmfs)
{
AnnotationAttributes::Copy(obj);
}
// ****************************************************************************
......@@ -269,28 +357,9 @@ AnnotationAttributes&
AnnotationAttributes::operator = (const AnnotationAttributes &obj)
{
if (this == &obj) return *this;
axes2D = obj.axes2D;
axes3D = obj.axes3D;
userInfoFlag = obj.userInfoFlag;
userInfoFont = obj.userInfoFont;
databaseInfoFlag = obj.databaseInfoFlag;
databaseInfoFont = obj.databaseInfoFont;
databaseInfoExpansionMode = obj.databaseInfoExpansionMode;
databaseInfoTimeScale = obj.databaseInfoTimeScale;
databaseInfoTimeOffset = obj.databaseInfoTimeOffset;
legendInfoFlag = obj.legendInfoFlag;
backgroundColor = obj.backgroundColor;
foregroundColor = obj.foregroundColor;
gradientBackgroundStyle = obj.gradientBackgroundStyle;
gradientColor1 = obj.gradientColor1;
gradientColor2 = obj.gradientColor2;
backgroundMode = obj.backgroundMode;
backgroundImage = obj.backgroundImage;
imageRepeatX = obj.imageRepeatX;
imageRepeatY = obj.imageRepeatY;
axesArray = obj.axesArray;
SelectAll();
AnnotationAttributes::Copy(obj);
return *this;
}
......
......@@ -41,6 +41,7 @@
#include <state_exports.h>
#include <string>
#include <AttributeSubject.h>
#include <Axes2D.h>
#include <Axes3D.h>
#include <FontAttributes.h>
......@@ -89,13 +90,23 @@ public:
SmartDirectory
};
// These constructors are for objects of this class
AnnotationAttributes();
AnnotationAttributes(const AnnotationAttributes &obj);
protected:
// These constructors are for objects derived from this class
AnnotationAttributes(private_tmfs_t tmfs);
AnnotationAttributes(const AnnotationAttributes &obj, private_tmfs_t tmfs);
public:
virtual ~AnnotationAttributes();
virtual AnnotationAttributes& operator = (const AnnotationAttributes &obj);
virtual bool operator == (const AnnotationAttributes &obj) const;
virtual bool operator != (const AnnotationAttributes &obj) const;
private:
void Init();
void Copy(const AnnotationAttributes &obj);
public:
virtual const std::string TypeName() const;
virtual bool CopyAttributes(const AttributeGroup *);
......@@ -221,7 +232,8 @@ public:
ID_backgroundImage,
ID_imageRepeatX,
ID_imageRepeatY,
ID_axesArray
ID_axesArray,
ID__LAST
};
private:
......@@ -248,6 +260,8 @@ private:
// Static class format string for type map.
static const char *TypeMapFormatString;
static const private_tmfs_t TmfsStruct;
};
#define ANNOTATIONATTRIBUTES_TMFS "aababaiddbaaiaaisiia"
#endif
......@@ -508,9 +508,9 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode)
DataNode *node;
DataNode **children;
// Clear all the AnnotationObjects.
ClearAnnotations();
// Clear all the AnnotationObjects if we got any.
bool clearedAnnotations = false;
// Go through all of the children and construct a new
// AnnotationObject for each one of them.
children = searchNode->GetChildren();
......@@ -520,6 +520,11 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode)
{
if(children[i]->GetKey() == std::string("AnnotationObject"))
{
if (!clearedAnnotations)
{
ClearAnnotations();
clearedAnnotations = true;
}
AnnotationObject temp;
temp.SetFromNode(children[i]);
AddAnnotation(temp);
......
......@@ -39,14 +39,11 @@
#include <AppearanceAttributes.h>
#include <DataNode.h>
// Type map format string
const char *AppearanceAttributes::TypeMapFormatString = "bssssissssi";
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
// Purpose:
// Constructor for the AppearanceAttributes class.
// Init utility for the AppearanceAttributes class.
//
// Note: Autogenerated by xml2atts.
//
......@@ -57,8 +54,7 @@ const char *AppearanceAttributes::TypeMapFormatString = "bssssissssi";
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes() :
AttributeSubject(AppearanceAttributes::TypeMapFormatString)
void AppearanceAttributes::Init()
{
useSystemDefault = true;
background = "#c0c0c0";
......@@ -66,13 +62,15 @@ AppearanceAttributes::AppearanceAttributes() :
fontName = "Helvetica,12,-1,5,50,0,0,0,0,0";
InitializeStyle();
orientation = 0;
AppearanceAttributes::SelectAll();
}
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
// Purpose:
// Copy constructor for the AppearanceAttributes class.
// Copy utility for the AppearanceAttributes class.
//
// Note: Autogenerated by xml2atts.
//
......@@ -83,8 +81,7 @@ AppearanceAttributes::AppearanceAttributes() :
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes(const AppearanceAttributes &obj) :
AttributeSubject(AppearanceAttributes::TypeMapFormatString)
void AppearanceAttributes::Copy(const AppearanceAttributes &obj)
{
useSystemDefault = obj.useSystemDefault;
background = obj.background;
......@@ -98,7 +95,96 @@ AppearanceAttributes::AppearanceAttributes(const AppearanceAttributes &obj) :
defaultStyle = obj.defaultStyle;
defaultOrientation = obj.defaultOrientation;
SelectAll();
AppearanceAttributes::SelectAll();
}
// Type map format string
const char *AppearanceAttributes::TypeMapFormatString = APPEARANCEATTRIBUTES_TMFS;
const AttributeGroup::private_tmfs_t AppearanceAttributes::TmfsStruct = {APPEARANCEATTRIBUTES_TMFS};
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
// Purpose:
// Default constructor for the AppearanceAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes() :
AttributeSubject(AppearanceAttributes::TypeMapFormatString)
{
AppearanceAttributes::Init();
}
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
// Purpose:
// Constructor for the derived classes of AppearanceAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes(private_tmfs_t tmfs) :
AttributeSubject(tmfs.tmfs)
{
AppearanceAttributes::Init();
}
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
// Purpose:
// Copy constructor for the AppearanceAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes(const AppearanceAttributes &obj) :
AttributeSubject(AppearanceAttributes::TypeMapFormatString)
{
AppearanceAttributes::Copy(obj);
}
// ****************************************************************************
// Method: AppearanceAttributes::AppearanceAttributes
//
// Purpose:
// Copy constructor for derived classes of the AppearanceAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: omitted
//
// Modifications:
//
// ****************************************************************************
AppearanceAttributes::AppearanceAttributes(const AppearanceAttributes &obj, private_tmfs_t tmfs) :
AttributeSubject(tmfs.tmfs)
{
AppearanceAttributes::Copy(obj);
}
// ****************************************************************************
......@@ -140,19 +226,9 @@ AppearanceAttributes&
AppearanceAttributes::operator = (const AppearanceAttributes &obj)
{
if (this == &obj) return *this;
useSystemDefault = obj.useSystemDefault;
background = obj.background;
foreground = obj.foreground;
fontName = obj.fontName;
style = obj.style;
orientation = obj.orientation;
defaultForeground = obj.defaultForeground;
defaultBackground = obj.defaultBackground;
defaultFontName = obj.defaultFontName;
defaultStyle = obj.defaultStyle;
defaultOrientation = obj.defaultOrientation;
SelectAll();
AppearanceAttributes::Copy(obj);
return *this;
}
......
......@@ -42,6 +42,7 @@
#include <string>
#include <AttributeSubject.h>