Commit 111f1838 authored by Dan Lipsa's avatar Dan Lipsa

Add ClientServerCorePythonRendering

parent 604fa6c1
......@@ -318,11 +318,13 @@ if (PARAVIEW_ENABLE_PYTHON)
list(APPEND paraview_requested_modules
ParaView::PythonAlgorithm
ParaView::PythonInitializer
ParaView::ClientServerCorePythonRendering
VTK::RenderingMatplotlib)
else ()
list(APPEND paraview_rejected_modules
ParaView::PythonAlgorithm
ParaView::PythonInitializer
ParaView::ClientServerCorePythonRendering
VTK::RenderingMatplotlib)
endif ()
......
......@@ -5,8 +5,8 @@
"Enable-Python"
],
"modules": [
{ "name": "vtkPVClientServerCoreRendering",
"path": "ParaViewCore/ClientServerCore/Rendering",
{ "name": "vtkPVClientServerCorePythonRendering",
"path": "ParaViewCore/ClientServerCore/PythonRendering",
"include": [
{ "class": "vtkPythonRepresentation" },
{ "class": "vtkPythonView" }
......
set(classes
vtkPythonRepresentation
vtkPythonView)
vtk_module_add_module(ParaView::ClientServerCorePythonRendering
CLASSES ${classes})
NAME
ParaView::ClientServerCorePythonRendering
LIBRARY_NAME
vtkPVClientServerCorePythonRendering
CONDITION
PARAVIEW_ENABLE_PYTHON
KIT
ParaView::ClientServerKit
DEPENDS
ParaView::ClientServerCoreRendering
PRIVATE_DEPENDS
VTK::PythonInterpreter
VTK::WrappingPythonCore
......@@ -25,11 +25,12 @@
#include "vtkPVDataRepresentation.h"
#include "vtkPVClientServerCoreRenderingModule.h" //needed for exports
#include "vtkPVClientServerCorePythonRenderingModule.h" //needed for exports
class vtkReductionFilter;
class VTKPVCLIENTSERVERCORERENDERING_EXPORT vtkPythonRepresentation : public vtkPVDataRepresentation
class VTKPVCLIENTSERVERCOREPYTHONRENDERING_EXPORT vtkPythonRepresentation
: public vtkPVDataRepresentation
{
public:
static vtkPythonRepresentation* New();
......
......@@ -53,10 +53,10 @@ class vtkPythonView::vtkInternals
// import the wrapping module.
this->WrappingModule.TakeReference(
PyImport_ImportModule("paraview.modules.vtkPVClientServerCoreRendering"));
PyImport_ImportModule("paraview.modules.vtkPVClientServerCorePythonRendering"));
if (!this->WrappingModule)
{
vtkGenericWarningMacro("Failed to import `vtkPVClientServerCoreRendering`.");
vtkGenericWarningMacro("Failed to import `vtkPVClientServerCorePythonRendering`.");
if (PyErr_Occurred())
{
PyErr_Print();
......
......@@ -24,9 +24,9 @@
#include "vtkPVView.h"
#include "vtkImageData.h" // needed for member variable
#include "vtkPVClientServerCoreRenderingModule.h" //needed for exports
#include "vtkSmartPointer.h" //needed for member variables
#include "vtkImageData.h" // needed for member variable
#include "vtkPVClientServerCorePythonRenderingModule.h" //needed for exports
#include "vtkSmartPointer.h" //needed for member variables
class vtkImageData;
class vtkInformationRequestKey;
......@@ -35,7 +35,7 @@ class vtkRenderer;
class vtkRenderWindow;
class vtkTexture;
class VTKPVCLIENTSERVERCORERENDERING_EXPORT vtkPythonView : public vtkPVView
class VTKPVCLIENTSERVERCOREPYTHONRENDERING_EXPORT vtkPythonView : public vtkPVView
{
public:
static vtkPythonView* New();
......
......@@ -107,14 +107,6 @@ set(classes
vtkUnstructuredGridVolumeRepresentation
vtkXYChartRepresentation)
if (TARGET VTK::WrappingPythonCore AND TARGET VTK::PythonInterpreter)
# TODO: Split these into a separate module so that there isn't a public
# optional dependency.
list(APPEND classes
vtkPythonRepresentation
vtkPythonView)
endif ()
if (TARGET VTK::ParallelMPI AND TARGET ParaView::icet)
# TODO: Split these into a separate module so that there isn't a public
# optional dependency.
......
......@@ -31,7 +31,5 @@ OPTIONAL_DEPENDS
# These affect the public API.
ParaView::icet
VTK::PythonInterpreter
VTK::WrappingPythonCore
TEST_LABELS
ParaView
......@@ -77,7 +77,8 @@ set(classes
vtkSMViewResolutionDomain
vtkSMWidgetRepresentationProxy)
if (TARGET ParaView::ClientServerCorePython)
if (TARGET ParaView::ClientServerCorePython AND
TARGET ParaView::ClientServerCorePythonRendering)
# TODO: Split these into a separate module so that there isn't a public
# optional dependency.
list(APPEND classes
......
......@@ -20,6 +20,7 @@ OPTIONAL_DEPENDS
# These affect the public API.
ParaView::ClientServerCorePython
ParaView::ClientServerCorePythonRendering
TEST_DEPENDS
ParaView::ServerManagerApplication
VTK::TestingCore
......
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