Commit 675b5834 authored by hrchilds's avatar hrchilds
Browse files

Update from June 30, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@492 18c085ea-50e0-402c-830e-de6fd14e8384
parent d51c598b
/* XPM */
static const char * layout2x3_xpm[] = {
"13 13 3 1",
". c #000000",
"+ c None",
"# c #ffffff",
"+++++++++++++",
"+++++++++++++",
".............",
".###.###.###.",
".###.###.###.",
".###.###.###.",
".............",
".###.###.###.",
".###.###.###.",
".###.###.###.",
".............",
"+++++++++++++",
"+++++++++++++"};
/* XPM */
static const char * layout4x4_xpm[] = {
"13 13 2 1",
". c #000000",
"+ c #ffffff",
".............",
".++.++.++.++.",
".++.++.++.++.",
".............",
".++.++.++.++.",
".++.++.++.++.",
".............",
".++.++.++.++.",
".++.++.++.++.",
".............",
".++.++.++.++.",
".++.++.++.++.",
"............."};
......@@ -52,13 +52,13 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*bb")
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*bbi")
{
variables.push_back("default");
displayIncidentElements = true;
......@@ -114,6 +114,7 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
globalElement = -1;
elementIsGlobal = false;
displayPickLetter = true;
ghostType = 0;
}
// ****************************************************************************
......@@ -125,13 +126,13 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*bb")
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bbbbbii*bbi")
{
AttributeGroupVector::const_iterator pos;
int i;
......@@ -224,6 +225,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
globalIncidentElements = obj.globalIncidentElements;
elementIsGlobal = obj.elementIsGlobal;
displayPickLetter = obj.displayPickLetter;
ghostType = obj.ghostType;
SelectAll();
}
......@@ -237,7 +239,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -261,7 +263,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -362,6 +364,7 @@ PickAttributes::operator = (const PickAttributes &obj)
globalIncidentElements = obj.globalIncidentElements;
elementIsGlobal = obj.elementIsGlobal;
displayPickLetter = obj.displayPickLetter;
ghostType = obj.ghostType;
SelectAll();
return *this;
......@@ -376,7 +379,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -483,7 +486,8 @@ PickAttributes::operator == (const PickAttributes &obj) const
(globalElement == obj.globalElement) &&
(globalIncidentElements == obj.globalIncidentElements) &&
(elementIsGlobal == obj.elementIsGlobal) &&
(displayPickLetter == obj.displayPickLetter));
(displayPickLetter == obj.displayPickLetter) &&
(ghostType == obj.ghostType));
}
// ****************************************************************************
......@@ -495,7 +499,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -516,7 +520,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -537,7 +541,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -565,7 +569,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -591,7 +595,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -618,7 +622,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -684,6 +688,7 @@ PickAttributes::SelectAll()
Select(54, (void *)&globalIncidentElements);
Select(55, (void *)&elementIsGlobal);
Select(56, (void *)&displayPickLetter);
Select(57, (void *)&ghostType);
}
// ****************************************************************************
......@@ -695,7 +700,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -1304,6 +1309,13 @@ PickAttributes::SetDisplayPickLetter(bool displayPickLetter_)
Select(56, (void *)&displayPickLetter);
}
void
PickAttributes::SetGhostType(int ghostType_)
{
ghostType = ghostType_;
Select(57, (void *)&ghostType);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1800,6 +1812,12 @@ PickAttributes::GetDisplayPickLetter() const
return displayPickLetter;
}
int
PickAttributes::GetGhostType() const
{
return ghostType;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1967,7 +1985,7 @@ PickAttributes::SelectGlobalIncidentElements()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -1992,7 +2010,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2020,7 +2038,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2055,7 +2073,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2076,7 +2094,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2097,7 +2115,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2118,7 +2136,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2139,7 +2157,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2164,7 +2182,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2232,6 +2250,7 @@ PickAttributes::GetFieldName(int index) const
case 54: return "globalIncidentElements";
case 55: return "elementIsGlobal";
case 56: return "displayPickLetter";
case 57: return "ghostType";
default: return "invalid index";
}
}
......@@ -2245,7 +2264,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2313,6 +2332,7 @@ PickAttributes::GetFieldType(int index) const
case 54: return FieldType_intVector;
case 55: return FieldType_bool;
case 56: return FieldType_bool;
case 57: return FieldType_int;
default: return FieldType_unknown;
}
}
......@@ -2326,7 +2346,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2394,6 +2414,7 @@ PickAttributes::GetFieldTypeName(int index) const
case 54: return "intVector";
case 55: return "bool";
case 56: return "bool";
case 57: return "int";
default: return "invalid index";
}
}
......@@ -2407,7 +2428,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -2746,6 +2767,11 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (displayPickLetter == obj.displayPickLetter);
}
break;
case 57:
{ // new scope
retval = (ghostType == obj.ghostType);
}
break;
default: retval = false;
}
......@@ -3317,6 +3343,7 @@ PickAttributes::PrepareForNewPick()
cellPoint[0] = cellPoint[1] = cellPoint[2] = 0;
nodePoint[0] = nodePoint[1] = nodePoint[2] = 0;
needTransformMessage = false;
ghostType = 0;
if (!incidentElements.empty())
incidentElements.clear();
......
......@@ -568,6 +568,7 @@ PickAttributes::PrepareForNewPick()
cellPoint[0] = cellPoint[1] = cellPoint[2] = 0;
nodePoint[0] = nodePoint[1] = nodePoint[2] = 0;
needTransformMessage = false;
ghostType = 0;
if (!incidentElements.empty())
incidentElements.clear();
......
......@@ -15,7 +15,7 @@ class PickVarInfo;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Dec 28 12:29:43 PDT 2004
// Creation: Tue Jun 28 14:39:58 PST 2005
//
// Modifications:
//
......@@ -132,6 +132,7 @@ public:
void SetGlobalIncidentElements(const intVector &globalIncidentElements_);
void SetElementIsGlobal(bool elementIsGlobal_);
void SetDisplayPickLetter(bool displayPickLetter_);
void SetGhostType(int ghostType_);
// Property getting methods
const stringVector &GetVariables() const;
......@@ -216,6 +217,7 @@ public:
intVector &GetGlobalIncidentElements();
bool GetElementIsGlobal() const;
bool GetDisplayPickLetter() const;
int GetGhostType() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -311,6 +313,7 @@ private:
intVector globalIncidentElements;
bool elementIsGlobal;
bool displayPickLetter;
int ghostType;
};
#endif
......@@ -176,6 +176,9 @@
<Field name="displayPickLetter" label="displayPickLetter" type="bool" internal="false">
true
</Field>
<Field name="ghostType" label="ghostType" type="int" internal="true">
0
</Field>
<Function name="PrintSelf" user="true" member="true">
</Function>
<Function name="CreateOutputString" user="true" member="true">
......
......@@ -48,21 +48,21 @@ RenderingAttributes::GeometryRepresentation_FromString(const std::string &s, Ren
//
static const char *StereoTypes_strings[] = {
"RedBlue", "Interlaced", "CrystalEyes"
};
"RedBlue", "Interlaced", "CrystalEyes",
"RedGreen"};
std::string
RenderingAttributes::StereoTypes_ToString(RenderingAttributes::StereoTypes t)
{
int index = int(t);
if(index < 0 || index >= 3) index = 0;
if(index < 0 || index >= 4) index = 0;
return StereoTypes_strings[index];
}
std::string
RenderingAttributes::StereoTypes_ToString(int t)
{
int index = (t < 0 || t >= 3) ? 0 : t;
int index = (t < 0 || t >= 4) ? 0 : t;
return StereoTypes_strings[index];
}
......@@ -70,7 +70,7 @@ bool
RenderingAttributes::StereoTypes_FromString(const std::string &s, RenderingAttributes::StereoTypes &val)
{
val = RenderingAttributes::RedBlue;
for(int i = 0; i < 3; ++i)
for(int i = 0; i < 4; ++i)
{
if(s == StereoTypes_strings[i])
{
......@@ -128,7 +128,7 @@ RenderingAttributes::TriStateMode_FromString(const std::string &s, RenderingAttr
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -161,7 +161,7 @@ RenderingAttributes::RenderingAttributes() : AttributeSubject("biibibiibffabd"),
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -196,7 +196,7 @@ RenderingAttributes::RenderingAttributes(const RenderingAttributes &obj) : Attri
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -216,15 +216,16 @@ RenderingAttributes::~RenderingAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
// ****************************************************************************
void
RenderingAttributes&
RenderingAttributes::operator = (const RenderingAttributes &obj)
{
if (this == &obj) return *this;
antialiasing = obj.antialiasing;
geometryRepresentation = obj.geometryRepresentation;
displayListMode = obj.displayListMode;
......@@ -241,6 +242,7 @@ RenderingAttributes::operator = (const RenderingAttributes &obj)
shadowStrength = obj.shadowStrength;
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -252,7 +254,7 @@ RenderingAttributes::operator = (const RenderingAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -287,7 +289,7 @@ RenderingAttributes::operator == (const RenderingAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -308,7 +310,7 @@ RenderingAttributes::operator != (const RenderingAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -329,7 +331,7 @@ RenderingAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -357,7 +359,7 @@ RenderingAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -383,7 +385,7 @@ RenderingAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -410,7 +412,7 @@ RenderingAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -448,7 +450,7 @@ RenderingAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -570,7 +572,7 @@ RenderingAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool fo
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -630,7 +632,7 @@ RenderingAttributes::SetFromNode(DataNode *parentNode)
if(node->GetNodeType() == INT_NODE)
{
int ival = node->AsInt();
if(ival >= 0 && ival < 3)
if(ival >= 0 && ival < 4)
SetStereoType(StereoTypes(ival));
}
else if(node->GetNodeType() == STRING_NODE)
......@@ -893,7 +895,7 @@ RenderingAttributes::SelectSpecularColor()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -931,7 +933,7 @@ RenderingAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -969,7 +971,7 @@ RenderingAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -1007,7 +1009,7 @@ RenderingAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......
......@@ -15,7 +15,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sun Oct 24 07:27:47 PDT 2004
// Creation: Thu Jun 30 14:31:44 PST 2005
//
// Modifications:
//
......@@ -34,7 +34,8 @@ public:
{
RedBlue,
Interlaced,
CrystalEyes
CrystalEyes,
RedGreen
};
enum TriStateMode
{
......@@ -49,7 +50,7 @@ public: