diff --git a/CMakeLists.txt b/CMakeLists.txt index 27c423085615546dbb7863fa84d02ed0ea896cbe..646ef13c0759cc66b82a672552125537a03c29f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,6 +303,9 @@ else() ParaViewCore/ServerImplementation/Core ParaViewCore/ServerImplementation/Rendering ParaViewCore/ServerImplementation/Default + ParaViewCore/ServerManager/Core + ParaViewCore/ServerManager/Rendering + ParaViewCore/ServerManager/Default #ParaViewCore/VTKExtensions #ParaViewCore/ClientServerCore #ParaViewCore/ServerImplementation @@ -337,5 +340,5 @@ configure_file( #------------------------------------------------------------------------------ # Client-Server Wrapping for all Modules. #------------------------------------------------------------------------------ -add_subdirectory(Wrapping/ClientServer) +#add_subdirectory(Wrapping/ClientServer) #------------------------------------------------------------------------------ diff --git a/ParaViewCore/ServerManager/Core/CMakeLists.txt b/ParaViewCore/ServerManager/Core/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..dce82228197d128c42d2dbbcef067c0d8cae449e --- /dev/null +++ b/ParaViewCore/ServerManager/Core/CMakeLists.txt @@ -0,0 +1,138 @@ +#========================================================================== +# +# 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 + vtkSMArrayListDomain.cxx + vtkSMArrayRangeDomain.cxx + vtkSMArraySelectionDomain.cxx + vtkSMBooleanDomain.cxx + vtkSMBoundsDomain.cxx + vtkSMCollaborationManager.cxx + vtkSMCompositeTreeDomain.cxx + vtkSMCompoundProxyDefinitionLoader.cxx + vtkSMCompoundSourceProxy.cxx + vtkSMCompoundSourceProxyDefinitionBuilder.cxx + vtkSMDataSourceProxy.cxx + vtkSMDataTypeDomain.cxx + vtkSMDeserializer.cxx + vtkSMDeserializerProtobuf.cxx + vtkSMDeserializerXMLCache.cxx + vtkSMDeserializerXML.cxx + vtkSMDimensionsDomain.cxx + vtkSMDocumentation.cxx + vtkSMDomain.cxx + vtkSMDomainIterator.cxx + vtkSMDoubleRangeDomain.cxx + vtkSMDoubleVectorProperty.cxx + vtkSMEnumerationDomain.cxx + vtkSMExtentDomain.cxx + vtkSMFieldDataDomain.cxx + vtkSMFileListDomain.cxx + vtkSMFixedTypeDomain.cxx + vtkSMGlobalPropertiesLinkUndoElement.cxx + vtkSMGlobalPropertiesManager.cxx + vtkSMIdTypeVectorProperty.cxx + vtkSMInputArrayDomain.cxx + vtkSMInputProperty.cxx + vtkSMIntRangeDomain.cxx + vtkSMIntVectorProperty.cxx + vtkSMLink.cxx + vtkSMNamedPropertyIterator.cxx + vtkSMNumberOfComponentsDomain.cxx + vtkSMNumberOfGroupsDomain.cxx + vtkSMObject.cxx + vtkSMOrderedPropertyIterator.cxx + vtkSMOutputPort.cxx + vtkSMPipelineState.cxx + vtkSMPluginLoaderProxy.cxx + vtkSMPluginManager.cxx + vtkSMPropertyAdaptor.cxx + vtkSMProperty.cxx + vtkSMPropertyGroup.cxx + vtkSMPropertyHelper.cxx + vtkSMPropertyIterator.cxx + vtkSMPropertyLink.cxx + vtkSMProxy.cxx + vtkSMProxyDefinitionManager.cxx + vtkSMProxyGroupDomain.cxx + vtkSMProxyIterator.cxx + vtkSMProxyLink.cxx + vtkSMProxyListDomain.cxx + vtkSMProxyLocator.cxx + vtkSMProxyManager.cxx + vtkSMProxyProperty.cxx + vtkSMProxySelectionModel.cxx + vtkSMPythonTraceObserver.cxx + vtkSMReaderFactory.cxx + vtkSMRemoteObject.cxx + vtkSMRemoteObjectUpdateUndoElement.cxx + vtkSMServerStateLocator.cxx + vtkSMSessionClient.cxx + vtkSMSession.cxx + vtkSMSessionObject.cxx + vtkSMSessionProxyManager.cxx + vtkSMSILDomain.cxx + vtkSMSILModel.cxx + vtkSMSourceProxy.cxx + vtkSMStateLoader.cxx + vtkSMStateLocator.cxx + vtkSMStateVersionControllerBase.cxx + vtkSMStateVersionController.cxx + vtkSMStringListDomain.cxx + vtkSMStringListRangeDomain.cxx + vtkSMStringVectorProperty.cxx + vtkSMUndoElement.cxx + vtkSMUndoStackBuilder.cxx + vtkSMUndoStack.cxx + vtkSMVectorProperty.cxx + vtkSMWriterFactory.cxx + vtkSMWriterProxy.cxx +) + +SET_SOURCE_FILES_PROPERTIES( + vtkSMDeserializer + vtkSMDomain. + vtkSMLink + vtkSMPropertyHelper + vtkSMProxyManager # since New() is protected. + vtkSMRemoteObject + vtkSMSession + vtkSMSessionProxyManager # since New() is non-standard. + vtkSMStateVersionControllerBase + vtkSMUndoElement + vtkSMVectorProperty + ABSTRACT + ) + +SET_SOURCE_FILES_PROPERTIES( + vtkSMPropertyHelper + WRAP_EXCLUDE) + +vtk_module_library(vtkPVServerManagerCore ${Module_SRCS}) diff --git a/ParaViewCore/ServerManager/Core/module.cmake b/ParaViewCore/ServerManager/Core/module.cmake new file mode 100644 index 0000000000000000000000000000000000000000..1425c739975950ad636f560eedbe0d5968938faa --- /dev/null +++ b/ParaViewCore/ServerManager/Core/module.cmake @@ -0,0 +1,6 @@ +vtk_module(vtkPVServerManagerCore + GROUPS + ParaViewCore + DEPENDS + vtkPVServerImplementationCore +) diff --git a/ParaViewCore/ServerManager/vtkSMArrayListDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMArrayListDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMArrayListDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMArrayListDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMArrayListDomain.h b/ParaViewCore/ServerManager/Core/vtkSMArrayListDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMArrayListDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMArrayListDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMArrayRangeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMArrayRangeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMArrayRangeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMArrayRangeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMArrayRangeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMArrayRangeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMArrayRangeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMArrayRangeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMArraySelectionDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMArraySelectionDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMArraySelectionDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMArraySelectionDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMArraySelectionDomain.h b/ParaViewCore/ServerManager/Core/vtkSMArraySelectionDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMArraySelectionDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMArraySelectionDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMBooleanDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMBooleanDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMBooleanDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMBooleanDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMBooleanDomain.h b/ParaViewCore/ServerManager/Core/vtkSMBooleanDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMBooleanDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMBooleanDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMBoundsDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMBoundsDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMBoundsDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMBoundsDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMBoundsDomain.h b/ParaViewCore/ServerManager/Core/vtkSMBoundsDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMBoundsDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMBoundsDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMCollaborationManager.cxx b/ParaViewCore/ServerManager/Core/vtkSMCollaborationManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCollaborationManager.cxx rename to ParaViewCore/ServerManager/Core/vtkSMCollaborationManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCollaborationManager.h b/ParaViewCore/ServerManager/Core/vtkSMCollaborationManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCollaborationManager.h rename to ParaViewCore/ServerManager/Core/vtkSMCollaborationManager.h diff --git a/ParaViewCore/ServerManager/vtkSMCompositeTreeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMCompositeTreeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompositeTreeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMCompositeTreeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCompositeTreeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMCompositeTreeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompositeTreeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMCompositeTreeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMCompoundProxyDefinitionLoader.cxx b/ParaViewCore/ServerManager/Core/vtkSMCompoundProxyDefinitionLoader.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompoundProxyDefinitionLoader.cxx rename to ParaViewCore/ServerManager/Core/vtkSMCompoundProxyDefinitionLoader.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCompoundProxyDefinitionLoader.h b/ParaViewCore/ServerManager/Core/vtkSMCompoundProxyDefinitionLoader.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompoundProxyDefinitionLoader.h rename to ParaViewCore/ServerManager/Core/vtkSMCompoundProxyDefinitionLoader.h diff --git a/ParaViewCore/ServerManager/vtkSMCompoundSourceProxy.cxx b/ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompoundSourceProxy.cxx rename to ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCompoundSourceProxy.h b/ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompoundSourceProxy.h rename to ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMCompoundSourceProxyDefinitionBuilder.cxx b/ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxyDefinitionBuilder.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompoundSourceProxyDefinitionBuilder.cxx rename to ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxyDefinitionBuilder.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCompoundSourceProxyDefinitionBuilder.h b/ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxyDefinitionBuilder.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCompoundSourceProxyDefinitionBuilder.h rename to ParaViewCore/ServerManager/Core/vtkSMCompoundSourceProxyDefinitionBuilder.h diff --git a/ParaViewCore/ServerManager/vtkSMDataSourceProxy.cxx b/ParaViewCore/ServerManager/Core/vtkSMDataSourceProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDataSourceProxy.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDataSourceProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDataSourceProxy.h b/ParaViewCore/ServerManager/Core/vtkSMDataSourceProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDataSourceProxy.h rename to ParaViewCore/ServerManager/Core/vtkSMDataSourceProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMDataTypeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMDataTypeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDataTypeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDataTypeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDataTypeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMDataTypeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDataTypeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMDataTypeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMDeserializer.cxx b/ParaViewCore/ServerManager/Core/vtkSMDeserializer.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializer.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDeserializer.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDeserializer.h b/ParaViewCore/ServerManager/Core/vtkSMDeserializer.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializer.h rename to ParaViewCore/ServerManager/Core/vtkSMDeserializer.h diff --git a/ParaViewCore/ServerManager/vtkSMDeserializerProtobuf.cxx b/ParaViewCore/ServerManager/Core/vtkSMDeserializerProtobuf.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializerProtobuf.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDeserializerProtobuf.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDeserializerProtobuf.h b/ParaViewCore/ServerManager/Core/vtkSMDeserializerProtobuf.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializerProtobuf.h rename to ParaViewCore/ServerManager/Core/vtkSMDeserializerProtobuf.h diff --git a/ParaViewCore/ServerManager/vtkSMDeserializerXML.cxx b/ParaViewCore/ServerManager/Core/vtkSMDeserializerXML.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializerXML.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDeserializerXML.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDeserializerXML.h b/ParaViewCore/ServerManager/Core/vtkSMDeserializerXML.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializerXML.h rename to ParaViewCore/ServerManager/Core/vtkSMDeserializerXML.h diff --git a/ParaViewCore/ServerManager/vtkSMDeserializerXMLCache.cxx b/ParaViewCore/ServerManager/Core/vtkSMDeserializerXMLCache.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializerXMLCache.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDeserializerXMLCache.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDeserializerXMLCache.h b/ParaViewCore/ServerManager/Core/vtkSMDeserializerXMLCache.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDeserializerXMLCache.h rename to ParaViewCore/ServerManager/Core/vtkSMDeserializerXMLCache.h diff --git a/ParaViewCore/ServerManager/vtkSMDimensionsDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMDimensionsDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDimensionsDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDimensionsDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDimensionsDomain.h b/ParaViewCore/ServerManager/Core/vtkSMDimensionsDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDimensionsDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMDimensionsDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMDocumentation.cxx b/ParaViewCore/ServerManager/Core/vtkSMDocumentation.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDocumentation.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDocumentation.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDocumentation.h b/ParaViewCore/ServerManager/Core/vtkSMDocumentation.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDocumentation.h rename to ParaViewCore/ServerManager/Core/vtkSMDocumentation.h diff --git a/ParaViewCore/ServerManager/vtkSMDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDomain.h b/ParaViewCore/ServerManager/Core/vtkSMDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMDomainIterator.cxx b/ParaViewCore/ServerManager/Core/vtkSMDomainIterator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDomainIterator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDomainIterator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDomainIterator.h b/ParaViewCore/ServerManager/Core/vtkSMDomainIterator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDomainIterator.h rename to ParaViewCore/ServerManager/Core/vtkSMDomainIterator.h diff --git a/ParaViewCore/ServerManager/vtkSMDoubleRangeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMDoubleRangeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDoubleRangeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDoubleRangeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDoubleRangeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMDoubleRangeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDoubleRangeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMDoubleRangeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMDoubleVectorProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMDoubleVectorProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDoubleVectorProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMDoubleVectorProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDoubleVectorProperty.h b/ParaViewCore/ServerManager/Core/vtkSMDoubleVectorProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDoubleVectorProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMDoubleVectorProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMEnumerationDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMEnumerationDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMEnumerationDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMEnumerationDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMEnumerationDomain.h b/ParaViewCore/ServerManager/Core/vtkSMEnumerationDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMEnumerationDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMEnumerationDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMExtentDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMExtentDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMExtentDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMExtentDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMExtentDomain.h b/ParaViewCore/ServerManager/Core/vtkSMExtentDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMExtentDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMExtentDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMFieldDataDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMFieldDataDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMFieldDataDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMFieldDataDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMFieldDataDomain.h b/ParaViewCore/ServerManager/Core/vtkSMFieldDataDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMFieldDataDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMFieldDataDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMFileListDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMFileListDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMFileListDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMFileListDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMFileListDomain.h b/ParaViewCore/ServerManager/Core/vtkSMFileListDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMFileListDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMFileListDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMFixedTypeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMFixedTypeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMFixedTypeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMFixedTypeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMFixedTypeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMFixedTypeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMFixedTypeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMFixedTypeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMGlobalPropertiesLinkUndoElement.cxx b/ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesLinkUndoElement.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMGlobalPropertiesLinkUndoElement.cxx rename to ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesLinkUndoElement.cxx diff --git a/ParaViewCore/ServerManager/vtkSMGlobalPropertiesLinkUndoElement.h b/ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesLinkUndoElement.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMGlobalPropertiesLinkUndoElement.h rename to ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesLinkUndoElement.h diff --git a/ParaViewCore/ServerManager/vtkSMGlobalPropertiesManager.cxx b/ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMGlobalPropertiesManager.cxx rename to ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMGlobalPropertiesManager.h b/ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMGlobalPropertiesManager.h rename to ParaViewCore/ServerManager/Core/vtkSMGlobalPropertiesManager.h diff --git a/ParaViewCore/ServerManager/vtkSMIdTypeVectorProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMIdTypeVectorProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMIdTypeVectorProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMIdTypeVectorProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMIdTypeVectorProperty.h b/ParaViewCore/ServerManager/Core/vtkSMIdTypeVectorProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMIdTypeVectorProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMIdTypeVectorProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMInputArrayDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMInputArrayDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMInputArrayDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMInputArrayDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMInputArrayDomain.h b/ParaViewCore/ServerManager/Core/vtkSMInputArrayDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMInputArrayDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMInputArrayDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMInputProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMInputProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMInputProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMInputProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMInputProperty.h b/ParaViewCore/ServerManager/Core/vtkSMInputProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMInputProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMInputProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMIntRangeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMIntRangeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMIntRangeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMIntRangeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMIntRangeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMIntRangeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMIntRangeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMIntRangeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMIntVectorProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMIntVectorProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMIntVectorProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMIntVectorProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMIntVectorProperty.h b/ParaViewCore/ServerManager/Core/vtkSMIntVectorProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMIntVectorProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMIntVectorProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMLink.cxx b/ParaViewCore/ServerManager/Core/vtkSMLink.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMLink.cxx rename to ParaViewCore/ServerManager/Core/vtkSMLink.cxx diff --git a/ParaViewCore/ServerManager/vtkSMLink.h b/ParaViewCore/ServerManager/Core/vtkSMLink.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMLink.h rename to ParaViewCore/ServerManager/Core/vtkSMLink.h diff --git a/ParaViewCore/ServerManager/vtkSMNamedPropertyIterator.cxx b/ParaViewCore/ServerManager/Core/vtkSMNamedPropertyIterator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNamedPropertyIterator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMNamedPropertyIterator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMNamedPropertyIterator.h b/ParaViewCore/ServerManager/Core/vtkSMNamedPropertyIterator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNamedPropertyIterator.h rename to ParaViewCore/ServerManager/Core/vtkSMNamedPropertyIterator.h diff --git a/ParaViewCore/ServerManager/vtkSMNumberOfComponentsDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMNumberOfComponentsDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNumberOfComponentsDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMNumberOfComponentsDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMNumberOfComponentsDomain.h b/ParaViewCore/ServerManager/Core/vtkSMNumberOfComponentsDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNumberOfComponentsDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMNumberOfComponentsDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMNumberOfGroupsDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMNumberOfGroupsDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNumberOfGroupsDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMNumberOfGroupsDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMNumberOfGroupsDomain.h b/ParaViewCore/ServerManager/Core/vtkSMNumberOfGroupsDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNumberOfGroupsDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMNumberOfGroupsDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMObject.cxx b/ParaViewCore/ServerManager/Core/vtkSMObject.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMObject.cxx rename to ParaViewCore/ServerManager/Core/vtkSMObject.cxx diff --git a/ParaViewCore/ServerManager/vtkSMObject.h b/ParaViewCore/ServerManager/Core/vtkSMObject.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMObject.h rename to ParaViewCore/ServerManager/Core/vtkSMObject.h diff --git a/ParaViewCore/ServerManager/vtkSMOrderedPropertyIterator.cxx b/ParaViewCore/ServerManager/Core/vtkSMOrderedPropertyIterator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMOrderedPropertyIterator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMOrderedPropertyIterator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMOrderedPropertyIterator.h b/ParaViewCore/ServerManager/Core/vtkSMOrderedPropertyIterator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMOrderedPropertyIterator.h rename to ParaViewCore/ServerManager/Core/vtkSMOrderedPropertyIterator.h diff --git a/ParaViewCore/ServerManager/vtkSMOutputPort.cxx b/ParaViewCore/ServerManager/Core/vtkSMOutputPort.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMOutputPort.cxx rename to ParaViewCore/ServerManager/Core/vtkSMOutputPort.cxx diff --git a/ParaViewCore/ServerManager/vtkSMOutputPort.h b/ParaViewCore/ServerManager/Core/vtkSMOutputPort.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMOutputPort.h rename to ParaViewCore/ServerManager/Core/vtkSMOutputPort.h diff --git a/ParaViewCore/ServerManager/vtkSMPipelineState.cxx b/ParaViewCore/ServerManager/Core/vtkSMPipelineState.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPipelineState.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPipelineState.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPipelineState.h b/ParaViewCore/ServerManager/Core/vtkSMPipelineState.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPipelineState.h rename to ParaViewCore/ServerManager/Core/vtkSMPipelineState.h diff --git a/ParaViewCore/ServerManager/vtkSMPluginLoaderProxy.cxx b/ParaViewCore/ServerManager/Core/vtkSMPluginLoaderProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPluginLoaderProxy.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPluginLoaderProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPluginLoaderProxy.h b/ParaViewCore/ServerManager/Core/vtkSMPluginLoaderProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPluginLoaderProxy.h rename to ParaViewCore/ServerManager/Core/vtkSMPluginLoaderProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMPluginManager.cxx b/ParaViewCore/ServerManager/Core/vtkSMPluginManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPluginManager.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPluginManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPluginManager.h b/ParaViewCore/ServerManager/Core/vtkSMPluginManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPluginManager.h rename to ParaViewCore/ServerManager/Core/vtkSMPluginManager.h diff --git a/ParaViewCore/ServerManager/vtkSMProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProperty.h b/ParaViewCore/ServerManager/Core/vtkSMProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyAdaptor.cxx b/ParaViewCore/ServerManager/Core/vtkSMPropertyAdaptor.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyAdaptor.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPropertyAdaptor.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPropertyAdaptor.h b/ParaViewCore/ServerManager/Core/vtkSMPropertyAdaptor.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyAdaptor.h rename to ParaViewCore/ServerManager/Core/vtkSMPropertyAdaptor.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyGroup.cxx b/ParaViewCore/ServerManager/Core/vtkSMPropertyGroup.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyGroup.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPropertyGroup.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPropertyGroup.h b/ParaViewCore/ServerManager/Core/vtkSMPropertyGroup.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyGroup.h rename to ParaViewCore/ServerManager/Core/vtkSMPropertyGroup.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyHelper.cxx b/ParaViewCore/ServerManager/Core/vtkSMPropertyHelper.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyHelper.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPropertyHelper.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPropertyHelper.h b/ParaViewCore/ServerManager/Core/vtkSMPropertyHelper.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyHelper.h rename to ParaViewCore/ServerManager/Core/vtkSMPropertyHelper.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyInternals.h b/ParaViewCore/ServerManager/Core/vtkSMPropertyInternals.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyInternals.h rename to ParaViewCore/ServerManager/Core/vtkSMPropertyInternals.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyIterator.cxx b/ParaViewCore/ServerManager/Core/vtkSMPropertyIterator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyIterator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPropertyIterator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPropertyIterator.h b/ParaViewCore/ServerManager/Core/vtkSMPropertyIterator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyIterator.h rename to ParaViewCore/ServerManager/Core/vtkSMPropertyIterator.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyLink.cxx b/ParaViewCore/ServerManager/Core/vtkSMPropertyLink.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyLink.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPropertyLink.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPropertyLink.h b/ParaViewCore/ServerManager/Core/vtkSMPropertyLink.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyLink.h rename to ParaViewCore/ServerManager/Core/vtkSMPropertyLink.h diff --git a/ParaViewCore/ServerManager/vtkSMProxy.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxy.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxy.h b/ParaViewCore/ServerManager/Core/vtkSMProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxy.h rename to ParaViewCore/ServerManager/Core/vtkSMProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyDefinitionManager.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyDefinitionManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyDefinitionManager.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyDefinitionManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyDefinitionManager.h b/ParaViewCore/ServerManager/Core/vtkSMProxyDefinitionManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyDefinitionManager.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyDefinitionManager.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyGroupDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyGroupDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyGroupDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyGroupDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyGroupDomain.h b/ParaViewCore/ServerManager/Core/vtkSMProxyGroupDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyGroupDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyGroupDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyInternals.h b/ParaViewCore/ServerManager/Core/vtkSMProxyInternals.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyInternals.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyInternals.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyIterator.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyIterator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyIterator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyIterator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyIterator.h b/ParaViewCore/ServerManager/Core/vtkSMProxyIterator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyIterator.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyIterator.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyLink.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyLink.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyLink.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyLink.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyLink.h b/ParaViewCore/ServerManager/Core/vtkSMProxyLink.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyLink.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyLink.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyListDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyListDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyListDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyListDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyListDomain.h b/ParaViewCore/ServerManager/Core/vtkSMProxyListDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyListDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyListDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyLocator.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyLocator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyLocator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyLocator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyLocator.h b/ParaViewCore/ServerManager/Core/vtkSMProxyLocator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyLocator.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyLocator.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyManager.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyManager.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyManager.h b/ParaViewCore/ServerManager/Core/vtkSMProxyManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyManager.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyManager.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxyProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxyProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyProperty.h b/ParaViewCore/ServerManager/Core/vtkSMProxyProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMProxyProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMProxySelectionModel.cxx b/ParaViewCore/ServerManager/Core/vtkSMProxySelectionModel.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxySelectionModel.cxx rename to ParaViewCore/ServerManager/Core/vtkSMProxySelectionModel.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxySelectionModel.h b/ParaViewCore/ServerManager/Core/vtkSMProxySelectionModel.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxySelectionModel.h rename to ParaViewCore/ServerManager/Core/vtkSMProxySelectionModel.h diff --git a/ParaViewCore/ServerManager/vtkSMPythonTraceObserver.cxx b/ParaViewCore/ServerManager/Core/vtkSMPythonTraceObserver.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPythonTraceObserver.cxx rename to ParaViewCore/ServerManager/Core/vtkSMPythonTraceObserver.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPythonTraceObserver.h b/ParaViewCore/ServerManager/Core/vtkSMPythonTraceObserver.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPythonTraceObserver.h rename to ParaViewCore/ServerManager/Core/vtkSMPythonTraceObserver.h diff --git a/ParaViewCore/ServerManager/vtkSMReaderFactory.cxx b/ParaViewCore/ServerManager/Core/vtkSMReaderFactory.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMReaderFactory.cxx rename to ParaViewCore/ServerManager/Core/vtkSMReaderFactory.cxx diff --git a/ParaViewCore/ServerManager/vtkSMReaderFactory.h b/ParaViewCore/ServerManager/Core/vtkSMReaderFactory.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMReaderFactory.h rename to ParaViewCore/ServerManager/Core/vtkSMReaderFactory.h diff --git a/ParaViewCore/ServerManager/vtkSMRemoteObject.cxx b/ParaViewCore/ServerManager/Core/vtkSMRemoteObject.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRemoteObject.cxx rename to ParaViewCore/ServerManager/Core/vtkSMRemoteObject.cxx diff --git a/ParaViewCore/ServerManager/vtkSMRemoteObject.h b/ParaViewCore/ServerManager/Core/vtkSMRemoteObject.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRemoteObject.h rename to ParaViewCore/ServerManager/Core/vtkSMRemoteObject.h diff --git a/ParaViewCore/ServerManager/vtkSMRemoteObjectUpdateUndoElement.cxx b/ParaViewCore/ServerManager/Core/vtkSMRemoteObjectUpdateUndoElement.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRemoteObjectUpdateUndoElement.cxx rename to ParaViewCore/ServerManager/Core/vtkSMRemoteObjectUpdateUndoElement.cxx diff --git a/ParaViewCore/ServerManager/vtkSMRemoteObjectUpdateUndoElement.h b/ParaViewCore/ServerManager/Core/vtkSMRemoteObjectUpdateUndoElement.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRemoteObjectUpdateUndoElement.h rename to ParaViewCore/ServerManager/Core/vtkSMRemoteObjectUpdateUndoElement.h diff --git a/ParaViewCore/ServerManager/vtkSMSILDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMSILDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSILDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSILDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSILDomain.h b/ParaViewCore/ServerManager/Core/vtkSMSILDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSILDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMSILDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMSILModel.cxx b/ParaViewCore/ServerManager/Core/vtkSMSILModel.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSILModel.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSILModel.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSILModel.h b/ParaViewCore/ServerManager/Core/vtkSMSILModel.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSILModel.h rename to ParaViewCore/ServerManager/Core/vtkSMSILModel.h diff --git a/ParaViewCore/ServerManager/vtkSMServerStateLocator.cxx b/ParaViewCore/ServerManager/Core/vtkSMServerStateLocator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMServerStateLocator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMServerStateLocator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMServerStateLocator.h b/ParaViewCore/ServerManager/Core/vtkSMServerStateLocator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMServerStateLocator.h rename to ParaViewCore/ServerManager/Core/vtkSMServerStateLocator.h diff --git a/ParaViewCore/ServerManager/vtkSMSession.cxx b/ParaViewCore/ServerManager/Core/vtkSMSession.cxx similarity index 96% rename from ParaViewCore/ServerManager/vtkSMSession.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSession.cxx index 8182cb063592e6e37582eb3ec36bc73d4e57009e..a392230f7ed61dbaa15a49a22c1927e496c72549 100644 --- a/ParaViewCore/ServerManager/vtkSMSession.cxx +++ b/ParaViewCore/ServerManager/Core/vtkSMSession.cxx @@ -17,7 +17,8 @@ #include "vtkCommand.h" #include "vtkDebugLeaks.h" #include "vtkObjectFactory.h" -#include "vtkPVRenderView.h" +// FIXME:MODULARIZATION +// #include "vtkPVRenderView.h" #include "vtkPVServerInformation.h" #include "vtkPVSessionCore.h" #include "vtkProcessModule.h" @@ -218,7 +219,8 @@ void vtkSMSession::PrintSelf(ostream& os, vtkIndent indent) //---------------------------------------------------------------------------- vtkIdType vtkSMSession::ConnectToSelf() { - vtkPVRenderView::AllowRemoteRendering(true); +// FIXME:MODULARIZATION +// vtkPVRenderView::AllowRemoteRendering(true); vtkProcessModule* pm = vtkProcessModule::GetProcessModule(); vtkIdType sid = 0; @@ -251,7 +253,8 @@ vtkIdType vtkSMSession::ConnectToRemote(const char* hostname, int port) vtkIdType vtkSMSession::ConnectToRemote(const char* hostname, int port, bool allowRemoteRendering) { - vtkPVRenderView::AllowRemoteRendering(allowRemoteRendering); +// FIXME:MODULARIZATION +// vtkPVRenderView::AllowRemoteRendering(allowRemoteRendering); vtksys_ios::ostringstream sname; sname << "cs://" << hostname << ":" << port; vtkSMSessionClient* session = vtkSMSessionClient::New(); @@ -269,7 +272,8 @@ vtkIdType vtkSMSession::ConnectToRemote(const char* hostname, int port, vtkIdType vtkSMSession::ConnectToRemote(const char* dshost, int dsport, const char* rshost, int rsport) { - vtkPVRenderView::AllowRemoteRendering(true); +// FIXME:MODULARIZATION +// vtkPVRenderView::AllowRemoteRendering(true); vtksys_ios::ostringstream sname; sname << "cdsrs://" << dshost << ":" << dsport << "/" << rshost << ":" << rsport; @@ -321,7 +325,8 @@ vtkIdType vtkSMSession::ReverseConnectToRemote(int port, bool (*callback)()) vtkIdType vtkSMSession::ReverseConnectToRemote( int dsport, int rsport, bool (*callback)()) { - vtkPVRenderView::AllowRemoteRendering(true); +// FIXME:MODULARIZATION +// vtkPVRenderView::AllowRemoteRendering(true); vtkTemp temp; temp.Callback = callback; diff --git a/ParaViewCore/ServerManager/vtkSMSession.h b/ParaViewCore/ServerManager/Core/vtkSMSession.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSession.h rename to ParaViewCore/ServerManager/Core/vtkSMSession.h diff --git a/ParaViewCore/ServerManager/vtkSMSessionClient.cxx b/ParaViewCore/ServerManager/Core/vtkSMSessionClient.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionClient.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSessionClient.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSessionClient.h b/ParaViewCore/ServerManager/Core/vtkSMSessionClient.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionClient.h rename to ParaViewCore/ServerManager/Core/vtkSMSessionClient.h diff --git a/ParaViewCore/ServerManager/vtkSMSessionObject.cxx b/ParaViewCore/ServerManager/Core/vtkSMSessionObject.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionObject.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSessionObject.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSessionObject.h b/ParaViewCore/ServerManager/Core/vtkSMSessionObject.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionObject.h rename to ParaViewCore/ServerManager/Core/vtkSMSessionObject.h diff --git a/ParaViewCore/ServerManager/vtkSMSessionProxyManager.cxx b/ParaViewCore/ServerManager/Core/vtkSMSessionProxyManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionProxyManager.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSessionProxyManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSessionProxyManager.h b/ParaViewCore/ServerManager/Core/vtkSMSessionProxyManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionProxyManager.h rename to ParaViewCore/ServerManager/Core/vtkSMSessionProxyManager.h diff --git a/ParaViewCore/ServerManager/vtkSMSessionProxyManagerInternals.h b/ParaViewCore/ServerManager/Core/vtkSMSessionProxyManagerInternals.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSessionProxyManagerInternals.h rename to ParaViewCore/ServerManager/Core/vtkSMSessionProxyManagerInternals.h diff --git a/ParaViewCore/ServerManager/vtkSMSourceProxy.cxx b/ParaViewCore/ServerManager/Core/vtkSMSourceProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSourceProxy.cxx rename to ParaViewCore/ServerManager/Core/vtkSMSourceProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSourceProxy.h b/ParaViewCore/ServerManager/Core/vtkSMSourceProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSourceProxy.h rename to ParaViewCore/ServerManager/Core/vtkSMSourceProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMStateLoader.cxx b/ParaViewCore/ServerManager/Core/vtkSMStateLoader.cxx similarity index 98% rename from ParaViewCore/ServerManager/vtkSMStateLoader.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStateLoader.cxx index 9f3e5972a5c5d4bd02bd3031dc04843705797068..750b4d46239ee412ae60cc584f9728c7ca084f64 100644 --- a/ParaViewCore/ServerManager/vtkSMStateLoader.cxx +++ b/ParaViewCore/ServerManager/Core/vtkSMStateLoader.cxx @@ -17,7 +17,8 @@ #include "vtkObjectFactory.h" #include "vtkPVXMLElement.h" #include "vtkSmartPointer.h" -#include "vtkSMCameraLink.h" +// FIXME:MODULARIZATION +//#include "vtkSMCameraLink.h" #include "vtkSMGlobalPropertiesManager.h" #include "vtkSMProperty.h" #include "vtkSMPropertyLink.h" @@ -407,9 +408,12 @@ int vtkSMStateLoader::HandleLinks(vtkPVXMLElement* element) link = pxm->GetRegisteredLink(linkname); if (!link) { - link = vtkSMCameraLink::New(); - pxm->RegisterLink(linkname, link); - link->Delete(); + + // FIXME:MODULARIZATION + vtkErrorMacro("Need to fix camera link states"); + // link = vtkSMCameraLink::New(); + // pxm->RegisterLink(linkname, link); + // link->Delete(); } } if (link) diff --git a/ParaViewCore/ServerManager/vtkSMStateLoader.h b/ParaViewCore/ServerManager/Core/vtkSMStateLoader.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateLoader.h rename to ParaViewCore/ServerManager/Core/vtkSMStateLoader.h diff --git a/ParaViewCore/ServerManager/vtkSMStateLocator.cxx b/ParaViewCore/ServerManager/Core/vtkSMStateLocator.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateLocator.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStateLocator.cxx diff --git a/ParaViewCore/ServerManager/vtkSMStateLocator.h b/ParaViewCore/ServerManager/Core/vtkSMStateLocator.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateLocator.h rename to ParaViewCore/ServerManager/Core/vtkSMStateLocator.h diff --git a/ParaViewCore/ServerManager/vtkSMStateVersionController.cxx b/ParaViewCore/ServerManager/Core/vtkSMStateVersionController.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateVersionController.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStateVersionController.cxx diff --git a/ParaViewCore/ServerManager/vtkSMStateVersionController.h b/ParaViewCore/ServerManager/Core/vtkSMStateVersionController.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateVersionController.h rename to ParaViewCore/ServerManager/Core/vtkSMStateVersionController.h diff --git a/ParaViewCore/ServerManager/vtkSMStateVersionControllerBase.cxx b/ParaViewCore/ServerManager/Core/vtkSMStateVersionControllerBase.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateVersionControllerBase.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStateVersionControllerBase.cxx diff --git a/ParaViewCore/ServerManager/vtkSMStateVersionControllerBase.h b/ParaViewCore/ServerManager/Core/vtkSMStateVersionControllerBase.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStateVersionControllerBase.h rename to ParaViewCore/ServerManager/Core/vtkSMStateVersionControllerBase.h diff --git a/ParaViewCore/ServerManager/vtkSMStringListDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMStringListDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStringListDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStringListDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMStringListDomain.h b/ParaViewCore/ServerManager/Core/vtkSMStringListDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStringListDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMStringListDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMStringListRangeDomain.cxx b/ParaViewCore/ServerManager/Core/vtkSMStringListRangeDomain.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStringListRangeDomain.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStringListRangeDomain.cxx diff --git a/ParaViewCore/ServerManager/vtkSMStringListRangeDomain.h b/ParaViewCore/ServerManager/Core/vtkSMStringListRangeDomain.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStringListRangeDomain.h rename to ParaViewCore/ServerManager/Core/vtkSMStringListRangeDomain.h diff --git a/ParaViewCore/ServerManager/vtkSMStringVectorProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMStringVectorProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStringVectorProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMStringVectorProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMStringVectorProperty.h b/ParaViewCore/ServerManager/Core/vtkSMStringVectorProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMStringVectorProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMStringVectorProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMUncheckedPropertyHelper.h b/ParaViewCore/ServerManager/Core/vtkSMUncheckedPropertyHelper.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUncheckedPropertyHelper.h rename to ParaViewCore/ServerManager/Core/vtkSMUncheckedPropertyHelper.h diff --git a/ParaViewCore/ServerManager/vtkSMUndoElement.cxx b/ParaViewCore/ServerManager/Core/vtkSMUndoElement.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUndoElement.cxx rename to ParaViewCore/ServerManager/Core/vtkSMUndoElement.cxx diff --git a/ParaViewCore/ServerManager/vtkSMUndoElement.h b/ParaViewCore/ServerManager/Core/vtkSMUndoElement.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUndoElement.h rename to ParaViewCore/ServerManager/Core/vtkSMUndoElement.h diff --git a/ParaViewCore/ServerManager/vtkSMUndoStack.cxx b/ParaViewCore/ServerManager/Core/vtkSMUndoStack.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUndoStack.cxx rename to ParaViewCore/ServerManager/Core/vtkSMUndoStack.cxx diff --git a/ParaViewCore/ServerManager/vtkSMUndoStack.h b/ParaViewCore/ServerManager/Core/vtkSMUndoStack.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUndoStack.h rename to ParaViewCore/ServerManager/Core/vtkSMUndoStack.h diff --git a/ParaViewCore/ServerManager/vtkSMUndoStackBuilder.cxx b/ParaViewCore/ServerManager/Core/vtkSMUndoStackBuilder.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUndoStackBuilder.cxx rename to ParaViewCore/ServerManager/Core/vtkSMUndoStackBuilder.cxx diff --git a/ParaViewCore/ServerManager/vtkSMUndoStackBuilder.h b/ParaViewCore/ServerManager/Core/vtkSMUndoStackBuilder.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMUndoStackBuilder.h rename to ParaViewCore/ServerManager/Core/vtkSMUndoStackBuilder.h diff --git a/ParaViewCore/ServerManager/vtkSMVectorProperty.cxx b/ParaViewCore/ServerManager/Core/vtkSMVectorProperty.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMVectorProperty.cxx rename to ParaViewCore/ServerManager/Core/vtkSMVectorProperty.cxx diff --git a/ParaViewCore/ServerManager/vtkSMVectorProperty.h b/ParaViewCore/ServerManager/Core/vtkSMVectorProperty.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMVectorProperty.h rename to ParaViewCore/ServerManager/Core/vtkSMVectorProperty.h diff --git a/ParaViewCore/ServerManager/vtkSMVectorPropertyTemplate.h b/ParaViewCore/ServerManager/Core/vtkSMVectorPropertyTemplate.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMVectorPropertyTemplate.h rename to ParaViewCore/ServerManager/Core/vtkSMVectorPropertyTemplate.h diff --git a/ParaViewCore/ServerManager/vtkSMWriterFactory.cxx b/ParaViewCore/ServerManager/Core/vtkSMWriterFactory.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMWriterFactory.cxx rename to ParaViewCore/ServerManager/Core/vtkSMWriterFactory.cxx diff --git a/ParaViewCore/ServerManager/vtkSMWriterFactory.h b/ParaViewCore/ServerManager/Core/vtkSMWriterFactory.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMWriterFactory.h rename to ParaViewCore/ServerManager/Core/vtkSMWriterFactory.h diff --git a/ParaViewCore/ServerManager/vtkSMWriterProxy.cxx b/ParaViewCore/ServerManager/Core/vtkSMWriterProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMWriterProxy.cxx rename to ParaViewCore/ServerManager/Core/vtkSMWriterProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMWriterProxy.h b/ParaViewCore/ServerManager/Core/vtkSMWriterProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMWriterProxy.h rename to ParaViewCore/ServerManager/Core/vtkSMWriterProxy.h diff --git a/ParaViewCore/ServerManager/Default/CMakeLists.txt b/ParaViewCore/ServerManager/Default/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..3675ebb3c507ba0c8e72084cbdf7b3e75d127514 --- /dev/null +++ b/ParaViewCore/ServerManager/Default/CMakeLists.txt @@ -0,0 +1,67 @@ +#========================================================================== +# +# 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 + vtkPVKeyFrameAnimationCueForProxies.cxx + vtkPVMultiServerDataSource.cxx + vtkPVRepresentationAnimationHelper.cxx + vtkPVServerSideAnimationPlayer.cxx + vtkSMAnimationScene.cxx + vtkSMAnimationSceneGeometryWriter.cxx + vtkSMAnimationSceneImageWriter.cxx + vtkSMAnimationSceneProxy.cxx + vtkSMAnimationSceneWriter.cxx + vtkSMCameraConfigurationReader.cxx + vtkSMCameraConfigurationWriter.cxx + vtkSMCSVExporterProxy.cxx + vtkSMDirectoryProxy.cxx + vtkSMExporterProxy.cxx + vtkSMInteractionUndoStackBuilder.cxx + vtkSMMultiServerSourceProxy.cxx + vtkSMNullProxy.cxx + vtkSMPropertyModificationUndoElement.cxx + vtkSMProxyConfigurationReader.cxx + vtkSMProxyConfigurationWriter.cxx + vtkSMPSWriterProxy.cxx + vtkSMPWriterProxy.cxx + vtkSMRenderViewExporterProxy.cxx + vtkSMTesting.cxx + vtkSMTimeKeeper.cxx + vtkSMTimeKeeperProxy.cxx +) + +SET_SOURCE_FILES_PROPERTIES( + vtkSMAnimationSceneWriter.cxx + vtkSMExporterProxy.cxx + ABSTRACT + ) + +vtk_module_library(vtkPVServerManagerDefault + ${Module_SRCS}) diff --git a/ParaViewCore/ServerManager/Default/module.cmake b/ParaViewCore/ServerManager/Default/module.cmake new file mode 100644 index 0000000000000000000000000000000000000000..10df5eedf0a36ac3ccccb32eaf164e3cebe2ef4a --- /dev/null +++ b/ParaViewCore/ServerManager/Default/module.cmake @@ -0,0 +1,9 @@ +vtk_module(vtkPVServerManagerDefault + GROUPS + ParaView + DEPENDS + vtkPVServerManagerRendering + vtkPVServerImplementationDefault + vtkTestingRendering + vtkIOExport +) diff --git a/ParaViewCore/ServerManager/vtkPVKeyFrameAnimationCueForProxies.cxx b/ParaViewCore/ServerManager/Default/vtkPVKeyFrameAnimationCueForProxies.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkPVKeyFrameAnimationCueForProxies.cxx rename to ParaViewCore/ServerManager/Default/vtkPVKeyFrameAnimationCueForProxies.cxx diff --git a/ParaViewCore/ServerManager/vtkPVKeyFrameAnimationCueForProxies.h b/ParaViewCore/ServerManager/Default/vtkPVKeyFrameAnimationCueForProxies.h similarity index 100% rename from ParaViewCore/ServerManager/vtkPVKeyFrameAnimationCueForProxies.h rename to ParaViewCore/ServerManager/Default/vtkPVKeyFrameAnimationCueForProxies.h diff --git a/ParaViewCore/ServerManager/vtkPVMultiServerDataSource.cxx b/ParaViewCore/ServerManager/Default/vtkPVMultiServerDataSource.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkPVMultiServerDataSource.cxx rename to ParaViewCore/ServerManager/Default/vtkPVMultiServerDataSource.cxx diff --git a/ParaViewCore/ServerManager/vtkPVMultiServerDataSource.h b/ParaViewCore/ServerManager/Default/vtkPVMultiServerDataSource.h similarity index 100% rename from ParaViewCore/ServerManager/vtkPVMultiServerDataSource.h rename to ParaViewCore/ServerManager/Default/vtkPVMultiServerDataSource.h diff --git a/ParaViewCore/ServerManager/vtkPVRepresentationAnimationHelper.cxx b/ParaViewCore/ServerManager/Default/vtkPVRepresentationAnimationHelper.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkPVRepresentationAnimationHelper.cxx rename to ParaViewCore/ServerManager/Default/vtkPVRepresentationAnimationHelper.cxx diff --git a/ParaViewCore/ServerManager/vtkPVRepresentationAnimationHelper.h b/ParaViewCore/ServerManager/Default/vtkPVRepresentationAnimationHelper.h similarity index 100% rename from ParaViewCore/ServerManager/vtkPVRepresentationAnimationHelper.h rename to ParaViewCore/ServerManager/Default/vtkPVRepresentationAnimationHelper.h diff --git a/ParaViewCore/ServerManager/vtkPVServerSideAnimationPlayer.cxx b/ParaViewCore/ServerManager/Default/vtkPVServerSideAnimationPlayer.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkPVServerSideAnimationPlayer.cxx rename to ParaViewCore/ServerManager/Default/vtkPVServerSideAnimationPlayer.cxx diff --git a/ParaViewCore/ServerManager/vtkPVServerSideAnimationPlayer.h b/ParaViewCore/ServerManager/Default/vtkPVServerSideAnimationPlayer.h similarity index 100% rename from ParaViewCore/ServerManager/vtkPVServerSideAnimationPlayer.h rename to ParaViewCore/ServerManager/Default/vtkPVServerSideAnimationPlayer.h diff --git a/ParaViewCore/ServerManager/vtkSMAnimationScene.cxx b/ParaViewCore/ServerManager/Default/vtkSMAnimationScene.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationScene.cxx rename to ParaViewCore/ServerManager/Default/vtkSMAnimationScene.cxx diff --git a/ParaViewCore/ServerManager/vtkSMAnimationScene.h b/ParaViewCore/ServerManager/Default/vtkSMAnimationScene.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationScene.h rename to ParaViewCore/ServerManager/Default/vtkSMAnimationScene.h diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneGeometryWriter.cxx b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneGeometryWriter.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneGeometryWriter.cxx rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneGeometryWriter.cxx diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneGeometryWriter.h b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneGeometryWriter.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneGeometryWriter.h rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneGeometryWriter.h diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneImageWriter.cxx b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx similarity index 91% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneImageWriter.cxx rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx index 0723364f4bce52c49172412336c64f763f5f1d12..76894094b7d6d23b5b7eb5ce4cc65f4e47502de9 100644 --- a/ParaViewCore/ServerManager/vtkSMAnimationSceneImageWriter.cxx +++ b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx @@ -31,6 +31,7 @@ #include "vtkSMViewProxy.h" #include "vtkTIFFWriter.h" #include "vtkToolkits.h" +#include "vtkSMUtilities.h" #ifdef VTK_USE_MPEG2_ENCODER # include "vtkMPEG2Writer.h" @@ -183,43 +184,7 @@ vtkImageData* vtkSMAnimationSceneImageWriter::CaptureViewImage( //----------------------------------------------------------------------------- void vtkSMAnimationSceneImageWriter::Merge(vtkImageData* dest, vtkImageData* src) { - if (!src || !dest) - { - return; - } - - vtkImageIterator inIt(src, src->GetExtent()); - int outextent[6]; - src->GetExtent(outextent); - - // we need to flip Y. - outextent[2] = dest->GetExtent()[3] - outextent[2]; - outextent[3] = dest->GetExtent()[3] - outextent[3]; - int temp = outextent[2]; - outextent[2] = outextent[3]; - outextent[3] = temp; - // snap extents to what is available. - outextent[0] = std::max(outextent[0], dest->GetExtent()[0]); - outextent[1] = std::min(outextent[1], dest->GetExtent()[1]); - outextent[2] = std::max(outextent[2], dest->GetExtent()[2]); - outextent[3] = std::min(outextent[3], dest->GetExtent()[3]); - vtkImageIterator outIt(dest, outextent); - - while (!outIt.IsAtEnd() && !inIt.IsAtEnd()) - { - unsigned char* spanOut = outIt.BeginSpan(); - unsigned char* spanIn = inIt.BeginSpan(); - unsigned char* outSpanEnd = outIt.EndSpan(); - unsigned char* inSpanEnd = inIt.EndSpan(); - if (outSpanEnd != spanOut && inSpanEnd != spanIn) - { - size_t minO = outSpanEnd - spanOut; - size_t minI = inSpanEnd - spanIn; - memcpy(spanOut, spanIn, (minO < minI)? minO : minI); - } - inIt.NextSpan(); - outIt.NextSpan(); - } + vtkSMUtilities::Merge(dest, src); } //----------------------------------------------------------------------------- diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneImageWriter.h b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneImageWriter.h rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.h diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneProxy.h b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneWriter.cxx b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneWriter.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneWriter.cxx rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneWriter.cxx diff --git a/ParaViewCore/ServerManager/vtkSMAnimationSceneWriter.h b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneWriter.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMAnimationSceneWriter.h rename to ParaViewCore/ServerManager/Default/vtkSMAnimationSceneWriter.h diff --git a/ParaViewCore/ServerManager/vtkSMCSVExporterProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMCSVExporterProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCSVExporterProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMCSVExporterProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCSVExporterProxy.h b/ParaViewCore/ServerManager/Default/vtkSMCSVExporterProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCSVExporterProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMCSVExporterProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMCameraConfigurationFileInfo.h b/ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationFileInfo.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraConfigurationFileInfo.h rename to ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationFileInfo.h diff --git a/ParaViewCore/ServerManager/vtkSMCameraConfigurationReader.cxx b/ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationReader.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraConfigurationReader.cxx rename to ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationReader.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCameraConfigurationReader.h b/ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationReader.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraConfigurationReader.h rename to ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationReader.h diff --git a/ParaViewCore/ServerManager/vtkSMCameraConfigurationWriter.cxx b/ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationWriter.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraConfigurationWriter.cxx rename to ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationWriter.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCameraConfigurationWriter.h b/ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationWriter.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraConfigurationWriter.h rename to ParaViewCore/ServerManager/Default/vtkSMCameraConfigurationWriter.h diff --git a/ParaViewCore/ServerManager/vtkSMDirectoryProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMDirectoryProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDirectoryProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMDirectoryProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDirectoryProxy.h b/ParaViewCore/ServerManager/Default/vtkSMDirectoryProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDirectoryProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMDirectoryProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMExporterProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMExporterProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMExporterProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMExporterProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMExporterProxy.h b/ParaViewCore/ServerManager/Default/vtkSMExporterProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMExporterProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMExporterProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMInteractionUndoStackBuilder.cxx b/ParaViewCore/ServerManager/Default/vtkSMInteractionUndoStackBuilder.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMInteractionUndoStackBuilder.cxx rename to ParaViewCore/ServerManager/Default/vtkSMInteractionUndoStackBuilder.cxx diff --git a/ParaViewCore/ServerManager/vtkSMInteractionUndoStackBuilder.h b/ParaViewCore/ServerManager/Default/vtkSMInteractionUndoStackBuilder.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMInteractionUndoStackBuilder.h rename to ParaViewCore/ServerManager/Default/vtkSMInteractionUndoStackBuilder.h diff --git a/ParaViewCore/ServerManager/vtkSMMultiServerSourceProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMMultiServerSourceProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMMultiServerSourceProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMMultiServerSourceProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMMultiServerSourceProxy.h b/ParaViewCore/ServerManager/Default/vtkSMMultiServerSourceProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMMultiServerSourceProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMMultiServerSourceProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMNullProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMNullProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNullProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMNullProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMNullProxy.h b/ParaViewCore/ServerManager/Default/vtkSMNullProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNullProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMNullProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMPSWriterProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMPSWriterProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPSWriterProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMPSWriterProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPSWriterProxy.h b/ParaViewCore/ServerManager/Default/vtkSMPSWriterProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPSWriterProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMPSWriterProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMPWriterProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMPWriterProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPWriterProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMPWriterProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPWriterProxy.h b/ParaViewCore/ServerManager/Default/vtkSMPWriterProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPWriterProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMPWriterProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMPropertyModificationUndoElement.cxx b/ParaViewCore/ServerManager/Default/vtkSMPropertyModificationUndoElement.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyModificationUndoElement.cxx rename to ParaViewCore/ServerManager/Default/vtkSMPropertyModificationUndoElement.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPropertyModificationUndoElement.h b/ParaViewCore/ServerManager/Default/vtkSMPropertyModificationUndoElement.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPropertyModificationUndoElement.h rename to ParaViewCore/ServerManager/Default/vtkSMPropertyModificationUndoElement.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyConfigurationFileInfo.h b/ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationFileInfo.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyConfigurationFileInfo.h rename to ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationFileInfo.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyConfigurationReader.cxx b/ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationReader.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyConfigurationReader.cxx rename to ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationReader.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyConfigurationReader.h b/ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationReader.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyConfigurationReader.h rename to ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationReader.h diff --git a/ParaViewCore/ServerManager/vtkSMProxyConfigurationWriter.cxx b/ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationWriter.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyConfigurationWriter.cxx rename to ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationWriter.cxx diff --git a/ParaViewCore/ServerManager/vtkSMProxyConfigurationWriter.h b/ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationWriter.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMProxyConfigurationWriter.h rename to ParaViewCore/ServerManager/Default/vtkSMProxyConfigurationWriter.h diff --git a/ParaViewCore/ServerManager/vtkSMRenderViewExporterProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMRenderViewExporterProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRenderViewExporterProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMRenderViewExporterProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMRenderViewExporterProxy.h b/ParaViewCore/ServerManager/Default/vtkSMRenderViewExporterProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRenderViewExporterProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMRenderViewExporterProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMTesting.cxx b/ParaViewCore/ServerManager/Default/vtkSMTesting.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTesting.cxx rename to ParaViewCore/ServerManager/Default/vtkSMTesting.cxx diff --git a/ParaViewCore/ServerManager/vtkSMTesting.h b/ParaViewCore/ServerManager/Default/vtkSMTesting.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTesting.h rename to ParaViewCore/ServerManager/Default/vtkSMTesting.h diff --git a/ParaViewCore/ServerManager/vtkSMTimeKeeper.cxx b/ParaViewCore/ServerManager/Default/vtkSMTimeKeeper.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTimeKeeper.cxx rename to ParaViewCore/ServerManager/Default/vtkSMTimeKeeper.cxx diff --git a/ParaViewCore/ServerManager/vtkSMTimeKeeper.h b/ParaViewCore/ServerManager/Default/vtkSMTimeKeeper.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTimeKeeper.h rename to ParaViewCore/ServerManager/Default/vtkSMTimeKeeper.h diff --git a/ParaViewCore/ServerManager/vtkSMTimeKeeperProxy.cxx b/ParaViewCore/ServerManager/Default/vtkSMTimeKeeperProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTimeKeeperProxy.cxx rename to ParaViewCore/ServerManager/Default/vtkSMTimeKeeperProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMTimeKeeperProxy.h b/ParaViewCore/ServerManager/Default/vtkSMTimeKeeperProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTimeKeeperProxy.h rename to ParaViewCore/ServerManager/Default/vtkSMTimeKeeperProxy.h diff --git a/ParaViewCore/ServerManager/Rendering/CMakeLists.txt b/ParaViewCore/ServerManager/Rendering/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..b3c33af366c061b8aaa036f0b0148de86c894cca --- /dev/null +++ b/ParaViewCore/ServerManager/Rendering/CMakeLists.txt @@ -0,0 +1,62 @@ +#========================================================================== +# +# 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 + vtkPVComparativeAnimationCue.cxx + vtkPVComparativeView.cxx + vtkSMBoxRepresentationProxy.cxx + vtkSMCameraLink.cxx + vtkSMCameraProxy.cxx + vtkSMChartRepresentationProxy.cxx + vtkSMComparativeAnimationCueProxy.cxx + vtkSMComparativeAnimationCueUndoElement.cxx + vtkSMComparativeViewProxy.cxx + vtkSMContextNamedOptionsProxy.cxx + vtkSMContextViewProxy.cxx + vtkSMDataDeliveryManager.cxx + vtkSMImplicitPlaneRepresentationProxy.cxx + vtkSMNewWidgetRepresentationProxy.cxx + vtkSMParallelCoordinatesRepresentationProxy.cxx + vtkSMPlotMatrixViewProxy.cxx + vtkSMPVRepresentationProxy.cxx + vtkSMRenderViewProxy.cxx + vtkSMRepresentationProxy.cxx + vtkSMScalarBarWidgetRepresentationProxy.cxx + vtkSMSelectionHelper.cxx + vtkSMSpreadSheetRepresentationProxy.cxx + vtkSMTextWidgetRepresentationProxy.cxx + vtkSMUtilities.cxx + vtkSMViewLayoutProxy.cxx + vtkSMViewProxy.cxx + vtkSMWidgetRepresentationProxy.cxx +) + +vtk_module_library(vtkPVServerManagerRendering + ${Module_SRCS}) diff --git a/ParaViewCore/ServerManager/Rendering/module.cmake b/ParaViewCore/ServerManager/Rendering/module.cmake new file mode 100644 index 0000000000000000000000000000000000000000..ff4380cc67d37ef5265ea084b4c94aa390c77795 --- /dev/null +++ b/ParaViewCore/ServerManager/Rendering/module.cmake @@ -0,0 +1,7 @@ +vtk_module(vtkPVServerManagerRendering + GROUPS + ParaViewRendering + DEPENDS + vtkPVServerManagerCore + vtkPVServerImplementationRendering +) diff --git a/ParaViewCore/ServerManager/vtkPVComparativeAnimationCue.cxx b/ParaViewCore/ServerManager/Rendering/vtkPVComparativeAnimationCue.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkPVComparativeAnimationCue.cxx rename to ParaViewCore/ServerManager/Rendering/vtkPVComparativeAnimationCue.cxx diff --git a/ParaViewCore/ServerManager/vtkPVComparativeAnimationCue.h b/ParaViewCore/ServerManager/Rendering/vtkPVComparativeAnimationCue.h similarity index 100% rename from ParaViewCore/ServerManager/vtkPVComparativeAnimationCue.h rename to ParaViewCore/ServerManager/Rendering/vtkPVComparativeAnimationCue.h diff --git a/ParaViewCore/ServerManager/vtkPVComparativeView.cxx b/ParaViewCore/ServerManager/Rendering/vtkPVComparativeView.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkPVComparativeView.cxx rename to ParaViewCore/ServerManager/Rendering/vtkPVComparativeView.cxx diff --git a/ParaViewCore/ServerManager/vtkPVComparativeView.h b/ParaViewCore/ServerManager/Rendering/vtkPVComparativeView.h similarity index 100% rename from ParaViewCore/ServerManager/vtkPVComparativeView.h rename to ParaViewCore/ServerManager/Rendering/vtkPVComparativeView.h diff --git a/ParaViewCore/ServerManager/vtkSMBoxRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMBoxRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMBoxRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMBoxRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMBoxRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMBoxRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMBoxRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMBoxRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMCameraLink.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraLink.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCameraLink.h b/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraLink.h rename to ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.h diff --git a/ParaViewCore/ServerManager/vtkSMCameraProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMCameraProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMCameraProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMCameraProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMCameraProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMCameraProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMCameraProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMChartRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMChartRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMChartRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMChartRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMChartRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMChartRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMChartRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMChartRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMComparativeAnimationCueProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMComparativeAnimationCueProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMComparativeAnimationCueProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMComparativeAnimationCueProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMComparativeAnimationCueUndoElement.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueUndoElement.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMComparativeAnimationCueUndoElement.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueUndoElement.cxx diff --git a/ParaViewCore/ServerManager/vtkSMComparativeAnimationCueUndoElement.h b/ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueUndoElement.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMComparativeAnimationCueUndoElement.h rename to ParaViewCore/ServerManager/Rendering/vtkSMComparativeAnimationCueUndoElement.h diff --git a/ParaViewCore/ServerManager/vtkSMComparativeViewProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMComparativeViewProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMComparativeViewProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMComparativeViewProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMComparativeViewProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMComparativeViewProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMComparativeViewProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMComparativeViewProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMContextNamedOptionsProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMContextNamedOptionsProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMContextNamedOptionsProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMContextNamedOptionsProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMContextNamedOptionsProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMContextNamedOptionsProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMContextNamedOptionsProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMContextNamedOptionsProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMContextViewProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMContextViewProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMContextViewProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMContextViewProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMContextViewProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMContextViewProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMContextViewProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMContextViewProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMDataDeliveryManager.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMDataDeliveryManager.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDataDeliveryManager.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMDataDeliveryManager.cxx diff --git a/ParaViewCore/ServerManager/vtkSMDataDeliveryManager.h b/ParaViewCore/ServerManager/Rendering/vtkSMDataDeliveryManager.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMDataDeliveryManager.h rename to ParaViewCore/ServerManager/Rendering/vtkSMDataDeliveryManager.h diff --git a/ParaViewCore/ServerManager/vtkSMImplicitPlaneRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMImplicitPlaneRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMImplicitPlaneRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMImplicitPlaneRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMImplicitPlaneRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMImplicitPlaneRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMImplicitPlaneRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMImplicitPlaneRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMNewWidgetRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMNewWidgetRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNewWidgetRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMNewWidgetRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMNewWidgetRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMNewWidgetRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMNewWidgetRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMNewWidgetRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMPVRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPVRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPVRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPVRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMPVRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMParallelCoordinatesRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMParallelCoordinatesRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMParallelCoordinatesRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMParallelCoordinatesRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMParallelCoordinatesRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMParallelCoordinatesRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMParallelCoordinatesRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMParallelCoordinatesRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMPlotMatrixViewProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMPlotMatrixViewProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPlotMatrixViewProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMPlotMatrixViewProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMPlotMatrixViewProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMPlotMatrixViewProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMPlotMatrixViewProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMPlotMatrixViewProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMRenderViewProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMRenderViewProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRenderViewProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMRenderViewProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMRenderViewProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMRenderViewProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRenderViewProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMRenderViewProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMScalarBarWidgetRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMScalarBarWidgetRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMScalarBarWidgetRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMScalarBarWidgetRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMScalarBarWidgetRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMScalarBarWidgetRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMScalarBarWidgetRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMScalarBarWidgetRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMSelectionHelper.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMSelectionHelper.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSelectionHelper.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMSelectionHelper.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSelectionHelper.h b/ParaViewCore/ServerManager/Rendering/vtkSMSelectionHelper.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSelectionHelper.h rename to ParaViewCore/ServerManager/Rendering/vtkSMSelectionHelper.h diff --git a/ParaViewCore/ServerManager/vtkSMSpreadSheetRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMSpreadSheetRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSpreadSheetRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMSpreadSheetRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMSpreadSheetRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMSpreadSheetRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMSpreadSheetRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMSpreadSheetRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMTextWidgetRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMTextWidgetRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTextWidgetRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMTextWidgetRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMTextWidgetRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMTextWidgetRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMTextWidgetRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMTextWidgetRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMUtilities.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMUtilities.cxx similarity index 81% rename from ParaViewCore/ServerManager/vtkSMUtilities.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMUtilities.cxx index 34e5bd54204a0572aa0f5cd24de4ba7027f55ba4..fec71bb54eaa0da482c0e5ebb3adb890560cc691 100644 --- a/ParaViewCore/ServerManager/vtkSMUtilities.cxx +++ b/ParaViewCore/ServerManager/Rendering/vtkSMUtilities.cxx @@ -17,6 +17,7 @@ #include "vtkBMPWriter.h" #include "vtkErrorCode.h" #include "vtkImageData.h" +#include "vtkImageIterator.h" #include "vtkInstantiator.h" #include "vtkJPEGWriter.h" #include "vtkMath.h" @@ -213,6 +214,48 @@ vtkPoints* vtkSMUtilities::CreateOrbit(const double center[3], return pts; } +//----------------------------------------------------------------------------- +void vtkSMUtilities::Merge(vtkImageData* dest, vtkImageData* src) +{ + if (!src || !dest) + { + return; + } + + vtkImageIterator inIt(src, src->GetExtent()); + int outextent[6]; + src->GetExtent(outextent); + + // we need to flip Y. + outextent[2] = dest->GetExtent()[3] - outextent[2]; + outextent[3] = dest->GetExtent()[3] - outextent[3]; + int temp = outextent[2]; + outextent[2] = outextent[3]; + outextent[3] = temp; + // snap extents to what is available. + outextent[0] = std::max(outextent[0], dest->GetExtent()[0]); + outextent[1] = std::min(outextent[1], dest->GetExtent()[1]); + outextent[2] = std::max(outextent[2], dest->GetExtent()[2]); + outextent[3] = std::min(outextent[3], dest->GetExtent()[3]); + vtkImageIterator outIt(dest, outextent); + + while (!outIt.IsAtEnd() && !inIt.IsAtEnd()) + { + unsigned char* spanOut = outIt.BeginSpan(); + unsigned char* spanIn = inIt.BeginSpan(); + unsigned char* outSpanEnd = outIt.EndSpan(); + unsigned char* inSpanEnd = inIt.EndSpan(); + if (outSpanEnd != spanOut && inSpanEnd != spanIn) + { + size_t minO = outSpanEnd - spanOut; + size_t minI = inSpanEnd - spanIn; + memcpy(spanOut, spanIn, (minO < minI)? minO : minI); + } + inIt.NextSpan(); + outIt.NextSpan(); + } +} + //---------------------------------------------------------------------------- void vtkSMUtilities::PrintSelf(ostream& os, vtkIndent indent) diff --git a/ParaViewCore/ServerManager/vtkSMUtilities.h b/ParaViewCore/ServerManager/Rendering/vtkSMUtilities.h similarity index 91% rename from ParaViewCore/ServerManager/vtkSMUtilities.h rename to ParaViewCore/ServerManager/Rendering/vtkSMUtilities.h index 0bc1680951d5921c0b59ec3ac453e01601f31753..b7210372088a9d7863687a72955b51d6518c29bf 100644 --- a/ParaViewCore/ServerManager/vtkSMUtilities.h +++ b/ParaViewCore/ServerManager/Rendering/vtkSMUtilities.h @@ -66,6 +66,11 @@ public: static vtkPoints* CreateOrbit(const double center[3], const double normal[3], double radius, int resolution); + // Description: + // Convenience method used to merge a smaller image (\c src) into a + // larger one (\c dest). The location of the smaller image in the larger image + // are determined by their extents. + static void Merge(vtkImageData* dest, vtkImageData* src); //BTX protected: vtkSMUtilities() {} diff --git a/ParaViewCore/ServerManager/vtkSMViewLayoutProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMViewLayoutProxy.cxx similarity index 99% rename from ParaViewCore/ServerManager/vtkSMViewLayoutProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMViewLayoutProxy.cxx index 11bf7bcb556018aa1cffa016e96ddbbf203dbd2f..57613b7b5b5f87558d9fee03ebf3cdfa8ccbca76 100644 --- a/ParaViewCore/ServerManager/vtkSMViewLayoutProxy.cxx +++ b/ParaViewCore/ServerManager/Rendering/vtkSMViewLayoutProxy.cxx @@ -20,7 +20,6 @@ #include "vtkMemberFunctionCommand.h" #include "vtkObjectFactory.h" #include "vtkPVXMLElement.h" -#include "vtkSMAnimationSceneImageWriter.h" #include "vtkSmartPointer.h" #include "vtkSMMessage.h" #include "vtkSMPropertyHelper.h" @@ -28,6 +27,7 @@ #include "vtkSMProxyProperty.h" #include "vtkSMSession.h" #include "vtkSMSessionProxyManager.h" +#include "vtkSMUtilities.h" #include "vtkSMViewProxy.h" #include "vtkWeakPointer.h" @@ -965,7 +965,7 @@ vtkImageData* vtkSMViewLayoutProxy::CaptureWindow(int magnification) for (size_t cc=0; cc < images.size(); cc++) { - vtkSMAnimationSceneImageWriter::Merge(image, images[cc]); + vtkSMUtilities::Merge(image, images[cc]); } return image; } diff --git a/ParaViewCore/ServerManager/vtkSMViewLayoutProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMViewLayoutProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMViewLayoutProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMViewLayoutProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMViewProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMViewProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMViewProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMViewProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMViewProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMViewProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMViewProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMViewProxy.h diff --git a/ParaViewCore/ServerManager/vtkSMWidgetRepresentationProxy.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMWidgetRepresentationProxy.cxx similarity index 100% rename from ParaViewCore/ServerManager/vtkSMWidgetRepresentationProxy.cxx rename to ParaViewCore/ServerManager/Rendering/vtkSMWidgetRepresentationProxy.cxx diff --git a/ParaViewCore/ServerManager/vtkSMWidgetRepresentationProxy.h b/ParaViewCore/ServerManager/Rendering/vtkSMWidgetRepresentationProxy.h similarity index 100% rename from ParaViewCore/ServerManager/vtkSMWidgetRepresentationProxy.h rename to ParaViewCore/ServerManager/Rendering/vtkSMWidgetRepresentationProxy.h diff --git a/ParaViewCore/ServerManager/hints b/ParaViewCore/ServerManager/hints deleted file mode 100644 index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000 --- a/ParaViewCore/ServerManager/hints +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ParaViewCore/ServerManager/vtkSMLinearAnimationCueManipulatorProxy.cxx b/ParaViewCore/ServerManager/vtkSMLinearAnimationCueManipulatorProxy.cxx deleted file mode 100644 index 2bbb1b4dcdb59a1fe6d51a18ef3299a32c71d27d..0000000000000000000000000000000000000000 --- a/ParaViewCore/ServerManager/vtkSMLinearAnimationCueManipulatorProxy.cxx +++ /dev/null @@ -1,71 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: vtkSMLinearAnimationCueManipulatorProxy.cxx - - Copyright (c) Kitware, Inc. - All rights reserved. - See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notice for more information. - -=========================================================================*/ -#include "vtkSMLinearAnimationCueManipulatorProxy.h" - -#include "vtkObjectFactory.h" -#include "vtkSMAnimationCueProxy.h" -#include "vtkSMDomain.h" -#include "vtkSMProxy.h" -#include "vtkSMProperty.h" -#include "vtkClientServerID.h" - -vtkStandardNewMacro(vtkSMLinearAnimationCueManipulatorProxy); - -//---------------------------------------------------------------------------- -vtkSMLinearAnimationCueManipulatorProxy::vtkSMLinearAnimationCueManipulatorProxy() -{ - this->StartValue = 0.0; - this->EndValue = 0.0; -} - -//---------------------------------------------------------------------------- -vtkSMLinearAnimationCueManipulatorProxy::~vtkSMLinearAnimationCueManipulatorProxy() -{ -} - -//---------------------------------------------------------------------------- -void vtkSMLinearAnimationCueManipulatorProxy::UpdateValue(double currenttime, - vtkSMAnimationCueProxy* cueproxy) -{ - double vmax = this->EndValue; - double vmin = this->StartValue; - double value = vmin + currenttime * (vmax - vmin); - - vtkSMDomain *domain = cueproxy->GetAnimatedDomain(); - vtkSMProperty *property = cueproxy->GetAnimatedProperty(); - vtkSMProxy *proxy = cueproxy->GetAnimatedProxy(); - - if (domain && property) - { - domain->SetAnimationValue(property, cueproxy->GetAnimatedElement(), - value); - } - if (proxy) - { - proxy->UpdateVTKObjects(); - } - this->InvokeEvent(vtkSMAnimationCueManipulatorProxy::StateModifiedEvent); -} - -//---------------------------------------------------------------------------- -void vtkSMLinearAnimationCueManipulatorProxy::PrintSelf(ostream& os, vtkIndent indent) -{ - this->Superclass::PrintSelf(os, indent); - os << indent << "StartValue: " << this->StartValue << endl; - os << indent << "EndValue: " << this->EndValue << endl; -} - -//---------------------------------------------------------------------------- - diff --git a/ParaViewCore/ServerManager/vtkSMLinearAnimationCueManipulatorProxy.h b/ParaViewCore/ServerManager/vtkSMLinearAnimationCueManipulatorProxy.h deleted file mode 100644 index 5e6fb630745bb537f1e2f21c90c4be61b58defa1..0000000000000000000000000000000000000000 --- a/ParaViewCore/ServerManager/vtkSMLinearAnimationCueManipulatorProxy.h +++ /dev/null @@ -1,63 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: vtkSMLinearAnimationCueManipulatorProxy.h - - Copyright (c) Kitware, Inc. - All rights reserved. - See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notice for more information. - -=========================================================================*/ -// .NAME vtkSMLinearAnimationCueManipulatorProxy -// .SECTION Description -// Linear value variance. An example of Manipulator which is not using KeyFrames. -// ParaView GUI never creates this. But provided as an example. -// .SECTION See Also -// vtkSMAnimationCueProxy - -#ifndef __vtkSMLinearAnimationCueManipulatorProxy_h -#define __vtkSMLinearAnimationCueManipulatorProxy_h - -#include "vtkSMAnimationCueManipulatorProxy.h" - -class vtkSMAnimationCueProxy; - -class VTK_EXPORT vtkSMLinearAnimationCueManipulatorProxy : public vtkSMAnimationCueManipulatorProxy -{ -public: - vtkTypeMacro(vtkSMLinearAnimationCueManipulatorProxy, vtkSMAnimationCueManipulatorProxy); - void PrintSelf(ostream& os, vtkIndent indent); - - static vtkSMLinearAnimationCueManipulatorProxy* New(); - - // Get/Set the start values. - vtkSetMacro(StartValue, double); - vtkGetMacro(StartValue, double); - - vtkSetMacro(EndValue, double); - vtkGetMacro(EndValue, double); - -protected: - vtkSMLinearAnimationCueManipulatorProxy(); - ~vtkSMLinearAnimationCueManipulatorProxy(); - - double StartValue; - double EndValue; - - // Description: - // This updates the values based on current. - // currenttime is normalized to the time range of the Cue. - virtual void UpdateValue(double currenttime, - vtkSMAnimationCueProxy* cueproxy); -private: - vtkSMLinearAnimationCueManipulatorProxy(const vtkSMLinearAnimationCueManipulatorProxy&); // Not implemented. - void operator=(const vtkSMLinearAnimationCueManipulatorProxy&); // Not implemented. -}; - - -#endif -