From 88d57c3c646073c7058f60372e6e6533d58463c3 Mon Sep 17 00:00:00 2001 From: Spiros Tsalikis Date: Mon, 4 Mar 2024 10:53:47 -0500 Subject: [PATCH 1/2] vtkPVGeometryFilter: Fix RequestDataObject --- VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx b/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx index 968c4e85a9f..0132b5b552a 100644 --- a/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx +++ b/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx @@ -157,7 +157,9 @@ int vtkPVGeometryFilter::RequestDataObject(vtkInformation* vtkNotUsed(request), } else if (input->IsA("vtkMultiBlockDataSet")) { - outputType = VTK_MULTIBLOCK_DATA_SET; + // Some developers have sub-classed vtkMultiBlockDataSet, in which case, + // we try to preserve the type. + outputType = input->GetDataObjectType(); } else if (input->IsA("vtkCompositeDataSet")) { -- GitLab From 285afd015ca21a8f7bdc9947c40cbfe33b376cd6 Mon Sep 17 00:00:00 2001 From: Spiros Tsalikis Date: Mon, 4 Mar 2024 10:56:01 -0500 Subject: [PATCH 2/2] vtkPVGeometryFilter: Re-add and deprecate offsets keys --- .../FiltersRendering/vtkPVGeometryFilter.cxx | 7 +++++++ .../FiltersRendering/vtkPVGeometryFilter.h | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx b/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx index 0132b5b552a..b170940e482 100644 --- a/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx +++ b/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.cxx @@ -88,6 +88,13 @@ vtkStandardNewMacro(vtkPVGeometryFilter); //---------------------------------------------------------------------------- vtkCxxSetObjectMacro(vtkPVGeometryFilter, Controller, vtkMultiProcessController); +//---------------------------------------------------------------------------- +vtkInformationKeyMacro(vtkPVGeometryFilter, POINT_OFFSETS, IntegerVector); +vtkInformationKeyMacro(vtkPVGeometryFilter, VERTS_OFFSETS, IntegerVector); +vtkInformationKeyMacro(vtkPVGeometryFilter, LINES_OFFSETS, IntegerVector); +vtkInformationKeyMacro(vtkPVGeometryFilter, POLYS_OFFSETS, IntegerVector); +vtkInformationKeyMacro(vtkPVGeometryFilter, STRIPS_OFFSETS, IntegerVector); + //---------------------------------------------------------------------------- vtkPVGeometryFilter::vtkPVGeometryFilter() { diff --git a/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.h b/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.h index cd30a82b491..7cbd006204f 100644 --- a/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.h +++ b/VTKExtensions/FiltersRendering/vtkPVGeometryFilter.h @@ -13,6 +13,7 @@ #include "vtkDataObjectAlgorithm.h" #include "vtkPVVTKExtensionsFiltersRenderingModule.h" // needed for export macro +#include "vtkParaViewDeprecation.h" // For PARAVIEW_DEPRECATED_IN_5_13_0 #include "vtkSmartPointer.h" // needed for vtkSmartPointer class vtkCallbackCommand; @@ -192,6 +193,19 @@ public: vtkBooleanMacro(UseNonOverlappingAMRMetaDataForOutlines, bool); ///@} + // These keys are put in the output composite-data metadata for multipieces + // since this filter merges multipieces together. + PARAVIEW_DEPRECATED_IN_5_13_0("They are not used anymore.") + static vtkInformationIntegerVectorKey* POINT_OFFSETS(); + PARAVIEW_DEPRECATED_IN_5_13_0("They are not used anymore.") + static vtkInformationIntegerVectorKey* VERTS_OFFSETS(); + PARAVIEW_DEPRECATED_IN_5_13_0("They are not used anymore.") + static vtkInformationIntegerVectorKey* LINES_OFFSETS(); + PARAVIEW_DEPRECATED_IN_5_13_0("They are not used anymore.") + static vtkInformationIntegerVectorKey* POLYS_OFFSETS(); + PARAVIEW_DEPRECATED_IN_5_13_0("They are not used anymore.") + static vtkInformationIntegerVectorKey* STRIPS_OFFSETS(); + protected: vtkPVGeometryFilter(); ~vtkPVGeometryFilter() override; -- GitLab