Commit 9bc00f34 authored by Allison Vacanti's avatar Allison Vacanti

Initial round of support for partitioned datasets.

parent dae0e913
ee48166e5da9868f015c235f32938e75dd12b1f1c3eb509f2965f5042a592101969c6a34e048fe69a8e447c2b8bcc18da758394f55f31eae4a72b65fbc455c9d
a9cae2abdb7b0b92ffafb367e74f4c4a537a4e142d28dda62d79672c41b8ca8d489444dffd037b3e49dc7d6c80928771f3253e3f1e0e244d244579cc9ef4ed06
b8e252f07926081313f040e575ba6924afdf350a4fb8562b08c4ba7e21f776df6543abfc5572ed9689829ed33336f146ab753e504de5bb53c26f03664c544ada
feb58c2b490711362bb7cc2f225d0d1789c95dae3c34bad0510fd0fde1efa59d44f74da383cd34e5e4e47d8a613d98ad2cbecefd6312ba4ca65fca5f07478eef
......@@ -91,6 +91,10 @@ ExternalData_Expand_Arguments(ParaViewData _
"DATA{${paraview_test_data_directory_input}/Data/singleSphereAnimation.pvd}"
"DATA{${paraview_test_data_directory_input}/Data/singleSphereAnimation/,REGEX:.*}"
"DATA{${paraview_test_data_directory_input}/Data/tensors.pvti}"
"DATA{${paraview_test_data_directory_input}/Data/testxmlpartdscol.vtpc}"
"DATA{${paraview_test_data_directory_input}/Data/testxmlpartdscol/,REGEX:.*}"
"DATA{${paraview_test_data_directory_input}/Data/testxmlpartds.vtpd}"
"DATA{${paraview_test_data_directory_input}/Data/testxmlpartds/,REGEX:.*}"
"DATA{${paraview_test_data_directory_input}/Data/timestep_0_15.vts}"
"DATA{${paraview_test_data_directory_input}/Data/tube.exo}"
"DATA{${paraview_test_data_directory_input}/Data/vehicle_data.csv}"
......@@ -236,6 +240,10 @@ ExternalData_Expand_Arguments(ParaViewData _
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/OBBMajorAxis.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/OBBMediumAxis.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/OBBMinorAxis.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSet_Slice.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSet_Surface.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSetCollection_Slice.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSetCollection_Surface.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PLYWriter.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PointGaussianScaleOpacityArrayA.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PolyLineSourceInterA.png}"
......@@ -452,6 +460,8 @@ SET (TESTS_WITH_INLINE_COMPARES
MemoryInspectorPanel.xml
Molecule.xml
NonlinearSubdivisionDisplay.xml
PartitionedDataSet.xml
PartitionedDataSetCollection.xml
QuartilePlot.xml
ReadPartitionedCGNS.xml
RectilinearFractal.xml
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionOpenData" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/Testing/Data/testxmlpartds.vtpd" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/representationToolbar/displayRepresentation/comboBox" command="activated" arguments="Surface" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="activated" arguments="RTData" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.728365,0.379845,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.254808,0.395349,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.254808,0.395349,1,0,0)" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Applications/ParaView/Testing/Data/Baseline/PartitionedDataSet_Surface.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuFilters" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/Alphabetical" command="activate" arguments="Cut" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.429087,0.79845,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.705529,0.735581,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.705529,0.735581,1,0,0)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Applications/ParaView/Testing/Data/Baseline/PartitionedDataSet_Slice.png" width="300" height="300" />
</pqevents>
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionOpenData" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/Testing/Data/testxmlpartdscol.vtpc" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/representationToolbar/displayRepresentation/comboBox" command="activated" arguments="Surface" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="activated" arguments="RTData" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.862981,0.323643,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.237981,0.24031,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.237981,0.24031,1,0,0)" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Applications/ParaView/Testing/Data/Baseline/PartitionedDataSetCollection_Surface.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuFilters" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/Alphabetical" command="activate" arguments="Cut" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.679087,0.434109,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.418269,0.120155,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.418269,0.120155,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.127404,0.199612,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.219952,0.350775,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.219952,0.350775,1,0,0)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Applications/ParaView/Testing/Data/Baseline/PartitionedDataSetCollection_Slice.png" width="300" height="300" />
</pqevents>
# Support for vtkPartitionedDataSet and vtkPartitionedDataSetCollection
These new VTK composite dataset types are now able to be read/written
(.vtpd/.vtpc) and rendering in ParaView.
......@@ -21,6 +21,7 @@
#include "vtkNew.h"
#include "vtkObjectFactory.h"
#include "vtkPVDataInformation.h"
#include "vtkPartitionedDataSet.h"
#include "vtkSmartPointer.h"
#include "vtkTimerLog.h"
#include "vtkUniformGrid.h"
......@@ -182,6 +183,15 @@ void vtkPVCompositeDataInformation::CopyFromObject(vtkObject* object)
return;
}
// partitioned datasets are treated like multi-piece here:
vtkPartitionedDataSet* partDS = vtkPartitionedDataSet::SafeDownCast(cds);
if (partDS)
{
this->DataIsMultiPiece = 1;
this->SetNumberOfPieces(partDS->GetNumberOfPartitions());
return;
}
vtkUniformGridAMR* amr = vtkUniformGridAMR::SafeDownCast(cds);
if (amr)
{
......
......@@ -1089,9 +1089,11 @@ void vtkPVDataInformation::AddInformation(vtkPVInformation* pvi, int addingParts
const char* vtkPVDataInformation::GetPrettyDataTypeString()
{
int dataType = this->DataSetType;
const char* className = this->DataClassName;
if (this->CompositeDataSetType >= 0)
{
dataType = this->CompositeDataSetType;
className = this->CompositeDataClassName;
}
switch (dataType)
......@@ -1158,6 +1160,10 @@ const char* vtkPVDataInformation::GetPrettyDataTypeString()
return "Directed Acyclic Graph";
case VTK_MOLECULE:
return "Molecule";
case VTK_PARTITIONED_DATA_SET:
return "Partitioned Dataset";
case VTK_PARTITIONED_DATA_SET_COLLECTION:
return "Partitioned Dataset Collection";
default:
vtkPVDataInformationHelper* dhelper = vtkPVDataInformation::FindHelper(this->DataClassName);
if (dhelper)
......@@ -1168,7 +1174,7 @@ const char* vtkPVDataInformation::GetPrettyDataTypeString()
}
}
return "UnknownType";
return (className && className[0]) ? className : "UnknownType";
}
//----------------------------------------------------------------------------
......
......@@ -519,6 +519,23 @@
<!-- End of XMLPMultiBlockDataWriterCore -->
</PWriterProxy>
<!-- ================================================================= -->
<PWriterProxy base_proxygroup="internal_writers"
base_proxyname="XMLDataObjectWriterCore"
class="vtkXMLPartitionedDataSetWriter"
name="XMLPartitionedDataSetWriterCore">
<Documentation>Internal proxy used by XMLPartitionedDataSetWriter.</Documentation>
<!-- End of XMLPartitionedDataSetWriterCore -->
</PWriterProxy>
<!-- ================================================================= -->
<PWriterProxy base_proxygroup="internal_writers"
base_proxyname="XMLDataObjectWriterCore"
class="vtkXMLPartitionedDataSetCollectionWriter"
name="XMLPartitionedDataSetCollectionWriterCore">
<Documentation>Internal proxy used by
XMLPartitionedDataSetCollectionWriter.</Documentation>
<!-- End of XMLPartitionedDataSetCollectionWriterCore -->
</PWriterProxy>
<!-- ================================================================= -->
<PWriterProxy base_proxygroup="internal_writers"
base_proxyname="XMLDataObjectWriterCore"
class="vtkXMLPUniformGridAMRWriter"
......
......@@ -667,6 +667,98 @@
<!-- End of XMLMultiBlockDataWriter -->
</WriterProxy>
<!-- ================================================================= -->
<WriterProxy base_proxygroup="internal_writers"
base_proxyname="FileSeriesWriter"
class="vtkFileSeriesWriter"
file_name_method="SetFileName"
name="XMLPartitionedDataSetWriter"
supports_parallel="1">
<Documentation>
Write a vtkPartitionedDataSet to a xml-based vtk data file.
</Documentation>
<InputProperty command="SetInputConnection"
name="Input">
<DataTypeDomain composite_data_supported="1"
name="input_type">
<DataType value="vtkPartitionedDataSet" />
</DataTypeDomain>
<Documentation>The input filter/source whose output dataset is to
written to the file.</Documentation>
</InputProperty>
<SubProxy>
<Proxy name="Writer"
proxygroup="internal_writers"
proxyname="XMLPartitionedDataSetWriterCore"></Proxy>
<ExposedProperties>
<PropertyGroup label="XML Writer Parameters">
<Property name="DataMode" />
<Property name="HeaderType" />
<Property name="EncodeAppendedData" />
<Property name="CompressorType" />
<Property name="CompressionLevel" />
</PropertyGroup>
</ExposedProperties>
</SubProxy>
<Hints>
<Property name="Input"
show="0" />
<Property name="FileName"
show="0" />
<Property name="HeaderType"
show="0" />
<WriterFactory extensions="vtpd"
file_description="VTK PartitionedDataSet Files" />
</Hints>
<!-- End of XMLPartitionedDataSetWriter -->
</WriterProxy>
<!-- ================================================================= -->
<WriterProxy base_proxygroup="internal_writers"
base_proxyname="FileSeriesWriter"
class="vtkFileSeriesWriter"
file_name_method="SetFileName"
name="XMLPartitionedDataSetCollectionWriter"
supports_parallel="1">
<Documentation>
Write a vtkPartitionedDataSetCollection to a xml-based vtk data file.
</Documentation>
<InputProperty command="SetInputConnection"
name="Input">
<DataTypeDomain composite_data_supported="1"
name="input_type">
<DataType value="vtkPartitionedDataSetCollection" />
</DataTypeDomain>
<Documentation>The input filter/source whose output dataset is to
written to the file.</Documentation>
</InputProperty>
<SubProxy>
<Proxy name="Writer"
proxygroup="internal_writers"
proxyname="XMLPartitionedDataSetCollectionWriterCore"></Proxy>
<ExposedProperties>
<PropertyGroup label="XML Writer Parameters">
<Property name="DataMode" />
<Property name="HeaderType" />
<Property name="EncodeAppendedData" />
<Property name="CompressorType" />
<Property name="CompressionLevel" />
</PropertyGroup>
</ExposedProperties>
</SubProxy>
<Hints>
<Property name="Input"
show="0" />
<Property name="FileName"
show="0" />
<Property name="HeaderType"
show="0" />
<WriterFactory extensions="vtpc"
file_description="VTK PartitionedDataSetCollection Files" />
</Hints>
<!-- End of XMLPartitionedDataSetCollectionWriter -->
</WriterProxy>
<!-- ================================================================= -->
<WriterProxy base_proxygroup="internal_writers"
base_proxyname="FileSeriesWriter"
......
......@@ -308,7 +308,7 @@ vtkSMSourceProxy* pqSpreadSheetViewSelectionModel::getSelectionSource()
{
proxyname = "HierarchicalDataIDSelectionSource";
}
else if (cdclassname && strcmp(cdclassname, "vtkMultiBlockDataSet") == 0)
else if (cdclassname)
{
proxyname = "CompositeDataIDSelectionSource";
}
......
aec86fb26f63d39b69212d99bd4670ea8e81251520f65f13858cda934bb1182773cd503fa900e900cc4160d60e5e574c267f54c9e4d13baf3470a3abe5376f1d
245c251f3480b2e6657f370015bd56dfda95062e8d4a304f2dd84c16b9a3103d6aeb687a846397778149afa2d976d9f9c43673c54e598e2b03e9b04b760c437a
ee4819407db3107aeeb2466ecfee48b86458c76abfb63cbdc74e45945c3d7cabdf2e26bf3ad63fdef8ea285fcb0a951ff44d8091e8777e0a3d33ac5ab5b7ea07
dc6287a9ca9867d42b9e23de8c130a2b06fac8d701da8518099e6cdda424f01c184600114ad165bb50d159a6f21568805183c4c1f7cb9a38f452e5f4fa921eac
245c251f3480b2e6657f370015bd56dfda95062e8d4a304f2dd84c16b9a3103d6aeb687a846397778149afa2d976d9f9c43673c54e598e2b03e9b04b760c437a
ee4819407db3107aeeb2466ecfee48b86458c76abfb63cbdc74e45945c3d7cabdf2e26bf3ad63fdef8ea285fcb0a951ff44d8091e8777e0a3d33ac5ab5b7ea07
5cd59e0b86a3cb9cc749ced6090535c29d3ca69a7c4415bf64a7911abc580b4af3b36e3042285d4c9964a58e110e2a47cd31aa19a5ef3fddcdb1c4558e5f7f3f
1489f87e6d5dfdf1fb5d7c4c35f67dc20e5eb305ee4e34cfa2d8526ef8d6b35a4b237d6cb0c02c2e594122924515106eb07aa9f0baad39596fdbc5085e89912c
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