diff --git a/CMakeLists.txt b/CMakeLists.txt index 68ff95153b044c4d06fe365b5c6b4984ea0ef8a7..86b9c032e5377ef7c9f864895c2d9395c3302bc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/ParaViewCore/ClientServerCore/Core/CMakeLists.txt b/ParaViewCore/ClientServerCore/Core/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..a5884a9f7ec75ecf2556fa6f20d77b6ff17f00ad --- /dev/null +++ b/ParaViewCore/ClientServerCore/Core/CMakeLists.txt @@ -0,0 +1,111 @@ +#========================================================================== +# +# 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}) diff --git a/ParaViewCore/ClientServerCore/Core/hints b/ParaViewCore/ClientServerCore/Core/hints new file mode 100644 index 0000000000000000000000000000000000000000..19ebc86e75ce38b2b18b1da8cdaf740182a995c4 --- /dev/null +++ b/ParaViewCore/ClientServerCore/Core/hints @@ -0,0 +1 @@ +vtkPVArrayInformation GetComponentRange 307 2 diff --git a/ParaViewCore/ClientServerCore/Core/module.cmake b/ParaViewCore/ClientServerCore/Core/module.cmake new file mode 100644 index 0000000000000000000000000000000000000000..e70580218d14511b87204336b176071cc7676f31 --- /dev/null +++ b/ParaViewCore/ClientServerCore/Core/module.cmake @@ -0,0 +1,22 @@ +set (__dependencies) + +if (PARAVIEW_USE_MPI) + list (APPEND __dependencies + vtkParallelMPI) +endif() + +if (PARAVIEW_ENABLE_PYTHON) + list(APPEND __dependencies + vtkPVPythonSupport + vtkFiltersProgrammable) +endif (PARAVIEW_ENABLE_PYTHON) + +vtk_module(vtkPVClientServerCoreCore + GROUPS + ParaViewCore + DEPENDS + vtkPVVTKExtensionsCore + vtkRenderingCore # needed for vtkMapper in vtkProcessModule. + # we should fix that. + ${__dependencies} +) diff --git a/ParaViewCore/ClientServerCore/vtkCompleteArrays.cxx b/ParaViewCore/ClientServerCore/Core/vtkCompleteArrays.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCompleteArrays.cxx rename to ParaViewCore/ClientServerCore/Core/vtkCompleteArrays.cxx diff --git a/ParaViewCore/ClientServerCore/vtkCompleteArrays.h b/ParaViewCore/ClientServerCore/Core/vtkCompleteArrays.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCompleteArrays.h rename to ParaViewCore/ClientServerCore/Core/vtkCompleteArrays.h diff --git a/ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnection.cxx b/ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnection.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnection.cxx rename to ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnection.cxx diff --git a/ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnection.h b/ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnection.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnection.h rename to ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnection.h diff --git a/ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnectionPortInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnectionPortInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnectionPortInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnectionPortInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnectionPortInformation.h b/ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnectionPortInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMPIMToNSocketConnectionPortInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkMPIMToNSocketConnectionPortInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkNetworkAccessManager.cxx b/ParaViewCore/ClientServerCore/Core/vtkNetworkAccessManager.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkNetworkAccessManager.cxx rename to ParaViewCore/ClientServerCore/Core/vtkNetworkAccessManager.cxx diff --git a/ParaViewCore/ClientServerCore/vtkNetworkAccessManager.h b/ParaViewCore/ClientServerCore/Core/vtkNetworkAccessManager.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkNetworkAccessManager.h rename to ParaViewCore/ClientServerCore/Core/vtkNetworkAccessManager.h diff --git a/ParaViewCore/ClientServerCore/vtkPVAlgorithmPortsInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVAlgorithmPortsInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVAlgorithmPortsInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVAlgorithmPortsInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVAlgorithmPortsInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVAlgorithmPortsInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVAlgorithmPortsInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVAlgorithmPortsInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVArrayInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVArrayInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVArrayInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVArrayInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVArrayInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVArrayInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVArrayInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVArrayInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVClassNameInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVClassNameInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVClassNameInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVClassNameInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVClassNameInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVClassNameInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVClassNameInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVClassNameInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCompositeDataInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCompositeDataInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCompositeDataInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCompositeDataInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCompositeDataInformationIterator.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformationIterator.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCompositeDataInformationIterator.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformationIterator.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCompositeDataInformationIterator.h b/ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformationIterator.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCompositeDataInformationIterator.h rename to ParaViewCore/ClientServerCore/Core/vtkPVCompositeDataInformationIterator.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDataInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVDataInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVDataInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDataInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVDataInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVDataInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDataSetAttributesInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVDataSetAttributesInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataSetAttributesInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVDataSetAttributesInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDataSetAttributesInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVDataSetAttributesInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataSetAttributesInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVDataSetAttributesInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDataSizeInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVDataSizeInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataSizeInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVDataSizeInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDataSizeInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVDataSizeInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataSizeInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVDataSizeInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVExtractSelection.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVExtractSelection.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVExtractSelection.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVExtractSelection.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVExtractSelection.h b/ParaViewCore/ClientServerCore/Core/vtkPVExtractSelection.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVExtractSelection.h rename to ParaViewCore/ClientServerCore/Core/vtkPVExtractSelection.h diff --git a/ParaViewCore/ClientServerCore/vtkPVGenericAttributeInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVGenericAttributeInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVGenericAttributeInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVGenericAttributeInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVGenericAttributeInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVGenericAttributeInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVGenericAttributeInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVGenericAttributeInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVMPICommunicator.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVMPICommunicator.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVMPICommunicator.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVMPICommunicator.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVMPICommunicator.h b/ParaViewCore/ClientServerCore/Core/vtkPVMPICommunicator.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVMPICommunicator.h rename to ParaViewCore/ClientServerCore/Core/vtkPVMPICommunicator.h diff --git a/ParaViewCore/ClientServerCore/vtkPVMultiClientsInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVMultiClientsInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVMultiClientsInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVMultiClientsInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVMultiClientsInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVMultiClientsInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVMultiClientsInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVMultiClientsInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVOptions.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVOptions.cxx similarity index 99% rename from ParaViewCore/ClientServerCore/vtkPVOptions.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVOptions.cxx index 61463a5181bce15885cbb19beef998a3fd6c0a6a..7226d78e277a98e93f7de45c25c88bdc7142ead0 100644 --- a/ParaViewCore/ClientServerCore/vtkPVOptions.cxx +++ b/ParaViewCore/ClientServerCore/Core/vtkPVOptions.cxx @@ -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 #include @@ -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; diff --git a/ParaViewCore/ClientServerCore/vtkPVOptions.h b/ParaViewCore/ClientServerCore/Core/vtkPVOptions.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVOptions.h rename to ParaViewCore/ClientServerCore/Core/vtkPVOptions.h diff --git a/ParaViewCore/ClientServerCore/vtkPVOptionsXMLParser.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVOptionsXMLParser.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVOptionsXMLParser.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVOptionsXMLParser.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVOptionsXMLParser.h b/ParaViewCore/ClientServerCore/Core/vtkPVOptionsXMLParser.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVOptionsXMLParser.h rename to ParaViewCore/ClientServerCore/Core/vtkPVOptionsXMLParser.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPlugin.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVPlugin.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPlugin.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVPlugin.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPlugin.h b/ParaViewCore/ClientServerCore/Core/vtkPVPlugin.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPlugin.h rename to ParaViewCore/ClientServerCore/Core/vtkPVPlugin.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPluginLoader.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVPluginLoader.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPluginLoader.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVPluginLoader.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPluginLoader.h b/ParaViewCore/ClientServerCore/Core/vtkPVPluginLoader.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPluginLoader.h rename to ParaViewCore/ClientServerCore/Core/vtkPVPluginLoader.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPluginTracker.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPluginTracker.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPluginTracker.h b/ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPluginTracker.h rename to ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPluginsInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVPluginsInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPluginsInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVPluginsInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPluginsInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVPluginsInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPluginsInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVPluginsInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVProgressHandler.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVProgressHandler.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVProgressHandler.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVProgressHandler.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVProgressHandler.h b/ParaViewCore/ClientServerCore/Core/vtkPVProgressHandler.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVProgressHandler.h rename to ParaViewCore/ClientServerCore/Core/vtkPVProgressHandler.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPythonModule.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVPythonModule.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPythonModule.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVPythonModule.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPythonModule.h b/ParaViewCore/ClientServerCore/Core/vtkPVPythonModule.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPythonModule.h rename to ParaViewCore/ClientServerCore/Core/vtkPVPythonModule.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPythonPluginInterface.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVPythonPluginInterface.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPythonPluginInterface.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVPythonPluginInterface.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPythonPluginInterface.h b/ParaViewCore/ClientServerCore/Core/vtkPVPythonPluginInterface.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPythonPluginInterface.h rename to ParaViewCore/ClientServerCore/Core/vtkPVPythonPluginInterface.h diff --git a/ParaViewCore/ClientServerCore/vtkPVSILInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVSILInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSILInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVSILInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSILInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVSILInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSILInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVSILInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVServerInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVServerInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVServerInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVServerInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVServerInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVServerInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVServerManagerPluginInterface.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVServerManagerPluginInterface.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerManagerPluginInterface.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVServerManagerPluginInterface.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVServerManagerPluginInterface.h b/ParaViewCore/ClientServerCore/Core/vtkPVServerManagerPluginInterface.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerManagerPluginInterface.h rename to ParaViewCore/ClientServerCore/Core/vtkPVServerManagerPluginInterface.h diff --git a/ParaViewCore/ClientServerCore/vtkPVServerOptions.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVServerOptions.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerOptions.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVServerOptions.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVServerOptions.h b/ParaViewCore/ClientServerCore/Core/vtkPVServerOptions.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerOptions.h rename to ParaViewCore/ClientServerCore/Core/vtkPVServerOptions.h diff --git a/ParaViewCore/ClientServerCore/vtkPVServerOptionsInternals.h b/ParaViewCore/ClientServerCore/Core/vtkPVServerOptionsInternals.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVServerOptionsInternals.h rename to ParaViewCore/ClientServerCore/Core/vtkPVServerOptionsInternals.h diff --git a/ParaViewCore/ClientServerCore/vtkPVSession.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVSession.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSession.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVSession.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSession.h b/ParaViewCore/ClientServerCore/Core/vtkPVSession.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSession.h rename to ParaViewCore/ClientServerCore/Core/vtkPVSession.h diff --git a/ParaViewCore/ClientServerCore/vtkPVSystemInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVSystemInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSystemInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVSystemInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSystemInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVSystemInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSystemInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVSystemInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVTemporalDataInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVTemporalDataInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVTemporalDataInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVTemporalDataInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVTemporalDataInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVTemporalDataInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVTemporalDataInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVTemporalDataInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVTimerInformation.cxx b/ParaViewCore/ClientServerCore/Core/vtkPVTimerInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVTimerInformation.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPVTimerInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVTimerInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVTimerInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVTimerInformation.h rename to ParaViewCore/ClientServerCore/Core/vtkPVTimerInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkProcessModule.cxx b/ParaViewCore/ClientServerCore/Core/vtkProcessModule.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkProcessModule.cxx rename to ParaViewCore/ClientServerCore/Core/vtkProcessModule.cxx diff --git a/ParaViewCore/ClientServerCore/vtkProcessModule.h b/ParaViewCore/ClientServerCore/Core/vtkProcessModule.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkProcessModule.h rename to ParaViewCore/ClientServerCore/Core/vtkProcessModule.h diff --git a/ParaViewCore/ClientServerCore/vtkProcessModuleAutoMPI.cxx b/ParaViewCore/ClientServerCore/Core/vtkProcessModuleAutoMPI.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkProcessModuleAutoMPI.cxx rename to ParaViewCore/ClientServerCore/Core/vtkProcessModuleAutoMPI.cxx diff --git a/ParaViewCore/ClientServerCore/vtkProcessModuleAutoMPI.h b/ParaViewCore/ClientServerCore/Core/vtkProcessModuleAutoMPI.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkProcessModuleAutoMPI.h rename to ParaViewCore/ClientServerCore/Core/vtkProcessModuleAutoMPI.h diff --git a/ParaViewCore/ClientServerCore/vtkProcessModuleInternals.h b/ParaViewCore/ClientServerCore/Core/vtkProcessModuleInternals.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkProcessModuleInternals.h rename to ParaViewCore/ClientServerCore/Core/vtkProcessModuleInternals.h diff --git a/ParaViewCore/ClientServerCore/vtkPythonAnimationCue.cxx b/ParaViewCore/ClientServerCore/Core/vtkPythonAnimationCue.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonAnimationCue.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPythonAnimationCue.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPythonAnimationCue.h b/ParaViewCore/ClientServerCore/Core/vtkPythonAnimationCue.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonAnimationCue.h rename to ParaViewCore/ClientServerCore/Core/vtkPythonAnimationCue.h diff --git a/ParaViewCore/ClientServerCore/vtkPythonExtractSelection.cxx b/ParaViewCore/ClientServerCore/Core/vtkPythonExtractSelection.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonExtractSelection.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPythonExtractSelection.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPythonExtractSelection.h b/ParaViewCore/ClientServerCore/Core/vtkPythonExtractSelection.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonExtractSelection.h rename to ParaViewCore/ClientServerCore/Core/vtkPythonExtractSelection.h diff --git a/ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.cxx b/ParaViewCore/ClientServerCore/Core/vtkPythonProgrammableFilter.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.cxx rename to ParaViewCore/ClientServerCore/Core/vtkPythonProgrammableFilter.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.h b/ParaViewCore/ClientServerCore/Core/vtkPythonProgrammableFilter.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.h rename to ParaViewCore/ClientServerCore/Core/vtkPythonProgrammableFilter.h diff --git a/ParaViewCore/ClientServerCore/vtkSession.cxx b/ParaViewCore/ClientServerCore/Core/vtkSession.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSession.cxx rename to ParaViewCore/ClientServerCore/Core/vtkSession.cxx diff --git a/ParaViewCore/ClientServerCore/vtkSession.h b/ParaViewCore/ClientServerCore/Core/vtkSession.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSession.h rename to ParaViewCore/ClientServerCore/Core/vtkSession.h diff --git a/ParaViewCore/ClientServerCore/vtkSessionIterator.cxx b/ParaViewCore/ClientServerCore/Core/vtkSessionIterator.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSessionIterator.cxx rename to ParaViewCore/ClientServerCore/Core/vtkSessionIterator.cxx diff --git a/ParaViewCore/ClientServerCore/vtkSessionIterator.h b/ParaViewCore/ClientServerCore/Core/vtkSessionIterator.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSessionIterator.h rename to ParaViewCore/ClientServerCore/Core/vtkSessionIterator.h diff --git a/ParaViewCore/ClientServerCore/vtkTCPNetworkAccessManager.cxx b/ParaViewCore/ClientServerCore/Core/vtkTCPNetworkAccessManager.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkTCPNetworkAccessManager.cxx rename to ParaViewCore/ClientServerCore/Core/vtkTCPNetworkAccessManager.cxx diff --git a/ParaViewCore/ClientServerCore/vtkTCPNetworkAccessManager.h b/ParaViewCore/ClientServerCore/Core/vtkTCPNetworkAccessManager.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkTCPNetworkAccessManager.h rename to ParaViewCore/ClientServerCore/Core/vtkTCPNetworkAccessManager.h diff --git a/ParaViewCore/ClientServerCore/Default/CMakeLists.txt b/ParaViewCore/ClientServerCore/Default/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..4efa0e4ed428bf88f86512146a6b27d59e8f0d34 --- /dev/null +++ b/ParaViewCore/ClientServerCore/Default/CMakeLists.txt @@ -0,0 +1,53 @@ +#========================================================================== +# +# 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}) diff --git a/ParaViewCore/ClientServerCore/Default/module.cmake b/ParaViewCore/ClientServerCore/Default/module.cmake new file mode 100644 index 0000000000000000000000000000000000000000..27f0248c267272fc15a6a19e12acf7e7f9cf120a --- /dev/null +++ b/ParaViewCore/ClientServerCore/Default/module.cmake @@ -0,0 +1,7 @@ +vtk_module(vtkPVClientServerCoreDefault + GROUPS + ParaView + DEPENDS + vtkPVClientServerCoreRendering + vtkPVVTKExtensionsDefault +) diff --git a/ParaViewCore/ClientServerCore/vtkAnnotateGlobalDataFilter.cxx b/ParaViewCore/ClientServerCore/Default/vtkAnnotateGlobalDataFilter.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkAnnotateGlobalDataFilter.cxx rename to ParaViewCore/ClientServerCore/Default/vtkAnnotateGlobalDataFilter.cxx diff --git a/ParaViewCore/ClientServerCore/vtkAnnotateGlobalDataFilter.h b/ParaViewCore/ClientServerCore/Default/vtkAnnotateGlobalDataFilter.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkAnnotateGlobalDataFilter.h rename to ParaViewCore/ClientServerCore/Default/vtkAnnotateGlobalDataFilter.h diff --git a/ParaViewCore/ClientServerCore/vtkNetworkImageSource.cxx b/ParaViewCore/ClientServerCore/Default/vtkNetworkImageSource.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkNetworkImageSource.cxx rename to ParaViewCore/ClientServerCore/Default/vtkNetworkImageSource.cxx diff --git a/ParaViewCore/ClientServerCore/vtkNetworkImageSource.h b/ParaViewCore/ClientServerCore/Default/vtkNetworkImageSource.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkNetworkImageSource.h rename to ParaViewCore/ClientServerCore/Default/vtkNetworkImageSource.h diff --git a/ParaViewCore/ClientServerCore/vtkPVEnvironmentInformation.cxx b/ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVEnvironmentInformation.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVEnvironmentInformation.h b/ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVEnvironmentInformation.h rename to ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVEnvironmentInformationHelper.cxx b/ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformationHelper.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVEnvironmentInformationHelper.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformationHelper.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVEnvironmentInformationHelper.h b/ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformationHelper.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVEnvironmentInformationHelper.h rename to ParaViewCore/ClientServerCore/Default/vtkPVEnvironmentInformationHelper.h diff --git a/ParaViewCore/ClientServerCore/vtkPVFileInformation.cxx b/ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVFileInformation.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVFileInformation.h b/ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVFileInformation.h rename to ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVFileInformationHelper.cxx b/ParaViewCore/ClientServerCore/Default/vtkPVFileInformationHelper.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVFileInformationHelper.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPVFileInformationHelper.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVFileInformationHelper.h b/ParaViewCore/ClientServerCore/Default/vtkPVFileInformationHelper.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVFileInformationHelper.h rename to ParaViewCore/ClientServerCore/Default/vtkPVFileInformationHelper.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPaths.h.in b/ParaViewCore/ClientServerCore/Default/vtkPVPaths.h.in similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPaths.h.in rename to ParaViewCore/ClientServerCore/Default/vtkPVPaths.h.in diff --git a/ParaViewCore/ClientServerCore/vtkPVSingleOutputExtractSelection.cxx b/ParaViewCore/ClientServerCore/Default/vtkPVSingleOutputExtractSelection.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSingleOutputExtractSelection.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPVSingleOutputExtractSelection.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSingleOutputExtractSelection.h b/ParaViewCore/ClientServerCore/Default/vtkPVSingleOutputExtractSelection.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSingleOutputExtractSelection.h rename to ParaViewCore/ClientServerCore/Default/vtkPVSingleOutputExtractSelection.h diff --git a/ParaViewCore/ClientServerCore/vtkPythonAnnotationFilter.cxx b/ParaViewCore/ClientServerCore/Default/vtkPythonAnnotationFilter.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonAnnotationFilter.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPythonAnnotationFilter.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPythonAnnotationFilter.h b/ParaViewCore/ClientServerCore/Default/vtkPythonAnnotationFilter.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonAnnotationFilter.h rename to ParaViewCore/ClientServerCore/Default/vtkPythonAnnotationFilter.h diff --git a/ParaViewCore/ClientServerCore/vtkPythonCalculator.cxx b/ParaViewCore/ClientServerCore/Default/vtkPythonCalculator.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonCalculator.cxx rename to ParaViewCore/ClientServerCore/Default/vtkPythonCalculator.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPythonCalculator.h b/ParaViewCore/ClientServerCore/Default/vtkPythonCalculator.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPythonCalculator.h rename to ParaViewCore/ClientServerCore/Default/vtkPythonCalculator.h diff --git a/ParaViewCore/ClientServerCore/vtkReservedRemoteObjectIds.h b/ParaViewCore/ClientServerCore/Default/vtkReservedRemoteObjectIds.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkReservedRemoteObjectIds.h rename to ParaViewCore/ClientServerCore/Default/vtkReservedRemoteObjectIds.h diff --git a/ParaViewCore/ClientServerCore/vtkXMLPVAnimationWriter.cxx b/ParaViewCore/ClientServerCore/Default/vtkXMLPVAnimationWriter.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkXMLPVAnimationWriter.cxx rename to ParaViewCore/ClientServerCore/Default/vtkXMLPVAnimationWriter.cxx diff --git a/ParaViewCore/ClientServerCore/vtkXMLPVAnimationWriter.h b/ParaViewCore/ClientServerCore/Default/vtkXMLPVAnimationWriter.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkXMLPVAnimationWriter.h rename to ParaViewCore/ClientServerCore/Default/vtkXMLPVAnimationWriter.h diff --git a/ParaViewCore/ClientServerCore/CMakeLists.txt b/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt similarity index 60% rename from ParaViewCore/ClientServerCore/CMakeLists.txt rename to ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt index 860e43c444645941315cc8065b73ac13675a0def..eac9cbc5c5ed13a2e09e3c191bcbe80354897dcf 100644 --- a/ParaViewCore/ClientServerCore/CMakeLists.txt +++ b/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt @@ -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 vtkPVParallelCoordinatesRepresentation.cxx vtkPVPlotMatrixRepresentation.cxx vtkPVPlotMatrixView.cxx - vtkPVPlugin.cxx - vtkPVPluginLoader.cxx - vtkPVPluginsInformation.cxx - vtkPVPluginTracker.cxx - vtkPVProgressHandler.cxx - vtkPVPythonModule.cxx - vtkPVPythonPluginInterface.cxx vtkPVRayCastPickingHelper.cxx vtkPVRenderView.cxx vtkPVRepresentedDataInformation.cxx vtkPVSelectionInformation.cxx - vtkPVServerInformation.cxx - vtkPVServerManagerPluginInterface.cxx - vtkPVServerOptions.cxx - vtkPVSession.cxx - vtkPVSILInformation.cxx - vtkPVSingleOutputExtractSelection.cxx vtkPVSynchronizedRenderer.cxx vtkPVSynchronizedRenderWindows.cxx - vtkPVSystemInformation.cxx - vtkPVTemporalDataInformation.cxx - vtkPVTimerInformation.cxx vtkPVView.cxx vtkPVXYChartView.cxx vtkSelectionDeliveryFilter.cxx vtkSelectionRepresentation.cxx - vtkSession.cxx - vtkSessionIterator.cxx vtkSpreadSheetRepresentation.cxx vtkSpreadSheetView.cxx - vtkTCPNetworkAccessManager.cxx vtkTextSourceRepresentation.cxx vtkUnstructuredGridVolumeRepresentation.cxx - vtkXMLPVAnimationWriter.cxx vtkXYChartRepresentation.cxx ) -if (PARAVIEW_ENABLE_PYTHON) - list(APPEND Module_SRCS - vtkAnnotateGlobalDataFilter.cxx - vtkPythonAnimationCue.cxx - vtkPythonCalculator.cxx - vtkPythonProgrammableFilter.cxx - vtkPythonExtractSelection.cxx - vtkPythonAnnotationFilter.cxx - ) -endif() - if (PARAVIEW_USE_ICE_T) list(APPEND Module_SRCS vtkIceTSynchronizedRenderers.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( +# WRAP_EXCLUDE +# ) set_source_files_properties( - vtkNetworkAccessManager vtkPVContextView vtkPVDataRepresentation - vtkPVInformation - vtkPVPlugin - vtkPVPluginTracker - vtkPVPythonPluginInterface - vtkPVServerManagerPluginInterface - vtkPVSession vtkPVSynchronizedRenderWindows vtkPVView - vtkSession - vtkTileDisplayHelper ABSTRACT) -vtk_module_library(vtkPVClientServerCore ${Module_SRCS}) +vtk_module_library(vtkPVClientServerCoreRendering ${Module_SRCS}) diff --git a/ParaViewCore/ClientServerCore/hints b/ParaViewCore/ClientServerCore/Rendering/hints similarity index 78% rename from ParaViewCore/ClientServerCore/hints rename to ParaViewCore/ClientServerCore/Rendering/hints index c2de126f287f2513752d1f8e058730baab65689b..1b31478842997023983b740592ae254e06b4b5a2 100644 --- a/ParaViewCore/ClientServerCore/hints +++ b/ParaViewCore/ClientServerCore/Rendering/hints @@ -1,4 +1,3 @@ -vtkPVArrayInformation GetComponentRange 307 2 vtkGlyph3DRepresentation GetBounds 307 6 vtkPVImplicitPlaneRepresentation GetTransformedOrigin 307 3 vtkPVImplicitPlaneRepresentation GetTransformedNormal 307 3 diff --git a/ParaViewCore/ClientServerCore/Rendering/module.cmake b/ParaViewCore/ClientServerCore/Rendering/module.cmake new file mode 100644 index 0000000000000000000000000000000000000000..29ef2d5aff88087eb9e0fd2f6a7f8ac7fe8820ab --- /dev/null +++ b/ParaViewCore/ClientServerCore/Rendering/module.cmake @@ -0,0 +1,12 @@ +vtk_module(vtkPVClientServerCoreRendering + GROUPS + ParaViewRendering + DEPENDS + vtkDomainsChemistry + vtkFiltersAMR + vtkPVClientServerCoreCore + vtkPVVTKExtensionsRendering + vtkRenderingLabel + vtkViewsContext2D + vtkViewsCore +) diff --git a/ParaViewCore/ClientServerCore/vtk3DWidgetRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtk3DWidgetRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtk3DWidgetRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtk3DWidgetRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtk3DWidgetRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtk3DWidgetRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtk3DWidgetRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtk3DWidgetRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkAMRVolumeRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkAMRVolumeRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkAMRVolumeRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkAMRVolumeRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkAMRVolumeRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkAMRVolumeRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkAMRVolumeRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkAMRVolumeRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkCaveSynchronizedRenderers.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkCaveSynchronizedRenderers.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCaveSynchronizedRenderers.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkCaveSynchronizedRenderers.cxx diff --git a/ParaViewCore/ClientServerCore/vtkCaveSynchronizedRenderers.h b/ParaViewCore/ClientServerCore/Rendering/vtkCaveSynchronizedRenderers.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCaveSynchronizedRenderers.h rename to ParaViewCore/ClientServerCore/Rendering/vtkCaveSynchronizedRenderers.h diff --git a/ParaViewCore/ClientServerCore/vtkChartRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkChartRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkChartRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkChartRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkChartRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkChartRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkChartRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkChartRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkClientServerMoveData.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkClientServerMoveData.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkClientServerMoveData.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkClientServerMoveData.cxx diff --git a/ParaViewCore/ClientServerCore/vtkClientServerMoveData.h b/ParaViewCore/ClientServerCore/Rendering/vtkClientServerMoveData.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkClientServerMoveData.h rename to ParaViewCore/ClientServerCore/Rendering/vtkClientServerMoveData.h diff --git a/ParaViewCore/ClientServerCore/vtkCompositeRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkCompositeRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCompositeRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkCompositeRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkCompositeRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkCompositeRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCompositeRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkCompositeRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkCubeAxesRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkCubeAxesRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCubeAxesRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkCubeAxesRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkCubeAxesRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkCubeAxesRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkCubeAxesRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkCubeAxesRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkDataLabelRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkDataLabelRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkDataLabelRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkDataLabelRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkDataLabelRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkDataLabelRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkDataLabelRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkDataLabelRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkGeometryRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkGeometryRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkGeometryRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkGeometryRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkGeometryRepresentationWithFaces.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentationWithFaces.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkGeometryRepresentationWithFaces.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentationWithFaces.cxx diff --git a/ParaViewCore/ClientServerCore/vtkGeometryRepresentationWithFaces.h b/ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentationWithFaces.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkGeometryRepresentationWithFaces.h rename to ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentationWithFaces.h diff --git a/ParaViewCore/ClientServerCore/vtkGlyph3DRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkGlyph3DRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkGlyph3DRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkGlyph3DRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkGlyph3DRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkGlyph3DRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkGlyph3DRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkGlyph3DRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkIceTSynchronizedRenderers.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkIceTSynchronizedRenderers.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkIceTSynchronizedRenderers.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkIceTSynchronizedRenderers.cxx diff --git a/ParaViewCore/ClientServerCore/vtkIceTSynchronizedRenderers.h b/ParaViewCore/ClientServerCore/Rendering/vtkIceTSynchronizedRenderers.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkIceTSynchronizedRenderers.h rename to ParaViewCore/ClientServerCore/Rendering/vtkIceTSynchronizedRenderers.h diff --git a/ParaViewCore/ClientServerCore/vtkImageSliceRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkImageSliceRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkImageSliceRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkImageSliceRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkImageSliceRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkImageSliceRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkImageSliceRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkImageSliceRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkImageVolumeRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkImageVolumeRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkImageVolumeRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkImageVolumeRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkImageVolumeRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkImageVolumeRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkImageVolumeRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkImageVolumeRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkMPIMoveData.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkMPIMoveData.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMPIMoveData.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkMPIMoveData.cxx diff --git a/ParaViewCore/ClientServerCore/vtkMPIMoveData.h b/ParaViewCore/ClientServerCore/Rendering/vtkMPIMoveData.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMPIMoveData.h rename to ParaViewCore/ClientServerCore/Rendering/vtkMPIMoveData.h diff --git a/ParaViewCore/ClientServerCore/vtkMoleculeRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkMoleculeRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMoleculeRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkMoleculeRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkMoleculeRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkMoleculeRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkMoleculeRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkMoleculeRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkOutlineRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkOutlineRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkOutlineRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkOutlineRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkOutlineRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkOutlineRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkOutlineRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkOutlineRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVBarChartView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVBarChartView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVBarChartView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVBarChartView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVBarChartView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVBarChartView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVBarChartView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVBarChartView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCacheKeeper.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeper.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCacheKeeper.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeper.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCacheKeeper.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeper.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCacheKeeper.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeper.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCacheKeeperPipeline.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeperPipeline.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCacheKeeperPipeline.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeperPipeline.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCacheKeeperPipeline.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeperPipeline.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCacheKeeperPipeline.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCacheKeeperPipeline.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCacheSizeInformation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCacheSizeInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCacheSizeInformation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCacheSizeInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCacheSizeInformation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCacheSizeInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCacheSizeInformation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCacheSizeInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCameraAnimationCue.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCameraAnimationCue.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCameraAnimationCue.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCameraAnimationCue.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCameraAnimationCue.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCameraAnimationCue.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCameraAnimationCue.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCameraAnimationCue.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCameraCueManipulator.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCameraCueManipulator.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCameraCueManipulator.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCameraCueManipulator.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCameraCueManipulator.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCameraCueManipulator.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCameraCueManipulator.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCameraCueManipulator.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCameraKeyFrame.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCameraKeyFrame.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCameraKeyFrame.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCameraKeyFrame.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCameraKeyFrame.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCameraKeyFrame.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCameraKeyFrame.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCameraKeyFrame.h diff --git a/ParaViewCore/ClientServerCore/vtkPVClientServerSynchronizedRenderers.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVClientServerSynchronizedRenderers.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVClientServerSynchronizedRenderers.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVClientServerSynchronizedRenderers.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVClientServerSynchronizedRenderers.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVClientServerSynchronizedRenderers.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVClientServerSynchronizedRenderers.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVClientServerSynchronizedRenderers.h diff --git a/ParaViewCore/ClientServerCore/vtkPVCompositeRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVCompositeRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCompositeRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCompositeRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVCompositeRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVCompositeRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVCompositeRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVCompositeRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVContextView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVContextView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVContextView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVContextView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVContextView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVContextView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVContextView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVContextView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVDataDeliveryManager.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDataDeliveryManager.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVDataDeliveryManager.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDataDeliveryManager.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDataRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDataRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDataRepresentationPipeline.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentationPipeline.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataRepresentationPipeline.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentationPipeline.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDataRepresentationPipeline.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentationPipeline.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDataRepresentationPipeline.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDataRepresentationPipeline.h diff --git a/ParaViewCore/ClientServerCore/vtkPVDisplayInformation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVDisplayInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDisplayInformation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDisplayInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVDisplayInformation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVDisplayInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVDisplayInformation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVDisplayInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVImageSliceMapper.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVImageSliceMapper.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVImageSliceMapper.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVImageSliceMapper.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVImageSliceMapper.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVImageSliceMapper.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVImageSliceMapper.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVImageSliceMapper.h diff --git a/ParaViewCore/ClientServerCore/vtkPVImplicitPlaneRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVImplicitPlaneRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVImplicitPlaneRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVImplicitPlaneRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVImplicitPlaneRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVImplicitPlaneRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVImplicitPlaneRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVImplicitPlaneRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVLastSelectionInformation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVLastSelectionInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVLastSelectionInformation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVLastSelectionInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVLastSelectionInformation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVLastSelectionInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVLastSelectionInformation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVLastSelectionInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVLineChartView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVLineChartView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVLineChartView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVLineChartView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVLineChartView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVLineChartView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVLineChartView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVLineChartView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVOpenGLExtensionsInformation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVOpenGLExtensionsInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVOpenGLExtensionsInformation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVOpenGLExtensionsInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVOpenGLExtensionsInformation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVOpenGLExtensionsInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVOpenGLExtensionsInformation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVOpenGLExtensionsInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesChartView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesChartView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesChartView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesChartView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesChartView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesChartView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesChartView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesChartView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVParallelCoordinatesRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPlotMatrixRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPlotMatrixRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPlotMatrixRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPlotMatrixRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVPlotMatrixView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPlotMatrixView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVPlotMatrixView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVPlotMatrixView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVPlotMatrixView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVRayCastPickingHelper.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVRayCastPickingHelper.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVRayCastPickingHelper.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVRayCastPickingHelper.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVRayCastPickingHelper.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVRayCastPickingHelper.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVRayCastPickingHelper.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVRayCastPickingHelper.h diff --git a/ParaViewCore/ClientServerCore/vtkPVRenderView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVRenderView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVRenderView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVRenderView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVRenderView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVRenderView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVRenderView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVRenderView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVRepresentedDataInformation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVRepresentedDataInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVRepresentedDataInformation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVRepresentedDataInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVRepresentedDataInformation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVRepresentedDataInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVRepresentedDataInformation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVRepresentedDataInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVSelectionInformation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVSelectionInformation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSelectionInformation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVSelectionInformation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSelectionInformation.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVSelectionInformation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSelectionInformation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVSelectionInformation.h diff --git a/ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderWindows.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderWindows.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderWindows.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderWindows.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderWindows.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderWindows.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderWindows.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderWindows.h diff --git a/ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderer.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderer.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderer.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderer.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderer.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderer.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVSynchronizedRenderer.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVSynchronizedRenderer.h diff --git a/ParaViewCore/ClientServerCore/vtkPVView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVView.h diff --git a/ParaViewCore/ClientServerCore/vtkPVXYChartView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkPVXYChartView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVXYChartView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkPVXYChartView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkPVXYChartView.h b/ParaViewCore/ClientServerCore/Rendering/vtkPVXYChartView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkPVXYChartView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkPVXYChartView.h diff --git a/ParaViewCore/ClientServerCore/vtkSelectionDeliveryFilter.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkSelectionDeliveryFilter.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSelectionDeliveryFilter.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkSelectionDeliveryFilter.cxx diff --git a/ParaViewCore/ClientServerCore/vtkSelectionDeliveryFilter.h b/ParaViewCore/ClientServerCore/Rendering/vtkSelectionDeliveryFilter.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSelectionDeliveryFilter.h rename to ParaViewCore/ClientServerCore/Rendering/vtkSelectionDeliveryFilter.h diff --git a/ParaViewCore/ClientServerCore/vtkSelectionRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkSelectionRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSelectionRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkSelectionRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkSelectionRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkSelectionRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSelectionRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkSelectionRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkSpreadSheetRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSpreadSheetRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkSpreadSheetRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSpreadSheetRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkSpreadSheetView.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetView.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSpreadSheetView.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetView.cxx diff --git a/ParaViewCore/ClientServerCore/vtkSpreadSheetView.h b/ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetView.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkSpreadSheetView.h rename to ParaViewCore/ClientServerCore/Rendering/vtkSpreadSheetView.h diff --git a/ParaViewCore/ClientServerCore/vtkTextSourceRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkTextSourceRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkTextSourceRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkTextSourceRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkTextSourceRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkTextSourceRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkTextSourceRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkTextSourceRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkUnstructuredGridVolumeRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkUnstructuredGridVolumeRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkUnstructuredGridVolumeRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkUnstructuredGridVolumeRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkUnstructuredGridVolumeRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkUnstructuredGridVolumeRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkUnstructuredGridVolumeRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkUnstructuredGridVolumeRepresentation.h diff --git a/ParaViewCore/ClientServerCore/vtkXYChartRepresentation.cxx b/ParaViewCore/ClientServerCore/Rendering/vtkXYChartRepresentation.cxx similarity index 100% rename from ParaViewCore/ClientServerCore/vtkXYChartRepresentation.cxx rename to ParaViewCore/ClientServerCore/Rendering/vtkXYChartRepresentation.cxx diff --git a/ParaViewCore/ClientServerCore/vtkXYChartRepresentation.h b/ParaViewCore/ClientServerCore/Rendering/vtkXYChartRepresentation.h similarity index 100% rename from ParaViewCore/ClientServerCore/vtkXYChartRepresentation.h rename to ParaViewCore/ClientServerCore/Rendering/vtkXYChartRepresentation.h diff --git a/ParaViewCore/ClientServerCore/module.cmake b/ParaViewCore/ClientServerCore/module.cmake deleted file mode 100644 index ddc090acebb186deacab2688b9b217cda6ca0e82..0000000000000000000000000000000000000000 --- a/ParaViewCore/ClientServerCore/module.cmake +++ /dev/null @@ -1,21 +0,0 @@ -set (__dependencies) - -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 - GROUPS - ParaView - DEPENDS - vtkDomainsChemistry - vtkPVVTKExtensions - vtkRenderingLabel - ${__dependencies} -) diff --git a/ParaViewCore/VTKExtensions/Default/vtkMemberFunctionCommand.h b/ParaViewCore/VTKExtensions/Core/vtkMemberFunctionCommand.h similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkMemberFunctionCommand.h rename to ParaViewCore/VTKExtensions/Core/vtkMemberFunctionCommand.h diff --git a/ParaViewCore/VTKExtensions/Default/CMakeLists.txt b/ParaViewCore/VTKExtensions/Default/CMakeLists.txt index 385501e399a277ad1442923f63233dd0066fe5dd..ee8adeec6a22a07fa6148c449fcb9a991a84700c 100644 --- a/ParaViewCore/VTKExtensions/Default/CMakeLists.txt +++ b/ParaViewCore/VTKExtensions/Default/CMakeLists.txt @@ -33,15 +33,12 @@ set(Module_SRCS vtkAMRDualContour.cxx vtkAMRDualGridHelper.cxx vtkAMRFileSeriesReader.cxx - vtkAMRIncrementalResampleHelper.cxx vtkAppendArcLength.cxx vtkAppendRectilinearGrid.cxx vtkAttributeDataReductionFilter.cxx vtkCellIntegrator.cxx vtkCleanUnstructuredGrid.cxx vtkCleanUnstructuredGridCells.cxx - vtkCompositeDataToUnstructuredGridFilter.cxx - vtkCSVExporter.cxx vtkCSVWriter.cxx vtkDataSetToRectilinearGrid.cxx vtkEquivalenceSet.cxx @@ -91,7 +88,6 @@ set(Module_SRCS vtkPVAMRDualClip.cxx vtkPVAMRDualContour.cxx vtkPVArrayCalculator.cxx - vtkPVArrowSource.cxx vtkPVBox.cxx vtkPVClipClosedSurface.cxx vtkPVClipDataSet.cxx @@ -109,7 +105,6 @@ set(Module_SRCS vtkPVMetaSliceDataSet.cxx vtkPVNullSource.cxx vtkPVPlane.cxx - vtkPVPlotTime.cxx vtkPVSelectionSource.cxx vtkPVTextSource.cxx vtkPVTransform.cxx diff --git a/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt b/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt index f5333f610baf2835abd8c252e3f60966382daa83..fef3b4dada3b7c626bffafc5f88d7abcae3a4bd1 100644 --- a/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt +++ b/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt @@ -29,6 +29,7 @@ # #========================================================================== set(Module_SRCS + vtkAMRIncrementalResampleHelper.cxx vtkAttributeDataToTableFilter.cxx vtkBlockDeliveryPreprocessor.cxx vtkBSPCutsGenerator.cxx @@ -37,12 +38,15 @@ set(Module_SRCS vtkCameraManipulatorGUIHelper.cxx vtkChartNamedOptions.cxx vtkCleanArrays.cxx + vtkCompositeDataToUnstructuredGridFilter.cxx + vtkCSVExporter.cxx vtkImageCompressor.cxx vtkKdTreeGenerator.cxx vtkKdTreeManager.cxx vtkMarkSelectedRows.cxx vtkMultiProcessControllerHelper.cxx vtkOrderedCompositeDistributor.cxx + vtkPVArrowSource.cxx vtkPVAxesActor.cxx vtkPVAxesWidget.cxx vtkPVCenterAxesActor.cxx @@ -57,6 +61,7 @@ set(Module_SRCS vtkPVLODActor.cxx vtkPVLODVolume.cxx vtkPVMergeTables.cxx + vtkPVPlotTime.cxx vtkPVRecoverGeometryWireframe.cxx vtkPVRenderViewProxy.cxx vtkPVScalarBarActor.cxx diff --git a/ParaViewCore/VTKExtensions/Default/vtkAMRIncrementalResampleHelper.cxx b/ParaViewCore/VTKExtensions/Rendering/vtkAMRIncrementalResampleHelper.cxx similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkAMRIncrementalResampleHelper.cxx rename to ParaViewCore/VTKExtensions/Rendering/vtkAMRIncrementalResampleHelper.cxx diff --git a/ParaViewCore/VTKExtensions/Default/vtkAMRIncrementalResampleHelper.h b/ParaViewCore/VTKExtensions/Rendering/vtkAMRIncrementalResampleHelper.h similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkAMRIncrementalResampleHelper.h rename to ParaViewCore/VTKExtensions/Rendering/vtkAMRIncrementalResampleHelper.h diff --git a/ParaViewCore/VTKExtensions/Default/vtkCSVExporter.cxx b/ParaViewCore/VTKExtensions/Rendering/vtkCSVExporter.cxx similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkCSVExporter.cxx rename to ParaViewCore/VTKExtensions/Rendering/vtkCSVExporter.cxx diff --git a/ParaViewCore/VTKExtensions/Default/vtkCSVExporter.h b/ParaViewCore/VTKExtensions/Rendering/vtkCSVExporter.h similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkCSVExporter.h rename to ParaViewCore/VTKExtensions/Rendering/vtkCSVExporter.h diff --git a/ParaViewCore/VTKExtensions/Default/vtkCompositeDataToUnstructuredGridFilter.cxx b/ParaViewCore/VTKExtensions/Rendering/vtkCompositeDataToUnstructuredGridFilter.cxx similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkCompositeDataToUnstructuredGridFilter.cxx rename to ParaViewCore/VTKExtensions/Rendering/vtkCompositeDataToUnstructuredGridFilter.cxx diff --git a/ParaViewCore/VTKExtensions/Default/vtkCompositeDataToUnstructuredGridFilter.h b/ParaViewCore/VTKExtensions/Rendering/vtkCompositeDataToUnstructuredGridFilter.h similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkCompositeDataToUnstructuredGridFilter.h rename to ParaViewCore/VTKExtensions/Rendering/vtkCompositeDataToUnstructuredGridFilter.h diff --git a/ParaViewCore/VTKExtensions/Default/vtkPVArrowSource.cxx b/ParaViewCore/VTKExtensions/Rendering/vtkPVArrowSource.cxx similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkPVArrowSource.cxx rename to ParaViewCore/VTKExtensions/Rendering/vtkPVArrowSource.cxx diff --git a/ParaViewCore/VTKExtensions/Default/vtkPVArrowSource.h b/ParaViewCore/VTKExtensions/Rendering/vtkPVArrowSource.h similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkPVArrowSource.h rename to ParaViewCore/VTKExtensions/Rendering/vtkPVArrowSource.h diff --git a/ParaViewCore/VTKExtensions/Default/vtkPVPlotTime.cxx b/ParaViewCore/VTKExtensions/Rendering/vtkPVPlotTime.cxx similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkPVPlotTime.cxx rename to ParaViewCore/VTKExtensions/Rendering/vtkPVPlotTime.cxx diff --git a/ParaViewCore/VTKExtensions/Default/vtkPVPlotTime.h b/ParaViewCore/VTKExtensions/Rendering/vtkPVPlotTime.h similarity index 100% rename from ParaViewCore/VTKExtensions/Default/vtkPVPlotTime.h rename to ParaViewCore/VTKExtensions/Rendering/vtkPVPlotTime.h