Commit 50e18c57 authored by hrchilds's avatar hrchilds
Browse files

Update from January 4, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@389 18c085ea-50e0-402c-830e-de6fd14e8384
parent 60c6b3b7
...@@ -786,9 +786,9 @@ env command for configure. ...@@ -786,9 +786,9 @@ env command for configure.
# #
# Build and install it in the visit directory. # Build and install it in the visit directory.
# #
gunzip visit041108.tar.gz gunzip visit050110.tar.gz
tar xf visit041108.tar tar xf visit050110.tar
cd visit041108/config-site cd visit050110/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd .. cd ..
...@@ -797,12 +797,12 @@ make ...@@ -797,12 +797,12 @@ make
clearcase_bin/visit-bin-dist clearcase_bin/visit-bin-dist
# Use the appropriate install command based on the operating system on # Use the appropriate install command based on the operating system on
# which you built VisIt. # which you built VisIt.
clearcase_bin/visit-install 1.4 aix $VISITDIR clearcase_bin/visit-install 1.4.1 aix $VISITDIR
clearcase_bin/visit-install 1.4 irix6 $VISITDIR clearcase_bin/visit-install 1.4.1 irix6 $VISITDIR
clearcase_bin/visit-install 1.4 linux $VISITDIR clearcase_bin/visit-install 1.4.1 linux $VISITDIR
clearcase_bin/visit-install 1.4 linux-ia64 $VISITDIR clearcase_bin/visit-install 1.4.1 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.4 osf1 $VISITDIR clearcase_bin/visit-install 1.4.1 osf1 $VISITDIR
clearcase_bin/visit-install 1.4 sunos5 $VISITDIR clearcase_bin/visit-install 1.4.1 sunos5 $VISITDIR
When running the configure script you can enable or disable certain dependent When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the packages. All the configure options are listed at the beginning of the
......
Copyright 2000 - 2004. Copyright 2000 - 2005.
The Regents of the University of California. The Regents of the University of California.
All rights reserved. All rights reserved.
......
...@@ -17,7 +17,7 @@ Unix and Mac OS X: ...@@ -17,7 +17,7 @@ Unix and Mac OS X:
where where
"version" will be 1.4 for the current distribution. "version" will be 1.4.1 for the current distribution.
"platform" will be one of the following: aix, darwin, irix6, linux, "platform" will be one of the following: aix, darwin, irix6, linux,
osf1, or sunos5 depending on the machine. The one you use should osf1, or sunos5 depending on the machine. The one you use should
...@@ -28,17 +28,17 @@ Unix and Mac OS X: ...@@ -28,17 +28,17 @@ Unix and Mac OS X:
For example For example
visit-install 1.4 irix6 /usr/local/visit visit-install 1.4.1 irix6 /usr/local/visit
will install the irix6, 1.4 version of visit in the directory will install the irix6, 1.4.1 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file "/usr/local/visit". Note that you will need to have the file
"visit1_4.irix6.tar.gz" present in the current directory for this "visit1_4_1.irix6.tar.gz" present in the current directory for this
to function properly. You can install multiple binaries into the to function properly. You can install multiple binaries into the
same directory. For example, you could then execute same directory. For example, you could then execute
visit-install 1.4 linux /usr/local/visit visit-install 1.4.1 linux /usr/local/visit
to add a linux, 1.4 version of visit to the same directory. to add a linux, 1.4.1 version of visit to the same directory.
2. Add the bin directory below the installation directory 2. Add the bin directory below the installation directory
(/usr/local/visit/bin in our example) to each user's search path. (/usr/local/visit/bin in our example) to each user's search path.
...@@ -76,8 +76,8 @@ Unix and Mac OS X: ...@@ -76,8 +76,8 @@ Unix and Mac OS X:
Windows: Windows:
1. Copy the file visit1.4.exe to your desktop. 1. Copy the file visit1.4.1.exe to your desktop.
2. Double click on the visit1.4.exe icon to run the installer. 2. Double click on the visit1.4.1.exe icon to run the installer.
3. Follow the directions provided by the installer. 3. Follow the directions provided by the installer.
...@@ -20,10 +20,14 @@ using std::deque; ...@@ -20,10 +20,14 @@ using std::deque;
// //
// Mark C. Miller, Thu May 27 11:05:15 PDT 2004 // Mark C. Miller, Thu May 27 11:05:15 PDT 2004
// Added missing initialization for plotActor data member // Added missing initialization for plotActor data member
//
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added window id (wid)
// **************************************************************************** // ****************************************************************************
DataNetwork::DataNetwork(void) DataNetwork::DataNetwork(void)
{ {
id = -1; nid = -1;
wid = -1;
pspec = NULL; pspec = NULL;
dspec = NULL; dspec = NULL;
writer = NULL; writer = NULL;
...@@ -144,11 +148,14 @@ DataNetwork::GetActor(avtDataObject_p dob) ...@@ -144,11 +148,14 @@ DataNetwork::GetActor(avtDataObject_p dob)
// Mark C. Miller, 30Apr03 // Mark C. Miller, 30Apr03
// Make sure plot is not NULL before calling a method on it. // Make sure plot is not NULL before calling a method on it.
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Changed id to nid
//
// **************************************************************************** // ****************************************************************************
void void
DataNetwork::ReleaseData(void) DataNetwork::ReleaseData(void)
{ {
debug1 << "Releasing all data associated with network " << id << endl; debug1 << "Releasing all data associated with network " << nid << endl;
int nNodes = nodeList.size(); int nNodes = nodeList.size();
for (int i = 0 ; i < nNodes ; i++) for (int i = 0 ; i < nNodes ; i++)
{ {
......
...@@ -52,6 +52,11 @@ ...@@ -52,6 +52,11 @@
// Kathleen Bonnell, Thu Oct 21 15:55:46 PDT 2004 // Kathleen Bonnell, Thu Oct 21 15:55:46 PDT 2004
// Added ActorIsNull method. // Added ActorIsNull method.
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Changed id to nid
// Added wid for window id
// Added methods to set/get window id
//
// **************************************************************************** // ****************************************************************************
class DataNetwork class DataNetwork
{ {
...@@ -59,7 +64,8 @@ public: ...@@ -59,7 +64,8 @@ public:
DataNetwork(void); DataNetwork(void);
virtual ~DataNetwork(void); virtual ~DataNetwork(void);
void SetID(int _id) { id = _id; }; void SetNetID(int _id) { nid = _id; };
void SetWinID(int _id) { wid = _id; };
void SetPlottype(const std::string &type) { plottype = type; }; void SetPlottype(const std::string &type) { plottype = type; };
virtual void SetPlot(avtPlot *_plot) { plot = _plot; }; virtual void SetPlot(avtPlot *_plot) { plot = _plot; };
void SetTerminalNode(Netnode* t) {terminalNode = t;}; void SetTerminalNode(Netnode* t) {terminalNode = t;};
...@@ -76,7 +82,8 @@ public: ...@@ -76,7 +82,8 @@ public:
avtDataObjectWriter_p GetWriter(avtDataObject_p dob, avtDataObjectWriter_p GetWriter(avtDataObject_p dob,
avtPipelineSpecification_p pspec, avtPipelineSpecification_p pspec,
WindowAttributes *atts); WindowAttributes *atts);
int GetID(void) { return id; }; int GetNetID(void) const { return nid; };
int GetWinID(void) const { return wid; };
Netnode* GetTerminalNode(void) { return terminalNode; }; Netnode* GetTerminalNode(void) { return terminalNode; };
virtual avtPlot_p GetPlot(void) { return plot; }; virtual avtPlot_p GetPlot(void) { return plot; };
avtActor_p GetActor(avtDataObject_p dob); avtActor_p GetActor(avtDataObject_p dob);
...@@ -88,7 +95,8 @@ public: ...@@ -88,7 +95,8 @@ public:
std::vector<Netnode*> &GetNodeList(void) { return nodeList; }; std::vector<Netnode*> &GetNodeList(void) { return nodeList; };
protected: protected:
int id; int nid;
int wid;
Netnode *terminalNode; Netnode *terminalNode;
std::vector<Netnode*> nodeList; std::vector<Netnode*> nodeList;
avtDataSpecification_p dspec; avtDataSpecification_p dspec;
......
...@@ -385,6 +385,9 @@ RPCExecutor<PreparePlotRPC>::Execute(PreparePlotRPC *rpc) ...@@ -385,6 +385,9 @@ RPCExecutor<PreparePlotRPC>::Execute(PreparePlotRPC *rpc)
// Eric Brugger, Fri Mar 19 15:19:13 PST 2004 // Eric Brugger, Fri Mar 19 15:19:13 PST 2004
// Modified the rpc to pass the data extents to the engine. // Modified the rpc to pass the data extents to the engine.
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added code to pass window id
//
// **************************************************************************** // ****************************************************************************
template<> template<>
void void
...@@ -398,7 +401,7 @@ RPCExecutor<MakePlotRPC>::Execute(MakePlotRPC *rpc) ...@@ -398,7 +401,7 @@ RPCExecutor<MakePlotRPC>::Execute(MakePlotRPC *rpc)
{ {
netmgr->MakePlot(rpc->GetID().c_str(), rpc->GetAtts(), netmgr->MakePlot(rpc->GetID().c_str(), rpc->GetAtts(),
rpc->GetDataExtents()); rpc->GetDataExtents());
MakePlotRPC::NetworkID id(netmgr->EndNetwork()); MakePlotRPC::NetworkID id(netmgr->EndNetwork(rpc->GetWindowID()));
rpc->SendReply(&id); rpc->SendReply(&id);
} }
CATCH2(VisItException, e) CATCH2(VisItException, e)
...@@ -539,6 +542,8 @@ RPCExecutor<UpdatePlotAttsRPC>::Execute(UpdatePlotAttsRPC *rpc) ...@@ -539,6 +542,8 @@ RPCExecutor<UpdatePlotAttsRPC>::Execute(UpdatePlotAttsRPC *rpc)
// Kathleen Bonnell, Fri Oct 10 10:58:10 PDT 2003 // Kathleen Bonnell, Fri Oct 10 10:58:10 PDT 2003
// Set up callbacks for DataObjectQuery. // Set up callbacks for DataObjectQuery.
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added window id to pick rpc
// **************************************************************************** // ****************************************************************************
template<> template<>
void void
...@@ -555,7 +560,7 @@ RPCExecutor<PickRPC>::Execute(PickRPC *rpc) ...@@ -555,7 +560,7 @@ RPCExecutor<PickRPC>::Execute(PickRPC *rpc)
LoadBalancer::RegisterProgressCallback(NULL, NULL); LoadBalancer::RegisterProgressCallback(NULL, NULL);
avtTerminatingSource::RegisterInitializeProgressCallback(NULL, NULL); avtTerminatingSource::RegisterInitializeProgressCallback(NULL, NULL);
avtDataObjectQuery::RegisterInitializeProgressCallback(NULL, NULL); avtDataObjectQuery::RegisterInitializeProgressCallback(NULL, NULL);
netmgr->Pick(rpc->GetNetId(), rpc->GetPickAtts()); netmgr->Pick(rpc->GetNetId(), rpc->GetWinId(), rpc->GetPickAtts());
rpc->SendReply(rpc->GetPickAtts()); rpc->SendReply(rpc->GetPickAtts());
} }
CATCH2(VisItException, e) CATCH2(VisItException, e)
...@@ -655,6 +660,9 @@ RPCExecutor<StartPickRPC>::Execute(StartPickRPC *rpc) ...@@ -655,6 +660,9 @@ RPCExecutor<StartPickRPC>::Execute(StartPickRPC *rpc)
// //
// Mark C. Miller, Tue Oct 19 19:44:00 PDT 2004 // Mark C. Miller, Tue Oct 19 19:44:00 PDT 2004
// Added arg to pass changed color table name // Added arg to pass changed color table name
//
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added window id to SetWinAnnotAttsRPC
// **************************************************************************** // ****************************************************************************
template<> template<>
void void
...@@ -671,11 +679,13 @@ RPCExecutor<SetWinAnnotAttsRPC>::Execute(SetWinAnnotAttsRPC *rpc) ...@@ -671,11 +679,13 @@ RPCExecutor<SetWinAnnotAttsRPC>::Execute(SetWinAnnotAttsRPC *rpc)
netmgr->SetWindowAttributes(rpc->GetWindowAtts(), netmgr->SetWindowAttributes(rpc->GetWindowAtts(),
rpc->GetExtentTypeString(), rpc->GetExtentTypeString(),
rpc->GetViewExtents(), rpc->GetViewExtents(),
rpc->GetChangedCtName()); rpc->GetChangedCtName(),
rpc->GetWindowID());
netmgr->SetAnnotationAttributes(rpc->GetAnnotationAtts(), netmgr->SetAnnotationAttributes(rpc->GetAnnotationAtts(),
rpc->GetAnnotationObjectList(), rpc->GetAnnotationObjectList(),
rpc->GetVisualCueList(), rpc->GetVisualCueList(),
rpc->GetFrameAndState()); rpc->GetFrameAndState(),
rpc->GetWindowID());
rpc->SendReply(); rpc->SendReply();
} }
CATCH2(VisItException, e) CATCH2(VisItException, e)
...@@ -764,6 +774,8 @@ RPCExecutor<SetWinAnnotAttsRPC>::Execute(SetWinAnnotAttsRPC *rpc) ...@@ -764,6 +774,8 @@ RPCExecutor<SetWinAnnotAttsRPC>::Execute(SetWinAnnotAttsRPC *rpc)
// Mark C. Miller, Mon Aug 23 20:24:31 PDT 2004 // Mark C. Miller, Mon Aug 23 20:24:31 PDT 2004
// Moved code to get cellCountMultiplier to inside GetOutput // Moved code to get cellCountMultiplier to inside GetOutput
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added code to operate on specific window id
// **************************************************************************** // ****************************************************************************
template<> template<>
void void
...@@ -799,6 +811,7 @@ RPCExecutor<ExecuteRPC>::Execute(ExecuteRPC *rpc) ...@@ -799,6 +811,7 @@ RPCExecutor<ExecuteRPC>::Execute(ExecuteRPC *rpc)
bool shouldSendAbort = false; bool shouldSendAbort = false;
float cellCountMultiplier; float cellCountMultiplier;
int netId = netmgr->GetCurrentNetworkId(); int netId = netmgr->GetCurrentNetworkId();
int winId = netmgr->GetCurrentWindowId();
avtNullData abortDob(NULL); avtNullData abortDob(NULL);
// Get the output of the network manager. This does the job of // Get the output of the network manager. This does the job of
...@@ -823,8 +836,8 @@ RPCExecutor<ExecuteRPC>::Execute(ExecuteRPC *rpc) ...@@ -823,8 +836,8 @@ RPCExecutor<ExecuteRPC>::Execute(ExecuteRPC *rpc)
writingData = visitTimer->StartTimer(); writingData = visitTimer->StartTimer();
// set params influencing scalable rendering // set params influencing scalable rendering
int scalableThreshold = netmgr->GetScalableThreshold(); int scalableThreshold = netmgr->GetScalableThreshold(winId);
int currentTotalGlobalCellCount = netmgr->GetTotalGlobalCellCounts(); int currentTotalGlobalCellCount = netmgr->GetTotalGlobalCellCounts(winId);
int currentNetworkGlobalCellCount = 0; int currentNetworkGlobalCellCount = 0;
bool scalableThresholdExceeded = false; bool scalableThresholdExceeded = false;
...@@ -1132,6 +1145,9 @@ RPCExecutor<DefineVirtualDatabaseRPC>::Execute(DefineVirtualDatabaseRPC *rpc) ...@@ -1132,6 +1145,9 @@ RPCExecutor<DefineVirtualDatabaseRPC>::Execute(DefineVirtualDatabaseRPC *rpc)
// //
// Mark C. Miller, Wed Oct 6 18:12:29 PDT 2004 // Mark C. Miller, Wed Oct 6 18:12:29 PDT 2004
// Changed bool flag for 3D annots to integer mode // Changed bool flag for 3D annots to integer mode
//
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added code to operate on specific window id
// **************************************************************************** // ****************************************************************************
template<> template<>
void void
...@@ -1155,7 +1171,7 @@ RPCExecutor<RenderRPC>::Execute(RenderRPC *rpc) ...@@ -1155,7 +1171,7 @@ RPCExecutor<RenderRPC>::Execute(RenderRPC *rpc)
// do the render // do the render
avtDataObjectWriter_p writer = avtDataObjectWriter_p writer =
netmgr->Render(rpc->GetIDs(),rpc->GetSendZBuffer(), netmgr->Render(rpc->GetIDs(),rpc->GetSendZBuffer(),
rpc->GetAnnotMode()); rpc->GetAnnotMode(), rpc->GetWindowID());
// Send the data back to the viewer. // Send the data back to the viewer.
engine->WriteData(rpc, writer); engine->WriteData(rpc, writer);
......
This diff is collapsed.
...@@ -24,6 +24,19 @@ class QueryOverTimeAttributes; ...@@ -24,6 +24,19 @@ class QueryOverTimeAttributes;
class MaterialAttributes; class MaterialAttributes;
class VisWindow; class VisWindow;
typedef struct _EngineVisWinInfo
{
WindowAttributes windowAttributes;
AnnotationAttributes annotationAttributes;
AnnotationObjectList annotationObjectList;
VisualCueList visualCueList;
std::string extentTypeString;
std::string changedCtName;
int frameAndState[7];
VisWindow *viswin;
std::vector<int> plotsCurrentlyInWindow;
} EngineVisWinInfo;
// **************************************************************************** // ****************************************************************************
// Class: NetworkManager // Class: NetworkManager
// //
...@@ -187,6 +200,10 @@ class VisWindow; ...@@ -187,6 +200,10 @@ class VisWindow;
// Hank Childs, Wed Nov 24 17:30:11 PST 2004 // Hank Childs, Wed Nov 24 17:30:11 PST 2004
// Added support for image based plots. // Added support for image based plots.
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Modified to use a map of EngineVisWindowInfo objects keyed on the
// window ID
//
// **************************************************************************** // ****************************************************************************
class NetworkManager class NetworkManager
{ {
...@@ -211,15 +228,16 @@ class NetworkManager ...@@ -211,15 +228,16 @@ class NetworkManager
const unsigned int ninputs = 1); const unsigned int ninputs = 1);
void MakePlot(const std::string&, const AttributeGroup*, void MakePlot(const std::string&, const AttributeGroup*,
const std::vector<double> &); const std::vector<double> &);
int EndNetwork(void); int EndNetwork(int windowID);
void CancelNetwork(); void CancelNetwork();
void UseNetwork(int); void UseNetwork(int);
avtPlot_p GetPlot(void); avtPlot_p GetPlot(void);
int GetCurrentNetworkId(void); int GetCurrentNetworkId(void) const;
int GetTotalGlobalCellCounts(void) const; int GetCurrentWindowId(void) const;
int GetTotalGlobalCellCounts(int winID) const;
void SetGlobalCellCount(int netId, int cellCount); void SetGlobalCellCount(int netId, int cellCount);
int GetScalableThreshold(void) const; int GetScalableThreshold(int winId) const;
void DoneWithNetwork(int); void DoneWithNetwork(int);
void UpdatePlotAtts(int, const AttributeGroup *); void UpdatePlotAtts(int, const AttributeGroup *);
...@@ -227,11 +245,13 @@ class NetworkManager ...@@ -227,11 +245,13 @@ class NetworkManager
void SetWindowAttributes(const WindowAttributes&, void SetWindowAttributes(const WindowAttributes&,
const std::string&, const std::string&,
const double*, const double*,
const std::string&); const std::string&,
int);
void SetAnnotationAttributes(const AnnotationAttributes&, void SetAnnotationAttributes(const AnnotationAttributes&,
const AnnotationObjectList&, const AnnotationObjectList&,
const VisualCueList&, const VisualCueList&,
const int *fns, const int *fns,
int,
int annotMode=1); int annotMode=1);
void SetLoadBalancer(LoadBalancer *lb) {loadBalancer = lb;}; void SetLoadBalancer(LoadBalancer *lb) {loadBalancer = lb;};
...@@ -240,12 +260,12 @@ class NetworkManager ...@@ -240,12 +260,12 @@ class NetworkManager
bool calledForRender, bool calledForRender,
float *cellCountMultiplier); float *cellCountMultiplier);
avtDataObjectWriter_p Render(intVector networkIds, bool getZBuffer, avtDataObjectWriter_p Render(intVector networkIds, bool getZBuffer,
int annotMode); int annotMode, int windowID);
void StartPickMode(const bool); void StartPickMode(const bool);
void StopPickMode(void); void StopPickMode(void);
void Pick(const int, PickAttributes *); void Pick(const int, const int, PickAttributes *);
void Query(const std::vector<int> &, QueryAttributes*); void Query(const std::vector<int> &, QueryAttributes*);
void DumpRenders(void) { dumpRenders = true; }; void DumpRenders(void) { dumpRenders = true; };
...@@ -271,15 +291,8 @@ class NetworkManager ...@@ -271,15 +291,8 @@ class NetworkManager
bool requireOriginalCells; bool requireOriginalCells;
bool requireOriginalNodes; bool requireOriginalNodes;
LoadBalancer *loadBalancer; LoadBalancer *loadBalancer;
WindowAttributes windowAttributes;
AnnotationAttributes annotationAttributes; std::map<int, EngineVisWinInfo> viswinMap;
AnnotationObjectList annotationObjectList;
VisualCueList visualCueList;
std::string extentTypeString;
std::string changedCtName;
int frameAndState[7];
VisWindow *viswin;
std::vector<int> plotsCurrentlyInWindow;
bool dumpRenders; bool dumpRenders;
}; };
......
...@@ -401,13 +401,16 @@ EngineProxy::ApplyOperator(const string &name, const AttributeSubject *atts) ...@@ -401,13 +401,16 @@ EngineProxy::ApplyOperator(const string &name, const AttributeSubject *atts)
// Eric Brugger, Fri Mar 19 15:14:34 PST 2004 // Eric Brugger, Fri Mar 19 15:14:34 PST 2004
// I modified the rpc to pass the data limits to the engine. // I modified the rpc to pass the data limits to the engine.
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added window id
//
// **************************************************************************** // ****************************************************************************
int int
EngineProxy::MakePlot(const string &name, const AttributeSubject *atts, EngineProxy::MakePlot(const string &name, const AttributeSubject *atts,
const vector<double> &extents) const vector<double> &extents, int winID)
{ {
int id; int id;
id = makePlotRPC(name, atts, extents); id = makePlotRPC(name, atts, extents, winID);
if (makePlotRPC.GetStatus() == VisItRPC::error) if (makePlotRPC.GetStatus() == VisItRPC::error)
{ {
RECONSTITUTE_EXCEPTION(makePlotRPC.GetExceptionType(), RECONSTITUTE_EXCEPTION(makePlotRPC.GetExceptionType(),
...@@ -502,6 +505,9 @@ EngineProxy::UpdatePlotAttributes(const string &name, int id, ...@@ -502,6 +505,9 @@ EngineProxy::UpdatePlotAttributes(const string &name, int id,
// Mark C. Miller, Tue Oct 19 20:18:22 PDT 2004 // Mark C. Miller, Tue Oct 19 20:18:22 PDT 2004
// Added argument for color table name // Added argument for color table name
// //
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added winID
//
// **************************************************************************** // ****************************************************************************
void void
...@@ -512,10 +518,11 @@ EngineProxy::SetWinAnnotAtts(const WindowAttributes *winAtts, ...@@ -512,10 +518,11 @@ EngineProxy::SetWinAnnotAtts(const WindowAttributes *winAtts,
const VisualCueList *visCues, const VisualCueList *visCues,
const int *frameAndState, const int *frameAndState,
const double *viewExtents, const double *viewExtents,
const string ctName) const string ctName,
const int winID)
{ {
setWinAnnotAttsRPC(winAtts, annotAtts, aoList, extStr, visCues, setWinAnnotAttsRPC(winAtts, annotAtts, aoList, extStr, visCues,
frameAndState, viewExtents, ctName); frameAndState, viewExtents, ctName, winID);
if (setWinAnnotAttsRPC.GetStatus() == VisItRPC::error) if (setWinAnnotAttsRPC.GetStatus() == VisItRPC::error)
{ {
RECONSTITUTE_EXCEPTION(setWinAnnotAttsRPC.GetExceptionType(), RECONSTITUTE_EXCEPTION(setWinAnnotAttsRPC.GetExceptionType(),
...@@ -777,18 +784,21 @@ EngineProxy::DefineVirtualDatabase(const std::string &fileFormat, ...@@ -777,18 +784,21 @@ EngineProxy::DefineVirtualDatabase(const std::string &fileFormat,
// //
// Mark C. Miller, Sat Nov 13 09:35:51 PST 2004 // Mark C. Miller, Sat Nov 13 09:35:51 PST 2004
// Disabled callback to waitCB // Disabled callback to waitCB
//
// Mark C. Miller, Tue Jan 4 10:23:19 PST 2005
// Added windowID
// **************************************************************************** // ****************************************************************************
avtDataObjectReader_p avtDataObjectReader_p
EngineProxy::Render(bool sendZBuffer, const intVector& networkIDs, EngineProxy::Render(bool sendZBuffer, const intVector& networkIDs,
int annotMode, void (*waitCB)(void *), void *cbData) int annotMode, int windowID, void (*waitCB)(void *), void *cbData)
{ {
// Send a status message indicating that we're starting a scalable render // Send a status message indicating that we're starting a scalable render
Status("Scalable Rendering."); Status("Scalable Rendering.");
// Do it! // Do it!
renderRPC(networkIDs, sendZBuffer, annotMode); renderRPC(networkIDs, sendZBuffer, annotMode, windowID);
// Get the reply and update the progress bar // Get the reply and update the progress bar
while (renderRPC.GetStatus() == VisItRPC::incomplete || while (renderRPC.GetStatus() == VisItRPC::incomplete ||
...@@ -1023,13 +1033,16 @@ EngineProxy::Interrupt() ...@@ -1023,13 +1033,16 @@ EngineProxy::Interrupt()
// Kathleen Bonnell, Tue Mar 5 09:27:51 PST 2002 // Kathleen Bonnell, Tue Mar 5 09:27:51 PST 2002
// Remove unnecessary debug lines. // Remove unnecessary debug lines.