Skip to content

GitLab

Commit 455955fd authored by Utkarsh Ayachit's avatar Utkarsh Ayachit ⛰
Browse files
Options

Restructuring ClientServerCore.

parent 3c0a7dcc
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 96 deletions
CMakeLists.txt
View file @ 455955fd
......@@ -297,6 +297,9 @@ else()
ParaViewCore/VTKExtensions/Core
ParaViewCore/VTKExtensions/Rendering
ParaViewCore/VTKExtensions/Default
ParaViewCore/ClientServerCore/Core
ParaViewCore/ClientServerCore/Rendering
ParaViewCore/ClientServerCore/Default
#ParaViewCore/VTKExtensions
#ParaViewCore/ClientServerCore
#ParaViewCore/ServerImplementation
......
ParaViewCore/ClientServerCore/Core/CMakeLists.txt 0 → 100644
View file @ 455955fd
#==========================================================================
#
# Program: ParaView
#
# Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
# All rights reserved.
#
# ParaView is a free software; you can redistribute it and/or modify it
# under the terms of the ParaView license version 1.2.
#
# See License_v1.2.txt for the full ParaView license.
# A copy of this license can be obtained by contacting
# Kitware Inc.
# 28 Corporate Drive
# Clifton Park, NY 12065
# USA
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#==========================================================================
set (Module_SRCS
vtkCompleteArrays.cxx
vtkMPIMToNSocketConnection.cxx
vtkMPIMToNSocketConnectionPortInformation.cxx
vtkNetworkAccessManager.cxx
vtkProcessModuleAutoMPI.cxx
vtkProcessModule.cxx
vtkPVAlgorithmPortsInformation.cxx
vtkPVArrayInformation.cxx
vtkPVClassNameInformation.cxx
vtkPVCompositeDataInformation.cxx
vtkPVCompositeDataInformationIterator.cxx
vtkPVDataInformation.cxx
vtkPVDataSetAttributesInformation.cxx
vtkPVDataSizeInformation.cxx
vtkPVExtractSelection.cxx
vtkPVGenericAttributeInformation.cxx
vtkPVInformation.cxx
vtkPVMultiClientsInformation.cxx
vtkPVOptions.cxx
vtkPVOptionsXMLParser.cxx
vtkPVPlugin.cxx
vtkPVPluginLoader.cxx
vtkPVPluginsInformation.cxx
vtkPVPluginTracker.cxx
vtkPVProgressHandler.cxx
vtkPVPythonModule.cxx
vtkPVPythonPluginInterface.cxx
vtkPVServerInformation.cxx
vtkPVServerManagerPluginInterface.cxx
vtkPVServerOptions.cxx
vtkPVSession.cxx
vtkPVSILInformation.cxx
vtkPVSystemInformation.cxx
vtkPVTemporalDataInformation.cxx
vtkPVTimerInformation.cxx
vtkSession.cxx
vtkSessionIterator.cxx
vtkTCPNetworkAccessManager.cxx
)
if (PARAVIEW_ENABLE_PYTHON)
list(APPEND Module_SRCS
vtkPythonAnimationCue.cxx
vtkPythonExtractSelection.cxx
vtkPythonProgrammableFilter.cxx
)
endif()
if (PARAVIEW_USE_MPI)
list(APPEND Module_SRCS
vtkPVMPICommunicator.cxx)
set_source_files_properties(
vtkPVMPICommunicator
WRAP_EXCLUDE)
endif()
set_source_files_properties(
vtkProcessModuleAutoMPI
vtkPVOptionsXMLParser
vtkPVPlugin
vtkPVPythonPluginInterface
vtkPVServerManagerPluginInterface
vtkPVServerOptions
WRAP_EXCLUDE
)
set_source_files_properties(
vtkNetworkAccessManager
vtkPVInformation
vtkPVPlugin
vtkPVPluginTracker
vtkPVPythonPluginInterface
vtkPVServerManagerPluginInterface
vtkPVSession
vtkSession
ABSTRACT)
vtk_module_library(vtkPVClientServerCoreCore ${Module_SRCS})
ParaViewCore/ClientServerCore/Core/hints 0 → 100644
View file @ 455955fd
vtkPVArrayInformation GetComponentRange 307 2
ParaViewCore/ClientServerCore/module.cmake → ParaViewCore/ClientServerCore/Core/module.cmake
View file @ 455955fd
set (__dependencies)
if (PARAVIEW_USE_MPI)
list (APPEND __dependencies
vtkParallelMPI)
endif()
if (PARAVIEW_ENABLE_PYTHON)
list(APPEND __dependencies
vtkPVPythonSupport
vtkFiltersProgrammable)
endif (PARAVIEW_ENABLE_PYTHON)
if (PARAVIEW_USE_ICE_T)
list(APPEND __dependencies vtkicet)
endif()
vtk_module(vtkPVClientServerCore
vtk_module(vtkPVClientServerCoreCore
GROUPS
ParaView
ParaViewCore
DEPENDS
vtkDomainsChemistry
vtkPVVTKExtensions
vtkRenderingLabel
vtkPVVTKExtensionsCore
vtkRenderingCore # needed for vtkMapper in vtkProcessModule.
# we should fix that.
${__dependencies}
)
ParaViewCore/ClientServerCore/vtkPVOptions.cxx → ParaViewCore/ClientServerCore/Core/vtkPVOptions.cxx
View file @ 455955fd
......@@ -17,7 +17,7 @@
#include "vtkProcessModule.h"
#include "vtkPVConfig.h" //For PARAVIEW_ALWAYS_SECURE_CONNECTION option
#include "vtkPVOptionsXMLParser.h"
#include "vtkPVView.h"
// #include "vtkPVView.h"
#include <vtksys/CommandLineArguments.hxx>
#include <vtksys/SystemInformation.hxx>
......@@ -374,11 +374,12 @@ int vtkPVOptions::PostProcess(int, const char* const*)
if (this->AMRStreaming)
{
vtkPVView::SetEnableStreaming(true);
vtkErrorMacro("FIXME");
// vtkPVView::SetEnableStreaming(true);
}
else
{
vtkPVView::SetEnableStreaming(false);
// vtkPVView::SetEnableStreaming(false);
}
return 1;
......
ParaViewCore/ClientServerCore/Default/CMakeLists.txt 0 → 100644
View file @ 455955fd
#==========================================================================
#
# Program: ParaView
#
# Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
# All rights reserved.
#
# ParaView is a free software; you can redistribute it and/or modify it
# under the terms of the ParaView license version 1.2.
#
# See License_v1.2.txt for the full ParaView license.
# A copy of this license can be obtained by contacting
# Kitware Inc.
# 28 Corporate Drive
# Clifton Park, NY 12065
# USA
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#==========================================================================
set (Module_SRCS
vtkNetworkImageSource.cxx
vtkPVEnvironmentInformation.cxx
vtkPVEnvironmentInformationHelper.cxx
vtkPVFileInformation.cxx
vtkPVFileInformationHelper.cxx
vtkPVSingleOutputExtractSelection.cxx
vtkXMLPVAnimationWriter.cxx
)
if (PARAVIEW_ENABLE_PYTHON)
list(APPEND Module_SRCS
vtkAnnotateGlobalDataFilter.cxx
vtkPythonCalculator.cxx
vtkPythonAnnotationFilter.cxx
)
endif()
set_source_files_properties(
vtkNetworkAccessManager
ABSTRACT)
vtk_module_library(vtkPVClientServerCoreDefault ${Module_SRCS})
ParaViewCore/ClientServerCore/Default/module.cmake 0 → 100644
View file @ 455955fd
vtk_module(vtkPVClientServerCoreDefault
GROUPS
ParaView
DEPENDS
vtkPVClientServerCoreRendering
vtkPVVTKExtensionsDefault
)
ParaViewCore/ClientServerCore/CMakeLists.txt → ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt
View file @ 455955fd
......@@ -34,25 +34,17 @@ set (Module_SRCS
vtkCaveSynchronizedRenderers.cxx
vtkChartRepresentation.cxx
vtkClientServerMoveData.cxx
vtkCompleteArrays.cxx
vtkCompositeRepresentation.cxx
vtkCubeAxesRepresentation.cxx
vtkDataLabelRepresentation.cxx
vtkGeometryRepresentation.cxx
vtkGeometryRepresentationWithFaces.cxx
vtkGlyph3DRepresentation.cxx
vtkPVImageSliceMapper.cxx
vtkImageSliceRepresentation.cxx
vtkImageVolumeRepresentation.cxx
vtkMoleculeRepresentation.cxx
vtkMPIMoveData.cxx
vtkMPIMToNSocketConnection.cxx
vtkMPIMToNSocketConnectionPortInformation.cxx
vtkNetworkAccessManager.cxx
vtkNetworkImageSource.cxx
vtkOutlineRepresentation.cxx
vtkPVAlgorithmPortsInformation.cxx
vtkPVArrayInformation.cxx
vtkPVBarChartView.cxx
vtkPVCacheKeeper.cxx
vtkPVCacheKeeperPipeline.cxx
......@@ -60,126 +52,53 @@ set (Module_SRCS
vtkPVCameraAnimationCue.cxx
vtkPVCameraCueManipulator.cxx
vtkPVCameraKeyFrame.cxx
vtkPVClassNameInformation.cxx
vtkPVClientServerSynchronizedRenderers.cxx
vtkPVCompositeDataInformation.cxx
vtkPVCompositeDataInformationIterator.cxx
vtkPVCompositeRepresentation.cxx
vtkPVContextView.cxx
vtkPVDataInformation.cxx
vtkPVDataDeliveryManager.cxx
vtkPVDataRepresentation.cxx
vtkPVDataRepresentationPipeline.cxx
vtkProcessModuleAutoMPI.cxx
vtkProcessModule.cxx
vtkPVDataDeliveryManager.cxx
vtkPVDataSetAttributesInformation.cxx
vtkPVDataSizeInformation.cxx
vtkPVDisplayInformation.cxx
vtkPVEnvironmentInformation.cxx
vtkPVEnvironmentInformationHelper.cxx
vtkPVExtractSelection.cxx
vtkPVFileInformation.cxx
vtkPVFileInformationHelper.cxx
vtkPVGenericAttributeInformation.cxx
vtkPVImageSliceMapper.cxx
vtkPVImplicitPlaneRepresentation.cxx
vtkPVInformation.cxx
vtkPVLastSelectionInformation.cxx
vtkPVLineChartView.cxx
vtkPVMultiClientsInformation.cxx
vtkPVOpenGLExtensionsInformation.cxx
vtkPVOptions.cxx
vtkPVOptionsXMLParser.cxx
vtkPVParallelCoordinatesChartView.cxx