Commit 73823b8c authored by hrchilds's avatar hrchilds

Update from February 6, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@614 18c085ea-50e0-402c-830e-de6fd14e8384
parent e8656d78
......@@ -824,29 +824,13 @@ Boxlib does not work on Solaris or Irix systems. We had to modify boxlib
to use it with VisIt so you will need to contact us for the source code if
you wish to build it.
You will need to modify GNUmakefile so that it doesn't use MPI. To do this
change "USE_MPI = TRUE" to "USE_MPI = FALSE".
On Linux systems you will also need to add -fPIC to the compile flags.
This can done by adding the line "CXXFLAGS += -fPIC" and "FFLAGS += -fPIC"
near the top of the file GNUmakefile.
If the mpi header files are located in a non-standard location you will
need to add the line "CXXFLAGS += -I" near the top of the file GNUmakefile,
where the "-I" is followed by the mpi include directory.
On systems using MPI 2.0 (altix), you will need to change the following 3
lines
typedef int MPI_Op;
typedef int MPI_Comm;
typedef int MPI_Datatype;
to
typedef unsigned int MPI_Op;
typedef unsigned int MPI_Comm;
typedef unsigned int MPI_Datatype;
in the file ccse-mpi.H.
#
# Boxlib builds either a 2d or 3d version and VisIt needs both, so you will
# need to build the 3d version, install it and then build the 2d version and
......
......@@ -223,6 +223,11 @@
# Brad Whitlock, Fri Feb 3 08:30:30 PDT 2006
# I added Qt's qui library to the distribution.
#
# Eric Brugger, Mon Feb 6 10:52:03 PST 2006
# Make some corrections for libqui. Split some commands to overcome line
# length restrictions on old Irix systems. Add links for libqt.a and
# libqui.a.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -765,7 +770,7 @@ endif
# Copy the VisIt libraries to the distribution.
#
echo "Copying libraries to the distribution..."
cp `ls $VisItDir/lib/*.$SHLIB_SOEXT | grep -v libvtk | grep -v libqt | grep -v libpython` $libdir
cp `ls $VisItDir/lib/*.$SHLIB_SOEXT | grep -v libvtk | grep -v libqt | grep -v libqui | grep -v libpython` $libdir
cp $VisItDir/lib/libvtkqt.$SHLIB_SOEXT $libdir
cp $VisItDir/lib/libqtviswindow.$SHLIB_SOEXT $libdir
......@@ -779,14 +784,20 @@ if ("$os" != "darwin") then
ln -s $QtLibName $libdir/libqt.$SHLIB_SOEXT.$majorVersion.$minorVersion
ln -s $QtLibName $libdir/libqt.$SHLIB_SOEXT.$majorVersion
ln -s $QtLibName $libdir/libqt.$SHLIB_SOEXT
if (-e $VisItDir/lib/libqt.a) then
ln -s $QtLibName $libdir/libqt.a
endif
endif
cp $VisItDir/lib/$QUILibName $libdir/$QUILibName
set majorVersion = `echo $QUILibName | awk '{printf substr($1, 10, 1)}'`
set minorVersion = `echo $QUILibName | awk '{printf substr($1, 12, 1)}'`
set majorVersion = `echo $QUILibName | awk '{printf substr($1, 11, 1)}'`
set minorVersion = `echo $QUILibName | awk '{printf substr($1, 13, 1)}'`
if ("$os" != "darwin") then
ln -s $QUILibName $libdir/libqui.$SHLIB_SOEXT.$majorVersion.$minorVersion
ln -s $QUILibName $libdir/libqui.$SHLIB_SOEXT.$majorVersion
ln -s $QUILibName $libdir/libqui.$SHLIB_SOEXT
if (-e $VisItDir/lib/libqui.a) then
ln -s $QtLibName $libdir/libqui.a
endif
endif
#
......@@ -851,9 +862,12 @@ endif
# Copy the plugins to the distribution.
#
echo "Copying plugins to the distribution..."
cp $VisItDir/plugins/plots/*.$SHLIB_SOEXT $plugindir/plots
cp $VisItDir/plugins/operators/*.$SHLIB_SOEXT $plugindir/operators
cp $VisItDir/plugins/databases/*.$SHLIB_SOEXT $plugindir/databases
cp $VisItDir/plugins/plots/*.$SHLIB_SOEXT $plugindir/plots
cp $VisItDir/plugins/operators/libE*.$SHLIB_SOEXT $plugindir/operators
cp $VisItDir/plugins/operators/libG*.$SHLIB_SOEXT $plugindir/operators
cp $VisItDir/plugins/operators/libI*.$SHLIB_SOEXT $plugindir/operators
cp $VisItDir/plugins/operators/libS*.$SHLIB_SOEXT $plugindir/operators
cp $VisItDir/plugins/databases/*.$SHLIB_SOEXT $plugindir/databases
#
# Copy includes
......
......@@ -730,7 +730,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit"</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
......@@ -752,7 +752,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit"</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
......@@ -774,7 +774,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit"</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
......
......@@ -762,7 +762,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit"</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......@@ -785,7 +785,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......@@ -808,7 +808,7 @@
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" "-compiler" "xlc" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
......
......@@ -48,15 +48,16 @@ LightAttributes::LightType_FromString(const std::string &s, LightAttributes::Lig
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
// ****************************************************************************
LightAttributes::LightAttributes() : AttributeSubject("biDad"),
LightAttributes::LightAttributes() : AttributeSubject("bbiDad"),
color(255, 255, 255)
{
enabledFlagCanBeToggled = true;
enabledFlag = false;
type = Camera;
direction[0] = 0;
......@@ -74,14 +75,15 @@ LightAttributes::LightAttributes() : AttributeSubject("biDad"),
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
// ****************************************************************************
LightAttributes::LightAttributes(const LightAttributes &obj) : AttributeSubject("biDad")
LightAttributes::LightAttributes(const LightAttributes &obj) : AttributeSubject("bbiDad")
{
enabledFlagCanBeToggled = obj.enabledFlagCanBeToggled;
enabledFlag = obj.enabledFlag;
type = obj.type;
direction[0] = obj.direction[0];
......@@ -103,7 +105,7 @@ LightAttributes::LightAttributes(const LightAttributes &obj) : AttributeSubject(
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -114,25 +116,13 @@ LightAttributes::~LightAttributes()
// nothing here
}
// ****************************************************************************
// Method: LightAttributes::operator =
//
// Purpose:
// Assignment operator for the LightAttributes class.
//
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
//
// Modifications:
//
// ****************************************************************************
void
LightAttributes&
LightAttributes::operator = (const LightAttributes &obj)
{
enabledFlag = obj.enabledFlag;
if (this == &obj) return *this;
enabledFlagCanBeToggled = obj.enabledFlagCanBeToggled;
if (enabledFlagCanBeToggled)
enabledFlag = obj.enabledFlag;
type = obj.type;
direction[0] = obj.direction[0];
direction[1] = obj.direction[1];
......@@ -142,6 +132,7 @@ LightAttributes::operator = (const LightAttributes &obj)
brightness = obj.brightness;
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -153,7 +144,7 @@ LightAttributes::operator = (const LightAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -170,7 +161,8 @@ LightAttributes::operator == (const LightAttributes &obj) const
direction_equal = (direction[i] == obj.direction[i]);
// Create the return value
return ((enabledFlag == obj.enabledFlag) &&
return ((enabledFlagCanBeToggled == obj.enabledFlagCanBeToggled) &&
(enabledFlag == obj.enabledFlag) &&
(type == obj.type) &&
direction_equal &&
(color == obj.color) &&
......@@ -186,7 +178,7 @@ LightAttributes::operator == (const LightAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -207,7 +199,7 @@ LightAttributes::operator != (const LightAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -228,7 +220,7 @@ LightAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -256,7 +248,7 @@ LightAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -282,7 +274,7 @@ LightAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -309,7 +301,7 @@ LightAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -318,11 +310,12 @@ LightAttributes::NewInstance(bool copy) const
void
LightAttributes::SelectAll()
{
Select(0, (void *)&enabledFlag);
Select(1, (void *)&type);
Select(2, (void *)direction, 3);
Select(3, (void *)&color);
Select(4, (void *)&brightness);
Select(0, (void *)&enabledFlagCanBeToggled);
Select(1, (void *)&enabledFlag);
Select(2, (void *)&type);
Select(3, (void *)direction, 3);
Select(4, (void *)&color);
Select(5, (void *)&brightness);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -338,7 +331,7 @@ LightAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -358,16 +351,22 @@ LightAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceA
if(completeSave || !FieldsEqual(0, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("enabledFlag", enabledFlag));
node->AddNode(new DataNode("enabledFlagCanBeToggled", enabledFlagCanBeToggled));
}
if(completeSave || !FieldsEqual(1, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("type", LightType_ToString(type)));
node->AddNode(new DataNode("enabledFlag", enabledFlag));
}
if(completeSave || !FieldsEqual(2, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("type", LightType_ToString(type)));
}
if(completeSave || !FieldsEqual(3, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("direction", direction, 3));
......@@ -381,7 +380,7 @@ LightAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceA
}
else
delete colorNode;
if(completeSave || !FieldsEqual(4, &defaultObject))
if(completeSave || !FieldsEqual(5, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("brightness", brightness));
......@@ -406,7 +405,7 @@ LightAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forceA
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -424,6 +423,8 @@ LightAttributes::SetFromNode(DataNode *parentNode)
return;
DataNode *node;
if((node = searchNode->GetNode("enabledFlagCanBeToggled")) != 0)
SetEnabledFlagCanBeToggled(node->AsBool());
if((node = searchNode->GetNode("enabledFlag")) != 0)
SetEnabledFlag(node->AsBool());
if((node = searchNode->GetNode("type")) != 0)
......@@ -454,18 +455,28 @@ LightAttributes::SetFromNode(DataNode *parentNode)
// Set property methods
///////////////////////////////////////////////////////////////////////////////
void
LightAttributes::SetEnabledFlagCanBeToggled(bool enabledFlagCanBeToggled_)
{
enabledFlagCanBeToggled = enabledFlagCanBeToggled_;
Select(0, (void *)&enabledFlagCanBeToggled);
}
void
LightAttributes::SetEnabledFlag(bool enabledFlag_)
{
enabledFlag = enabledFlag_;
Select(0, (void *)&enabledFlag);
if (enabledFlagCanBeToggled)
{
enabledFlag = enabledFlag_;
Select(1, (void *)&enabledFlag);
}
}
void
LightAttributes::SetType(LightAttributes::LightType type_)
{
type = type_;
Select(1, (void *)&type);
Select(2, (void *)&type);
}
void
......@@ -474,27 +485,33 @@ LightAttributes::SetDirection(const double *direction_)
direction[0] = direction_[0];
direction[1] = direction_[1];
direction[2] = direction_[2];
Select(2, (void *)direction, 3);
Select(3, (void *)direction, 3);
}
void
LightAttributes::SetColor(const ColorAttribute &color_)
{
color = color_;
Select(3, (void *)&color);
Select(4, (void *)&color);
}
void
LightAttributes::SetBrightness(double brightness_)
{
brightness = brightness_;
Select(4, (void *)&brightness);
Select(5, (void *)&brightness);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
bool
LightAttributes::GetEnabledFlagCanBeToggled() const
{
return enabledFlagCanBeToggled;
}
bool
LightAttributes::GetEnabledFlag() const
{
......@@ -544,13 +561,13 @@ LightAttributes::GetBrightness() const
void
LightAttributes::SelectDirection()
{
Select(2, (void *)direction, 3);
Select(3, (void *)direction, 3);
}
void
LightAttributes::SelectColor()
{
Select(3, (void *)&color);
Select(4, (void *)&color);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -566,7 +583,7 @@ LightAttributes::SelectColor()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -577,11 +594,12 @@ LightAttributes::GetFieldName(int index) const
{
switch (index)
{
case 0: return "enabledFlag";
case 1: return "type";
case 2: return "direction";
case 3: return "color";
case 4: return "brightness";
case 0: return "enabledFlagCanBeToggled";
case 1: return "enabledFlag";
case 2: return "type";
case 3: return "direction";
case 4: return "color";
case 5: return "brightness";
default: return "invalid index";
}
}
......@@ -595,7 +613,7 @@ LightAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -607,10 +625,11 @@ LightAttributes::GetFieldType(int index) const
switch (index)
{
case 0: return FieldType_bool;
case 1: return FieldType_enum;
case 2: return FieldType_doubleArray;
case 3: return FieldType_color;
case 4: return FieldType_double;
case 1: return FieldType_bool;
case 2: return FieldType_enum;
case 3: return FieldType_doubleArray;
case 4: return FieldType_color;
case 5: return FieldType_double;
default: return FieldType_unknown;
}
}
......@@ -624,7 +643,7 @@ LightAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -636,10 +655,11 @@ LightAttributes::GetFieldTypeName(int index) const
switch (index)
{
case 0: return "bool";
case 1: return "enum";
case 2: return "doubleArray";
case 3: return "color";
case 4: return "double";
case 1: return "bool";
case 2: return "enum";
case 3: return "doubleArray";
case 4: return "color";
case 5: return "double";
default: return "invalid index";
}
}
......@@ -653,7 +673,7 @@ LightAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -670,15 +690,20 @@ LightAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
{
case 0:
{ // new scope
retval = (enabledFlag == obj.enabledFlag);
retval = (enabledFlagCanBeToggled == obj.enabledFlagCanBeToggled);
}
break;
case 1:
{ // new scope
retval = (type == obj.type);
retval = (enabledFlag == obj.enabledFlag);
}
break;
case 2:
{ // new scope
retval = (type == obj.type);
}
break;
case 3:
{ // new scope
// Compare the direction arrays.
bool direction_equal = true;
......@@ -688,12 +713,12 @@ LightAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = direction_equal;
}
break;
case 3:
case 4:
{ // new scope
retval = (color == obj.color);
}
break;
case 4:
case 5:
{ // new scope
retval = (brightness == obj.brightness);
}
......
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:02:23 PST 2006
//
// Modifications:
//
......@@ -34,7 +34,7 @@ public:
LightAttributes(const LightAttributes &obj);
virtual ~LightAttributes();
virtual void operator = (const LightAttributes &obj);
virtual LightAttributes& operator = (const LightAttributes &obj);
virtual bool operator == (const LightAttributes &obj) const;
virtual bool operator != (const LightAttributes &obj) const;
......@@ -49,6 +49,7 @@ public:
void SelectColor();
// Property setting methods
void SetEnabledFlagCanBeToggled(bool enabledFlagCanBeToggled_);
void SetEnabledFlag(bool enabledFlag_);
void SetType(LightType type_);
void SetDirection(const double *direction_);
......@@ -56,6 +57,7 @@ public:
void SetBrightness(double brightness_);
// Property getting methods
bool GetEnabledFlagCanBeToggled() const;
bool GetEnabledFlag() const;
LightType GetType() const;
const double *GetDirection() const;
......@@ -82,6 +84,7 @@ public:
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
private:
bool enabledFlagCanBeToggled;
bool enabledFlag;
int type;
double direction[3];
......
<?xml version="1.0"?>
<Attribute name="LightAttributes" purpose="This class is a light in a light list." exportAPI="STATE_API" exportInclude="state_exports.h">
<Attribute name="LightAttributes" purpose="This class is a light in a light list." persistent="true" exportAPI="STATE_API" exportInclude="state_exports.h" codefile="LightAttributes.code">
<Enum name="LightType">
Ambient
Object
Camera
</Enum>
<Field name="enabledFlag" type="bool">false</Field>
<Field name="type" type="enum" subtype="LightType">Camera</Field>
<Field name="direction" type="doubleArray" length="3">0. 0. -1.</Field>
<Field name="color" type="color">255 255 255 255</Field>
<Field name="brightness" type="double">1.</Field>