Commit fdd4b89a authored by hrchilds's avatar hrchilds

Update from July 23, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@286 18c085ea-50e0-402c-830e-de6fd14e8384
parent c6e0cff4
......@@ -10,15 +10,17 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
// ****************************************************************************
GlobalLineoutAttributes::GlobalLineoutAttributes() : AttributeSubject("b")
GlobalLineoutAttributes::GlobalLineoutAttributes() : AttributeSubject("bbi")
{
Dynamic = false;
createWindow = true;
windowId = 2;
}
// ****************************************************************************
......@@ -30,15 +32,17 @@ GlobalLineoutAttributes::GlobalLineoutAttributes() : AttributeSubject("b")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
// ****************************************************************************
GlobalLineoutAttributes::GlobalLineoutAttributes(const GlobalLineoutAttributes &obj) : AttributeSubject("b")
GlobalLineoutAttributes::GlobalLineoutAttributes(const GlobalLineoutAttributes &obj) : AttributeSubject("bbi")
{
Dynamic = obj.Dynamic;
createWindow = obj.createWindow;
windowId = obj.windowId;
SelectAll();
}
......@@ -52,7 +56,7 @@ GlobalLineoutAttributes::GlobalLineoutAttributes(const GlobalLineoutAttributes &
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -72,7 +76,7 @@ GlobalLineoutAttributes::~GlobalLineoutAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -82,6 +86,8 @@ void
GlobalLineoutAttributes::operator = (const GlobalLineoutAttributes &obj)
{
Dynamic = obj.Dynamic;
createWindow = obj.createWindow;
windowId = obj.windowId;
SelectAll();
}
......@@ -95,7 +101,7 @@ GlobalLineoutAttributes::operator = (const GlobalLineoutAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -105,7 +111,9 @@ bool
GlobalLineoutAttributes::operator == (const GlobalLineoutAttributes &obj) const
{
// Create the return value
return ((Dynamic == obj.Dynamic));
return ((Dynamic == obj.Dynamic) &&
(createWindow == obj.createWindow) &&
(windowId == obj.windowId));
}
// ****************************************************************************
......@@ -117,7 +125,7 @@ GlobalLineoutAttributes::operator == (const GlobalLineoutAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -138,7 +146,7 @@ GlobalLineoutAttributes::operator != (const GlobalLineoutAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -159,7 +167,7 @@ GlobalLineoutAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -187,7 +195,7 @@ GlobalLineoutAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -213,7 +221,7 @@ GlobalLineoutAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -240,7 +248,7 @@ GlobalLineoutAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -250,6 +258,8 @@ void
GlobalLineoutAttributes::SelectAll()
{
Select(0, (void *)&Dynamic);
Select(1, (void *)&createWindow);
Select(2, (void *)&windowId);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -263,6 +273,20 @@ GlobalLineoutAttributes::SetDynamic(bool Dynamic_)
Select(0, (void *)&Dynamic);
}
void
GlobalLineoutAttributes::SetCreateWindow(bool createWindow_)
{
createWindow = createWindow_;
Select(1, (void *)&createWindow);
}
void
GlobalLineoutAttributes::SetWindowId(int windowId_)
{
windowId = windowId_;
Select(2, (void *)&windowId);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -273,6 +297,18 @@ GlobalLineoutAttributes::GetDynamic() const
return Dynamic;
}
bool
GlobalLineoutAttributes::GetCreateWindow() const
{
return createWindow;
}
int
GlobalLineoutAttributes::GetWindowId() const
{
return windowId;
}
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
......@@ -286,7 +322,7 @@ GlobalLineoutAttributes::GetDynamic() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -298,6 +334,8 @@ GlobalLineoutAttributes::GetFieldName(int index) const
switch (index)
{
case 0: return "Dynamic";
case 1: return "createWindow";
case 2: return "windowId";
default: return "invalid index";
}
}
......@@ -311,7 +349,7 @@ GlobalLineoutAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -323,6 +361,8 @@ GlobalLineoutAttributes::GetFieldType(int index) const
switch (index)
{
case 0: return FieldType_bool;
case 1: return FieldType_bool;
case 2: return FieldType_int;
default: return FieldType_unknown;
}
}
......@@ -336,7 +376,7 @@ GlobalLineoutAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -348,6 +388,8 @@ GlobalLineoutAttributes::GetFieldTypeName(int index) const
switch (index)
{
case 0: return "bool";
case 1: return "bool";
case 2: return "int";
default: return "invalid index";
}
}
......@@ -361,7 +403,7 @@ GlobalLineoutAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -379,6 +421,16 @@ GlobalLineoutAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) cons
retval = (Dynamic == obj.Dynamic);
}
break;
case 1:
{ // new scope
retval = (createWindow == obj.createWindow);
}
break;
case 2:
{ // new scope
retval = (windowId == obj.windowId);
}
break;
default: retval = false;
}
......
......@@ -12,7 +12,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:10 PDT 2003
// Creation: Thu Jul 22 09:13:56 PDT 2004
//
// Modifications:
//
......@@ -39,9 +39,13 @@ public:
// Property setting methods
void SetDynamic(bool Dynamic_);
void SetCreateWindow(bool createWindow_);
void SetWindowId(int windowId_);
// Property getting methods
bool GetDynamic() const;
bool GetCreateWindow() const;
int GetWindowId() const;
// Keyframing methods
......@@ -52,6 +56,8 @@ public:
private:
bool Dynamic;
bool createWindow;
int windowId;
};
#endif
......@@ -7,4 +7,10 @@
<Field name="Dynamic" label="Dynamic" type="bool">
false
</Field>
<Field name="createWindow" label="createWindow" type="bool">
true
</Field>
<Field name="windowId" label="windowId" type="int" enabler="createWindow:false">
2
</Field>
</Attribute>
......@@ -49,16 +49,17 @@ PickVarInfo::Centering_FromString(const std::string &s, PickVarInfo::Centering &
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
// ****************************************************************************
PickVarInfo::PickVarInfo() : AttributeSubject("sss*d*s*d*bisi*s*i*")
PickVarInfo::PickVarInfo() : AttributeSubject("sss*d*s*d*bisi*s*i*b")
{
mixVar = false;
centering = None;
treatAsASCII = false;
}
// ****************************************************************************
......@@ -70,13 +71,13 @@ PickVarInfo::PickVarInfo() : AttributeSubject("sss*d*s*d*bisi*s*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
// ****************************************************************************
PickVarInfo::PickVarInfo(const PickVarInfo &obj) : AttributeSubject("sss*d*s*d*bisi*s*i*")
PickVarInfo::PickVarInfo(const PickVarInfo &obj) : AttributeSubject("sss*d*s*d*bisi*s*i*b")
{
variableName = obj.variableName;
variableType = obj.variableType;
......@@ -90,6 +91,7 @@ PickVarInfo::PickVarInfo(const PickVarInfo &obj) : AttributeSubject("sss*d*s*d*b
numMatsPerZone = obj.numMatsPerZone;
matNames = obj.matNames;
numSpecsPerMat = obj.numSpecsPerMat;
treatAsASCII = obj.treatAsASCII;
SelectAll();
}
......@@ -103,7 +105,7 @@ PickVarInfo::PickVarInfo(const PickVarInfo &obj) : AttributeSubject("sss*d*s*d*b
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -123,7 +125,7 @@ PickVarInfo::~PickVarInfo()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -144,6 +146,7 @@ PickVarInfo::operator = (const PickVarInfo &obj)
numMatsPerZone = obj.numMatsPerZone;
matNames = obj.matNames;
numSpecsPerMat = obj.numSpecsPerMat;
treatAsASCII = obj.treatAsASCII;
SelectAll();
}
......@@ -157,7 +160,7 @@ PickVarInfo::operator = (const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -178,7 +181,8 @@ PickVarInfo::operator == (const PickVarInfo &obj) const
(miscMessage == obj.miscMessage) &&
(numMatsPerZone == obj.numMatsPerZone) &&
(matNames == obj.matNames) &&
(numSpecsPerMat == obj.numSpecsPerMat));
(numSpecsPerMat == obj.numSpecsPerMat) &&
(treatAsASCII == obj.treatAsASCII));
}
// ****************************************************************************
......@@ -190,7 +194,7 @@ PickVarInfo::operator == (const PickVarInfo &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -211,7 +215,7 @@ PickVarInfo::operator != (const PickVarInfo &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -232,7 +236,7 @@ PickVarInfo::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -260,7 +264,7 @@ PickVarInfo::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -286,7 +290,7 @@ PickVarInfo::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -313,7 +317,7 @@ PickVarInfo::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -334,6 +338,7 @@ PickVarInfo::SelectAll()
Select(9, (void *)&numMatsPerZone);
Select(10, (void *)&matNames);
Select(11, (void *)&numSpecsPerMat);
Select(12, (void *)&treatAsASCII);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -424,6 +429,13 @@ PickVarInfo::SetNumSpecsPerMat(const intVector &numSpecsPerMat_)
Select(11, (void *)&numSpecsPerMat);
}
void
PickVarInfo::SetTreatAsASCII(bool treatAsASCII_)
{
treatAsASCII = treatAsASCII_;
Select(12, (void *)&treatAsASCII);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -560,6 +572,12 @@ PickVarInfo::GetNumSpecsPerMat()
return numSpecsPerMat;
}
bool
PickVarInfo::GetTreatAsASCII() const
{
return treatAsASCII;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -637,7 +655,7 @@ PickVarInfo::SelectNumSpecsPerMat()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -660,6 +678,7 @@ PickVarInfo::GetFieldName(int index) const
case 9: return "numMatsPerZone";
case 10: return "matNames";
case 11: return "numSpecsPerMat";
case 12: return "treatAsASCII";
default: return "invalid index";
}
}
......@@ -673,7 +692,7 @@ PickVarInfo::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -696,6 +715,7 @@ PickVarInfo::GetFieldType(int index) const
case 9: return FieldType_intVector;
case 10: return FieldType_stringVector;
case 11: return FieldType_intVector;
case 12: return FieldType_bool;
default: return FieldType_unknown;
}
}
......@@ -709,7 +729,7 @@ PickVarInfo::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -732,6 +752,7 @@ PickVarInfo::GetFieldTypeName(int index) const
case 9: return "intVector";
case 10: return "stringVector";
case 11: return "intVector";
case 12: return "bool";
default: return "invalid index";
}
}
......@@ -745,7 +766,7 @@ PickVarInfo::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -818,6 +839,11 @@ PickVarInfo::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (numSpecsPerMat == obj.numSpecsPerMat);
}
break;
case 12:
{ // new scope
retval = (treatAsASCII == obj.treatAsASCII);
}
break;
default: retval = false;
}
......@@ -975,6 +1001,9 @@ PickVarInfo::PrintSelf(ostream &os)
// Kathleen Bonnell, Thu Jun 10 17:31:37 PDT 2004
// Reduce whitespace for material vars.
//
// Kathleen Bonnell, Thu Jul 22 12:06:53 PDT 2004
// Cast values to char if treatAsASCII is true.
//
// ****************************************************************************
void
PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
......@@ -1137,7 +1166,14 @@ PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
}
else if (variableType == "scalar")
{
SNPRINTF(buff, 256, "= %g\n", values[i]);
if (!treatAsASCII)
{
SNPRINTF(buff, 256, "= %g\n", values[i]);
}
else
{
SNPRINTF(buff, 256, "= %c\n", (char) values[i]);
}
os += buff;
}
else if (variableType == "tensor")
......
......@@ -151,6 +151,9 @@ Definition:
// Kathleen Bonnell, Thu Jun 10 17:31:37 PDT 2004
// Reduce whitespace for material vars.
//
// Kathleen Bonnell, Thu Jul 22 12:06:53 PDT 2004
// Cast values to char if treatAsASCII is true.
//
// ****************************************************************************
void
PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
......@@ -313,7 +316,14 @@ PickVarInfo::CreateOutputString(std::string &os, const std::string &type)
}
else if (variableType == "scalar")
{
SNPRINTF(buff, 256, "= %g\n", values[i]);
if (!treatAsASCII)
{
SNPRINTF(buff, 256, "= %g\n", values[i]);
}
else
{
SNPRINTF(buff, 256, "= %c\n", (char) values[i]);
}
os += buff;
}
else if (variableType == "tensor")
......
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jun 10 17:45:00 PST 2004
// Creation: Thu Jul 22 12:07:34 PDT 2004
//
// Modifications:
//
......@@ -69,6 +69,7 @@ public:
void SetNumMatsPerZone(const intVector &numMatsPerZone_);
void SetMatNames(const stringVector &matNames_);
void SetNumSpecsPerMat(const intVector &numSpecsPerMat_);
void SetTreatAsASCII(bool treatAsASCII_);
// Property getting methods
const std::string &GetVariableName() const;
......@@ -93,6 +94,7 @@ public:
stringVector &GetMatNames();
const intVector &GetNumSpecsPerMat() const;
intVector &GetNumSpecsPerMat();
bool GetTreatAsASCII() const;
// Enum conversion functions
static std::string Centering_ToString(Centering);
......@@ -126,6 +128,7 @@ private:
intVector numMatsPerZone;
stringVector matNames;
intVector numSpecsPerMat;
bool treatAsASCII;
};
#endif
......@@ -31,6 +31,9 @@
</Field>
<Field name="numSpecsPerMat" label="numSpecsPerMat" type="intVector">
</Field>
<Field name="treatAsASCII" label="treatAsASCII" type="bool" internal = "true">
false
</Field>
<Function name="PrintSelf" user="true" member="true">
</Function>
<Function name="CreateOutputString" user="true" member="true">
......
......@@ -697,12 +697,16 @@ avtMeshMetaData::Print(ostream &out, int indent) const
// Hank Childs, Mon Dec 9 17:04:39 PST 2002
// Initialized validVariable.
//
// Kathleen Bonnell, Thu Jul 22 12:10:19 PDT 2004
// Initialized treatAsASCII.
//
// ****************************************************************************
avtScalarMetaData::avtScalarMetaData()
: AttributeSubject("ssibffb")
: AttributeSubject("ssibffbb")
{
validVariable = true;
treatAsASCII = false;
}
......@@ -722,17 +726,21 @@ avtScalarMetaData::avtScalarMetaData()
// Hank Childs, Mon Dec 9 17:04:39 PST 2002
// Initialized validVariable.
//
// Kathleen Bonnell, Thu Jul 22 12:10:19 PDT 2004
// Initialized treatAsASCII.
//
// ****************************************************************************
avtScalarMetaData::avtScalarMetaData(std::string n, std::string mn,
avtCentering c)
: AttributeSubject("ssibffb")
: AttributeSubject("ssibffbb")
{
name = n;
meshName = mn;
centering = c;
hasDataExtents = false;
validVariable = true;
treatAsASCII = false;
}
......@@ -754,16 +762,20 @@ avtScalarMetaData::avtScalarMetaData(std::string n, std::string mn,
// Hank Childs, Mon Dec 9 17:04:39 PST 2002
// Initialized validVariable.
//
// Kathleen Bonnell, Thu Jul 22 12:10:19 PDT 2004
// Initialized treatAsASCII.
//
// ****************************************************************************
avtScalarMetaData::avtScalarMetaData(std::string n, std::string mn,
avtCentering c, float min, float max)
: AttributeSubject("ssibffb")
: AttributeSubject("ssibffbb")
{
name = n;
meshName = mn;
centering = c;
validVariable = true;
treatAsASCII = false;
float extents[2] = { min, max };
SetExtents(extents);
......@@ -784,10 +796,13 @@ avtScalarMetaData::avtScalarMetaData(std::string n, std::string mn,
// Hank Childs, Mon Dec 9 17:04:39 PST 2002
// Initialized validVariable.
//
// Kathleen Bonnell, Thu Jul 22 12:10:19 PDT 2004
// Initialized treatAsASCII.
//
// ****************************************************************************
avtScalarMetaData::avtScalarMetaData(const avtScalarMetaData &rhs)
: AttributeSubject("ssibffb")
: AttributeSubject("ssibffbb")
{
name = rhs.name;
meshName = rhs.meshName;
......@@ -796,6 +811,7 @@ avtScalarMetaData::avtScalarMetaData(const avtScalarMetaData &rhs)
minDataExtents = rhs.minDataExtents;
maxDataExtents = rhs.maxDataExtents;
validVariable = rhs.validVariable;
treatAsASCII = rhs.treatAsASCII;
}
......@@ -828,6 +844,9 @@ avtScalarMetaData::~avtScalarMetaData()
// Hank Childs, Mon Dec 9 17:04:39 PST 2002
// Copied validVariable.
//
// Kathleen Bonnell, Thu Jul 22 12:10:19 PDT 2004
// Copied treatAsASCII.
//
// ****************************************************************************
const avtScalarMetaData &
......@@ -840,6 +859,7 @@ avtScalarMetaData::operator=(const avtScalarMetaData &rhs)
minDataExtents = rhs.minDataExtents;
maxDataExtents = rhs.maxDataExtents;
validVariable = rhs.validVariable;
treatAsASCII = rhs.treatAsASCII;
return *this;
}
......@@ -852,6 +872,10 @@ avtScalarMetaData::operator=(const avtScalarMetaData &rhs)
// Programmer: Jeremy Meredith
// Creation: August 31, 2000
//
// Modifications:
// Kathleen Bonnell, Thu Jul 22 12:10:19 PDT 2004
// Added treatAsASCII.
//
// ****************************************************************************
void
......@@ -864,6 +888,7 @@ avtScalarMetaData::SelectAll()
Select(4, (void*)&minDataExtents);
Select(5, (void*)&maxDataExtents);
Select(6, (void*)&validVariable);