Commit 53d82746 authored by hrchilds's avatar hrchilds

Update from November 10, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@117 18c085ea-50e0-402c-830e-de6fd14e8384
parent e25b6288
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -88,7 +88,7 @@ RenderingAttributes::StereoTypes_FromString(const std::string &s, RenderingAttri
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -103,7 +103,7 @@ RenderingAttributes::RenderingAttributes() : AttributeSubject("bibbibbi")
stereoType = CrystalEyes;
notifyForEachRender = false;
scalableRendering = false;
scalableThreshold = 2000000;
scalableThreshold = DEFAULT_SCALABLE_THRESHOLD;
}
// ****************************************************************************
......@@ -115,7 +115,7 @@ RenderingAttributes::RenderingAttributes() : AttributeSubject("bibbibbi")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -144,7 +144,7 @@ RenderingAttributes::RenderingAttributes(const RenderingAttributes &obj) : Attri
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -164,7 +164,7 @@ RenderingAttributes::~RenderingAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -194,7 +194,7 @@ RenderingAttributes::operator = (const RenderingAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -223,7 +223,7 @@ RenderingAttributes::operator == (const RenderingAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -244,7 +244,7 @@ RenderingAttributes::operator != (const RenderingAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -265,7 +265,7 @@ RenderingAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -293,7 +293,7 @@ RenderingAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -319,7 +319,7 @@ RenderingAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -346,7 +346,7 @@ RenderingAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -378,7 +378,7 @@ RenderingAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -462,7 +462,7 @@ RenderingAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -471,6 +471,7 @@ RenderingAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
void
RenderingAttributes::SetFromNode(DataNode *parentNode)
{
int i;
if(parentNode == 0)
return;
......@@ -650,7 +651,7 @@ RenderingAttributes::GetScalableThreshold() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -682,7 +683,7 @@ RenderingAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -714,7 +715,7 @@ RenderingAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......@@ -746,7 +747,7 @@ RenderingAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......
......@@ -2,3 +2,6 @@ Constant: DEFAULT_SCALABLE_THRESHOLD
Declaration: static const int DEFAULT_SCALABLE_THRESHOLD;
Definition: const int RenderingAttributes::DEFAULT_SCALABLE_THRESHOLD = 2000000;
Constant: ModeToThreshold
Declaration: static int ModeToThreshold[3];
Definition: int RenderingAttributes::ModeToThreshold[3] = {DEFAULT_SCALABLE_THRESHOLD, 0, (1<<30)};
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 26 18:47:24 PST 2003
// Creation: Wed Nov 5 09:24:54 PDT 2003
//
// Modifications:
//
......
......@@ -10,13 +10,13 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
// ****************************************************************************
WindowInformation::WindowInformation() : AttributeSubject("ibbbbiifffiDbbbb")
WindowInformation::WindowInformation() : AttributeSubject("ibbbbiifffiDbbbbb")
{
windowMode = 0;
boundingBoxNavigate = true;
......@@ -39,6 +39,7 @@ WindowInformation::WindowInformation() : AttributeSubject("ibbbbiifffiDbbbb")
lockTime = false;
cameraViewMode = false;
fullFrame = false;
usingScalableRendering = false;
}
// ****************************************************************************
......@@ -50,13 +51,13 @@ WindowInformation::WindowInformation() : AttributeSubject("ibbbbiifffiDbbbb")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
// ****************************************************************************
WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSubject("ibbbbiifffiDbbbb")
WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSubject("ibbbbiifffiDbbbbb")
{
int i;
......@@ -78,6 +79,7 @@ WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSu
lockTime = obj.lockTime;
cameraViewMode = obj.cameraViewMode;
fullFrame = obj.fullFrame;
usingScalableRendering = obj.usingScalableRendering;
SelectAll();
}
......@@ -91,7 +93,7 @@ WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSu
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -111,7 +113,7 @@ WindowInformation::~WindowInformation()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -140,6 +142,7 @@ WindowInformation::operator = (const WindowInformation &obj)
lockTime = obj.lockTime;
cameraViewMode = obj.cameraViewMode;
fullFrame = obj.fullFrame;
usingScalableRendering = obj.usingScalableRendering;
SelectAll();
}
......@@ -153,7 +156,7 @@ WindowInformation::operator = (const WindowInformation &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -185,7 +188,8 @@ WindowInformation::operator == (const WindowInformation &obj) const
(lockTools == obj.lockTools) &&
(lockTime == obj.lockTime) &&
(cameraViewMode == obj.cameraViewMode) &&
(fullFrame == obj.fullFrame));
(fullFrame == obj.fullFrame) &&
(usingScalableRendering == obj.usingScalableRendering));
}
// ****************************************************************************
......@@ -197,7 +201,7 @@ WindowInformation::operator == (const WindowInformation &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -218,7 +222,7 @@ WindowInformation::operator != (const WindowInformation &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -239,7 +243,7 @@ WindowInformation::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -267,7 +271,7 @@ WindowInformation::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -293,7 +297,7 @@ WindowInformation::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -320,7 +324,7 @@ WindowInformation::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -345,6 +349,7 @@ WindowInformation::SelectAll()
Select(13, (void *)&lockTime);
Select(14, (void *)&cameraViewMode);
Select(15, (void *)&fullFrame);
Select(16, (void *)&usingScalableRendering);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -600,6 +605,13 @@ WindowInformation::SetFullFrame(bool fullFrame_)
Select(15, (void *)&fullFrame);
}
void
WindowInformation::SetUsingScalableRendering(bool usingScalableRendering_)
{
usingScalableRendering = usingScalableRendering_;
Select(16, (void *)&usingScalableRendering);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -706,6 +718,12 @@ WindowInformation::GetFullFrame() const
return fullFrame;
}
bool
WindowInformation::GetUsingScalableRendering() const
{
return usingScalableRendering;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -729,7 +747,7 @@ WindowInformation::SelectExtents()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -756,6 +774,7 @@ WindowInformation::GetFieldName(int index) const
case 13: return "lockTime";
case 14: return "cameraViewMode";
case 15: return "fullFrame";
case 16: return "usingScalableRendering";
default: return "invalid index";
}
}
......@@ -769,7 +788,7 @@ WindowInformation::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -796,6 +815,7 @@ WindowInformation::GetFieldType(int index) const
case 13: return FieldType_bool;
case 14: return FieldType_bool;
case 15: return FieldType_bool;
case 16: return FieldType_bool;
default: return FieldType_unknown;
}
}
......@@ -809,7 +829,7 @@ WindowInformation::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -836,6 +856,7 @@ WindowInformation::GetFieldTypeName(int index) const
case 13: return "bool";
case 14: return "bool";
case 15: return "bool";
case 16: return "bool";
default: return "invalid index";
}
}
......@@ -849,7 +870,7 @@ WindowInformation::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -949,6 +970,11 @@ WindowInformation::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (fullFrame == obj.fullFrame);
}
break;
case 16:
{ // new scope
retval = (usingScalableRendering == obj.usingScalableRendering);
}
break;
default: retval = false;
}
......
......@@ -12,7 +12,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:32:07 PDT 2003
// Creation: Tue Nov 4 18:41:51 PST 2003
//
// Modifications:
//
......@@ -55,6 +55,7 @@ public:
void SetLockTime(bool lockTime_);
void SetCameraViewMode(bool cameraViewMode_);
void SetFullFrame(bool fullFrame_);
void SetUsingScalableRendering(bool usingScalableRendering_);
// Property getting methods
int GetWindowMode() const;
......@@ -74,6 +75,7 @@ public:
bool GetLockTime() const;
bool GetCameraViewMode() const;
bool GetFullFrame() const;
bool GetUsingScalableRendering() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool forceAdd);
......@@ -103,6 +105,7 @@ private:
bool lockTime;
bool cameraViewMode;
bool fullFrame;
bool usingScalableRendering;
};
#endif
......@@ -53,6 +53,9 @@
<Field name="fullFrame" label="fullFrame" type="bool">
false
</Field>
<Field name="usingScalableRendering" label="usingScalableRendering" type="bool">
false
</Field>
<Function name="SetFromNode" user="false" member="true">
</Function>
<Function name="CreateNode" user="false" member="true">
......
......@@ -44,7 +44,8 @@ class PIPELINE_API avtDataObject
void SetSource(avtDataObjectSource *);
avtDataObjectInformation &GetInfo(void) { return info; };
virtual int GetNumberOfCells(void) const = 0;
const avtDataObjectInformation &GetInfo(void) const { return info; };
virtual int GetNumberOfCells(bool polysOnly = false) const = 0;
virtual const char *GetType(void) = 0;
virtual void ReleaseData(void);
......
......@@ -42,8 +42,10 @@ class PIPELINE_API avtDataObjectInformation
void Copy(const avtDataObjectInformation &);
avtDataAttributes &GetAttributes(void) { return atts; };
avtDataValidity &GetValidity(void) { return validity; };
avtDataAttributes &GetAttributes(void) { return atts; };
const avtDataAttributes &GetAttributes(void) const { return atts; };
avtDataValidity &GetValidity(void) { return validity; };
const avtDataValidity &GetValidity(void) const { return validity; };
void Merge(const avtDataObjectInformation &);
void ParallelMerge(const ref_ptr<avtDataObjectWriter>);
......
......@@ -334,15 +334,22 @@ avtDataRepresentation::Valid(void)
// Method: avtDataRepresentation::GetNumberOfCells
//
// Purpose:
// Count number of cells in this object
// Count number of cells in this object. If we're counting polygons only
// we'll return the value for the underlying vtk's GetNumberOfCells()
// only if topoDim < 3;
//
// Programmer: Mark C. Miller
// Creation: 19Aug03
//
// Modifications:
//
// Mark C. Miller, Wed Nov 5 09:48:13 PST 2003
// Added option to count polygons only
//
// ****************************************************************************
int
avtDataRepresentation::GetNumberOfCells(void) const
avtDataRepresentation::GetNumberOfCells(int topoDim, bool polysOnly) const
{
if (asVTK == NULL)
{
......@@ -351,9 +358,25 @@ avtDataRepresentation::GetNumberOfCells(void) const
return -1;
}
else
return (int) asVTK->GetNumberOfCells();
}
{
int numCells = 0;
if (polysOnly)
{
if (topoDim < 3)
numCells = (int) asVTK->GetNumberOfCells();
else
numCells = 0;
}
else
{
numCells = (int) asVTK->GetNumberOfCells();
}
return numCells;
}
}
// ****************************************************************************
// Method: avtDataRepresentation::GetDataString
......
......@@ -69,7 +69,7 @@ class PIPELINE_API avtDataRepresentation
vtkDataSet *GetDataVTK(void);
unsigned char *GetDataString(int &, DataSetType &);
int GetNumberOfCells(void) const;
int GetNumberOfCells(int topoDim, bool polysOnly) const;
bool Valid(void);
......
......@@ -615,10 +615,15 @@ avtDataTree::GetDataRepresentation()
// Programmer: Mark C. Miller
// Creation: 19Aug03
//
// Modifications:
//
// Mark C. Miller, Wed Nov 5 09:48:13 PST 2003
// Added optional argument to count polygons only
//
// ****************************************************************************
int
avtDataTree::GetNumberOfCells(void) const
avtDataTree::GetNumberOfCells(int topoDim, bool polysOnly) const
{
if (nChildren > 0)
{
......@@ -626,19 +631,18 @@ avtDataTree::GetNumberOfCells(void) const
for (int i = 0; i < nChildren; i++)
{
if (*children[i] != NULL)
sum += children[i]->GetNumberOfCells();
sum += children[i]->GetNumberOfCells(topoDim, polysOnly);
}
return sum;
}
else if (dataRep != NULL)
{
return dataRep->GetNumberOfCells();
return dataRep->GetNumberOfCells(topoDim, polysOnly);
}
return 0;
}
// ****************************************************************************
// Method: avtDataTree::GetAllLeaves
//
......
......@@ -97,7 +97,7 @@ class PIPELINE_API avtDataTree
avtDataTree_p GetChild(int);
avtDataRepresentation &GetDataRepresentation(void);
int GetNumberOfCells(void) const;
int GetNumberOfCells(int topoDim, bool polysOnly) const;
vtkDataSet *GetSingleLeaf(void);
int GetNumberOfLeaves(void);
......
......@@ -71,6 +71,30 @@ avtDataset::avtDataset(avtDataset_p in, bool dontCopyData)
// ****************************************************************************
// Method: avtDataset::GetNumberOfCells
//
// Purpose:
// Returns number of cells in the dataset. Will count only polygons if
// polysOnly is true
//
// Programmer: Mark C. Miller
// Creation: November 5, 2003
//
// ****************************************************************************
int
avtDataset::GetNumberOfCells(bool polysOnly) const
{
int topoDim = -1;
// we only care about topoDim if we're counting polys-only
if (polysOnly)
topoDim = GetInfo().GetAttributes().GetTopologicalDimension();
return dataTree->GetNumberOfCells(topoDim, polysOnly);
}
// ****************************************************************************
// Method: avtDataset::SetDataTree
//
......
......@@ -63,8 +63,7 @@ class PIPELINE_API avtDataset : public avtDataObject
virtual ~avtDataset() {;};
virtual const char *GetType(void) { return "avtDataset"; };
virtual int GetNumberOfCells(void) const
{ return dataTree->GetNumberOfCells(); };
virtual int GetNumberOfCells(bool polysOnly = false) const;
virtual void ReleaseData(void);
virtual avtDataObject *Instance(void);
......
......@@ -76,12 +76,17 @@ avtImage::GetImage(void)
// Programmer: Mark C. Miller
// Creation: 19Aug03
//
// Modificaitons:
//
// Mark C. Miller, Wed Nov 5 09:48:13 PST 2003
// Added option to count polygons only
//
// ****************************************************************************
int
avtImage::GetNumberOfCells(void) const
avtImage::GetNumberOfCells(bool polysOnly) const
{
return image.GetNumberOfCells();
return image.GetNumberOfCells(polysOnly);
}
......
......@@ -46,7 +46,7 @@ class PIPELINE_API avtImage : public avtDataObject
virtual ~avtImage() {;};
virtual const char *GetType(void) { return "avtImage"; };
virtual int GetNumberOfCells(void) const;
virtual int GetNumberOfCells(bool polysOnly = false) const;
virtual avtDataObjectWriter
*InstantiateWriter(void);
virtual void ReleaseData(void);
......
......@@ -686,10 +686,15 @@ avtImageRepresentation::GetSize(int *_rowSize, int *_colSize)
// Programmer: Mark C. Miller
// Creation: 19Aug03
//
// Modifications:
//
// Mark C. Miller, Wed Nov 5 09:48:13 PST 2003
// Added option to count polygons only
//
// ****************************************************************************
int
avtImageRepresentation::GetNumberOfCells(void) const
avtImageRepresentation::GetNumberOfCells(bool polysOnly) const
{
if (asVTK == NULL)
{
......@@ -699,5 +704,11 @@ avtImageRepresentation::GetNumberOfCells(void) const
}
return -1;
}
return asVTK->GetNumberOfCells();
else
{
if (polysOnly)
return 0;
else
return asVTK->GetNumberOfCells();
}
}
......@@ -58,7 +58,7 @@ class PIPELINE_API avtImageRepresentation
void SetOrigin(const int rowOrigin, const int colOrigin);
void GetOrigin(int *rowOrigin, int *colOrigin) const;
virtual int GetNumberOfCells(void) const;
virtual int GetNumberOfCells(bool polysOnly = false) const;