Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 3ee1d3b1 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: move vtkPVProcessModule out of GUI/Client. This will allow servers that...

ENH: move vtkPVProcessModule out of GUI/Client.  This will allow servers that do not link to vtkPVApplication to be created.   In the process many files were cvs removed and cvs added to Servers/Common.  Also, some files were moved from Servers/Common to Servers/Filters.   So, if you are looking for the author of a bug, or using cvs blame, you may have to go to the original directory to find the problem.
parent 560268e6
......@@ -303,6 +303,9 @@ SET(PVFILTERS_INCLUDE_DIR
SET(PVSERVERMANAGER_INCLUDE_DIR
${ParaView_SOURCE_DIR}/Servers/ServerManager
${ParaView_BINARY_DIR}/Servers/ServerManager)
SET(PVSERVERCOMMON_INCLUDE_DIR
${ParaView_SOURCE_DIR}/Servers/Common
${ParaView_BINARY_DIR}/Servers/Common)
SUBDIRS(Servers)
......
......@@ -9,14 +9,11 @@ SET( ParaViewSharedNotWrapped_SRCS
SET(ParaViewSharedNotTclWrapped_SRCS
vtkPickPointWidget.cxx
vtkPVProcessModule.cxx
vtkPVProcessModuleGUIHelper.cxx
vtkPVLODActor.cxx
vtkPVTimerInformation.cxx
vtkMPIMToNSocketConnection.cxx
vtkPVExtentTranslator.cxx
vtkPVClientServerModule.cxx
vtkPVGenericRenderWindowInteractor.cxx
vtkPVMPIProcessModule.cxx
)
SET( ParaViewServer_SRCS
......@@ -28,7 +25,6 @@ SET( ParaViewServer_SRCS
vtkPVServerProbe.cxx
vtkPVServerSelectTimeSet.cxx
vtkPVSummaryHelper.cxx
vtkMPIMoveData.cxx
vtkPVServerXDMFParameters.cxx
)
......@@ -68,7 +64,6 @@ SET( ParaViewClientNotWrapped_SRCS
vtkPVRenderModule.cxx
vtkPVWidgetCollection.cxx
vtkPVWorldPointPicker.cxx
vtkMPIMToNSocketConnectionPortInformation.cxx
vtkPVXMLPackageParser.cxx
)
......@@ -197,6 +192,7 @@ SET( ParaViewClient_SRCS
INCLUDE_DIRECTORIES(
${KWSYS_INCLUDE_DIR}
${PVSERVERCOMMON_INCLUDE_DIR}
${PVFILTERS_INCLUDE_DIR}
${PVGUI_BINARY_DIR}/Client
${PVGUI_SOURCE_DIR}/Client
......@@ -341,7 +337,7 @@ SET(VTK_BINARY_DIR "${PVClient_BINARY_DIR}")
INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkExportKit.cmake)
VTK_EXPORT_KIT("KWParaView" "PVSERVER" "${ParaViewServer_SRCS};${ParaViewShared_SRCS};${ParaView_SOURCE_DIR}/GUI/Widgets/vtkKWApplication.cxx;${ParaView_SOURCE_DIR}/GUI/Widgets/vtkKWObject.cxx;${ParaViewSharedNotTclWrapped_SRCS}")
SET(KIT_WRAP_DEPS PVFilters)
SET(KIT_WRAP_DEPS PVFilters PVCommon)
SET(VTK_KITS_DIR "${ParaView_BINARY_DIR}/GUI/Client/Utilities")
PV_WRAP_VTK_CS(KWParaView PVSERVER "${KIT_WRAP_DEPS}")
......
......@@ -61,9 +61,6 @@ PURPOSE. See the above copyright notice for more information.
#include "vtkSMInstantiator.h"
#include "vtkParaViewInstantiator.h"
#include "vtkClientServerInterpreter.h"
static void ParaViewEnableMSVCDebugHook();
static void ParaViewEnableWindowsExceptionFilter();
static void ParaViewInitializeInterpreter(vtkPVProcessModule* pm);
//----------------------------------------------------------------------------
......@@ -74,8 +71,6 @@ int MyMain(int argc, char *argv[])
int myId = 0;
vtkPVProcessModule *pm;
vtkPVApplication *app;
ParaViewEnableMSVCDebugHook();
ParaViewEnableWindowsExceptionFilter();
#ifdef PARAVIEW_ENABLE_FPE
#if defined(_MSC_VER)
......@@ -179,7 +174,7 @@ int MyMain(int argc, char *argv[])
{ // The render module has not been set by the user. Choose a default.
if (app->GetUseTiledDisplay())
{
#ifdef PARAVIEW_USE_ICE_T
#if defined(PARAVIEW_USE_ICE_T) && defined(VTK_USE_MPI)
app->SetRenderModuleName("IceTRenderModule");
#else
app->SetRenderModuleName("MultiDisplayRenderModule");
......@@ -187,7 +182,7 @@ int MyMain(int argc, char *argv[])
}
else if (app->GetClientMode())
{ // Client server, no tiled display.
#ifdef PARAVIEW_USE_ICE_T
#if defined(PARAVIEW_USE_ICE_T) && defined(VTK_USE_MPI)
app->SetRenderModuleName("DeskTopRenderModule");
#else
app->SetRenderModuleName("MPIRenderModule");
......@@ -221,7 +216,6 @@ int MyMain(int argc, char *argv[])
pm = processModule;
}
pm->SetApplication(app);
app->SetProcessModule(pm);
pm->InitializeInterpreter();
bool needLog = false;
......@@ -398,49 +392,6 @@ int main(int argc, char *argv[])
}
#endif
// For a DEBUG build on MSVC, add a hook to prevent error dialogs when
// being run from DART.
#if defined(_MSC_VER) && defined(_DEBUG)
# include <crtdbg.h>
static int ParaViewDebugReport(int, char* message, int*)
{
fprintf(stderr, message);
exit(1);
return 0;
}
void ParaViewEnableMSVCDebugHook()
{
if(getenv("DART_TEST_FROM_DART"))
{
_CrtSetReportHook(ParaViewDebugReport);
}
}
#else
void ParaViewEnableMSVCDebugHook()
{
}
#endif
#if defined(_WIN32) && !defined(__CYGWIN__)
# include <windows.h>
static LONG __stdcall
ParaViewUnhandledExceptionFilter(EXCEPTION_POINTERS* e)
{
ExitProcess(e->ExceptionRecord->ExceptionCode);
return 0;
}
static void ParaViewEnableWindowsExceptionFilter()
{
if(getenv("DART_TEST_FROM_DART"))
{
SetUnhandledExceptionFilter(&ParaViewUnhandledExceptionFilter);
}
}
#else
static void ParaViewEnableWindowsExceptionFilter()
{
}
#endif
//----------------------------------------------------------------------------
// ClientServer wrapper initialization functions.
......@@ -455,6 +406,7 @@ extern "C" void vtkParallelCS_Initialize(vtkClientServerInterpreter*);
#ifdef VTK_USE_PATENTED
extern "C" void vtkPatentedCS_Initialize(vtkClientServerInterpreter*);
#endif
extern "C" void vtkPVCommonCS_Initialize(vtkClientServerInterpreter*);
extern "C" void vtkPVFiltersCS_Initialize(vtkClientServerInterpreter*);
#ifdef PARAVIEW_NEW_SOURCE_ORGANIZATION
......@@ -485,6 +437,7 @@ void ParaViewInitializeInterpreter(vtkPVProcessModule* pm)
#ifdef VTK_USE_PATENTED
vtkPatentedCS_Initialize(pm->GetInterpreter());
#endif
vtkPVCommonCS_Initialize(pm->GetInterpreter());
vtkPVFiltersCS_Initialize(pm->GetInterpreter());
#ifdef PARAVIEW_NEW_SOURCE_ORGANIZATION
......
......@@ -53,6 +53,7 @@
#include "vtkPVData.h"
#include "vtkPVHelpPaths.h"
#include "vtkPVProcessModule.h"
#include "vtkPVProcessModuleGUIHelper.h"
#include "vtkPVRenderModule.h"
#include "vtkPVRenderView.h"
#include "vtkPVSource.h"
......@@ -72,7 +73,6 @@
#include "vtkShortArray.h"
#include "vtkString.h"
#include "vtkTclUtil.h"
#include "vtkTimerLog.h"
#include "vtkUnsignedCharArray.h"
#include "vtkUnsignedIntArray.h"
#include "vtkUnsignedLongArray.h"
......@@ -90,7 +90,7 @@
#include <sys/stat.h>
#include <stdarg.h>
#include <signal.h>
#include "vtkPVProgressHandler.h"
#include "vtkKWDirectoryUtilities.h"
#ifdef _WIN32
......@@ -109,7 +109,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVApplication);
vtkCxxRevisionMacro(vtkPVApplication, "1.294");
vtkCxxRevisionMacro(vtkPVApplication, "1.295");
vtkCxxSetObjectMacro(vtkPVApplication, RenderModule, vtkPVRenderModule);
......@@ -204,9 +204,6 @@ static void vtkPVAppProcessMessage(vtkObject* vtkNotUsed(object),
str.rdbuf()->freeze(0);
}
// initialze the class variables
int vtkPVApplication::GlobalLODFlag = 0;
//----------------------------------------------------------------------------
// Output window which prints out the process id
// with the error or warning messages
......@@ -505,7 +502,6 @@ vtkPVApplication::vtkPVApplication()
this->ShowSourcesLongHelp = 1;
this->DemoPath = NULL;
this->LogThreshold = 0.01;
this->SMApplication = vtkSMApplication::New();
}
......@@ -543,6 +539,31 @@ void vtkPVApplication::SetProcessModule(vtkPVProcessModule *pm)
{
this->ProcessModule = pm;
vtkPVProcessModule::SetProcessModule(pm);
if(pm)
{
// copy all the command line settings from the application
// to the process module
pm->SetAlwaysSSH(this->GetAlwaysSSH());
pm->SetPort(this->GetPort());
pm->SetHostName(this->GetHostName());
pm->SetUsername(this->GetUsername());
pm->SetRenderServerHostName(this->GetRenderServerHostName());
pm->SetClientMode(this->GetClientMode());
pm->SetRenderServerPort(this->GetRenderServerPort());
pm->SetRenderServerMode(this->GetRenderServerMode());
pm->SetRenderNodePort(this->GetRenderNodePort());
pm->SetMachinesFileName(this->GetMachinesFileName());
pm->SetReverseConnection(this->GetReverseConnection());
pm->SetDemoPath(this->GetDemoPath());
pm->SetServerMode(this->GetServerMode());
vtkPVProcessModuleGUIHelper* helper = vtkPVProcessModuleGUIHelper::New();
helper->SetPVApplication(this);
helper->SetPVProcessModule(pm);
pm->SetGUIHelper(helper);
helper->Delete();
pm->GetProgressHandler()->SetClientMode(this->GetClientMode());
pm->GetProgressHandler()->SetServerMode(this->GetServerMode());
}
}
//----------------------------------------------------------------------------
......@@ -1905,36 +1926,20 @@ void vtkPVApplication::StopRecordingScript()
//----------------------------------------------------------------------------
void vtkPVApplication::SetGlobalLODFlag(int val)
{
if (vtkPVApplication::GlobalLODFlag == val)
{
return;
}
vtkPVProcessModule* pm = this->GetProcessModule();
pm->GetStream() << vtkClientServerStream::Invoke
<< pm->GetApplicationID()
<< "SetGlobalLODFlagInternal"
<< val
<< vtkClientServerStream::End;
pm->SendStream(vtkProcessModule::CLIENT|vtkProcessModule::DATA_SERVER);
this->GetProcessModule()->SetGlobalLODFlag(val);
}
//----------------------------------------------------------------------------
void vtkPVApplication::SetGlobalLODFlagInternal(int val)
{
vtkPVApplication::GlobalLODFlag = val;
vtkPVProcessModule::SetGlobalLODFlagInternal(val);
}
//----------------------------------------------------------------------------
int vtkPVApplication::GetGlobalLODFlag()
{
return vtkPVApplication::GlobalLODFlag;
}
//============================================================================
// Make instances of sources.
......@@ -1951,23 +1956,6 @@ void vtkPVApplication::DisplayHelp(vtkKWWindow* master)
dlg->Delete();
}
//----------------------------------------------------------------------------
void vtkPVApplication::LogStartEvent(char* str)
{
vtkTimerLog::MarkStartEvent(str);
}
//----------------------------------------------------------------------------
void vtkPVApplication::RegisterProgressEvent(vtkProcessObject* po, int id)
{
this->GetProcessModule()->RegisterProgressEvent(po, id);
}
//----------------------------------------------------------------------------
void vtkPVApplication::LogEndEvent(char* str)
{
vtkTimerLog::MarkEndEvent(str);
}
#ifdef PV_HAVE_TRAPS_FOR_SIGNALS
//----------------------------------------------------------------------------
......@@ -2086,24 +2074,6 @@ void vtkPVApplication::ErrorExit()
}
#endif // PV_HAVE_TRAPS_FOR_SIGNALS
//----------------------------------------------------------------------------
void vtkPVApplication::SetLogBufferLength(int length)
{
vtkTimerLog::SetMaxEntries(length);
}
//----------------------------------------------------------------------------
void vtkPVApplication::ResetLog()
{
vtkTimerLog::ResetLog();
}
//----------------------------------------------------------------------------
void vtkPVApplication::SetEnableLog(int flag)
{
vtkTimerLog::SetLogging(flag);
}
//----------------------------------------------------------------------------
void vtkPVApplication::PrintSelf(ostream& os, vtkIndent indent)
{
......@@ -2190,7 +2160,6 @@ void vtkPVApplication::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "SourcesBrowserAlwaysShowName: "
<< (this->SourcesBrowserAlwaysShowName?"on":"off") << endl;
os << indent << "LogThreshold: " << this->LogThreshold << endl;
os << indent << "CrashOnErrors: " << (this->CrashOnErrors?"on":"off") << endl;
os << indent << "RenderServerPort: " << this->RenderServerPort << endl;
os << indent << "MachinesFileName: "
......@@ -2356,7 +2325,7 @@ void vtkPVApplication::PlayDemo(int fromDashboard)
// Server path
vtkPVProcessModule* pm = this->GetProcessModule();
pm->GetStream() << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "GetDemoPath"
<< pm->GetProcessModuleID() << "GetDemoPath"
<< vtkClientServerStream::End;
pm->SendStream(vtkProcessModule::DATA_SERVER_ROOT);
if(!pm->GetLastServerResult().GetArgument(0, 0, &demoDataPath))
......@@ -2465,3 +2434,9 @@ void vtkPVApplication::FindApplicationInstallationDirectory()
this->ApplicationInstallationDirectory[length - 4] = '\0';
}
}
int vtkPVApplication::GetGlobalLODFlag()
{
return vtkPVProcessModule::GetGlobalLODFlag();
}
......@@ -176,26 +176,6 @@ public:
static int GetGlobalLODFlag();
void SetGlobalLODFlagInternal(int val);
// Description:
// For loggin from Tcl start and end execute events. We do not have c
// pointers to all filters.
void LogStartEvent(char* str);
void LogEndEvent(char* str);
void RegisterProgressEvent(vtkProcessObject* po, int id);
// Description:
// More timer log access methods. Static methods are not accessible
// from tcl. We need a timer object on all procs.
void SetLogBufferLength(int length);
void ResetLog();
void SetEnableLog(int flag);
// Description:
// Time threshold for event (start-end) when getting the log with indents.
// We do not have a timer object on all procs. Statics do not work with Tcl.
vtkSetMacro(LogThreshold, float);
vtkGetMacro(LogThreshold, float);
// Description:
// Flag showing whether the commands are being executed from
// a ParaView script.
......@@ -477,10 +457,6 @@ protected:
int TileDimensions[2];
int DisableComposite;
// Need to put a global flag that indicates interactive rendering.
// All process must be consistent in choosing LODs because
// of the vtkCollectPolydata filter.
static int GlobalLODFlag;
int RunningParaViewScript;
......@@ -517,8 +493,6 @@ protected:
char* DemoPath;
vtkSetStringMacro(DemoPath);
float LogThreshold;
int CrashOnErrors;
vtkPVApplicationObserver* Observer;
......
......@@ -35,7 +35,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVCompositePartDisplay);
vtkCxxRevisionMacro(vtkPVCompositePartDisplay, "1.25");
vtkCxxRevisionMacro(vtkPVCompositePartDisplay, "1.26");
//----------------------------------------------------------------------------
......@@ -186,7 +186,7 @@ void vtkPVCompositePartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp
vtkClientServerStream cmd;
cmd << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "LogStartEvent" << "Execute Collect"
<< pm->GetProcessModuleID() << "LogStartEvent" << "Execute Collect"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
......@@ -194,7 +194,7 @@ void vtkPVCompositePartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp
<< vtkClientServerStream::End;
cmd.Reset();
cmd << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "LogEndEvent" << "Execute Collect"
<< pm->GetProcessModuleID() << "LogEndEvent" << "Execute Collect"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
......@@ -255,7 +255,7 @@ void vtkPVCompositePartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp
<< vtkClientServerStream::End;
cmd.Reset();
cmd << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "LogStartEvent" << "Execute LODCollect"
<< pm->GetProcessModuleID() << "LogStartEvent" << "Execute LODCollect"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
......@@ -263,7 +263,7 @@ void vtkPVCompositePartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp
<< vtkClientServerStream::End;
cmd.Reset();
cmd << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "LogEndEvent" << "Execute LODCollect"
<< pm->GetProcessModuleID() << "LogEndEvent" << "Execute LODCollect"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
......
......@@ -71,7 +71,7 @@ public:
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVFileEntry);
vtkCxxRevisionMacro(vtkPVFileEntry, "1.85");
vtkCxxRevisionMacro(vtkPVFileEntry, "1.86");
//----------------------------------------------------------------------------
vtkPVFileEntry::vtkPVFileEntry()
......@@ -317,11 +317,10 @@ void vtkPVFileEntry::TimestepChangedCallback()
void vtkPVFileEntry::BrowseCallback()
{
ostrstream str;
vtkPVProcessModule* pm = this->GetPVApplication()->GetProcessModule();
vtkKWLoadSaveDialog* loadDialog = this->GetPVApplication()->NewLoadSaveDialog();
const char* fname = this->Entry->GetValue();
vtkPVApplication* pvApp = pm->GetPVApplication();
vtkPVApplication* pvApp = this->GetPVApplication();
vtkPVWindow* win = 0;
if (pvApp)
{
......
......@@ -27,7 +27,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVIceTDisplayRenderModule);
vtkCxxRevisionMacro(vtkPVIceTDisplayRenderModule, "1.12");
vtkCxxRevisionMacro(vtkPVIceTDisplayRenderModule, "1.13");
......@@ -174,7 +174,7 @@ void vtkPVIceTDisplayRenderModule::SetPVApplication(vtkPVApplication *pvApp)
pm->GetStream() << vtkClientServerStream::Invoke << this->CompositeID
<< "SetClientController" << vtkClientServerStream::LastResult
<< vtkClientServerStream::End;
pm->GetStream() << vtkClientServerStream::Invoke << pm->GetApplicationID() << "GetClientMode"
pm->GetStream() << vtkClientServerStream::Invoke << pm->GetProcessModuleID() << "GetClientMode"
<< vtkClientServerStream::End;
pm->GetStream() << vtkClientServerStream::Invoke << this->CompositeID
<< "SetClientFlag" << vtkClientServerStream::LastResult
......
......@@ -27,7 +27,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVIceTRenderModule);
vtkCxxRevisionMacro(vtkPVIceTRenderModule, "1.13");
vtkCxxRevisionMacro(vtkPVIceTRenderModule, "1.14");
......@@ -199,7 +199,7 @@ void vtkPVIceTRenderModule::SetPVApplication(vtkPVApplication *pvApp)
pm->GetStream() << vtkClientServerStream::Invoke << this->CompositeID
<< "SetClientController" << vtkClientServerStream::LastResult
<< vtkClientServerStream::End;
pm->GetStream() << vtkClientServerStream::Invoke << pm->GetApplicationID() << "GetClientMode"
pm->GetStream() << vtkClientServerStream::Invoke << pm->GetProcessModuleID() << "GetClientMode"
<< vtkClientServerStream::End;
pm->GetStream() << vtkClientServerStream::Invoke << this->CompositeID
<< "SetClientFlag" << vtkClientServerStream::LastResult
......
......@@ -41,7 +41,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVLODPartDisplay);
vtkCxxRevisionMacro(vtkPVLODPartDisplay, "1.26");
vtkCxxRevisionMacro(vtkPVLODPartDisplay, "1.27");
//----------------------------------------------------------------------------
......@@ -130,7 +130,7 @@ void vtkPVLODPartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp)
// Keep track of how long each decimation filter takes to execute.
vtkClientServerStream cmd;
cmd << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "LogStartEvent" << "Execute Decimate"
<< pm->GetProcessModuleID() << "LogStartEvent" << "Execute Decimate"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
......@@ -138,7 +138,7 @@ void vtkPVLODPartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp)
<< vtkClientServerStream::End;
cmd.Reset();
cmd << vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "LogEndEvent" << "Execute Decimate"
<< pm->GetProcessModuleID() << "LogEndEvent" << "Execute Decimate"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
......@@ -146,7 +146,7 @@ void vtkPVLODPartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp)
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
<< pm->GetApplicationID() << "RegisterProgressEvent"
<< pm->GetProcessModuleID() << "RegisterProgressEvent"
<< this->LODDeciID << this->LODDeciID.ID
<< vtkClientServerStream::End;
pm->GetStream()
......
......@@ -24,7 +24,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVMPIRenderModule);
vtkCxxRevisionMacro(vtkPVMPIRenderModule, "1.11");
vtkCxxRevisionMacro(vtkPVMPIRenderModule, "1.12");
......@@ -77,7 +77,7 @@ void vtkPVMPIRenderModule::SetPVApplication(vtkPVApplication *pvApp)
<< "SetClientController" << vtkClientServerStream::LastResult
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke << pm->GetApplicationID()
<< vtkClientServerStream::Invoke << pm->GetProcessModuleID()
<< "GetClientMode" << vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke << this->CompositeID << "SetClientFlag"
......
......@@ -48,7 +48,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVPartDisplay);
vtkCxxRevisionMacro(vtkPVPartDisplay, "1.38");
vtkCxxRevisionMacro(vtkPVPartDisplay, "1.39");
//----------------------------------------------------------------------------
......@@ -248,11 +248,11 @@ void vtkPVPartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp)
// Keep track of how long each geometry filter takes to execute.
vtkClientServerStream start;
start << vtkClientServerStream::Invoke << pm->GetApplicationID()
start << vtkClientServerStream::Invoke << pm->GetProcessModuleID()
<< "LogStartEvent" << "Execute Geometry"
<< vtkClientServerStream::End;
vtkClientServerStream end;
end << vtkClientServerStream::Invoke << pm->GetApplicationID()
end << vtkClientServerStream::Invoke << pm->GetProcessModuleID()
<< "LogEndEvent" << "Execute Geometry"
<< vtkClientServerStream::End;
pm->GetStream() << vtkClientServerStream::Invoke << this->GeometryID
......
#include "vtkPVProcessModuleGUIHelper.h"
#include "vtkPVApplication.h"
#include "vtkPVProcessModule.h"
#include "vtkPVConnectDialog.h"
#include "vtkPVClientServerModule.h"
#include "vtkPVWindow.h"
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkPVProcessModuleGUIHelper, "1.1");
vtkSetObjectImplementationMacro(vtkPVProcessModuleGUIHelper,PVApplication, vtkPVApplication);
vtkSetObjectImplementationMacro(vtkPVProcessModuleGUIHelper,PVProcessModule, vtkPVProcessModule);
vtkStandardNewMacro(vtkPVProcessModuleGUIHelper);
vtkPVProcessModuleGUIHelper::vtkPVProcessModuleGUIHelper()
{
this->PVApplication = 0;
this->PVProcessModule = 0;
}
void vtkPVProcessModuleGUIHelper::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
}
int vtkPVProcessModuleGUIHelper::RunGUIStart(int argc, char **argv, int numServerProcs, int myId)
{
(void)myId;
// Start the application (UI).
// For SGI pipe option.
this->PVApplication->SetNumberOfPipes(numServerProcs);
#ifdef PV_HAVE_TRAPS_FOR_SIGNALS
this->PVApplication->SetupTrapsForSignals(myId);
#endif // PV_HAVE_TRAPS_FOR_SIGNALS
if (this->PVApplication->GetStartGUI())