Commit 3dbdda1c authored by hrchilds's avatar hrchilds
Browse files

Update from April 26, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@457 18c085ea-50e0-402c-830e-de6fd14e8384
parent 710946ca
......@@ -7,33 +7,33 @@ VISITHOME=/usr/gapps/visit
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/current/linux
MESA=$VISITHOME/mesa/current/linux_rhel3_gcc_3.2.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/redhat_7
VTK=$VISITHOME/vtk/2003.10.28/linux_rhel3_gcc_3.2.3
fi
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/bin
QT_BIN=$VISITHOME/qt/3.3.2/linux_rhel3_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_rhel3_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_redhat_gcc_2.96/lib
QT_LIB=$VISITHOME/qt/3.3.2/linux_rhel3_gcc_3.2.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/redhat_6
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
##
......@@ -56,36 +56,36 @@ MPI_LIBS="-lmpich"
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux_rhel3_gcc_3.2.3/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux_rhel3_gcc_3.2.3/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=/usr/gapps/visit/hdf4/1.5/redhat_7/include
DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
DEFAULT_HDF4_FLAGS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/include
DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
MILI_DIR=/usr/gapps/visit/mili/current/linux_rhel3_gcc_3.2.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/redhat_7_ia32/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.3-pre4/linux_rhel3_gcc_3.2.3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.3-pre4/linux_rhel3_gcc_3.2.3/lib
......@@ -640,6 +640,13 @@ avtBoxFilter::GeneralExecute(vtkDataSet *in_ds)
// Programmer: Hank Childs
// Creation: April 24, 2005
//
// Modidfications:
// Eric Brugger, Tue Apr 26 08:10:10 PDT 2005
// I added code to properly handle the case where the number of
// coordinates was one. I also fixed the logic to properly handle
// the case where the end of the range corresponded to a coordinate
// value and the amount of cell in range flag was some.
//
// ****************************************************************************
static bool
......@@ -657,6 +664,19 @@ GetRange(vtkDataArray *c, float Rmin, float Rmax, bool needAll,
if (cMax < Rmin)
return false;
//
// Handle special case where the number of coordinates is one.
//
if (nC == 1)
{
min = 0;
max = 0;
return true;
}
//
// Handle the general case.
//
bool setMin = false;
bool setMax = false;
for (int i = 0 ; i < nC-1 ; i++)
......@@ -664,7 +684,7 @@ GetRange(vtkDataArray *c, float Rmin, float Rmax, bool needAll,
float zMin = c->GetTuple1(i);
float zMax = c->GetTuple1(i+1);
bool allZoneInRange = (zMin >= Rmin && zMax <= Rmax);
bool partZoneInRange = (zMax > Rmin && zMin < Rmax);
bool partZoneInRange = (zMax >= Rmin && zMin <= Rmax);
bool zoneInRange = (needAll ? allZoneInRange : partZoneInRange);
if (zoneInRange && !setMin)
{
......
<?xml version="1.0"?>
<Plugin name="Project" type="operator" label="Project" version="1.0" enabled="true" iconFile="Project.xpm">
<Attribute name="ProjectAttributes" purpose="Project data from three to two dimensions" persistent="false" exportAPI="" exportInclude="">
<Attribute name="ProjectAttributes" purpose="Project data from three to two dimensions" persistent="true" exportAPI="" exportInclude="">
<Enum name="ProjectionType">
XYCartesian
ZRCylindrical
......
......@@ -47,7 +47,7 @@ ProjectAttributes::ProjectionType_FromString(const std::string &s, ProjectAttrib
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -67,7 +67,7 @@ ProjectAttributes::ProjectAttributes() : AttributeSubject("i")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -89,7 +89,7 @@ ProjectAttributes::ProjectAttributes(const ProjectAttributes &obj) : AttributeSu
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -109,18 +109,20 @@ ProjectAttributes::~ProjectAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
// ****************************************************************************
void
ProjectAttributes&
ProjectAttributes::operator = (const ProjectAttributes &obj)
{
if (this == &obj) return *this;
projectionType = obj.projectionType;
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -132,7 +134,7 @@ ProjectAttributes::operator = (const ProjectAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -154,7 +156,7 @@ ProjectAttributes::operator == (const ProjectAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -175,7 +177,7 @@ ProjectAttributes::operator != (const ProjectAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -196,7 +198,7 @@ ProjectAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -224,7 +226,7 @@ ProjectAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -250,7 +252,7 @@ ProjectAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -277,7 +279,7 @@ ProjectAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -289,6 +291,97 @@ ProjectAttributes::SelectAll()
Select(0, (void *)&projectionType);
}
///////////////////////////////////////////////////////////////////////////////
// Persistence methods
///////////////////////////////////////////////////////////////////////////////
// ****************************************************************************
// Method: ProjectAttributes::CreateNode
//
// Purpose:
// This method creates a DataNode representation of the object so it can be saved to a config file.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
// ****************************************************************************
bool
ProjectAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
{
if(parentNode == 0)
return false;
ProjectAttributes defaultObject;
bool addToParent = false;
// Create a node for ProjectAttributes.
DataNode *node = new DataNode("ProjectAttributes");
if(completeSave || !FieldsEqual(0, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("projectionType", ProjectionType_ToString(projectionType)));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
parentNode->AddNode(node);
else
delete node;
return (addToParent || forceAdd);
}
// ****************************************************************************
// Method: ProjectAttributes::SetFromNode
//
// Purpose:
// This method sets attributes in this object from values in a DataNode representation of the object.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
// ****************************************************************************
void
ProjectAttributes::SetFromNode(DataNode *parentNode)
{
int i;
if(parentNode == 0)
return;
DataNode *searchNode = parentNode->GetNode("ProjectAttributes");
if(searchNode == 0)
return;
DataNode *node;
if((node = searchNode->GetNode("projectionType")) != 0)
{
// Allow enums to be int or string in the config file
if(node->GetNodeType() == INT_NODE)
{
int ival = node->AsInt();
if(ival >= 0 && ival < 2)
SetProjectionType(ProjectionType(ival));
}
else if(node->GetNodeType() == STRING_NODE)
{
ProjectionType value;
if(ProjectionType_FromString(node->AsString(), value))
SetProjectionType(value);
}
}
}
///////////////////////////////////////////////////////////////////////////////
// Set property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -323,7 +416,7 @@ ProjectAttributes::GetProjectionType() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -348,7 +441,7 @@ ProjectAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -373,7 +466,7 @@ ProjectAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -398,7 +491,7 @@ ProjectAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......
......@@ -12,7 +12,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 18 14:35:36 PST 2004
// Creation: Tue Apr 26 11:32:23 PDT 2005
//
// Modifications:
//
......@@ -31,7 +31,7 @@ public:
ProjectAttributes(const ProjectAttributes &obj);
virtual ~ProjectAttributes();
virtual void operator = (const ProjectAttributes &obj);
virtual ProjectAttributes& operator = (const ProjectAttributes &obj);
virtual bool operator == (const ProjectAttributes &obj) const;
virtual bool operator != (const ProjectAttributes &obj) const;
......@@ -49,6 +49,10 @@ public:
// Property getting methods
ProjectionType GetProjectionType() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
virtual void SetFromNode(DataNode *node);
// Enum conversion functions
static std::string ProjectionType_ToString(ProjectionType);
static bool ProjectionType_FromString(const std::string &, ProjectionType &);
......
......@@ -11,7 +11,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Tue May 18 14:35:40 PST 2004
// Creation: Tue Apr 26 11:33:13 PDT 2005
//
// ****************************************************************************
......@@ -157,12 +157,12 @@ PyProjectAttributes_StringRepresentation(const ProjectAttributes *atts)
const char *projectionType_names = "XYCartesian, ZRCylindrical";
if(atts->GetProjectionType() == ProjectAttributes::XYCartesian)
{
SNPRINTF(tmpStr, 10000, "projectionType = XYCartesian # %s\n", projectionType_names);
SNPRINTF(tmpStr, 1000, "projectionType = XYCartesian # %s\n", projectionType_names);
str += tmpStr;
}
else
{
SNPRINTF(tmpStr, 10000, "projectionType = ZRCylindrical # %s\n", projectionType_names);
SNPRINTF(tmpStr, 1000, "projectionType = ZRCylindrical # %s\n", projectionType_names);
str += tmpStr;
}
......
......@@ -11,7 +11,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Sat Jan 29 19:46:19 PST 2005
// Creation: Tue Apr 26 12:02:08 PDT 2005
//
// ****************************************************************************
......@@ -573,8 +573,8 @@ PyResamplePluginAttributes_StringRepresentation(const ResamplePluginAttributes *
str += tmpStr;
}
SNPRINTF(tmpStr, 1000, "tieResolverVariable = \"%s\"\n", atts->GetTieResolverVariable().c_str());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "tieResolverVariable = \"%s\"\n", atts->GetTieResolverVariable().c_str());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "defaultValue = %g\n", atts->GetDefaultValue());
str += tmpStr;
return PyString_FromString(str.c_str());
......
......@@ -3,7 +3,7 @@
<Files components="E">
avtResamplePluginFilter.C
</Files>
<Attribute name="ResamplePluginAttributes" purpose="Atts for Resample operator" persistent="false" exportAPI="" exportInclude="">
<Attribute name="ResamplePluginAttributes" purpose="Atts for Resample operator" persistent="true" exportAPI="" exportInclude="">
<Enum name="TieResolver">
random
largest
......
......@@ -48,7 +48,7 @@ ResamplePluginAttributes::TieResolver_FromString(const std::string &s, ResampleP
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -80,7 +80,7 @@ ResamplePluginAttributes::ResamplePluginAttributes() : AttributeSubject("ddiddib
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -114,7 +114,7 @@ ResamplePluginAttributes::ResamplePluginAttributes(const ResamplePluginAttribute
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -134,7 +134,7 @@ ResamplePluginAttributes::~ResamplePluginAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -171,7 +171,7 @@ ResamplePluginAttributes::operator = (const ResamplePluginAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -205,7 +205,7 @@ ResamplePluginAttributes::operator == (const ResamplePluginAttributes &obj) cons
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -226,7 +226,7 @@ ResamplePluginAttributes::operator != (const ResamplePluginAttributes &obj) cons
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -247,7 +247,7 @@ ResamplePluginAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -275,7 +275,7 @@ ResamplePluginAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -301,7 +301,7 @@ ResamplePluginAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -328,7 +328,7 @@ ResamplePluginAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Jan 29 19:46:18 PST 2005
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
......@@ -352,6 +352,193 @@ ResamplePluginAttributes::SelectAll()
Select(12, (void *)&defaultValue);
}
///////////////////////////////////////////////////////////////////////////////
// Persistence methods
///////////////////////////////////////////////////////////////////////////////
// ****************************************************************************
// Method: ResamplePluginAttributes::CreateNode
//
// Purpose:
// This method creates a DataNode representation of the object so it can be saved to a config file.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Apr 26 12:02:10 PDT 2005
//
// Modifications:
//
// ****************************************************************************
bool
ResamplePluginAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
{
if(parentNode == 0)
return false;
ResamplePluginAttributes defaultObject;
bool addToParent = false;
// Create a node for ResamplePluginAttributes.
DataNode *node = new DataNode("ResamplePluginAttributes");
if(completeSave || !FieldsEqual(0, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("startX", startX));
}
if(completeSave || !FieldsEqual(1, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("endX", endX));
}
if(completeSave || !FieldsEqual(2, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("samplesX", samplesX));
}
if(completeSave || !FieldsEqual(3, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("startY", startY));
}