Commit d2219b18 authored by Clinton Stimpson's avatar Clinton Stimpson

BUG: Make plugins work in data-server/render-server mode too.

parent 009ec915
......@@ -92,11 +92,11 @@ MACRO(ADD_SERVER_MANAGER_EXTENSION OUTSRCS Name XMLFile)
ENDIF(HDRS)
CONFIGURE_FILE(
"${ParaView_SOURCE_DIR}/Servers/ServerManager/vtkSMPluginInit.cxx.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkSMPluginInit_${Name}.cxx" @ONLY)
"${ParaView_SOURCE_DIR}/Servers/Common/vtkPVPluginInit.cxx.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkPVPluginInit_${Name}.cxx" @ONLY)
SET(${OUTSRCS} ${CS_SRCS} ${XML_HEADER}
${CMAKE_CURRENT_BINARY_DIR}/vtkSMPluginInit_${Name}.cxx
${CMAKE_CURRENT_BINARY_DIR}/vtkPVPluginInit_${Name}.cxx
)
ENDMACRO(ADD_SERVER_MANAGER_EXTENSION)
......
......@@ -49,6 +49,7 @@ SET(Kit_SRCS
vtkPVInformation.cxx
vtkPVNumberOfOutputsInformation.cxx
vtkPVOpenGLExtensionsInformation.cxx
vtkPVPluginLoader.cxx
vtkPVProgressHandler.cxx
vtkPVSelectionInformation.cxx
vtkPVServerInformation.cxx
......
......@@ -42,6 +42,7 @@
#include "vtkPVOpenGLExtensionsInformation.h"
#include "vtkPVOptions.h"
#include "vtkPVOptionsXMLParser.h"
#include "vtkPVPluginLoader.h"
#include "vtkPVProgressHandler.h"
#include "vtkPVSelectionInformation.h"
#include "vtkPVServerInformation.h"
......@@ -87,6 +88,7 @@ int main(int, char * [])
c = vtkPVFileInformation::New(); c->Print(cout); c->Delete();
c = vtkPVFileInformationHelper::New(); c->Print(cout); c->Delete();
c = vtkPVInformation::New(); c->Print(cout); c->Delete();
c = vtkPVPluginLoader::New(); c->Print( cout ); c->Delete();
c = vtkPVProgressHandler::New(); c->Print(cout); c->Delete();
c = vtkPVOptions::New(); c->Print(cout); c->Delete();
c = vtkPVOptionsXMLParser::New(); c->Print(cout); c->Delete();
......
......@@ -4,7 +4,7 @@
/*=========================================================================
Program: ParaView
Module: vtkSMPluginInit.cxx.in
Module: vtkPVPluginInit.cxx.in
Copyright (c) Kitware, Inc.
All rights reserved.
......
/*=========================================================================
Program: ParaView
Module: vtkSMPluginLoader.cxx
Module: vtkPVPluginLoader.cxx
Copyright (c) Kitware, Inc.
All rights reserved.
......@@ -12,15 +12,15 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkSMPluginLoader.h"
#include "vtkPVPluginLoader.h"
#include "vtkObjectFactory.h"
#include "vtkProcessModule.h"
#include "vtkClientServerInterpreter.h"
#include "vtkDynamicLoader.h"
vtkStandardNewMacro(vtkSMPluginLoader);
vtkCxxRevisionMacro(vtkSMPluginLoader, "1.7");
vtkStandardNewMacro(vtkPVPluginLoader);
vtkCxxRevisionMacro(vtkPVPluginLoader, "1.1");
#ifdef _WIN32
// __cdecl gives an unmangled name
......@@ -34,7 +34,7 @@ typedef void (C_DECL *PluginInit)(vtkClientServerInterpreter*);
//-----------------------------------------------------------------------------
vtkSMPluginLoader::vtkSMPluginLoader()
vtkPVPluginLoader::vtkPVPluginLoader()
{
this->Loaded = 0;
this->FileName = 0;
......@@ -43,7 +43,7 @@ vtkSMPluginLoader::vtkSMPluginLoader()
}
//-----------------------------------------------------------------------------
vtkSMPluginLoader::~vtkSMPluginLoader()
vtkPVPluginLoader::~vtkPVPluginLoader()
{
if(this->ServerManagerXML)
{
......@@ -52,7 +52,7 @@ vtkSMPluginLoader::~vtkSMPluginLoader()
}
//-----------------------------------------------------------------------------
void vtkSMPluginLoader::SetFileName(const char* file)
void vtkPVPluginLoader::SetFileName(const char* file)
{
if(this->Loaded)
{
......@@ -114,7 +114,7 @@ void vtkSMPluginLoader::SetFileName(const char* file)
}
//-----------------------------------------------------------------------------
void vtkSMPluginLoader::PrintSelf(ostream& os, vtkIndent indent)
void vtkPVPluginLoader::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
os << indent << "FileName: "
......
/*=========================================================================
Program: ParaView
Module: vtkSMPluginLoader.h
Module: vtkPVPluginLoader.h
Copyright (c) Kitware, Inc.
All rights reserved.
......@@ -12,21 +12,21 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkSMPluginLoader - Object that can
// .NAME vtkPVPluginLoader - Object that can
// be used to load plugins in the server manager.
// .SECTION Description
// vtkSMPluginLoader can be used to load plugins into the server manager.
// vtkPVPluginLoader can be used to load plugins into the server manager.
#ifndef __vtkSMPluginLoader_h
#define __vtkSMPluginLoader_h
#ifndef __vtkPVPluginLoader_h
#define __vtkPVPluginLoader_h
#include "vtkSMObject.h"
#include "vtkObject.h"
class VTK_EXPORT vtkSMPluginLoader : public vtkSMObject
class VTK_EXPORT vtkPVPluginLoader : public vtkObject
{
public:
static vtkSMPluginLoader* New();
vtkTypeRevisionMacro(vtkSMPluginLoader, vtkSMObject);
static vtkPVPluginLoader* New();
vtkTypeRevisionMacro(vtkPVPluginLoader, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......@@ -47,8 +47,8 @@ public:
vtkGetStringMacro(Error);
protected:
vtkSMPluginLoader();
~vtkSMPluginLoader();
vtkPVPluginLoader();
~vtkPVPluginLoader();
vtkSetStringMacro(Error);
......@@ -58,8 +58,8 @@ protected:
char* Error;
private:
vtkSMPluginLoader(const vtkSMPluginLoader&); // Not implemented.
void operator=(const vtkSMPluginLoader&); // Not implemented.
vtkPVPluginLoader(const vtkPVPluginLoader&); // Not implemented.
void operator=(const vtkPVPluginLoader&); // Not implemented.
};
......
......@@ -93,7 +93,6 @@ SET(Kit_SRCS
vtkSMOrderedPropertyIterator.cxx
vtkSMOutlineRepresentationProxy.cxx
vtkSMPart.cxx
vtkSMPluginLoader.cxx
vtkSMPQStateLoader.cxx
vtkSMPropertyAdaptor.cxx
vtkSMProperty.cxx
......
......@@ -1795,7 +1795,7 @@
<!-- End of TimeKeeper -->
</TimeKeeperProxy>
<Proxy name="PluginLoader" class="vtkSMPluginLoader">
<Proxy name="PluginLoader" class="vtkPVPluginLoader">
<StringVectorProperty
name="FileName"
command="SetFileName"
......
......@@ -73,7 +73,6 @@
#include "vtkSMObject.h"
#include "vtkSMOrderedPropertyIterator.h"
#include "vtkSMPart.h"
#include "vtkSMPluginLoader.h"
#include "vtkSMPQStateLoader.h"
#include "vtkSMPropertyAdaptor.h"
#include "vtkSMProperty.h"
......@@ -217,7 +216,6 @@ int main(int , char *[])
c = vtkSMObject::New(); c->Print( cout ); c->Delete();
c = vtkSMOrderedPropertyIterator::New(); c->Print( cout ); c->Delete();
c = vtkSMPart::New(); c->Print( cout ); c->Delete();
c = vtkSMPluginLoader::New(); c->Print( cout ); c->Delete();
c = vtkSMPQStateLoader::New(); c->Print( cout ); c->Delete();
c = vtkSMPropertyAdaptor::New(); c->Print( cout ); c->Delete();
c = vtkSMProperty::New(); c->Print( cout ); c->Delete();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment