Updates will be applied tomorrow - Jan 26th, at 12pm EST (UTC-0500). GitLlab could be a little slow between 12 - 12:30pm EST.

Commit 30a64d6b authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

ENH: Moved properties/domains around so that the domains on the

XYPlotRepresentation now show arrays produced by the PolyLineToRectilinearGrid
filter.
parent 7583059c
......@@ -175,6 +175,7 @@ SET(Kit_SRCS
vtkSMXDMFInformationHelper.cxx
vtkSMXDMFPropertyDomain.cxx
vtkSMXMLPVAnimationWriterProxy.cxx
vtkSMXYPlotRepresentationProxy.cxx
)
SET( ServerManagerNonWrapped_SRCS
......
......@@ -5063,7 +5063,7 @@
<!-- End of BarChartRepresentation -->
</ClientDeliveryRepresentationProxy>
<ClientDeliveryRepresentationProxy name="XYPlotRepresentation"
<XYPlotRepresentationProxy name="XYPlotRepresentation"
base_proxygroup="representations"
base_proxyname="ClientDeliveryRepresentationBase">
<Documentation>
......@@ -5080,16 +5080,6 @@
<Group name="glyph_sources" />
</ProxyGroupDomain>
<InputArrayDomain name="input_array_cell"
attribute_type="cell"
number_of_components="0">
</InputArrayDomain>
<InputArrayDomain name="input_array_point"
attribute_type="point"
number_of_components="0">
</InputArrayDomain>
<DataTypeDomain name="input_type">
<DataType value="vtkRectilinearGrid"/>
<DataType value="vtkPolyData"/>
......@@ -5111,77 +5101,6 @@
</EnumerationDomain>
</IntVectorProperty>
<StringVectorProperty name="YCellArrayStatus"
repeat_command="1"
number_of_elements_per_command="11"
element_types="2 2 0 0 1 1 1 0 0 0 0" >
<Documentation>
Set the cell array to use on Y axis (arrayname, legendname,
enabled, inlegend, r, g, b, thickness, linestyle, axesindex,
component)
</Documentation>
<ArraySelectionDomain name="array_list">
<RequiredProperties>
<Property name="CellArrayInfo" function="ArrayList" />
</RequiredProperties>
</ArraySelectionDomain>
</StringVectorProperty>
<StringVectorProperty name="YPointArrayStatus"
repeat_command="1"
number_of_elements_per_command="11"
element_types="2 2 0 0 1 1 1 0 0 0 0" >
<Documentation>
Set the cell array to use on Y axis (arrayname, legendname,
enabled, inlegend, r, g, b, thickness, linestyle, axesindex,
component)
</Documentation>
<ArraySelectionDomain name="array_list">
<RequiredProperties>
<Property name="PointArrayInfo" function="ArrayList" />
</RequiredProperties>
</ArraySelectionDomain>
</StringVectorProperty>
<StringVectorProperty
name="CellArrayInfo"
number_of_elements_per_command="1"
element_types="2"
update_self="1"
information_only="1">
<ArrayListInformationHelper
list_domain_name="array_list" />
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_cell">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<StringVectorProperty
name="PointArrayInfo"
update_self="1"
number_of_elements_per_command="1"
element_types="2"
information_only="1">
<ArrayListInformationHelper
list_domain_name="array_list" />
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_point">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<IntVectorProperty name="UseYCellArrayIndex"
number_of_elements="1"
default_values="1">
......@@ -5198,49 +5117,145 @@
<BooleanDomain name="bool" />
</IntVectorProperty>
<StringVectorProperty name="XCellArrayName"
number_of_elements="1">
<!-- Set the array to use on X axis. This is used only if
UseYCellArrayIndex is set to 0 -->
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_cell">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<SubProxy>
<Proxy name="PostProcessor"
proxygroup="filters" proxyname="PolyLineToRectilinearGrid">
</Proxy>
</SubProxy>
<StringVectorProperty name="XPointArrayName"
number_of_elements="1">
<!-- Set the array to use on X axis. This is used only if
UseYPointArrayIndex is set to 0 -->
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_point">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<SubProxy>
<Proxy name="DummyConsumer">
<ProxyProperty name="Input">
<InputArrayDomain name="input_array_cell"
attribute_type="cell"
number_of_components="0">
</InputArrayDomain>
<InputArrayDomain name="input_array_point"
attribute_type="point"
number_of_components="0">
</InputArrayDomain>
</ProxyProperty>
<IntVectorProperty name="XCellArrayComponent"
number_of_elements="1"
default_values="-2">
</IntVectorProperty>
<StringVectorProperty name="YCellArrayStatus"
repeat_command="1"
number_of_elements_per_command="11"
element_types="2 2 0 0 1 1 1 0 0 0 0" >
<Documentation>
Set the cell array to use on Y axis (arrayname, legendname,
enabled, inlegend, r, g, b, thickness, linestyle, axesindex,
component)
</Documentation>
<ArraySelectionDomain name="array_list">
<RequiredProperties>
<Property name="CellArrayInfo" function="ArrayList" />
</RequiredProperties>
</ArraySelectionDomain>
</StringVectorProperty>
<IntVectorProperty name="XPointArrayComponent"
number_of_elements="1"
default_values="-2">
</IntVectorProperty>
<StringVectorProperty name="YPointArrayStatus"
repeat_command="1"
number_of_elements_per_command="11"
element_types="2 2 0 0 1 1 1 0 0 0 0" >
<Documentation>
Set the cell array to use on Y axis (arrayname, legendname,
enabled, inlegend, r, g, b, thickness, linestyle, axesindex,
component)
</Documentation>
<ArraySelectionDomain name="array_list">
<RequiredProperties>
<Property name="PointArrayInfo" function="ArrayList" />
</RequiredProperties>
</ArraySelectionDomain>
</StringVectorProperty>
<SubProxy>
<Proxy name="PostProcessor"
proxygroup="filters" proxyname="PolyLineToRectilinearGrid">
<StringVectorProperty
name="CellArrayInfo"
number_of_elements_per_command="1"
element_types="2"
update_self="1"
information_only="1">
<ArrayListInformationHelper
list_domain_name="array_list" />
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_cell">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<StringVectorProperty
name="PointArrayInfo"
update_self="1"
number_of_elements_per_command="1"
element_types="2"
information_only="1">
<ArrayListInformationHelper
list_domain_name="array_list" />
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_point">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<StringVectorProperty name="XCellArrayName"
number_of_elements="1">
<!-- Set the array to use on X axis. This is used only if
UseYCellArrayIndex is set to 0 -->
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_cell">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<StringVectorProperty name="XPointArrayName"
number_of_elements="1">
<!-- Set the array to use on X axis. This is used only if
UseYPointArrayIndex is set to 0 -->
<ArrayListDomain name="array_list"
attribute_type="Scalars"
input_domain_name="input_array_point">
<RequiredProperties>
<Property name="Input" function="Input"/>
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<IntVectorProperty name="XCellArrayComponent"
number_of_elements="1"
default_values="-2">
</IntVectorProperty>
<IntVectorProperty name="XPointArrayComponent"
number_of_elements="1"
default_values="-2">
</IntVectorProperty>
</Proxy>
<ExposedProperties>
<Property name="YCellArrayStatus" />
<Property name="YPointArrayStatus" />
<Property name="CellArrayInfo" />
<Property name="PointArrayInfo" />
<Property name="XCellArrayName" />
<Property name="XPointArrayName" />
<Property name="XCellArrayComponent" />
<Property name="XPointArrayComponent" />
</ExposedProperties>
</SubProxy>
<!-- End of XYPlotRepresentation -->
</ClientDeliveryRepresentationProxy>
</XYPlotRepresentationProxy>
<BlockDeliveryRepresentationProxy name="BlockDeliveryRepresentation">
<Documentation>
......
/*=========================================================================
Program: ParaView
Module: vtkSMXYPlotRepresentationProxy.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 "vtkSMXYPlotRepresentationProxy.h"
#include "vtkObjectFactory.h"
#include "vtkSMSourceProxy.h"
#include "vtkSMProxyProperty.h"
vtkStandardNewMacro(vtkSMXYPlotRepresentationProxy);
vtkCxxRevisionMacro(vtkSMXYPlotRepresentationProxy, "1.1");
//----------------------------------------------------------------------------
vtkSMXYPlotRepresentationProxy::vtkSMXYPlotRepresentationProxy()
{
}
//----------------------------------------------------------------------------
vtkSMXYPlotRepresentationProxy::~vtkSMXYPlotRepresentationProxy()
{
}
//----------------------------------------------------------------------------
bool vtkSMXYPlotRepresentationProxy::EndCreateVTKObjects()
{
if (!this->Superclass::EndCreateVTKObjects())
{
return false;
}
vtkSMProxy* subProxy = this->GetSubProxy("DummyConsumer");
vtkSMProxyProperty* pp = vtkSMProxyProperty::SafeDownCast(
subProxy->GetProperty("Input"));
pp->RemoveAllProxies();
pp->AddProxy(this->PostProcessorProxy);
pp->UpdateDependentDomains();
}
//----------------------------------------------------------------------------
void vtkSMXYPlotRepresentationProxy::Update(vtkSMViewProxy* view)
{
if (!this->ObjectsCreated)
{
vtkErrorMacro("Objects not created yet!");
return;
}
this->Superclass::Update(view);
vtkSMProxy* subProxy = this->GetSubProxy("DummyConsumer");
vtkSMProxyProperty* pp = vtkSMProxyProperty::SafeDownCast(
subProxy->GetProperty("Input"));
pp->UpdateDependentDomains();
}
//----------------------------------------------------------------------------
void vtkSMXYPlotRepresentationProxy::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
/*=========================================================================
Program: ParaView
Module: vtkSMXYPlotRepresentationProxy.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 vtkSMXYPlotRepresentationProxy
// .SECTION Description
//
#ifndef __vtkSMXYPlotRepresentationProxy_h
#define __vtkSMXYPlotRepresentationProxy_h
#include "vtkSMClientDeliveryRepresentationProxy.h"
class VTK_EXPORT vtkSMXYPlotRepresentationProxy :
public vtkSMClientDeliveryRepresentationProxy
{
public:
static vtkSMXYPlotRepresentationProxy* New();
vtkTypeRevisionMacro(vtkSMXYPlotRepresentationProxy,
vtkSMClientDeliveryRepresentationProxy);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Called to update the Display. Default implementation does nothing.
// Argument is the view requesting the update. Can be null in the
// case when something other than a view is requesting the update.
// Overridden to update the domains on the DummyConsumer proxy.
virtual void Update() { this->Update(0); };
virtual void Update(vtkSMViewProxy* view);
//BTX
protected:
vtkSMXYPlotRepresentationProxy();
~vtkSMXYPlotRepresentationProxy();
// Description:
// This method is called after CreateVTKObjects().
// This gives subclasses an opportunity to do some post-creation
// initialization.
virtual bool EndCreateVTKObjects();
private:
vtkSMXYPlotRepresentationProxy(const vtkSMXYPlotRepresentationProxy&); // Not implemented
void operator=(const vtkSMXYPlotRepresentationProxy&); // Not implemented
//ETX
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment