Commit 7f1ee500 authored by hrchilds's avatar hrchilds
Browse files

Update from March 27, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@842 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9d77e0b8
......@@ -128,7 +128,7 @@ const char *AnnotationObject::TypeMapFormatString = "sibbDDabaas*ibbbdi";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -166,7 +166,7 @@ AnnotationObject::AnnotationObject() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -211,7 +211,7 @@ AnnotationObject::AnnotationObject(const AnnotationObject &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -231,7 +231,7 @@ AnnotationObject::~AnnotationObject()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -278,7 +278,7 @@ AnnotationObject::operator = (const AnnotationObject &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -328,7 +328,7 @@ AnnotationObject::operator == (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -349,7 +349,7 @@ AnnotationObject::operator != (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -370,7 +370,7 @@ AnnotationObject::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -398,7 +398,7 @@ AnnotationObject::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -424,7 +424,7 @@ AnnotationObject::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -451,7 +451,7 @@ AnnotationObject::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -492,7 +492,7 @@ AnnotationObject::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -643,7 +643,10 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool completeSave, bool force
// Kathleen Bonnell, Fri Mar 31 14:14:25 PST 2006
// Handle the case where the parentNode saved postion as float instead
// of double.
//
//
// Brad Whitlock, Fri Mar 23 17:08:29 PST 2007
// Added objectName.
//
// ****************************************************************************
void
......@@ -658,6 +661,8 @@ AnnotationObject::SetFromNode(DataNode *parentNode)
return;
DataNode *node;
if((node = searchNode->GetNode("objectName")) != 0)
SetObjectName(node->AsString());
if((node = searchNode->GetNode("objectType")) != 0)
{
// Allow enums to be int or string in the config file
......@@ -1073,7 +1078,7 @@ AnnotationObject::SelectText()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -1114,7 +1119,7 @@ AnnotationObject::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -1155,7 +1160,7 @@ AnnotationObject::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......@@ -1196,7 +1201,7 @@ AnnotationObject::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 20 14:41:02 PST 2007
// Creation: Fri Mar 23 17:09:08 PST 2007
//
// Modifications:
//
......
......@@ -90,7 +90,10 @@ Definition:
// Kathleen Bonnell, Fri Mar 31 14:14:25 PST 2006
// Handle the case where the parentNode saved postion as float instead
// of double.
//
//
// Brad Whitlock, Fri Mar 23 17:08:29 PST 2007
// Added objectName.
//
// ****************************************************************************
void
......@@ -105,6 +108,8 @@ AnnotationObject::SetFromNode(DataNode *parentNode)
return;
DataNode *node;
if((node = searchNode->GetNode("objectName")) != 0)
SetObjectName(node->AsString());
if((node = searchNode->GetNode("objectType")) != 0)
{
// Allow enums to be int or string in the config file
......
......@@ -78,6 +78,9 @@ View2DAttributes::TriStateMode_FromString(const std::string &s, View2DAttributes
return false;
}
// Type map format string
const char *View2DAttributes::TypeMapFormatString = "DDid";
// ****************************************************************************
// Method: View2DAttributes::View2DAttributes
//
......@@ -87,13 +90,14 @@ View2DAttributes::TriStateMode_FromString(const std::string &s, View2DAttributes
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
// ****************************************************************************
View2DAttributes::View2DAttributes() : AttributeSubject("DDid")
View2DAttributes::View2DAttributes() :
AttributeSubject(View2DAttributes::TypeMapFormatString)
{
windowCoords[0] = 0;
windowCoords[1] = 0;
......@@ -116,13 +120,14 @@ View2DAttributes::View2DAttributes() : AttributeSubject("DDid")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
// ****************************************************************************
View2DAttributes::View2DAttributes(const View2DAttributes &obj) : AttributeSubject("DDid")
View2DAttributes::View2DAttributes(const View2DAttributes &obj) :
AttributeSubject(View2DAttributes::TypeMapFormatString)
{
int i;
......@@ -147,7 +152,7 @@ View2DAttributes::View2DAttributes(const View2DAttributes &obj) : AttributeSubje
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -167,7 +172,7 @@ View2DAttributes::~View2DAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -201,7 +206,7 @@ View2DAttributes::operator = (const View2DAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -238,7 +243,7 @@ View2DAttributes::operator == (const View2DAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -259,7 +264,7 @@ View2DAttributes::operator != (const View2DAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -280,7 +285,7 @@ View2DAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -308,7 +313,7 @@ View2DAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -334,7 +339,7 @@ View2DAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -361,7 +366,7 @@ View2DAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -389,7 +394,7 @@ View2DAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -449,7 +454,7 @@ View2DAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool force
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -598,7 +603,7 @@ View2DAttributes::SelectViewportCoords()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -626,7 +631,7 @@ View2DAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -654,7 +659,7 @@ View2DAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -682,7 +687,7 @@ View2DAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 8 15:02:46 PST 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -759,7 +764,15 @@ View2DAttributes::GetUseFullFrame(const double *limits) const
if (limits == 0)
return false;
// if the limits are not initialized then doing math
// with them will cause an error so check them first.
if ( limits[0] == DBL_MAX || limits[2] == DBL_MAX ||
limits[1] == -DBL_MAX || limits[3] == -DBL_MAX )
{
return false;
}
double dlimit1 = limits[1] - limits[0];
double dlimit2 = limits[3] - limits[2];
double aspect;
......
......@@ -15,6 +15,10 @@ Definition:
// Programmer: Mark C. Miller
// Creation: July 20, 2005
//
// Modifications:
// Shelly Prevost, Fri Mar 23 15:03:31 PDT 2007
// Added code to check for DBL_MAX to avoid doing math that
// exceeded maximums and cause a crash.
// ****************************************************************************
bool
......@@ -28,7 +32,15 @@ View2DAttributes::GetUseFullFrame(const double *limits) const
if (limits == 0)
return false;
// if the limits are not initialized then doing math
// with them will cause an error so check them first.
if ( limits[0] == DBL_MAX || limits[2] == DBL_MAX ||
limits[1] == -DBL_MAX || limits[3] == -DBL_MAX )
{
return false;
}
double dlimit1 = limits[1] - limits[0];
double dlimit2 = limits[3] - limits[2];
double aspect;
......
......@@ -40,6 +40,7 @@
#include <state_exports.h>
#include <string>
#include <AttributeSubject.h>
#include <float.h>
// ****************************************************************************
// Class: View2DAttributes
......@@ -50,7 +51,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Fri Mar 23 14:57:09 PST 2007
//
// Modifications:
//
......@@ -124,6 +125,9 @@ private:
double viewportCoords[4];
int fullFrameActivationMode;
double fullFrameAutoThreshold;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
<?xml version="1.0"?>
<Attribute name="View2DAttributes" purpose="This class contains the 2d view attributes." persistent="true" exportAPI="STATE_API" exportInclude="state_exports.h" codefile="View2DAttributes.code">
<Attribute name="View2DAttributes" purpose="This class contains the 2d view attributes." persistent="true" keyframe="true" exportAPI="STATE_API" exportInclude="state_exports.h" codefile="View2DAttributes.code">
<Enum name="TriStateMode">
On
Off
......@@ -27,6 +27,9 @@
</Function>
<Function name="SetUseFullFrame" user="true" member="true">
</Function>
<Constant name="DEFAULT_FULL_FRAME_AUTO_THRESHOLD" member="false">
<Constant name="DEFAULT_FULL_FRAME_AUTO_THRESHOLD" member="true">
</Constant>
<Include file="header" quoted="false">
float.h
</Include>
</Attribute>
......@@ -39,7 +39,7 @@
#include <DataNode.h>
// Type map format string
const char *avtMeshMetaData::TypeMapFormatString = "ssbiiiiissssssbDDiisss*iissi*bibbbbibFbD";
const char *avtMeshMetaData::TypeMapFormatString = "ssbiiiiissssssbDDiisss*iissi*bibbbbibFbDi";
// ****************************************************************************
// Method: avtMeshMetaData::avtMeshMetaData
......@@ -50,7 +50,7 @@ const char *avtMeshMetaData::TypeMapFormatString = "ssbiiiiissssssbDDiisss*iissi
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -118,6 +118,7 @@ avtMeshMetaData::avtMeshMetaData() :
rectilinearGridTransform[13] = 0;
rectilinearGridTransform[14] = 0;
rectilinearGridTransform[15] = 1;
nodeOrigin = 0;
}
// ****************************************************************************
......@@ -129,7 +130,7 @@ avtMeshMetaData::avtMeshMetaData() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -188,6 +189,7 @@ avtMeshMetaData::avtMeshMetaData(const avtMeshMetaData &obj) :
for(i = 0; i < 16; ++i)
rectilinearGridTransform[i] = obj.rectilinearGridTransform[i];
nodeOrigin = obj.nodeOrigin;
SelectAll();
}
......@@ -201,7 +203,7 @@ avtMeshMetaData::avtMeshMetaData(const avtMeshMetaData &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -221,7 +223,7 @@ avtMeshMetaData::~avtMeshMetaData()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -281,6 +283,7 @@ avtMeshMetaData::operator = (const avtMeshMetaData &obj)
for(i = 0; i < 16; ++i)
rectilinearGridTransform[i] = obj.rectilinearGridTransform[i];
nodeOrigin = obj.nodeOrigin;
SelectAll();
return *this;
......@@ -295,7 +298,7 @@ avtMeshMetaData::operator = (const avtMeshMetaData &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -364,7 +367,8 @@ avtMeshMetaData::operator == (const avtMeshMetaData &obj) const
(nodesAreCritical == obj.nodesAreCritical) &&
unitCellVectors_equal &&
(rectilinearGridHasTransform == obj.rectilinearGridHasTransform) &&
rectilinearGridTransform_equal);
rectilinearGridTransform_equal &&
(nodeOrigin == obj.nodeOrigin));
}
// ****************************************************************************
......@@ -376,7 +380,7 @@ avtMeshMetaData::operator == (const avtMeshMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -397,7 +401,7 @@ avtMeshMetaData::operator != (const avtMeshMetaData &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -418,7 +422,7 @@ avtMeshMetaData::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -446,7 +450,7 @@ avtMeshMetaData::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -472,7 +476,7 @@ avtMeshMetaData::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -499,7 +503,7 @@ avtMeshMetaData::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -546,6 +550,7 @@ avtMeshMetaData::SelectAll()
Select(35, (void *)unitCellVectors, 9);
Select(36, (void *)&rectilinearGridHasTransform);
Select(37, (void *)rectilinearGridTransform, 16);
Select(38, (void *)&nodeOrigin);
}
///////////////////////////////////////////////////////////////////////////////
......
......@@ -326,6 +326,8 @@ Definition:
// Jeremy Meredith, Thu Feb 15 11:42:44 EST 2007
// Added support for rectilinear grids with an inherent transform.
//
// Mark C. Miller, Tue Mar 27 08:39:55 PDT 2007
// Added support for node origin
// ****************************************************************************
inline void
Indent(ostream &out, int indent)
......@@ -354,6 +356,9 @@ avtMeshMetaData::Print(ostream &out, int indent) const
out << "Cell origin = " << cellOrigin
<< " (origin within one block of the cells)." << endl;
Indent(out, indent);
out << "Node origin = " << nodeOrigin
<< " (origin within one block of the nodes)." << endl;
Indent(out, indent);
out << "Group origin = " << groupOrigin << endl;
Indent(out, indent);
out << "Title for domain hierarchy is " << blockTitle.c_str() << endl;
......
......@@ -51,7 +51,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 9 16:13:17 PST 2007
// Creation: Mon Mar 26 16:11:53 PST 2007
//
// Modifications:
//
......@@ -121,6 +121,7 @@ public:
float unitCellVectors[9];
bool rectilinearGridHasTransform;
double rectilinearGridTransform[16];
int nodeOrigin;
private:
// Static class format string for type map.
......
......@@ -135,6 +135,9 @@
0.000000
1.000000
</Field>
<Field name="nodeOrigin" label="nodeOrigin" type="int" access="public">
0
</Field>
<Function name="avtMeshMetaData2" user="true" member="true">
</Function>
<Function name="avtMeshMetaData3" user="true" member="true">
......
......@@ -566,6 +566,8 @@ avtDatabase::GetOutput(const char *var, int ts)
// Jeremy Meredith, Thu Feb 15 12:53:11 EST 2007
// Added support for rectilinear grids with an inherent transform.
//
// Mark C. Miller, Tue Mar 27 08:39:55 PDT 2007
// Added support for node origin
// ****************************************************************************
void
......@@ -590,6 +592,7 @@ avtDatabase::PopulateDataObjectInformation(avtDataObject_p &dob,
if (mmd != NULL)