Commit 34f6eb8d authored by hrchilds's avatar hrchilds

Update from April 3, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@647 18c085ea-50e0-402c-830e-de6fd14e8384
parent 03ffd858
......@@ -17,7 +17,7 @@ shell prompt.
Python 2.1.2 Scripting Language http://www.python.org
Qt 3.3.2 GUI Toolkit http://www.trolltech.com
Silo 4.5 File I/O library http://www.llnl.gov/bdiv/meshtv
VTK 20031028c Visualization Toolkit http://www.kitware.com
VTK 20040323a Visualization Toolkit http://www.kitware.com
The public version of VisIt has been built with the above listed versions
......@@ -26,7 +26,7 @@ all the packages except VTK and Qt, you can probably use newer versions of the
packages and VisIt should work properly. For Mesa, you must build a mangled
version of Mesa. The distribution provided has already been set up to build
a mangled version so no additional work is required if you use it. For VTK,
you must use the October 28, 2003 distribution provided. The version of Qt
you must use the March 23, 2004 distribution provided. The version of Qt
used to build VisIt must be greater than or equal to 2.3.0. VisIt is also
compatible with Qt versions 3.0.2 or later.
......@@ -212,8 +212,8 @@ make
# Build VTK
#
cd ..
gunzip vtk_cvs_2003_10_28c.tar.gz
tar xf vtk_cvs_2003_10_28c.tar
gunzip vtk_cvs_2004.03.23a.tar.gz
tar xf vtk_cvs_2004.03.23a.tar
cd VTK
#
# On irix systems we have experienced problems with CMake not using the
......@@ -291,31 +291,32 @@ make
# Install it in the visit directory under the vtk directory.
#
mkdir $VISITDIR/vtk
mkdir $VISITDIR/vtk/2003.10.28c
mkdir $VISITDIR/vtk/2003.10.28c/$VISITARCH
mkdir $VISITDIR/vtk/2003.10.28c/$VISITARCH/{Common,Filtering,Graphics,Hybrid,IO,Imaging,Rendering,MangleMesaInclude,lib}
cp vtkConfigure.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp vtkToolkits.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp vtk*Instantiator.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/expat/expat.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/expat/expatDllConfig.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/zlib/zlib.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/zlib/zconf.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/zlib/zlibDllConfig.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/tiff/tiffio.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/tiff/tiff.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/tiff/tiffvers.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/tiff/tconf.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Utilities/tiff/tiffDllConfig.h $VISITDIR/vtk/2003.10.28c/$VISITARCH
cp Common/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/Common
cp Filtering/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/Filtering
cp Graphics/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/Graphics
cp Hybrid/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/Hybrid
cp IO/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/IO
cp Imaging/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/Imaging
cp Rendering/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/Rendering
cp MangleMesaInclude/*.h $VISITDIR/vtk/2003.10.28c/$VISITARCH/MangleMesaInclude
cp bin/*.so $VISITDIR/vtk/2003.10.28c/$VISITARCH/lib
mkdir $VISITDIR/vtk/2004.03.23a
mkdir $VISITDIR/vtk/2004.03.23a/$VISITARCH
mkdir $VISITDIR/vtk/2004.03.23a/$VISITARCH/{Common,Filtering,Graphics,Hybrid,IO,Imaging,Rendering,MangleMesaInclude,lib,vtkstd}
cp vtkConfigure.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp vtkToolkits.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp vtk*Instantiator.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/expat/expat.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/expat/expatDllConfig.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/zlib/zlib.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/zlib/zconf.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/zlib/zlibDllConfig.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiffio.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiff.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiffvers.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tconf.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Utilities/tiff/tiffDllConfig.h $VISITDIR/vtk/2004.03.23a/$VISITARCH
cp Common/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Common
cp Filtering/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Filtering
cp Graphics/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Graphics
cp Hybrid/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Hybrid
cp IO/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/IO
cp Imaging/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Imaging
cp Rendering/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/Rendering
cp MangleMesaInclude/*.h $VISITDIR/vtk/2004.03.23a/$VISITARCH/MangleMesaInclude
cp bin/*.so $VISITDIR/vtk/2004.03.23a/$VISITARCH/lib
cp vtkstd/* $VISITDIR/vtk/2004.03.23a/$VISITARCH/vtkstd
cd ..
#
......@@ -1160,3 +1161,5 @@ for reading exodus files.
If you have any problems send e-mail to visit-help@llnl.gov.
......@@ -7,21 +7,21 @@
static const char *AnnotationType_strings[] = {
"Text2D", "Text3D", "TimeSlider",
"Arrow2D", "Arrow3D", "Box",
"Image"};
"Line2D", "Arrow2D", "Arrow3D",
"Box", "Image"};
std::string
AnnotationObject::AnnotationType_ToString(AnnotationObject::AnnotationType t)
{
int index = int(t);
if(index < 0 || index >= 7) index = 0;
if(index < 0 || index >= 8) index = 0;
return AnnotationType_strings[index];
}
std::string
AnnotationObject::AnnotationType_ToString(int t)
{
int index = (t < 0 || t >= 7) ? 0 : t;
int index = (t < 0 || t >= 8) ? 0 : t;
return AnnotationType_strings[index];
}
......@@ -29,7 +29,7 @@ bool
AnnotationObject::AnnotationType_FromString(const std::string &s, AnnotationObject::AnnotationType &val)
{
val = AnnotationObject::Text2D;
for(int i = 0; i < 7; ++i)
for(int i = 0; i < 8; ++i)
{
if(s == AnnotationType_strings[i])
{
......@@ -87,13 +87,13 @@ AnnotationObject::FontFamily_FromString(const std::string &s, AnnotationObject::
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
// ****************************************************************************
AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfi"),
AnnotationObject::AnnotationObject() : AttributeSubject("ibbDDabaas*ibbbdi"),
textColor(), color1(),
color2()
{
......@@ -111,7 +111,7 @@ AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfi"),
fontBold = false;
fontItalic = false;
fontShadow = false;
floatAttribute1 = 0;
doubleAttribute1 = 0;
intAttribute1 = 0;
}
......@@ -124,13 +124,13 @@ AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfi"),
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
// ****************************************************************************
AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubject("ibbFFabaas*ibbbfi")
AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubject("ibbDDabaas*ibbbdi")
{
objectType = obj.objectType;
visible = obj.visible;
......@@ -152,7 +152,7 @@ AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubje
fontBold = obj.fontBold;
fontItalic = obj.fontItalic;
fontShadow = obj.fontShadow;
floatAttribute1 = obj.floatAttribute1;
doubleAttribute1 = obj.doubleAttribute1;
intAttribute1 = obj.intAttribute1;
SelectAll();
......@@ -167,7 +167,7 @@ AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubje
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -187,7 +187,7 @@ AnnotationObject::~AnnotationObject()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -217,7 +217,7 @@ AnnotationObject::operator = (const AnnotationObject &obj)
fontBold = obj.fontBold;
fontItalic = obj.fontItalic;
fontShadow = obj.fontShadow;
floatAttribute1 = obj.floatAttribute1;
doubleAttribute1 = obj.doubleAttribute1;
intAttribute1 = obj.intAttribute1;
SelectAll();
......@@ -233,7 +233,7 @@ AnnotationObject::operator = (const AnnotationObject &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -269,7 +269,7 @@ AnnotationObject::operator == (const AnnotationObject &obj) const
(fontBold == obj.fontBold) &&
(fontItalic == obj.fontItalic) &&
(fontShadow == obj.fontShadow) &&
(floatAttribute1 == obj.floatAttribute1) &&
(doubleAttribute1 == obj.doubleAttribute1) &&
(intAttribute1 == obj.intAttribute1));
}
......@@ -282,7 +282,7 @@ AnnotationObject::operator == (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -303,7 +303,7 @@ AnnotationObject::operator != (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -324,7 +324,7 @@ AnnotationObject::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -352,7 +352,7 @@ AnnotationObject::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -378,7 +378,7 @@ AnnotationObject::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -405,7 +405,7 @@ AnnotationObject::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -428,7 +428,7 @@ AnnotationObject::SelectAll()
Select(11, (void *)&fontBold);
Select(12, (void *)&fontItalic);
Select(13, (void *)&fontShadow);
Select(14, (void *)&floatAttribute1);
Select(14, (void *)&doubleAttribute1);
Select(15, (void *)&intAttribute1);
}
......@@ -445,7 +445,7 @@ AnnotationObject::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -555,7 +555,7 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool completeSave, bool force
if(completeSave || !FieldsEqual(14, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("floatAttribute1", floatAttribute1));
node->AddNode(new DataNode("doubleAttribute1", doubleAttribute1));
}
if(completeSave || !FieldsEqual(15, &defaultObject))
......@@ -578,14 +578,18 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool completeSave, bool force
// Method: AnnotationObject::SetFromNode
//
// Purpose:
// This method sets attributes in this object from values in a DataNode representation of the object.
// This method sets attributes in this object from values in a DataNode
// representation of the object.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 17 14:44:33 PST 2006
//
// Modifications:
// Kathleen Bonnell, Fri Mar 31 14:14:25 PST 2006
// Handle the case where the parentNode saved postion as float instead
// of double.
//
// ****************************************************************************
......@@ -607,7 +611,7 @@ AnnotationObject::SetFromNode(DataNode *parentNode)
if(node->GetNodeType() == INT_NODE)
{
int ival = node->AsInt();
if(ival >= 0 && ival < 7)
if(ival >= 0 && ival < 8)
SetObjectType(AnnotationType(ival));
}
else if(node->GetNodeType() == STRING_NODE)
......@@ -622,9 +626,27 @@ AnnotationObject::SetFromNode(DataNode *parentNode)
if((node = searchNode->GetNode("active")) != 0)
SetActive(node->AsBool());
if((node = searchNode->GetNode("position")) != 0)
SetPosition(node->AsFloatArray());
{
if(node->GetNodeType() == FLOAT_ARRAY_NODE)
{
const float *fn = node->AsFloatArray();
double dp[3] = {fn[0], fn[1], fn[2]};
SetPosition(dp);
}
else
SetPosition(node->AsDoubleArray());
}
if((node = searchNode->GetNode("position2")) != 0)
SetPosition2(node->AsFloatArray());
{
if(node->GetNodeType() == FLOAT_ARRAY_NODE)
{
const float *fn = node->AsFloatArray();
double dp[3] = {fn[0], fn[1], fn[2]};
SetPosition2(dp);
}
else
SetPosition2(node->AsDoubleArray());
}
if((node = searchNode->GetNode("textColor")) != 0)
textColor.SetFromNode(node);
if((node = searchNode->GetNode("useForegroundForTextColor")) != 0)
......@@ -658,11 +680,12 @@ AnnotationObject::SetFromNode(DataNode *parentNode)
if((node = searchNode->GetNode("fontShadow")) != 0)
SetFontShadow(node->AsBool());
if((node = searchNode->GetNode("floatAttribute1")) != 0)
SetFloatAttribute1(node->AsFloat());
SetDoubleAttribute1(node->AsDouble());
if((node = searchNode->GetNode("doubleAttribute1")) != 0)
SetDoubleAttribute1(node->AsDouble());
if((node = searchNode->GetNode("intAttribute1")) != 0)
SetIntAttribute1(node->AsInt());
}
///////////////////////////////////////////////////////////////////////////////
// Set property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -689,7 +712,7 @@ AnnotationObject::SetActive(bool active_)
}
void
AnnotationObject::SetPosition(const float *position_)
AnnotationObject::SetPosition(const double *position_)
{
position[0] = position_[0];
position[1] = position_[1];
......@@ -698,7 +721,7 @@ AnnotationObject::SetPosition(const float *position_)
}
void
AnnotationObject::SetPosition2(const float *position2_)
AnnotationObject::SetPosition2(const double *position2_)
{
position2[0] = position2_[0];
position2[1] = position2_[1];
......@@ -770,10 +793,10 @@ AnnotationObject::SetFontShadow(bool fontShadow_)
}
void
AnnotationObject::SetFloatAttribute1(float floatAttribute1_)
AnnotationObject::SetDoubleAttribute1(double doubleAttribute1_)
{
floatAttribute1 = floatAttribute1_;
Select(14, (void *)&floatAttribute1);
doubleAttribute1 = doubleAttribute1_;
Select(14, (void *)&doubleAttribute1);
}
void
......@@ -805,25 +828,25 @@ AnnotationObject::GetActive() const
return active;
}
const float *
const double *
AnnotationObject::GetPosition() const
{