Commit b477df13 authored by hrchilds's avatar hrchilds
Browse files

Update from November 19, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@126 18c085ea-50e0-402c-830e-de6fd14e8384
parent b26364fe
......@@ -50,13 +50,13 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*FF")
PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*FFbs*")
{
clearWindow = false;
fulfilled = false;
......@@ -91,6 +91,7 @@ PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisi
plotBounds[3] = 0;
plotBounds[4] = 0;
plotBounds[5] = 0;
logicalZone = false;
}
// ****************************************************************************
......@@ -102,13 +103,13 @@ PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisi
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*FF")
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*FFbs*")
{
AttributeGroupVector::const_iterator pos;
int i;
......@@ -170,6 +171,8 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bb
for(i = 0; i < 6; ++i)
plotBounds[i] = obj.plotBounds[i];
logicalZone = obj.logicalZone;
zoneCoords = obj.zoneCoords;
SelectAll();
}
......@@ -183,7 +186,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bb
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -207,7 +210,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -276,6 +279,8 @@ PickAttributes::operator = (const PickAttributes &obj)
for(i = 0; i < 6; ++i)
plotBounds[i] = obj.plotBounds[i];
logicalZone = obj.logicalZone;
zoneCoords = obj.zoneCoords;
SelectAll();
}
......@@ -289,7 +294,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -365,7 +370,9 @@ PickAttributes::operator == (const PickAttributes &obj) const
(realElementNumber == obj.realElementNumber) &&
(realIncidentElements == obj.realIncidentElements) &&
nodePoint_equal &&
plotBounds_equal);
plotBounds_equal &&
(logicalZone == obj.logicalZone) &&
(zoneCoords == obj.zoneCoords));
}
// ****************************************************************************
......@@ -377,7 +384,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -398,7 +405,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -419,7 +426,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -447,7 +454,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -473,7 +480,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -500,7 +507,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -535,6 +542,8 @@ PickAttributes::SelectAll()
Select(23, (void *)&realIncidentElements);
Select(24, (void *)nodePoint, 3);
Select(25, (void *)plotBounds, 6);
Select(26, (void *)&logicalZone);
Select(27, (void *)&zoneCoords);
}
// ****************************************************************************
......@@ -546,7 +555,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -571,7 +580,7 @@ PickAttributes::CreateSubAttributeGroup(int)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -745,6 +754,18 @@ PickAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
node->AddNode(new DataNode("plotBounds", plotBounds, 6));
}
if(!FieldsEqual(26, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("logicalZone", logicalZone));
}
if(!FieldsEqual(27, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("zoneCoords", zoneCoords));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -764,7 +785,7 @@ PickAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -863,6 +884,10 @@ PickAttributes::SetFromNode(DataNode *parentNode)
SetNodePoint(node->AsFloatArray());
if((node = searchNode->GetNode("plotBounds")) != 0)
SetPlotBounds(node->AsFloatArray());
if((node = searchNode->GetNode("logicalZone")) != 0)
SetLogicalZone(node->AsBool());
if((node = searchNode->GetNode("zoneCoords")) != 0)
SetZoneCoords(node->AsStringVector());
}
///////////////////////////////////////////////////////////////////////////////
......@@ -1055,6 +1080,20 @@ PickAttributes::SetPlotBounds(const float *plotBounds_)
Select(25, (void *)plotBounds, 6);
}
void
PickAttributes::SetLogicalZone(bool logicalZone_)
{
logicalZone = logicalZone_;
Select(26, (void *)&logicalZone);
}
void
PickAttributes::SetZoneCoords(const stringVector &zoneCoords_)
{
zoneCoords = zoneCoords_;
Select(27, (void *)&zoneCoords);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1305,6 +1344,24 @@ PickAttributes::GetPlotBounds()
return plotBounds;
}
bool
PickAttributes::GetLogicalZone() const
{
return logicalZone;
}
const stringVector &
PickAttributes::GetZoneCoords() const
{
return zoneCoords;
}
stringVector &
PickAttributes::GetZoneCoords()
{
return zoneCoords;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1399,6 +1456,12 @@ PickAttributes::SelectPlotBounds()
Select(25, (void *)plotBounds, 6);
}
void
PickAttributes::SelectZoneCoords()
{
Select(27, (void *)&zoneCoords);
}
///////////////////////////////////////////////////////////////////////////////
// AttributeGroupVector convenience methods.
///////////////////////////////////////////////////////////////////////////////
......@@ -1412,7 +1475,7 @@ PickAttributes::SelectPlotBounds()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1437,7 +1500,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1465,7 +1528,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1500,7 +1563,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1521,7 +1584,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1542,7 +1605,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1563,7 +1626,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1584,7 +1647,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1609,7 +1672,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1646,6 +1709,8 @@ PickAttributes::GetFieldName(int index) const
case 23: return "RealIncidentElements";
case 24: return "nodePoint";
case 25: return "plotBounds";
case 26: return "logicalZone";
case 27: return "zoneCoords";
default: return "invalid index";
}
}
......@@ -1659,7 +1724,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1696,6 +1761,8 @@ PickAttributes::GetFieldType(int index) const
case 23: return FieldType_intVector;
case 24: return FieldType_floatArray;
case 25: return FieldType_floatArray;
case 26: return FieldType_bool;
case 27: return FieldType_stringVector;
default: return FieldType_unknown;
}
}
......@@ -1709,7 +1776,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1746,6 +1813,8 @@ PickAttributes::GetFieldTypeName(int index) const
case 23: return "intVector";
case 24: return "floatArray";
case 25: return "floatArray";
case 26: return "bool";
case 27: return "stringVector";
default: return "invalid index";
}
}
......@@ -1759,7 +1828,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:24 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -1943,6 +2012,16 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = plotBounds_equal;
}
break;
case 26:
{ // new scope
retval = (logicalZone == obj.logicalZone);
}
break;
case 27:
{ // new scope
retval = (zoneCoords == obj.zoneCoords);
}
break;
default: retval = false;
}
......@@ -1970,6 +2049,9 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
// Kathleen Bonnell, Wed Sep 10 08:02:02 PDT 2003
// Added meshInfo.
//
// Kathleen Bonnell, Tue Nov 18 10:06:40 PST 2003
// Support logical zone numbers.
//
// ****************************************************************************
void
PickAttributes::PrintSelf(ostream &os)
......@@ -2018,9 +2100,14 @@ PickAttributes::PrintSelf(ostream &os)
}
}
bool printCoords = useNodeCoords && !nodeCoords.empty();
bool printZoneCoords = logicalZone && !zoneCoords.empty();
if (pickType == Zone)
{
os << "Zone " << elementNumber << " ";
if (printZoneCoords)
{
os << zoneCoords[0].c_str() << "\n";
}
}
else if (pickType == Node)
{
......@@ -2045,6 +2132,10 @@ PickAttributes::PrintSelf(ostream &os)
{
os << nodeCoords[i].c_str() << "\n";
}
else if (printZoneCoords && pickType == Node)
{
os << zoneCoords[i].c_str() << "\n";
}
}
os << "\n";
for (i = 0; i < varInfo.size(); i++)
......@@ -2076,6 +2167,9 @@ PickAttributes::PrintSelf(ostream &os)
// Added meshInfo. So that outputstring can be created with (default)
// or without the 'pickletter', added argument withLetter.
//
// Kathleen Bonnell, Tue Nov 18 10:06:40 PST 2003
// Support logical zone numbers.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -2150,9 +2244,18 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
}
bool printCoords = useNodeCoords && !nodeCoords.empty();
bool printZoneCoords = logicalZone && !zoneCoords.empty();
if (pickType == Zone)
{
sprintf(buff, "Zone: %d\n", elementNumber);
if (!printZoneCoords)
{
sprintf(buff, "Zone: %d\n", elementNumber);
}
else
{
sprintf(buff, "Zone: %d %s\n", elementNumber,
zoneCoords[0].c_str());
}
}
else if (pickType == Node)
{
......@@ -2178,6 +2281,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
else if (pickType == Node)
{
os += "Incident zones: " ;
if (printZoneCoords)
{
os += "\n ";
}
}
for (i = 0; i < incidentElements.size(); i++)
......@@ -2189,6 +2296,11 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
sprintf(buff, "%s\n ", nodeCoords[i].c_str());
os += buff;
}
else if (printZoneCoords && pickType == Node)
{
sprintf(buff, "%s\n ", zoneCoords[i].c_str());
os += buff;
}
}
os += "\n";
......@@ -2221,6 +2333,9 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
// Kathleen Bonnell, Wed Sep 17 17:09:00 PDT 2003
// Reset realElementNumber, realIncidentElements.
//
// Kathleen Bonnell, Tue Nov 18 10:06:40 PST 2003
// Reset zoneCoords.
//
// ****************************************************************************
void
......@@ -2242,6 +2357,9 @@ PickAttributes::PrepareForNewPick()
if (!nodeCoords.empty())
nodeCoords.clear();
if (!zoneCoords.empty())
zoneCoords.clear();
realElementNumber = -1;
if (!realIncidentElements.empty())
realIncidentElements.clear();
......
......@@ -18,6 +18,9 @@ Definition:
// Kathleen Bonnell, Wed Sep 10 08:02:02 PDT 2003
// Added meshInfo.
//
// Kathleen Bonnell, Tue Nov 18 10:06:40 PST 2003
// Support logical zone numbers.
//
// ****************************************************************************
void
PickAttributes::PrintSelf(ostream &os)
......@@ -66,9 +69,14 @@ PickAttributes::PrintSelf(ostream &os)
}
}
bool printCoords = useNodeCoords && !nodeCoords.empty();
bool printZoneCoords = logicalZone && !zoneCoords.empty();
if (pickType == Zone)
{
os << "Zone " << elementNumber << " ";
if (printZoneCoords)
{
os << zoneCoords[0].c_str() << "\n";
}
}
else if (pickType == Node)
{
......@@ -93,6 +101,10 @@ PickAttributes::PrintSelf(ostream &os)
{
os << nodeCoords[i].c_str() << "\n";
}
else if (printZoneCoords && pickType == Node)
{
os << zoneCoords[i].c_str() << "\n";
}
}
os << "\n";
for (i = 0; i < varInfo.size(); i++)
......@@ -127,6 +139,9 @@ Definition:
// Added meshInfo. So that outputstring can be created with (default)
// or without the 'pickletter', added argument withLetter.
//
// Kathleen Bonnell, Tue Nov 18 10:06:40 PST 2003
// Support logical zone numbers.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -201,9 +216,18 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
}
bool printCoords = useNodeCoords && !nodeCoords.empty();
bool printZoneCoords = logicalZone && !zoneCoords.empty();
if (pickType == Zone)
{
sprintf(buff, "Zone: %d\n", elementNumber);
if (!printZoneCoords)
{
sprintf(buff, "Zone: %d\n", elementNumber);
}
else
{
sprintf(buff, "Zone: %d %s\n", elementNumber,
zoneCoords[0].c_str());
}
}
else if (pickType == Node)
{
......@@ -229,6 +253,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
else if (pickType == Node)
{
os += "Incident zones: " ;
if (printZoneCoords)
{
os += "\n ";
}
}
for (i = 0; i < incidentElements.size(); i++)
......@@ -240,6 +268,11 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
sprintf(buff, "%s\n ", nodeCoords[i].c_str());
os += buff;
}
else if (printZoneCoords && pickType == Node)
{
sprintf(buff, "%s\n ", zoneCoords[i].c_str());
os += buff;
}
}
os += "\n";
......@@ -275,6 +308,9 @@ Definition:
// Kathleen Bonnell, Wed Sep 17 17:09:00 PDT 2003
// Reset realElementNumber, realIncidentElements.
//
// Kathleen Bonnell, Tue Nov 18 10:06:40 PST 2003
// Reset zoneCoords.
//
// ****************************************************************************
void
......@@ -296,6 +332,9 @@ PickAttributes::PrepareForNewPick()
if (!nodeCoords.empty())
nodeCoords.clear();
if (!zoneCoords.empty())
zoneCoords.clear();
realElementNumber = -1;
if (!realIncidentElements.empty())
realIncidentElements.clear();
......
......@@ -15,7 +15,7 @@ class PickVarInfo;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Nov 5 17:14:23 PST 2003
// Creation: Tue Nov 18 13:59:02 PST 2003
//
// Modifications:
//
......@@ -60,6 +60,7 @@ public:
void SelectRealIncidentElements();
void SelectNodePoint();
void SelectPlotBounds();
void SelectZoneCoords();
// Property setting methods
void SetClearWindow(bool clearWindow_);
......@@ -88,6 +89,8 @@ public:
void SetRealIncidentElements(const intVector &realIncidentElements_);
void SetNodePoint(const float *nodePoint_);
void SetPlotBounds(const float *plotBounds_);
void SetLogicalZone(bool logicalZone_);
void SetZoneCoords(const stringVector &zoneCoords_);
// Property getting methods
bool GetClearWindow() const;
......@@ -131,6 +134,9 @@ public:
float *GetNodePoint();
const float *GetPlotBounds() const;
float *GetPlotBounds();
bool GetLogicalZone() const;
const stringVector &GetZoneCoords() const;