Commit 6ee7b811 authored by hrchilds's avatar hrchilds

Update from June 28, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@24 18c085ea-50e0-402c-830e-de6fd14e8384
parent c3db4763
......@@ -51,8 +51,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/lib
##
## Location of installed PDB library.
......
......@@ -51,8 +51,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/lib
##
## Location of installed PDB library.
......
......@@ -51,8 +51,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/lib
##
## Location of installed PDB library.
......
......@@ -78,8 +78,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/hdf4/1.4.0/IRIX64/serial/n32/debug/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/IRIX64/serial/n32/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/IRIX64/serial/n32/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/IRIX64/serial/n32/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/IRIX64/serial/n32/optim/lib
##
## Location of installed PDB library.
......
......@@ -51,8 +51,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/lib
##
## Location of installed PDB library.
......
......@@ -51,8 +51,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/lib
##
## Location of installed PDB library.
......
......@@ -65,6 +65,6 @@ DEFAULT_HDF4_LIBS=/usr/gapps/hdf4/1.4.0/SunOS/gcc/static/debug/lib
#
# HDF5
#
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/SunOS/serial/32/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/SunOS/serial/32/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/SunOS/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/SunOS/serial/default/optim/lib
......@@ -65,6 +65,6 @@ DEFAULT_HDF4_LIBS=/usr/gapps/hdf4/1.4.0/SunOS/gcc/static/debug/lib
#
# HDF5
#
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/SunOS/serial/32/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/SunOS/serial/32/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/SunOS/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/SunOS/serial/default/optim/lib
......@@ -51,8 +51,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/1.5/redhat_7/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/Linux/serial/default/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/Linux/serial/default/optim/lib
##
## Location of installed PDB library.
......
......@@ -78,8 +78,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/hdf4/1.4.0/IRIX64/serial/n32/debug/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.2/IRIX64/serial/n32/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.2/IRIX64/serial/n32/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.4.5/IRIX64/serial/n32/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.4.5/IRIX64/serial/n32/optim/lib
##
## Location of installed PDB library.
......
......@@ -289,6 +289,22 @@ avtHistogramFilter::PostExecute(void)
outAtts.GetEffectiveSpatialExtents()->Set(extents);
outAtts.GetCurrentSpatialExtents()->Set(extents);
outAtts.GetCumulativeCurrentSpatialExtents()->Set(extents);
outAtts.SetXUnits(pipelineVariable);
string yunits = "";
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() == 3)
{
yunits = "Volume";
}
else
{
if (atts.GetTwoDAmount() == HistogramAttributes::Area)
yunits = "Area";
else
yunits = "Revolved Volume";
}
outAtts.SetYUnits(yunits);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment