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.
This diff is collapsed.
......@@ -71,3 +71,119 @@ AnnotationObject::GetFontShadow() const
return ((fontProperties & 16) >> 4) == 1;
}
Function: SetFromNode
Declaration: virtual void SetFromNode(DataNode *parentNode);
Definition:
// ****************************************************************************
// Method: AnnotationObject::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: 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.
//
// ****************************************************************************
void
AnnotationObject::SetFromNode(DataNode *parentNode)
{
int i;
if(parentNode == 0)
return;
DataNode *searchNode = parentNode->GetNode("AnnotationObject");
if(searchNode == 0)
return;
DataNode *node;
if((node = searchNode->GetNode("objectType")) != 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 < 8)
SetObjectType(AnnotationType(ival));
}
else if(node->GetNodeType() == STRING_NODE)
{
AnnotationType value;
if(AnnotationType_FromString(node->AsString(), value))
SetObjectType(value);
}
}
if((node = searchNode->GetNode("visible")) != 0)
SetVisible(node->AsBool());
if((node = searchNode->GetNode("active")) != 0)
SetActive(node->AsBool());
if((node = searchNode->GetNode("position")) != 0)
{
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)
{
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)
SetUseForegroundForTextColor(node->AsBool());
if((node = searchNode->GetNode("color1")) != 0)
color1.SetFromNode(node);
if((node = searchNode->GetNode("color2")) != 0)
color2.SetFromNode(node);
if((node = searchNode->GetNode("text")) != 0)
SetText(node->AsStringVector());
if((node = searchNode->GetNode("fontFamily")) != 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 < 3)
SetFontFamily(FontFamily(ival));
}
else if(node->GetNodeType() == STRING_NODE)
{
FontFamily value;
if(FontFamily_FromString(node->AsString(), value))
SetFontFamily(value);
}
}
if((node = searchNode->GetNode("fontBold")) != 0)
SetFontBold(node->AsBool());
if((node = searchNode->GetNode("fontItalic")) != 0)
SetFontItalic(node->AsBool());
if((node = searchNode->GetNode("fontShadow")) != 0)
SetFontShadow(node->AsBool());
if((node = searchNode->GetNode("floatAttribute1")) != 0)
SetDoubleAttribute1(node->AsDouble());
if((node = searchNode->GetNode("doubleAttribute1")) != 0)
SetDoubleAttribute1(node->AsDouble());
if((node = searchNode->GetNode("intAttribute1")) != 0)
SetIntAttribute1(node->AsInt());
}
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Feb 24 16:20:45 PST 2005
// Creation: Fri Mar 31 14:20:56 PST 2006
//
// Modifications:
//
......@@ -67,8 +67,8 @@ public:
void SetObjectType(AnnotationType objectType_);
void SetVisible(bool visible_);
void SetActive(bool active_);
void SetPosition(const float *position_);
void SetPosition2(const float *position2_);
void SetPosition(const double *position_);
void SetPosition2(const double *position2_);
void SetTextColor(const ColorAttribute &textColor_);
void SetUseForegroundForTextColor(bool useForegroundForTextColor_);
void SetColor1(const ColorAttribute &color1_);
......@@ -78,17 +78,17 @@ public:
void SetFontBold(bool fontBold_);
void SetFontItalic(bool fontItalic_);
void SetFontShadow(bool fontShadow_);
void SetFloatAttribute1(float floatAttribute1_);
void SetDoubleAttribute1(double doubleAttribute1_);
void SetIntAttribute1(int intAttribute1_);
// Property getting methods
AnnotationType GetObjectType() const;
bool GetVisible() const;
bool GetActive() const;
const float *GetPosition() const;
float *GetPosition();
const float *GetPosition2() const;
float *GetPosition2();
const double *GetPosition() const;
double *GetPosition();
const double *GetPosition2() const;
double *GetPosition2();
const ColorAttribute &GetTextColor() const;
ColorAttribute &GetTextColor();
bool GetUseForegroundForTextColor() const;
......@@ -102,7 +102,7 @@ public:
bool GetFontBold() const;
bool GetFontItalic() const;
bool GetFontShadow() const;
float GetFloatAttribute1() const;
double GetDoubleAttribute1() const;
int GetIntAttribute1() const;
// Persistence methods
......@@ -131,8 +131,8 @@ private:
int objectType;
bool visible;
bool active;
float position[3];
float position2[3];
double position[3];
double position2[3];
ColorAttribute textColor;
bool useForegroundForTextColor;
ColorAttribute color1;
......@@ -142,7 +142,7 @@ private:
bool fontBold;
bool fontItalic;
bool fontShadow;
float floatAttribute1;
double doubleAttribute1;
int intAttribute1;
};
......
<?xml version="1.0"?>
<Attribute name="AnnotationObject" purpose="This class defines a general set of attributes that are used to set the attributes for all annotation objects." persistent="true" exportAPI="STATE_API" exportInclude="state_exports.h">
<Attribute name="AnnotationObject" purpose="This class defines a general set of attributes that are used to set the attributes for all annotation objects." persistent="true" exportAPI="STATE_API" exportInclude="state_exports.h" codefile="AnnotationObject.code">
<Enum name="AnnotationType">
Text2D
Text3D
......@@ -24,12 +24,12 @@
<Field name="active" label="Active" type="bool">
false
</Field>
<Field name="position" label="Position" type="floatArray" length="3">
<Field name="position" label="Position" type="doubleArray" length="3">
0.000000
0.000000
0.000000
</Field>
<Field name="position2" label="Position2" type="floatArray" length="3">
<Field name="position2" label="Position2" type="doubleArray" length="3">
0.000000
0.000000
0.000000
......@@ -57,10 +57,13 @@
<Field name="fontShadow" label="Shadow" type="bool">
false
</Field>
<Field name="floatAttribute1" label="Float attribute 1" type="float">
<Field name="doubleAttribute1" label="Double attribute 1" type="double">
0.000000
</Field>
<Field name="intAttribute1" label="Integer attribute 1" type="int">
0
</Field>
<Function name="SetFromNode" user="false" member="true">
</Function>
</Attribute>
......@@ -10,7 +10,7 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -33,7 +33,7 @@ ColorAttribute::ColorAttribute() : AttributeSubject("U")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -59,7 +59,7 @@ ColorAttribute::ColorAttribute(const ColorAttribute &obj) : AttributeSubject("U"
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -79,15 +79,16 @@ ColorAttribute::~ColorAttribute()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
// ****************************************************************************
void
ColorAttribute&
ColorAttribute::operator = (const ColorAttribute &obj)
{
if (this == &obj) return *this;
int i;
for(i = 0; i < 4; ++i)
......@@ -95,6 +96,7 @@ ColorAttribute::operator = (const ColorAttribute &obj)
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -106,7 +108,7 @@ ColorAttribute::operator = (const ColorAttribute &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -135,7 +137,7 @@ ColorAttribute::operator == (const ColorAttribute &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -156,7 +158,7 @@ ColorAttribute::operator != (const ColorAttribute &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -177,7 +179,7 @@ ColorAttribute::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -205,7 +207,7 @@ ColorAttribute::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -231,7 +233,7 @@ ColorAttribute::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -258,7 +260,7 @@ ColorAttribute::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -316,7 +318,7 @@ ColorAttribute::CreateNode(DataNode *parentNode, bool, bool)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -381,7 +383,7 @@ ColorAttribute::GetColor()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -406,7 +408,7 @@ ColorAttribute::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -431,7 +433,7 @@ ColorAttribute::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -456,7 +458,7 @@ ColorAttribute::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu May 27 08:09:05 PDT 2004
// Creation: Fri Mar 31 16:58:56 PST 2006
//
// Modifications:
//
......@@ -591,9 +593,9 @@ ColorAttribute::Alpha() const
void ColorAttribute::SetRgba2(double c[4])
{
color[0] = (unsigned char) (c[0] * 255.);
color[1] = (unsigned char) (c[1] * 255.);
color[2] = (unsigned char) (c[2] * 255.);
color[3] = (unsigned char) (c[3] * 255.);
color[0] = (unsigned char)((float)c[0] * 255.f);
color[1] = (unsigned char)((float)c[1] * 255.f);
color[2] = (unsigned char)((float)c[2] * 255.f);
color[3] = (unsigned char)((float)c[3] * 255.f);
}
......@@ -175,9 +175,9 @@ Declaration: void SetRgba2(double c[4]);
Definition:
void ColorAttribute::SetRgba2(double c[4])
{
color[0] = (unsigned char)(c[0] * 255.);
color[1] = (unsigned char)(c[1] * 255.);
color[2] = (unsigned char)(c[2] * 255.);
color[3] = (unsigned char)(c[3] * 255.);
color[0] = (unsigned char)((float)c[0] * 255.f);
color[1] = (unsigned char)((float)c[1] * 255.f);
color[2] = (unsigned char)((float)c[2] * 255.f);
color[3] = (unsigned char)((float)c[3] * 255.f);