Commit 60c26005 authored by Sebastien Jourdain's avatar Sebastien Jourdain

Keep fixing Proxy classes

parent 2837848c
......@@ -52,7 +52,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkPVArrayInformation.h"
#include "vtkPVDataInformation.h"
#include "vtkPVDataSetAttributesInformation.h"
#include "vtkSMLookupTableProxy.h"
#include "vtkSMProperty.h"
#include "vtkSMProxyProperty.h"
#include "vtkSMPVRepresentationProxy.h"
......
......@@ -52,7 +52,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkPVArrayInformation.h"
#include "vtkPVDataInformation.h"
#include "vtkPVDataSetAttributesInformation.h"
#include "vtkSMLookupTableProxy.h"
#include "vtkSMProperty.h"
#include "vtkSMProxyProperty.h"
#include "vtkSMPVRepresentationProxy.h"
......
......@@ -42,7 +42,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkPVXMLElement.h"
#include "vtkSmartPointer.h"
#include "vtkSMInputProperty.h"
#include "vtkSMLookupTableProxy.h"
#include "vtkSMProxy.h"
#include "vtkSMProxyManager.h"
#include "vtkSMProxyProperty.h"
......
......@@ -183,6 +183,7 @@ SET(Filters_SRCS
vtkPVTrackballRoll.cxx
vtkPVTrackballRotate.cxx
vtkPVTrackballZoom.cxx
vtkPVTransform.cxx
vtkPVUpdateSuppressor.cxx
vtkPVView.cxx
vtkPVXYChartView.cxx
......
......@@ -35,6 +35,7 @@ SET (Kit_SRCS
vtkPMPVRepresentationProxy.cxx
vtkPMSelectionRepresentationProxy.cxx
vtkPMSILProperty.cxx
vtkPMScalarBarActorProxy.cxx
vtkPMSourceProxy.cxx
vtkPMStringVectorProperty.cxx
vtkPMTextSourceRepresentationProxy.cxx
......@@ -44,8 +45,17 @@ SET (Kit_SRCS
vtkPMVectorProperty.cxx
vtkPMWriterProxy.cxx
# --- SM Objects ---
vtkSMAnimationCueManipulatorProxy.cxx
vtkSMAnimationCueProxy.cxx
vtkSMAnimationPlayerProxy.cxx
vtkSMAnimationSceneProxy.cxx
vtkSMBooleanKeyFrameProxy.cxx
vtkSMBoxRepresentationProxy.cxx
vtkSMCameraLink.cxx
vtkSMCameraProxy.cxx
vtkSMCameraConfigurationReader.cxx
vtkSMCameraConfigurationWriter.cxx
vtkSMCameraKeyFrameProxy.cxx
vtkSMChartRepresentationProxy.cxx
vtkSMCompoundSourceProxy.cxx
vtkSMCompoundSourceProxyDefinitionBuilder.cxx
......@@ -62,8 +72,13 @@ SET (Kit_SRCS
vtkSMIdTypeVectorProperty.cxx
vtkSMInputProperty.cxx
vtkSMIntVectorProperty.cxx
vtkSMKeyFrameAnimationCueManipulatorProxy.cxx
vtkSMKeyFrameProxy.cxx
vtkSMLink.cxx
vtkSMNamedPropertyIterator.cxx
vtkSMNewWidgetRepresentationProxy.cxx
vtkSMObject.cxx
vtkSMOrderedPropertyIterator.cxx
vtkSMOutputPort.cxx
vtkSMParallelCoordinatesRepresentationProxy.cxx
vtkSMProperty.cxx
......@@ -71,6 +86,8 @@ SET (Kit_SRCS
vtkSMPropertyIterator.cxx
vtkSMPropertyLink.cxx
vtkSMProxy.cxx
vtkSMProxyConfigurationReader.cxx
vtkSMProxyConfigurationWriter.cxx
vtkSMProxyDefinitionIterator.cxx
vtkSMProxyDefinitionManager.cxx
vtkSMProxyIterator.cxx
......@@ -87,17 +104,21 @@ SET (Kit_SRCS
vtkSMRemoteObjectUpdateUndoElement.cxx
vtkSMRenderViewProxy.cxx
vtkSMRepresentationProxy.cxx
vtkSMScalarBarWidgetRepresentationProxy.cxx
vtkSMSelectionHelper.cxx
vtkSMSessionClient.cxx
vtkSMSessionCore.cxx
vtkSMSession.cxx
vtkSMSessionServer.cxx
vtkSMSILModel.cxx
vtkSMSourceProxy.cxx
vtkSMSpreadSheetRepresentationProxy.cxx
vtkSMStateLoader.cxx
vtkSMStateVersionControllerBase.cxx
vtkSMStateVersionController.cxx
vtkSMStringVectorProperty.cxx
vtkSMTextWidgetRepresentationProxy.cxx
vtkSMTimeKeeperProxy.cxx
vtkSMTwoDRenderViewProxy.cxx
vtkSMUndoElement.cxx
vtkSMUndoStackBuilder.cxx
......@@ -106,6 +127,7 @@ SET (Kit_SRCS
vtkSMUtilities.cxx
vtkSMVectorProperty.cxx
vtkSMViewProxy.cxx
vtkSMWidgetRepresentationProxy.cxx
vtkSMWriterFactory.cxx
vtkSMWriterProxy.cxx
)
......@@ -132,7 +154,7 @@ SET (Domain_SRCS
vtkSMNumberOfGroupsDomain.cxx
vtkSMProxyGroupDomain.cxx
vtkSMProxyListDomain.cxx
#vtkSMSILDomain.cxx
vtkSMSILDomain.cxx
vtkSMStringListDomain.cxx
vtkSMStringListRangeDomain.cxx
)
......@@ -144,21 +166,15 @@ SET (Kit_SRCS
IF (FIXME) #-------------------------------------------------------------- BEGIN
SET(Kit_SRCS
vtkSMAnimationCueManipulatorProxy.cxx
vtkSMAnimationCueProxy.cxx
vtkSMAnimationPlayerProxy.cxx
vtkSMAnimationSceneGeometryWriter.cxx
vtkSMAnimationSceneImageWriter.cxx
vtkSMAnimationSceneProxy.cxx
vtkSMAnimationSceneWriter.cxx
vtkSMApplication.cxx
vtkSMBooleanKeyFrameProxy.cxx
vtkSMBoxRepresentationProxy.cxx # ---- don't know how to setup transform...
vtkSMCameraConfigurationReader.cxx
vtkSMCameraConfigurationWriter.cxx
vtkSMCameraKeyFrameProxy.cxx
vtkSMCameraManipulatorProxy.cxx
#vtkSMCaveRenderModuleProxy.cxx
......@@ -172,7 +188,7 @@ SET(Kit_SRCS
vtkSMContextArraysInformationHelper.cxx #---- SM Side only, not managed yet...
vtkSMContextNamedOptionsProxy.cxx
vtkSMDataSourceProxy.cxx #---- Who use it ? --- Make a special property type ?
vtkSMDataSourceProxy.cxx #---- Who use it ? --- Make a special property type to copy data ?
vtkSMDistanceRepresentation2DProxy.cxx
vtkSMExponentialKeyFrameProxy.cxx
......@@ -185,62 +201,47 @@ SET(Kit_SRCS
vtkSMImplicitPlaneRepresentationProxy.cxx
vtkSMInteractionUndoStackBuilder.cxx#--------------------------------
vtkSMKeyFrameAnimationCueManipulatorProxy.cxx
vtkSMKeyFrameProxy.cxx
vtkSMLinearAnimationCueManipulatorProxy.cxx
vtkSMLookupTableProxy.cxx
vtkSMMaterialLoaderProxy.cxx
vtkSMLinearAnimationCueManipulatorProxy.cxx
vtkSMNamedPropertyIterator.cxx
vtkSMNewWidgetRepresentationProxy.cxx
vtkSMNetworkImageSourceProxy.cxx
vtkSMOrderedPropertyIterator.cxx
vtkSMPQStateLoader.cxx
vtkSMPluginManager.cxx
vtkSMPluginProxy.cxx
# vtkSMPluginInformationHelper.cxx
vtkSMPropertyAdaptor.cxx
vtkSMPropertyModificationUndoElement.cxx#--------------------------------
vtkSMProxyConfigurationReader.cxx
vtkSMProxyConfigurationWriter.cxx
vtkSMProxyManagerReviver.cxx
vtkSMProxyRegisterUndoElement.cxx#--------------------------------
vtkSMProxyStateChangedUndoElement.cxx#--------------------------------
vtkSMProxyUnRegisterUndoElement.cxx#--------------------------------
vtkSMPythonTraceObserver.cxx
vtkSMPVLookupTableProxy.cxx
vtkSMRampKeyFrameProxy.cxx
vtkSMReaderFactory.cxx
vtkSMRenderViewExporterProxy.cxx
vtkSMRepresentationAnimationHelperProxy.cxx
vtkSMScalarBarActorProxy.cxx
vtkSMScalarBarWidgetRepresentationProxy.cxx
# vtkSMScatterPlotArraysInformationHelper.cxx
# vtkSMScatterPlotViewProxy.cxx
# vtkSMSelectionDeliveryRepresentationProxy.cxx
vtkSMServerFileListingProxy.cxx
vtkSMServerProxyManagerReviver.cxx
vtkSMServerSideAnimationPlayer.cxx
vtkSMSILModel.cxx
vtkSMSinusoidKeyFrameProxy.cxx
# vtkSMTemporalInputDomain.cxx
vtkSMTesting.cxx
vtkSMTextWidgetRepresentationProxy.cxx
vtkSMTimeAnimationCueProxy.cxx
vtkSMTimeKeeperProxy.cxx
vtkSMTransformProxy.cxx
vtkSMUndoRedoStateLoader.cxx#-------------------------------- should be DELETE
vtkSMUpdateInformationUndoElement.cxx#--------------------------------
vtkSMWidgetRepresentationProxy.cxx
vtkSMWriterProxy.cxx
vtkSMXMLPVAnimationWriterProxy.cxx
......@@ -263,6 +264,7 @@ SET( ServerManager_SRCS
# Abstract and Wrap exclude
SET_SOURCE_FILES_PROPERTIES(
vtkSMAnimationCueManipulatorProxy.cxx
vtkInitializationHelper.cxx
vtkPMObject.cxx
vtkPMVectorProperty.cxx
......@@ -284,10 +286,8 @@ SET_SOURCE_FILES_PROPERTIES(
IF (FIXME) #-------------------------------------------------------------- BEGIN
SET_SOURCE_FILES_PROPERTIES(
vtkSMAnimationCueManipulatorProxy.cxx
vtkSMAnimationSceneWriter.cxx
vtkSMClientServerRenderSyncManagerHelper.cxx
vtkSMDomain.cxx
vtkSMInformationHelper.cxx
vtkSMLink.cxx
vtkSMProxyManagerReviver.cxx
......
......@@ -1004,8 +1004,9 @@
</BoxRepresentationProxy>
<!-- ================================================================== -->
<DistanceRepresentation2DProxy name="DistanceRepresentation2D"
class="vtkDistanceRepresentation2D">
<Proxy name="DistanceRepresentation2D"
class="vtkDistanceRepresentation2D"
post_create="InstantiateHandleRepresentation">
<IntVectorProperty name="Visibility"
command="SetVisibility"
......@@ -1052,7 +1053,7 @@
</DoubleVectorProperty>
<!-- End of DistanceRepresentation2D -->
</DistanceRepresentation2DProxy>
</Proxy>
<!-- ================================================================== -->
<ImplicitPlaneRepresentationProxy name="ImplicitPlaneRepresentation"
......
......@@ -1323,6 +1323,12 @@
information_only="1"
kernel_class="vtkPMSILProperty"
subtree="Blocks"/>
<IdTypeVectorProperty name="SILTimeStamp"
command="GetSILUpdateStamp"
number_of_elements="1"
default_values="0"
information_only="1" />
<StringVectorProperty
name="ElementBlocks"
......@@ -1330,13 +1336,12 @@
repeat_command="1"
number_of_elements_per_command="2"
element_types="2 0" >
<!--
<SILDomain name="array_list" subtree="Blocks">
<RequiredProperties>
<Property name="ElementBlocksInfo" function="ArrayList" />
<Property name="SILTimeStamp" function="TimeStamp" />
</RequiredProperties>
</SILDomain>
-->
</StringVectorProperty>
<StringVectorProperty
......@@ -4289,8 +4294,13 @@
<StringVectorProperty name="GridInfo"
information_only="1"
kernel_class="vtkPMSILProperty"
subtree="Blocks"
timestamp_command="GetSILUpdateStamp" />
subtree="Grids" />
<IdTypeVectorProperty name="SILTimeStamp"
command="GetSILUpdateStamp"
number_of_elements="1"
default_values="0"
information_only="1" />
<StringVectorProperty
name="GridStatus"
......@@ -4302,6 +4312,7 @@
<SILDomain name="array_list" subtree="Grids">
<RequiredProperties>
<Property name="GridInfo" function="ArrayList" />
<Property name="SILTimeStamp" function="TimeStamp" />
</RequiredProperties>
</SILDomain>
</StringVectorProperty>
......
<ServerManagerConfiguration>
<ProxyGroup name="lookup_tables">
<LookupTableProxy name="LookupTable" class="vtkLookupTable"
processes="dataserver|renderserver|client" >
<Proxy name="LookupTable"
post_push="Build"
class="vtkLookupTable"
processes="dataserver|renderserver|client" >
<IntVectorProperty
name="NumberOfTableValues"
command="SetNumberOfTableValues"
......@@ -72,10 +74,12 @@
default_values="">
</StringVectorProperty>
</LookupTableProxy>
</Proxy>
<PVLookupTableProxy name="PVLookupTable" class="vtkDiscretizableColorTransferFunction"
processes="dataserver|renderserver|client" >
<Proxy name="PVLookupTable"
post_push="Build"
class="vtkDiscretizableColorTransferFunction"
processes="dataserver|renderserver|client" >
<IntVectorProperty
name="LockScalarRange"
number_of_elements="1"
......@@ -185,7 +189,7 @@
</IntVectorProperty>
<!-- End of PVLookupTable -->
</PVLookupTableProxy>
</Proxy>
</ProxyGroup>
<ProxyGroup name="parametric_functions">
......@@ -1500,7 +1504,9 @@
</IntVectorProperty>
</Proxy>
<ScalarBarActorProxy name="ScalarBarActor" class="vtkPVScalarBarActor">
<Proxy name="ScalarBarActor"
class="vtkPVScalarBarActor"
kernel_class="vtkPMScalarBarActorProxy">
<ProxyProperty
name="LookupTable"
command="SetLookupTable"
......@@ -1616,7 +1622,7 @@
<Property name="FontSize" exposed_name="TitleFontSize" />
</ExposedProperties>
</SubProxy>
</ScalarBarActorProxy>
</Proxy>
<!-- End of ProxyGroup annotations -->
</ProxyGroup>
......@@ -1938,11 +1944,11 @@
<!-- End PointSource -->
</SourceProxy>
<TransformProxy name="Transform2" class="vtkTransform" >
<Proxy name="Transform2" class="vtkPVTransform" >
<!--Transform proxy with unconventional interface, used by BoxWidget -->
<DoubleVectorProperty
name="Position"
command="SetPosition"
command="SetAbsolutePosition"
number_of_elements="3"
update_self="1"
label="Translate"
......@@ -1952,14 +1958,14 @@
</DoubleVectorProperty>
<DoubleVectorProperty name="PositionInfo"
command="GetPosition"
command="GetAbsolutePosition"
information_only="1"
number_of_elements="3"
default_values="0.0 0.0 0.0" />
<DoubleVectorProperty
name="Rotation"
command="SetRotation"
command="SetAbsoluteRotation"
number_of_elements="3"
update_self="1"
information_property="RotationInfo"
......@@ -1969,14 +1975,14 @@
</DoubleVectorProperty>
<DoubleVectorProperty name="RotationInfo"
command="GetOrientation"
command="GetAbsoluteRotation"
information_only="1"
number_of_elements="3"
default_values="0.0 0.0 0.0" />
<DoubleVectorProperty
name="Scale"
command="SetScale"
command="SetAbsoluteScale"
number_of_elements="3"
update_self="1"
label="Scale"
......@@ -1986,63 +1992,63 @@
</DoubleVectorProperty>
<DoubleVectorProperty name="ScaleInfo"
command="GetScale"
command="GetAbsoluteScale"
information_only="1"
number_of_elements="3"
default_values="1.0 1.0 1.0" />
</TransformProxy>
<TransformProxy name="Transform3" class="vtkTransform" label="Transform">
<DoubleVectorProperty
name="Position"
command="SetPosition"
number_of_elements="3"
update_self="1"
label="Translate"
information_property="PositionInfo"
default_values="0.0 0.0 0.0" >
<DoubleRangeDomain name="range" />
</DoubleVectorProperty>
<DoubleVectorProperty name="PositionInfo"
command="GetPosition"
information_only="1"
number_of_elements="3"
default_values="0.0 0.0 0.0" />
<DoubleVectorProperty
name="Rotation"
command="SetRotation"
number_of_elements="3"
update_self="1"
information_property="RotationInfo"
label="Rotate"
default_values="0.0 0.0 0.0" >
<DoubleRangeDomain name="range" />
</DoubleVectorProperty>
<DoubleVectorProperty name="RotationInfo"
command="GetOrientation"
information_only="1"
number_of_elements="3"
default_values="0.0 0.0 0.0" />
<DoubleVectorProperty
name="Scale"
command="SetScale"
number_of_elements="3"
update_self="1"
label="Scale"
information_property="ScaleInfo"
default_values="1.0 1.0 1.0" >
<DoubleRangeDomain name="range" />
</DoubleVectorProperty>
</Proxy>
<DoubleVectorProperty name="ScaleInfo"
command="GetScale"
information_only="1"
number_of_elements="3"
default_values="1.0 1.0 1.0" />
<Proxy name="Transform3" class="vtkPVTransform" label="Transform">
<DoubleVectorProperty
name="Position"
command="SetAbsolutePosition"
number_of_elements="3"
update_self="1"
label="Translate"
information_property="PositionInfo"
default_values="0.0 0.0 0.0" >
<DoubleRangeDomain name="range" />
</DoubleVectorProperty>
<DoubleVectorProperty name="PositionInfo"
command="GetAbsolutePosition"
information_only="1"
number_of_elements="3"
default_values="0.0 0.0 0.0" />
<DoubleVectorProperty
name="Rotation"
command="SetAbsoluteRotation"
number_of_elements="3"
update_self="1"
information_property="RotationInfo"
label="Rotate"
default_values="0.0 0.0 0.0" >
<DoubleRangeDomain name="range" />
</DoubleVectorProperty>
<DoubleVectorProperty name="RotationInfo"
command="GetAbsoluteRotation"
information_only="1"
number_of_elements="3"
default_values="0.0 0.0 0.0" />
<DoubleVectorProperty
name="Scale"
command="SetAbsoluteScale"
number_of_elements="3"
update_self="1"
label="Scale"
information_property="ScaleInfo"
default_values="1.0 1.0 1.0" >
<DoubleRangeDomain name="range" />
</DoubleVectorProperty>
<DoubleVectorProperty name="ScaleInfo"
command="GetAbsoluteScale"
information_only="1"
number_of_elements="3"
default_values="1.0 1.0 1.0" />
<Hints>
<PropertyGroup type="Box">
......@@ -2056,7 +2062,7 @@
</ProxyList>
-->
</Hints>
</TransformProxy>
</Proxy>
</ProxyGroup>
<ProxyGroup name="misc">
......
......@@ -3836,9 +3836,10 @@
</SpreadSheetRepresentationProxy>
<!-- =================================================================== -->
<TextSourceRepresentationProxy name="TextSourceRepresentation"
class="vtkTextSourceRepresentation"
processes="client|dataserver|renderserver" >
<Proxy name="TextSourceRepresentation"
class="vtkTextSourceRepresentation"
kernel_class="vtkPMTextSourceRepresentationProxy"
processes="client|dataserver|renderserver" >
<Documentation>
Representation proxy used to show text.
</Documentation>
......@@ -3926,7 +3927,7 @@
</SubProxy>
<!-- End of TextSourceRepresentation -->
</TextSourceRepresentationProxy>
</Proxy>
<Proxy name="FrustumWidget" class="vtkPVFrustumActor"
processes="client|dataserver|renderserver" >
......
......@@ -19,13 +19,13 @@ message Variant {
INPUT = 5; // proxy_global_id + port_number
}
required Type type = 1;
repeated sint64 idtype = 3;
repeated sint32 integer = 4;
repeated double float64 = 5;
repeated int64 proxy_global_id = 6;
repeated int32 port_number = 7;
repeated string txt = 8;
required Type type = 1;
repeated sint64 idtype = 3;
repeated sint32 integer = 4;
repeated double float64 = 5;
repeated uint64 proxy_global_id = 6;
repeated int32 port_number = 7;
repeated string txt = 8;
}
message VariantList {
......
......@@ -66,7 +66,6 @@
#include "vtkSMFetchDataProxy.h"
#include "vtkSMFieldDataDomain.h"
#include "vtkSMFileListDomain.h"
#include "vtkSMFileSeriesReaderProxy.h"
#include "vtkSMFixedTypeDomain.h"
#include "vtkSMGlobalPropertiesLinkUndoElement.h"
#include "vtkSMGlobalPropertiesManager.h"
......@@ -84,8 +83,6 @@
#include "vtkSMKeyFrameProxy.h"
#include "vtkSMLinearAnimationCueManipulatorProxy.h"
#include "vtkSMLink.h"
#include "vtkSMLookupTableProxy.h"
#include "vtkSMMaterialLoaderProxy.h"
#include "vtkSMNamedPropertyIterator.h"
#include "vtkSMNetworkImageSourceProxy.h"
#include "vtkSMNewWidgetRepresentationProxy.h"
......@@ -120,7 +117,6 @@
#include "vtkSMProxyStateChangedUndoElement.h"
#include "vtkSMProxyUnRegisterUndoElement.h"
#include "vtkSMPSWriterProxy.h"
#include "vtkSMPVLookupTableProxy.h"
#include "vtkSMPVRepresentationProxy.h"
#include "vtkSMPWriterProxy.h"
#include "vtkSMPythonTraceObserver.h"
......@@ -152,7 +148,6 @@
#include "vtkSMTextWidgetRepresentationProxy.h"
#include "vtkSMTimeAnimationCueProxy.h"
#include "vtkSMTimeKeeperProxy.h"
#include "vtkSMTransformProxy.h"
#include "vtkSMTwoDRenderViewProxy.h"
#include "vtkSMUndoElement.h"
#include "vtkSMUndoRedoStateLoader.h"
......@@ -228,7 +223,6 @@ int main(int , char *[])
PRINT_SELF(vtkSMFetchDataProxy);
PRINT_SELF(vtkSMFieldDataDomain);