Commit 746e2c26 authored by hrchilds's avatar hrchilds

Update from July 31, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@47 18c085ea-50e0-402c-830e-de6fd14e8384
parent bdd00dbd
......@@ -417,6 +417,7 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-mdserver" ) { $exe_name = "mdserver"; }
elsif ($arg eq "-engine" ) { $exe_name = "engine"; }
elsif ($arg eq "-vcl" ) { $exe_name = "vcl"; }
elsif ($arg eq "-splashscreen" ) { print STDERR "Warning: You are running an old version of VisIt.\n"; $exe_name = "splashscreen"; }
elsif ($arg eq "-xml2atts") { $exe_name = "xml2atts"; }
elsif ($arg eq "-xml2avt") { $exe_name = "xml2avt"; }
elsif ($arg eq "-xml2info") { $exe_name = "xml2info"; }
......
......@@ -214,8 +214,8 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
make >> ../buildlog 2>&1
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.osf1.tar.gz ..
cd ..
......
......@@ -174,7 +174,7 @@ make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ..
make distclean >> ../buildlog 2>&1
env CXXFLAGS="-O2 -DFAKE_EXCEPTIONS" ./configure >> ../buildlog 2>&1
env CXXFLAGS=-O2 ./configure --enable-fake-exceptions >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ../visit\$ver2.linux_suse.tar.gz
......
......@@ -49,20 +49,14 @@
# Eric Brugger, Mon Jul 21 17:53:22 PDT 2003
# I added the ability to install a configuration file.
#
# Eric Brugger, Thu Jul 31 12:09:02 PDT 2003
# I removed some error tests that were redundant and caused a
# maintenance issue.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
if ($#argv < 3) then
echo "Usage: visit-install [-a] [-beta | -private] [-c config] [-g group] [-gw] version platform directory"
exit (1)
endif
if ($#argv >= 9) then
echo "Usage: visit-install [-a] [-beta | -private] [-c config] [-g group] [-gw] version platform directory"
exit (1)
endif
set append = false
set beta = false
set private = false
......
......@@ -561,7 +561,8 @@ SILAttributes::SetFromNode(DataNode *parentNode)
// Go through all of the children and construct a new
// NamespaceAttributes for each one of them.
children = searchNode->GetChildren();
for(int i = 0; i < searchNode->GetNumChildren(); ++i)
int i;
for(i = 0; i < searchNode->GetNumChildren(); ++i)
{
if(children[i]->GetKey() == std::string("NamespaceAttributes"))
{
......@@ -577,7 +578,7 @@ SILAttributes::SetFromNode(DataNode *parentNode)
// Go through all of the children and construct a new
// SILMatrixAttributes for each one of them.
children = searchNode->GetChildren();
for(int i = 0; i < searchNode->GetNumChildren(); ++i)
for(i = 0; i < searchNode->GetNumChildren(); ++i)
{
if(children[i]->GetKey() == std::string("SILMatrixAttributes"))
{
......
......@@ -17,6 +17,10 @@
#include <vtkRenderWindow.h>
#include <vtkTriangle.h>
// for HACK to deal with immediateModeRendering bug
#include <Init.h>
#define CERR if (!strcmp(Init::GetComponentName(),"engine")) cerr
#include <DebugStream.h>
......@@ -3457,6 +3461,14 @@ avtOpenGLSurfaceAndWireframeRenderer::SetupGraphicsLibrary2()
void
avtOpenGLSurfaceAndWireframeRenderer::DrawSurface()
{
CERR << "DrawSurface" << endl;
bool oldImmediateModeRendering = immediateModeRendering;
// HACK to deal with fact that immediateMode rendering settings
// not getting passed to this class
if (!strcmp(Init::GetComponentName(),"engine"))
immediateModeRendering = true;
if (VTKRen == NULL)
{
debug1 << "Asked to draw surface when we don't have a renderer."
......@@ -3518,6 +3530,9 @@ avtOpenGLSurfaceAndWireframeRenderer::DrawSurface()
{
DrawSurface2();
}
// undo the HACK
immediateModeRendering = oldImmediateModeRendering;
}
......@@ -3867,6 +3882,8 @@ avtOpenGLSurfaceAndWireframeRenderer::DrawSurface2()
glDisable(GL_POLYGON_OFFSET_FILL);
#endif
}
CERR << "draw funcs are " << (void*)draw0 << ", " << (void*)draw1 << ", " << (void*)draw2 << ", " << (void*)draw3 << endl;
}
......@@ -3893,6 +3910,14 @@ avtOpenGLSurfaceAndWireframeRenderer::DrawSurface2()
void
avtOpenGLSurfaceAndWireframeRenderer::DrawEdges()
{
CERR << "DrawEdges" << endl;
bool oldImmediateModeRendering = immediateModeRendering;
// HACK to deal with fact that immediateMode rendering settings
// not getting passed to this class
if (!strcmp(Init::GetComponentName(),"engine"))
immediateModeRendering = true;
if (VTKRen == NULL)
{
debug1 << "Asked to draw edges when we don't have a renderer." << endl;
......@@ -3956,6 +3981,9 @@ avtOpenGLSurfaceAndWireframeRenderer::DrawEdges()
{
DrawEdges2();
}
// undo the HACK
immediateModeRendering = oldImmediateModeRendering;
}
// ****************************************************************************
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on gps.
## Use the g++ 3.0.4 compiler.
##
CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on gps.
## Use the g++ 3.0.4 compiler.
##
CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on gps.
## Use the g++ 3.0.4 compiler.
##
CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on gps.
## Use the g++ 3.0.4 compiler.
##
CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -3,6 +3,11 @@
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.1
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
......
......@@ -3,6 +3,11 @@
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.1
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
......@@ -12,11 +17,6 @@ if test -z "$MPI_LIBS"; then
SHLIB_MPI_LIBS="-L/usr/lpp/ppe.poe/lib/threads -L/usr/lpp/ppe.poe/lib -L/usr/lpp/ppe.poe/lib/ip -lmpi_r -lvtd_r -llapi_r -lpthreads"
fi
##
## Use the gnu compiler.
##
CXX=g++
##
## Use fake exceptions instead of C++ exceptions.
##
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on sc.
## Use the g++ 3.0.4 compiler.
##
CXX=g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on sc.
## Use the g++ 3.0.4 compiler.
##
CXX=g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on sc.
## Use the g++ 3.0.4 compiler.
##
CXX=g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -4,9 +4,9 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ compiler by default on sc.
## Use the g++ 3.0.4 compiler.
##
CXX=g++
CXX=g++-3.0.4
##
## Use fake exceptions instead of C++ exceptions.
......
......@@ -3,6 +3,11 @@
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.1
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
......
......@@ -3,6 +3,11 @@
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.1
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
......
......@@ -3,6 +3,11 @@
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.1
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
......
......@@ -3,6 +3,11 @@
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.1
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
......
......@@ -2878,6 +2878,9 @@ QvisGUIApplication::LoadFile()
// Brad Whitlock, Mon Jul 28 14:41:10 PST 2003
// Made the e-mail address be visit-help@llnl.gov.
//
// Brad Whitlock, Thu Jul 31 15:15:38 PST 2003
// Fixed a bug that prevented full initialization of the GUI on Windows.
//
// ****************************************************************************
void
......@@ -2907,9 +2910,37 @@ QvisGUIApplication::ReadFromViewer(int)
{
debug1 << "Reading from the viewer's socket is currently not allowed!"
<< endl;
#if defined(_WIN32)
// If we ignore the socket read on Windows, we don't tend to keep
// getting the message so call this function again though the event
// loop using a timer.
QTimer::singleShot(10, this, SLOT(DelayedReadFromViewer()));
#endif
}
}
// ****************************************************************************
// Method: QvisGUIApplication::DelayedReadFromViewer
//
// Purpose:
// Tries to read from the viewer.
//
// Note: This method is called from the event loop in response to having
// been scheduled earlier by a premature return from ReadFromViewer.
//
// Programmer: Brad Whitlock
// Creation: Thu Jul 31 15:16:30 PST 2003
//
// Modifications:
//
// ****************************************************************************
void
QvisGUIApplication::DelayedReadFromViewer()
{
ReadFromViewer(0);
}
// ****************************************************************************
// Method: QvisGUIApplication::SaveSettings
//
......
......@@ -201,6 +201,9 @@ typedef std::vector<QvisWindowBase *> WindowBaseVector;
// Brad Whitlock, Mon Jul 14 11:50:34 PDT 2003
// I added RestoreSession and SaveSession.
//
// Brad Whitlock, Thu Jul 31 15:13:20 PST 2003
// Added a method to try and read from the viewer when called from a timer.
//
// ****************************************************************************
class GUI_API QvisGUIApplication : public QObject, public ConfigManager, public GUIBase
......@@ -243,7 +246,8 @@ private:
static void SyncCallback(Subject *s, void *data);
private slots:
void HeavyInitialization();
void ReadFromViewer(int sock_id);
void ReadFromViewer(int);
void DelayedReadFromViewer();
void SaveSettings();
void ActivatePlotWindow(int index);
void ActivateOperatorWindow(int index);
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Wed Jun 4 08:32:18 PDT 2003
// Creation: Thu Jul 31 16:19:10 PST 2003
//
// Modifications:
//
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Tue Jun 24 14:18:13 PST 2003
// Creation: Thu Jul 31 16:19:10 PST 2003
//
// Modifications:
//
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Aug 12 10:52:56 PDT 2002
// Creation: Thu Jul 31 16:19:10 PST 2003
//
// Modifications:
//
......@@ -33,10 +33,10 @@ public class AppearanceAttributes extends AttributeSubject
{
super(5);
background = obj.background;
foreground = obj.foreground;
fontDescription = obj.fontDescription;
style = obj.style;
background = new String(obj.background);
foreground = new String(obj.foreground);
fontDescription = new String(obj.fontDescription);
style = new String(obj.style);
orientation = obj.orientation;
SelectAll();
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Oct 24 13:19:28 PST 2002
// Creation: Thu Jul 31 16:19:11 PST 2003
//
// Modifications:
//
......
......@@ -11,7 +11,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Wed Aug 14 14:43:57 PST 2002
// Creation: Thu Jul 31 16:19:11 PST 2003
//
// Modifications:
//
......
......@@ -11,7 +11,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Jul 7 16:52:40 PST 2003
// Creation: Thu Jul 31 16:19:12 PST 2003
//
// Modifications:
//
......
......@@ -12,7 +12,7 @@ import java.lang.Integer;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Wed Nov 27 13:18:40 PST 2002
// Creation: Thu Jul 31 16:19:13 PST 2003
//
// Modifications:
//
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Aug 12 16:08:02 PST 2002
// Creation: Thu Jul 31 16:19:14 PST 2003
//
// Modifications:
//
......@@ -125,46 +125,6 @@ public class Expression extends AttributeSubject
}
}
// Added methods
public static int GetNumTypes()
{
return 6;
}
public static String GetTypeString(int t)
{
switch(t)
{
case EXPRTYPE_SCALARMESHVAR:
return new String("Scalar Mesh Variable");
case EXPRTYPE_VECTORMESHVAR:
return new String("Vector Mesh Variable");
case EXPRTYPE_MESH:
return new String("Mesh");
case EXPRTYPE_MATERIAL:
return new String("Material");
case EXPRTYPE_SPECIES:
return new String("Species");
default:
return new String("Unknown Type");
}
}
public static int GetTypeId(String s)
{
if (s == "Scalar Mesh Variable")
return EXPRTYPE_SCALARMESHVAR;
else if (s == "Vector Mesh Variable")
return EXPRTYPE_VECTORMESHVAR;
else if (s == "Mesh")
return EXPRTYPE_MESH;
else if (s == "Material")
return EXPRTYPE_MATERIAL;
else if (s == "Species")
return EXPRTYPE_SPECIES;
else
return EXPRTYPE_UNKNOWN;
}
// Attributes
private String name;
......
......@@ -11,7 +11,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Aug 12 16:11:52 PST 2002
// Creation: Thu Jul 31 16:19:14 PST 2003
//
// Modifications:
//
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Wed Aug 14 12:05:36 PDT 2002
// Creation: Thu Jul 31 16:19:14 PST 2003
//
// Modifications:
//
......
......@@ -11,7 +11,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Wed Aug 14 12:06:25 PDT 2002
// Creation: Thu Jul 31 16:19:15 PST 2003
//
// Modifications:
//
......
......@@ -12,7 +12,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu May 8 09:50:53 PDT 2003
// Creation: Thu Jul 31 16:19:15 PST 2003
//
// Modifications:
//
......
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Mar 20 10:27:03 PDT 2003
// Creation: Thu Jul 31 16:19:15 PST 2003
//
// Modifications:
//
......
......@@ -11,7 +11,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Fri May 16 10:54:57 PDT 2003
// Creation: Thu Jul 31 16:19:16 PST 2003
//
// Modifications:
//
......
......@@ -11,7 +11,7 @@ import java.util.Vector;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Aug 12 09:25:00 PDT 2002
// Creation: Thu Jul 31 16:19:16 PST 2003
//
// Modifications:
//
......@@ -135,7 +135,7 @@ public class HostProfileList extends AttributeSubject
{
if(index >= 0 && index < profiles.size())
{
profiles.remove(profiles.size() - 1);
profiles.remove(index);
Select(0);
}
}
......@@ -151,102 +151,6 @@ public class HostProfileList extends AttributeSubject
return tmp;
}
// Convenience methods
public HostProfile GetProfileForHost(String hostName)
{
HostProfile retval = null;
for(int i = 0; i < profiles.size(); ++i)
{
HostProfile p = (HostProfile)profiles.elementAt(i);
if(p.GetHost() == hostName && p.GetActive())
{
retval = p;
break;
}
}
return retval;
}
public int GetNumProfilesForHost(String hostName)
{
int nProfiles = 0;
for(int i = 0; i < profiles.size(); ++i)
{
HostProfile p = (HostProfile)profiles.elementAt(i);
if(p.GetHost() == hostName)
++nProfiles;
}
return nProfiles;
}
public void SetAsActiveProfile(int index)
{
if(index < 0 || index > profiles.size())
return;
// Set the specified profile as the active for its host.
HostProfile defProfile = (HostProfile)profiles.elementAt(index);
defProfile.SetActive(true);
// Make sure that all other profiles having the same host
// are NOT the active profile.
for(int i = 0; i < profiles.size(); ++i)
{
if(i == index)
continue;
HostProfile current = (HostProfile)profiles.elementAt(i);
if(current.GetHost() == defProfile.GetHost())
current.SetActive(false);
}
}
public void RemoveActiveProfile()
{
if(GetNumHostProfiles() < 1)
return;
int i;
HostProfile p = (HostProfile)profiles.elementAt(GetActiveProfile());
String oldHost = new String(p.GetHost());
// Remove the active profile.
RemoveHostProfile(GetActiveProfile());
// Go through the list and look for the first profile that has the
// same host as the one that was deleted. We'll make that the
// new active profile.
boolean keepGoing = true;
for(i = 0; i < GetNumHostProfiles() && keepGoing; ++i)
{
HostProfile current = (HostProfile)profiles.elementAt(i);
if(current.GetHost() == oldHost)
{
keepGoing = false;
SetActiveProfile(i);
}
}
if(!keepGoing)
{
// We found a profile having the same host. Now make sure
// that host profile group has a active profile.
if(GetProfileForHost(oldHost) == null)
{
SetAsActiveProfile(i - 1);
Select(0);
}
}