Commit 56d26466 authored by hrchilds's avatar hrchilds

Update from March 15, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@832 18c085ea-50e0-402c-830e-de6fd14e8384
parent f36a3a91
This diff is collapsed.
This diff is collapsed.
......@@ -50,7 +50,7 @@ class AnnotationObject;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003
// Creation: Tue Mar 13 10:49:51 PDT 2007
//
// Modifications:
//
......@@ -63,7 +63,7 @@ public:
AnnotationObjectList(const AnnotationObjectList &obj);
virtual ~AnnotationObjectList();
virtual void operator = (const AnnotationObjectList &obj);
virtual AnnotationObjectList& operator = (const AnnotationObjectList &obj);
virtual bool operator == (const AnnotationObjectList &obj) const;
virtual bool operator != (const AnnotationObjectList &obj) const;
......@@ -77,7 +77,6 @@ public:
void SelectAnnotation();
// Property setting methods
void SetAnnotation(const AttributeGroupVector &annotation_);
// Property getting methods
const AttributeGroupVector &GetAnnotation() const;
......@@ -89,12 +88,12 @@ public:
// Attributegroup convenience methods
void AddAnnotationObject(const AnnotationObject &);
void ClearAnnotationObjects();
void RemoveAnnotationObject(int i);
int GetNumAnnotationObjects() const;
AnnotationObject &GetAnnotationObject(int i);
const AnnotationObject &GetAnnotationObject(int i) const;
void AddAnnotation(const AnnotationObject &);
void ClearAnnotations();
void RemoveAnnotation(int i);
int GetNumAnnotations() const;
AnnotationObject &GetAnnotation(int i);
const AnnotationObject &GetAnnotation(int i) const;
AnnotationObject &operator [] (int i);
const AnnotationObject &operator [] (int i) const;
......@@ -110,6 +109,9 @@ protected:
AttributeGroup *CreateSubAttributeGroup(int index);
private:
AttributeGroupVector annotation;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
This diff is collapsed.
......@@ -50,7 +50,7 @@ class ClientInformation;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 5 18:51:39 PST 2005
// Creation: Tue Mar 13 10:49:51 PDT 2007
//
// Modifications:
//
......@@ -84,12 +84,12 @@ public:
// Attributegroup convenience methods
void AddClientInformation(const ClientInformation &);
void ClearClientInformations();
void RemoveClientInformation(int i);
int GetNumClientInformations() const;
ClientInformation &GetClientInformation(int i);
const ClientInformation &GetClientInformation(int i) const;
void AddClients(const ClientInformation &);
void ClearClients();
void RemoveClients(int i);
int GetNumClients() const;
ClientInformation &GetClients(int i);
const ClientInformation &GetClients(int i) const;
ClientInformation &operator [] (int i);
const ClientInformation &operator [] (int i) const;
......@@ -105,6 +105,9 @@ protected:
AttributeGroup *CreateSubAttributeGroup(int index);
private:
AttributeGroupVector clients;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
This diff is collapsed.
This diff is collapsed.
......@@ -49,7 +49,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jul 13 17:02:15 PST 2006
// Creation: Tue Mar 13 18:40:53 PST 2007
//
// Modifications:
//
......@@ -111,11 +111,13 @@ public:
void SetRgba2(double c[4]);
bool SetByName(const char *const colorName);
const char *GetByName() const;
static bool RgbStrToRgb(const char *const s, unsigned char rgb[3]);
static void RgbToRgbStr(unsigned char rgb[3], char *s);
private:
unsigned char color[4];
// Static class format string for type map.
static const char *TypeMapFormatString;
};
// User-defined functions
static bool RgbStrToRgb(const char *const s, unsigned char rgb[3]);
static void RgbToRgbStr(unsigned char rgb[3], char *s);
#endif
......@@ -38,9 +38,9 @@
</Function>
<Function name="GetByName" user="true" member="true">
</Function>
<Function name="RgbStrToRgb" user="true" member="false">
<Function name="RgbStrToRgb" user="true" member="true">
</Function>
<Function name="RgbToRgbStr" user="true" member="false">
<Function name="RgbToRgbStr" user="true" member="true">
</Function>
<Constant name="namedColors" member="false">
</Constant>
......
This diff is collapsed.
......@@ -50,7 +50,7 @@ class ColorAttribute;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:00 PDT 2003
// Creation: Tue Mar 13 17:09:22 PST 2007
//
// Modifications:
//
......@@ -63,7 +63,7 @@ public:
ColorAttributeList(const ColorAttributeList &obj);
virtual ~ColorAttributeList();
virtual void operator = (const ColorAttributeList &obj);
virtual ColorAttributeList& operator = (const ColorAttributeList &obj);
virtual bool operator == (const ColorAttributeList &obj) const;
virtual bool operator != (const ColorAttributeList &obj) const;
......@@ -77,7 +77,6 @@ public:
void SelectColors();
// Property setting methods
void SetColors(const AttributeGroupVector &colors_);
// Property getting methods
const AttributeGroupVector &GetColors() const;
......@@ -89,12 +88,12 @@ public:
// Attributegroup convenience methods
void AddColorAttribute(const ColorAttribute &);
void ClearColorAttributes();
void RemoveColorAttribute(int i);
int GetNumColorAttributes() const;
ColorAttribute &GetColorAttribute(int i);
const ColorAttribute &GetColorAttribute(int i) const;
void AddColors(const ColorAttribute &);
void ClearColors();
void RemoveColors(int i);
int GetNumColors() const;
ColorAttribute &GetColors(int i);
const ColorAttribute &GetColors(int i) const;
ColorAttribute &operator [] (int i);
const ColorAttribute &operator [] (int i) const;
......@@ -110,6 +109,9 @@ protected:
AttributeGroup *CreateSubAttributeGroup(int index);
private:
AttributeGroupVector colors;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
This diff is collapsed.
......@@ -52,7 +52,7 @@ ColorControlPointList::GetColors(unsigned char *rgb, int ncolors) const
* control point list and put into
* local vars.
*******************************************/
int npoints = GetNumColorControlPoints();
int npoints = GetNumControlPoints();
bool equal = GetEqualSpacingFlag();
bool smooth = GetSmoothingFlag();
bool discrete = GetDiscreteFlag();
......@@ -326,7 +326,7 @@ ColorControlPointList::CompactCreateNode(DataNode *parentNode, bool completeSave
//
// Save out the color control points as vectors of uchar and float.
//
int npts = GetNumColorControlPoints();
int npts = GetNumControlPoints();
if(npts > 0)
{
unsignedCharVector compactColors;
......@@ -335,7 +335,7 @@ ColorControlPointList::CompactCreateNode(DataNode *parentNode, bool completeSave
compactPositions.reserve(npts);
for(int i = 0; i < npts; ++i)
{
const ColorControlPoint &cpt = GetColorControlPoint(i);
const ColorControlPoint &cpt = GetControlPoints(i);
const unsigned char *c = cpt.GetColors();
compactColors.push_back(c[0]);
compactColors.push_back(c[1]);
......@@ -415,7 +415,7 @@ ColorControlPointList::SetFromNode(DataNode *parentNode)
DataNode *node;
DataNode **children;
// Clear all the ColorControlPoints.
ClearColorControlPoints();
ClearControlPoints();
//
// Try setting the colors from the compact color and position vectors.
......@@ -435,7 +435,7 @@ ColorControlPointList::SetFromNode(DataNode *parentNode)
for(int i = 0; i < npts; ++i)
{
int index = i << 2;
AddColorControlPoint(ColorControlPoint(positions[i],
AddControlPoints(ColorControlPoint(positions[i],
colors[index],
colors[index+1],
colors[index+2],
......@@ -457,7 +457,7 @@ ColorControlPointList::SetFromNode(DataNode *parentNode)
{
ColorControlPoint temp;
temp.SetFromNode(children[i]);
AddColorControlPoint(temp);
AddControlPoints(temp);
}
}
}
......
......@@ -50,7 +50,7 @@ class ColorControlPoint;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 27 12:06:49 PDT 2007
// Creation: Tue Mar 13 10:49:52 PDT 2007
//
// Modifications:
//
......@@ -96,12 +96,12 @@ public:
// Attributegroup convenience methods
void AddColorControlPoint(const ColorControlPoint &);
void ClearColorControlPoints();
void RemoveColorControlPoint(int i);
int GetNumColorControlPoints() const;
ColorControlPoint &GetColorControlPoint(int i);
const ColorControlPoint &GetColorControlPoint(int i) const;
void AddControlPoints(const ColorControlPoint &);
void ClearControlPoints();
void RemoveControlPoints(int i);
int GetNumControlPoints() const;
ColorControlPoint &GetControlPoints(int i);
const ColorControlPoint &GetControlPoints(int i) const;
ColorControlPoint &operator [] (int i);
const ColorControlPoint &operator [] (int i) const;
......@@ -124,6 +124,9 @@ private:
bool equalSpacingFlag;
bool discreteFlag;
bool externalFlag;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -10,7 +10,6 @@
<Function name="AddColorTable" user="true"></Function>
<Function name="RemoveColorTable1" user="true"></Function>
<Function name="RemoveColorTable2" user="true"></Function>
<Function name="GetNumColorTables" user="true"></Function>
<Function name="CreateNode" user="false"></Function>
<Function name="SetFromNode" user="false"></Function>
<Include file="source">ColorControlPoint.h</Include>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.