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>
......
This diff is collapsed.
......@@ -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>
<Field name="enabledFlagCanBeToggled" label="enabledFlagCanBeToggled" type="bool" internal="true">
true
</Field>
<Field name="enabledFlag" label="enabledFlag" type="bool" enabler="enabledFlagCanBeToggled:true">
false
</Field>
<Field name="type" label="type" type="enum" subtype="LightType">
Camera
</Field>
<Field name="direction" label="direction" type="doubleArray" length="3">
0.000000
0.000000
-1.000000
</Field>
<Field name="color" label="color" type="color">
255
255
255
255
</Field>
<Field name="brightness" label="brightness" type="double">
1.000000
</Field>
<Function name="operator =" user="false" member="true">
</Function>
<Function name="SetEnabledFlag" user="false" member="true">
</Function>
</Attribute>
......@@ -10,7 +10,7 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -30,7 +30,7 @@ LightList::LightList() : AttributeSubject("aaaaaaaa")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -59,7 +59,7 @@ LightList::LightList(const LightList &obj) : AttributeSubject("aaaaaaaa")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -79,15 +79,16 @@ LightList::~LightList()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
// ****************************************************************************
void
LightList&
LightList::operator = (const LightList &obj)
{
if (this == &obj) return *this;
light0 = obj.light0;
light1 = obj.light1;
light2 = obj.light2;
......@@ -98,6 +99,7 @@ LightList::operator = (const LightList &obj)
light7 = obj.light7;
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -109,7 +111,7 @@ LightList::operator = (const LightList &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -138,7 +140,7 @@ LightList::operator == (const LightList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -159,7 +161,7 @@ LightList::operator != (const LightList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -180,7 +182,7 @@ LightList::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -208,7 +210,7 @@ LightList::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -234,7 +236,7 @@ LightList::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:08:45 PST 2006
//
// Modifications:
//
......@@ -261,7 +263,7 @@ LightList::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -293,7 +295,7 @@ LightList::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -425,7 +427,7 @@ LightList::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -686,7 +688,7 @@ LightList::SelectLight7()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -718,7 +720,7 @@ LightList::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -750,7 +752,7 @@ LightList::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -782,7 +784,7 @@ LightList::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -939,6 +941,7 @@ void
LightList::SetDefaultEnabledStates()
{
light0.SetEnabledFlag(true);
light0.SetEnabledFlagCanBeToggled(false);
light1.SetEnabledFlag(false);
light2.SetEnabledFlag(false);
light3.SetEnabledFlag(false);
......
......@@ -113,6 +113,7 @@ void
LightList::SetDefaultEnabledStates()
{
light0.SetEnabledFlag(true);
light0.SetEnabledFlagCanBeToggled(false);
light1.SetEnabledFlag(false);
light2.SetEnabledFlag(false);
light3.SetEnabledFlag(false);
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:13 PDT 2003
// Creation: Mon Feb 6 14:08:45 PST 2006
//
// Modifications:
//
......@@ -26,7 +26,7 @@ public:
LightList(const LightList &obj);
virtual ~LightList();
virtual void operator = (const LightList &obj);
virtual LightList& operator = (const LightList &obj);
virtual bool operator == (const LightList &obj) const;
virtual bool operator != (const LightList &obj) const;
......
......@@ -251,15 +251,27 @@ QvisLightingWindow::UpdateWindow(bool)
{
// Make all enabled lights have a light icon.
activeLightComboBox->blockSignals(true);
if (activeLight == 0)
{
lightEnabledCheckBox->setEnabled(false);
}
else
{
lightEnabledCheckBox->setEnabled(true);
}
for(int i = 0; i < activeLightComboBox->count(); ++i)
{
bool enabled = lights->GetLight(i).GetEnabledFlag();
QString num;
num.sprintf("%d", i + 1);
if(enabled)
{
activeLightComboBox->changeItem(*onLightIcon, num, i);
}
else
{
activeLightComboBox->changeItem(*offLightIcon, num, i);
}
}
activeLightComboBox->blockSignals(false);
......@@ -320,19 +332,14 @@ QvisLightingWindow::UpdateWindow(bool)
// Kathleen Bonnell, Tue Dec 28 16:20:47 PST 2004
// Cast args for QColor constructor to int to prevent comiler warnings.
//
// Kathleen Bonnell, Mon Feb 6 16:58:40 PST 2006
// Removed unnecessary code that counted 'numEnabled' as it was not used.
//
// ****************************************************************************
void
QvisLightingWindow::UpdateLightWidget()
{
int numEnabled = 0;
for(int i = 0; i < lights->NumLights(); ++i)
{
const LightAttributes &light = lights->GetLight(i);
if(light.GetEnabledFlag())
++numEnabled;
}
// Update the light displayed in the light widget.
if(mode == 1)
{
......@@ -342,6 +349,7 @@ QvisLightingWindow::UpdateLightWidget()
for(int i = 0; i < lights->NumLights(); ++i)
{
const LightAttributes &light = lights->GetLight(i);
if(light.GetEnabledFlag())
{
QColor c2((int)(light.GetColor().Red() * light.GetBrightness()),
......
<HTML>
<BODY BGCOLOR=#ffffff>
<B><H2>
<CENTER>Copyright 2000 - 2005.</CENTER>
<CENTER>Copyright 2000 - 2006.</CENTER>
<CENTER>The Regents of the University of California.</CENTER>
<CENTER>All rights reserved.</CENTER>
</B></H2>
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Jul 31 16:19:16 PST 2003
// Creation: Mon Feb 6 14:05:52 PST 2006
//
// Modifications:
//
......@@ -18,7 +18,7 @@ package llnl.visit;
public class LightAttributes extends AttributeSubject
{
// Constants
// Enum values
public final static int LIGHTTYPE_AMBIENT = 0;
public final static int LIGHTTYPE_OBJECT = 1;
public final static int LIGHTTYPE_CAMERA = 2;
......@@ -26,8 +26,9 @@ public class LightAttributes extends AttributeSubject
public LightAttributes()
{
super(5);
super(6);
enabledFlagCanBeToggled = true;
enabledFlag = false;
type = LIGHTTYPE_CAMERA;
direction = new double[3];
......@@ -40,10 +41,11 @@ public class LightAttributes extends AttributeSubject
public LightAttributes(LightAttributes obj)
{
super(5);
super(6);
int i;
enabledFlagCanBeToggled = obj.enabledFlagCanBeToggled;
enabledFlag = obj.enabledFlag;
type = obj.type;
direction = new double[3];
......@@ -67,7 +69,8 @@ public class LightAttributes extends AttributeSubject
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) &&
......@@ -75,16 +78,22 @@ public class LightAttributes extends AttributeSubject
}
// Property setting methods
public void SetEnabledFlagCanBeToggled(boolean enabledFlagCanBeToggled_)
{
enabledFlagCanBeToggled = enabledFlagCanBeToggled_;
Select(0);
}
public void SetEnabledFlag(boolean enabledFlag_)
{
enabledFlag = enabledFlag_;
Select(0);
Select(1);
}
public void SetType(int type_)
{
type = type_;
Select(1);
Select(2);
}
public void SetDirection(double[] direction_)
......@@ -92,7 +101,7 @@ public class LightAttributes extends AttributeSubject
direction[0] = direction_[0];
direction[1] = direction_[1];
direction[2] = direction_[2];
Select(2);
Select(3);
}
public void SetDirection(double e0, double e1, double e2)
......@@ -100,22 +109,23 @@ public class LightAttributes extends AttributeSubject
direction[0] = e0;
direction[1] = e1;
direction[2] = e2;
Select(2);
Select(3);
}
public void SetColor(ColorAttribute color_)
{
color = color_;
Select(3);
Select(4);
}
public void SetBrightness(double brightness_)
{
brightness = brightness_;
Select(4);
Select(5);
}
// Property getting methods
public boolean GetEnabledFlagCanBeToggled() { return enabledFlagCanBeToggled; }
public boolean GetEnabledFlag() { return enabledFlag; }
public int GetType() { return type; }
public double[] GetDirection() { return direction; }
......@@ -126,14 +136,16 @@ public class LightAttributes extends AttributeSubject
public void WriteAtts(CommunicationBuffer buf)
{
if(WriteSelect(0, buf))
buf.WriteBool(enabledFlag);
buf.WriteBool(enabledFlagCanBeToggled);
if(WriteSelect(1, buf))
buf.WriteInt(type);
buf.WriteBool(enabledFlag);
if(WriteSelect(2, buf))
buf.WriteDoubleArray(direction);
buf.WriteInt(type);
if(WriteSelect(3, buf))
color.Write(buf);
buf.WriteDoubleArray(direction);
if(WriteSelect(4, buf))
color.Write(buf);
if(WriteSelect(5, buf))
buf.WriteDouble(brightness);
}
......@@ -145,19 +157,22 @@ public class LightAttributes extends AttributeSubject
switch(index)
{
case 0:
SetEnabledFlag(buf.ReadBool());
SetEnabledFlagCanBeToggled(buf.ReadBool());
break;
case 1:
SetType(buf.ReadInt());
SetEnabledFlag(buf.ReadBool());
break;
case 2:
SetDirection(buf.ReadDoubleArray());
SetType(buf.ReadInt());
break;
case 3:
color.Read(buf);
Select(3);
SetDirection(buf.ReadDoubleArray());
break;
case 4:
color.Read(buf);
Select(4);
break;
case 5:
SetBrightness(buf.ReadDouble());
break;
}
......@@ -166,6 +181,7 @@ public class LightAttributes extends AttributeSubject
// Attributes
private boolean enabledFlagCanBeToggled;
private boolean enabledFlag;
private int type;
private double[] direction;
......
......@@ -93,6 +93,9 @@
# Eric Brugger, Tue Jan 24 08:42:55 PST 2006
# I added links to qui.
#
# Eric Brugger, Mon Feb 6 12:58:57 PST 2006
# I added links to libqt.a and libqui.a.
#
##############################################################################
@SET_MAKE@
......@@ -197,14 +200,22 @@ libosmesa:
libqt:
if test -n "@QT_LIB@"; then \
$(RM) $(LIBQT)* ; \
ln -s @QT_LIB@/$(LIBQT)* . ; \
$(RM) $(LIBQT)* ; \
ln -s @QT_LIB@/$(LIBQT)* . ; \
if test -n "@QT_LIB@/libqt.a"; then \
$(RM) libqt.a ; \
ln -s @QT_LIB@/libqt.a . ; \
fi \
fi
libqui:
if test -n "@QT_LIB@"; then \
$(RM) $(LIBQUI)* ; \
ln -s @QT_LIB@/$(LIBQUI)* . ; \
if test -n "@QT_LIB@"; then \
$(RM) $(LIBQUI)* ; \
ln -s @QT_LIB@/$(LIBQUI)* . ; \
if test -n "@QT_LIB@/libqui.a"; then \
$(RM) libqui.a ; \
ln -s @QT_LIB@/libqui.a . ; \
fi \
fi
pythondir:
......
......@@ -122,6 +122,10 @@ using std::vector;
// Hank Childs, Tue May 24 09:54:36 PDT 2005
// Added new argument to constructor for hasoptions.
//
// Kathleen Bonnell, Mon Feb 6 16:23:30 PST 2006
// Allow assignment operator and 'SetProperty' methods from codefile to
// replace default generated methods.
//
// ****************************************************************************
// ----------------------------------------------------------------------------
......@@ -1897,6 +1901,12 @@ class AttsGeneratorAttribute
}
void WriteSourceAssignmentOperator(ostream &c)
{
if (HasFunction("operator ="))
{
PrintFunction(c, "operator =");
c << endl;
return;
}
// Write the method comment.
QString purposeString("Assignment operator for the ");
purposeString += (name + " class.");
......@@ -2455,7 +2465,17 @@ class AttsGeneratorAttribute
c << "// Set property methods" << endl;
c << "///////////////////////////////////////////////////////////////////////////////" << endl << endl;
for (i=0; i<fields.size(); i++)
fields[i]->WriteSourceSetFunction(c, name);
{
if (!HasFunction("Set"+fields[i]->Name))
{
fields[i]->WriteSourceSetFunction(c, name);
}
else
{
PrintFunction(c, "Set"+fields[i]->Name);
c << endl;
}
}
// Write out all the get methods
c << "///////////////////////////////////////////////////////////////////////////////" << endl;
......
......@@ -12,7 +12,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Mon Jan 9 14:52:44 PST 2006
// Creation: Mon Feb 6 14:04:48 PST 2006
//
// ****************************************************************************
......
......@@ -7685,6 +7685,8 @@ visit_GetPipelineCachingMode(PyObject *self, PyObject *args)
// Creation: October 28, 2004
//
// Modifications:
// Kathleen Bonnell, Mon Feb 6 16:23:30 PST 2006
// Don't allow light0 to be turned off.