From ac76fe16364c22f1af7b79f223850dc491898e00 Mon Sep 17 00:00:00 2001 From: Kitware Robot Date: Sun, 17 Nov 2019 18:10:33 -0500 Subject: [PATCH] clang-format: reformat using clang-format-8 Run the `clang-format.bash` script to update all our C and C++ code to a new style defined by `.clang-format`. Use `clang-format` version 8.0. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit. --- .../Vtkm/Testing/Cxx/TestVTKMCleanGrid.cxx | 3 +- .../Vtkm/Testing/Cxx/TestVTKMClip.cxx | 22 +- .../Cxx/TestVTKMClipWithImplicitFunction.cxx | 1 - .../Cxx/TestVTKMCoordinateSystemTransform.cxx | 70 +- .../Vtkm/Testing/Cxx/TestVTKMDataArray.cxx | 24 +- .../Vtkm/Testing/Cxx/TestVTKMDataSet.cxx | 132 +- .../Testing/Cxx/TestVTKMExternalFaces.cxx | 20 +- .../Vtkm/Testing/Cxx/TestVTKMGradient.cxx | 387 +- .../Cxx/TestVTKMGradientAndVorticity.cxx | 554 +- .../Vtkm/Testing/Cxx/TestVTKMHistogram.cxx | 77 +- .../Testing/Cxx/TestVTKMLevelOfDetail.cxx | 102 +- .../Testing/Cxx/TestVTKMMarchingCubes.cxx | 35 +- .../Testing/Cxx/TestVTKMMarchingCubes2.cxx | 9 +- .../Vtkm/Testing/Cxx/TestVTKMNDHistogram.cxx | 46 +- .../Testing/Cxx/TestVTKMPointElevation.cxx | 98 +- .../Testing/Cxx/TestVTKMPointTransform.cxx | 94 +- .../Testing/Cxx/TestVTKMPolyDataNormals.cxx | 6 +- .../Vtkm/Testing/Cxx/TestVTKMProbe.cxx | 29 +- .../Vtkm/Testing/Cxx/TestVTKMThreshold.cxx | 108 +- .../Vtkm/Testing/Cxx/TestVTKMThreshold2.cxx | 18 +- .../Cxx/TestVTKMTriangleMeshPointNormals.cxx | 9 +- .../Vtkm/Testing/Cxx/TestVTKMWarpScalar.cxx | 27 +- .../Vtkm/Testing/Cxx/TestVTKMWarpVector.cxx | 24 +- Accelerators/Vtkm/vtkmAverageToCells.cxx | 25 +- Accelerators/Vtkm/vtkmAverageToCells.h | 5 +- Accelerators/Vtkm/vtkmAverageToPoints.cxx | 39 +- Accelerators/Vtkm/vtkmAverageToPoints.h | 8 +- Accelerators/Vtkm/vtkmCleanGrid.cxx | 20 +- Accelerators/Vtkm/vtkmCleanGrid.h | 7 +- Accelerators/Vtkm/vtkmClip.cxx | 49 +- Accelerators/Vtkm/vtkmClip.h | 12 +- Accelerators/Vtkm/vtkmContour.cxx | 40 +- Accelerators/Vtkm/vtkmContour.h | 7 +- .../Vtkm/vtkmCoordinateSystemTransform.cxx | 53 +- .../Vtkm/vtkmCoordinateSystemTransform.h | 21 +- Accelerators/Vtkm/vtkmDataArray.h | 22 +- Accelerators/Vtkm/vtkmDataArray.hxx | 121 +- Accelerators/Vtkm/vtkmDataSet.cxx | 67 +- Accelerators/Vtkm/vtkmDataSet.h | 27 +- Accelerators/Vtkm/vtkmExternalFaces.cxx | 18 +- Accelerators/Vtkm/vtkmExternalFaces.h | 15 +- Accelerators/Vtkm/vtkmExtractVOI.cxx | 25 +- Accelerators/Vtkm/vtkmExtractVOI.h | 6 +- Accelerators/Vtkm/vtkmFilterPolicy.h | 119 +- Accelerators/Vtkm/vtkmGradient.cxx | 83 +- Accelerators/Vtkm/vtkmGradient.h | 6 +- Accelerators/Vtkm/vtkmHistogram.cxx | 42 +- Accelerators/Vtkm/vtkmHistogram.h | 15 +- Accelerators/Vtkm/vtkmImageConnectivity.cxx | 41 +- Accelerators/Vtkm/vtkmImageConnectivity.h | 14 +- Accelerators/Vtkm/vtkmLevelOfDetail.cxx | 30 +- Accelerators/Vtkm/vtkmLevelOfDetail.h | 12 +- Accelerators/Vtkm/vtkmNDHistogram.cxx | 67 +- Accelerators/Vtkm/vtkmNDHistogram.h | 8 +- Accelerators/Vtkm/vtkmPointElevation.cxx | 71 +- Accelerators/Vtkm/vtkmPointElevation.h | 6 +- Accelerators/Vtkm/vtkmPointTransform.cxx | 27 +- Accelerators/Vtkm/vtkmPointTransform.h | 31 +- Accelerators/Vtkm/vtkmPolyDataNormals.cxx | 18 +- Accelerators/Vtkm/vtkmPolyDataNormals.h | 5 +- Accelerators/Vtkm/vtkmProbe.cxx | 76 +- Accelerators/Vtkm/vtkmProbe.h | 32 +- Accelerators/Vtkm/vtkmThreshold.cxx | 23 +- Accelerators/Vtkm/vtkmThreshold.h | 7 +- .../Vtkm/vtkmTriangleMeshPointNormals.cxx | 28 +- .../Vtkm/vtkmTriangleMeshPointNormals.h | 8 +- Accelerators/Vtkm/vtkmWarpScalar.cxx | 36 +- Accelerators/Vtkm/vtkmWarpScalar.h | 5 +- Accelerators/Vtkm/vtkmWarpVector.cxx | 58 +- Accelerators/Vtkm/vtkmWarpVector.h | 5 +- Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx | 113 +- Accelerators/Vtkm/vtkmlib/ArrayConverters.h | 79 +- Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx | 70 +- .../Vtkm/vtkmlib/CellSetConverters.cxx | 184 +- Accelerators/Vtkm/vtkmlib/CellSetConverters.h | 20 +- .../Vtkm/vtkmlib/DataSetConverters.cxx | 71 +- Accelerators/Vtkm/vtkmlib/DataSetConverters.h | 10 +- .../Vtkm/vtkmlib/ImageDataConverter.cxx | 44 +- .../Vtkm/vtkmlib/ImageDataConverter.h | 13 +- .../vtkmlib/ImplicitFunctionConverter.cxx | 32 +- .../Vtkm/vtkmlib/ImplicitFunctionConverter.h | 9 +- .../Vtkm/vtkmlib/PolyDataConverter.cxx | 54 +- Accelerators/Vtkm/vtkmlib/PolyDataConverter.h | 12 +- Accelerators/Vtkm/vtkmlib/PortalTraits.h | 144 +- Accelerators/Vtkm/vtkmlib/Portals.cxx | 12 +- Accelerators/Vtkm/vtkmlib/Portals.h | 63 +- Accelerators/Vtkm/vtkmlib/Portals.hxx | 62 +- .../vtkmlib/UnstructuredGridConverter.cxx | 29 +- .../Vtkm/vtkmlib/UnstructuredGridConverter.h | 12 +- CMake/TestNO_ICC_IDYNAMIC_NEEDED.cxx | 20 +- CMake/patches/3.16/FindMPI/libver_mpi.c | 4 +- CMake/patches/3.16/FindMPI/test_mpi.c | 21 +- CMake/vtkRequireLargeFilesSupport.cxx | 14 +- CMake/vtkTestvfw32Capture.cxx | 26 +- .../Cxx/TestAdjustLowerBoundForLogPlot.cxx | 8 +- Charts/Core/Testing/Cxx/TestAreaPlot.cxx | 4 +- Charts/Core/Testing/Cxx/TestAxes.cxx | 53 +- Charts/Core/Testing/Cxx/TestAxes2.cxx | 2 +- Charts/Core/Testing/Cxx/TestBagPlot.cxx | 9 +- Charts/Core/Testing/Cxx/TestBarGraph.cxx | 26 +- .../Testing/Cxx/TestBarGraphHorizontal.cxx | 24 +- .../Testing/Cxx/TestBarGraphSelection.cxx | 26 +- Charts/Core/Testing/Cxx/TestBoxPlot.cxx | 12 +- Charts/Core/Testing/Cxx/TestBoxPlot2.cxx | 38 +- .../Core/Testing/Cxx/TestCategoryLegend.cxx | 2 +- .../Core/Testing/Cxx/TestChartBadPoints.cxx | 2 +- Charts/Core/Testing/Cxx/TestChartDouble.cxx | 4 +- .../Testing/Cxx/TestChartDoubleColors.cxx | 2 +- .../Cxx/TestChartDoubleColorsOpaque.cxx | 2 +- Charts/Core/Testing/Cxx/TestChartMatrix.cxx | 10 +- .../Core/Testing/Cxx/TestChartTileScaling.cxx | 6 +- Charts/Core/Testing/Cxx/TestChartUnicode.cxx | 8 +- .../Testing/Cxx/TestChartXYInvertedAxis.cxx | 2957 +++++---- Charts/Core/Testing/Cxx/TestChartXYZ.cxx | 25 +- Charts/Core/Testing/Cxx/TestChartsOn3D.cxx | 8 +- .../Testing/Cxx/TestColorTransferFunction.cxx | 11 +- Charts/Core/Testing/Cxx/TestContext.cxx | 44 +- Charts/Core/Testing/Cxx/TestContextArea.cxx | 13 +- .../Cxx/TestContextAreaFixedAspect.cxx | 13 +- .../Cxx/TestContextAreaFixedMargins.cxx | 13 +- .../Testing/Cxx/TestContextAreaFixedRect.cxx | 13 +- Charts/Core/Testing/Cxx/TestContextImage.cxx | 7 +- .../Testing/Cxx/TestContextItemStacking.cxx | 57 +- Charts/Core/Testing/Cxx/TestContextScene.cxx | 6 +- .../Core/Testing/Cxx/TestContextUnicode.cxx | 16 +- .../Cxx/TestControlPointsHandleItem.cxx | 1304 ++-- .../Testing/Cxx/TestControlPointsItem.cxx | 71 +- .../Cxx/TestControlPointsItemEvents.cxx | 117 +- Charts/Core/Testing/Cxx/TestDiagram.cxx | 8 +- .../Core/Testing/Cxx/TestFreeTypeRender.cxx | 24 +- .../Testing/Cxx/TestFunctionalBagPlot.cxx | 12 +- Charts/Core/Testing/Cxx/TestHistogram2D.cxx | 21 +- .../Testing/Cxx/TestInteractiveChartXYZ.cxx | 4 +- .../Testing/Cxx/TestLegendHiddenPlots.cxx | 9 +- Charts/Core/Testing/Cxx/TestLinePlot.cxx | 12 +- Charts/Core/Testing/Cxx/TestLinePlot2.cxx | 26 +- Charts/Core/Testing/Cxx/TestLinePlot3D.cxx | 4 +- .../Testing/Cxx/TestLinePlotAxisFonts.cxx | 12 +- .../Core/Testing/Cxx/TestLinePlotDouble.cxx | 4 +- .../Core/Testing/Cxx/TestLinePlotDouble2.cxx | 4 +- .../Testing/Cxx/TestLinePlotInteraction.cxx | 205 +- .../Testing/Cxx/TestLinePlotSelection.cxx | 11 +- .../Testing/Cxx/TestLinePlotSelection2.cxx | 11 +- .../Cxx/TestMultipleChartRenderers.cxx | 26 +- .../Testing/Cxx/TestMultipleRenderers.cxx | 39 +- .../Cxx/TestMultipleScalarsToColors.cxx | 37 +- .../Testing/Cxx/TestParallelCoordinates.cxx | 4 +- .../Cxx/TestParallelCoordinatesDouble.cxx | 2 +- Charts/Core/Testing/Cxx/TestPieChart.cxx | 12 +- Charts/Core/Testing/Cxx/TestPlotMatrix.cxx | 11 +- Charts/Core/Testing/Cxx/TestPropItem.cxx | 13 +- .../Core/Testing/Cxx/TestQtContextUnicode.cxx | 17 +- Charts/Core/Testing/Cxx/TestQtDiagram.cxx | 15 +- .../Core/Testing/Cxx/TestScalarsToColors.cxx | 18 +- Charts/Core/Testing/Cxx/TestScatterPlot.cxx | 8 +- .../Testing/Cxx/TestScatterPlotMatrix.cxx | 10 +- .../Cxx/TestScatterPlotMatrixVehicles.cxx | 9 +- .../Cxx/TestScatterPlotMatrixVisible.cxx | 6 +- .../Core/Testing/Cxx/TestScientificPlot.cxx | 13 +- .../Core/Testing/Cxx/TestStackedBarGraph.cxx | 87 +- Charts/Core/Testing/Cxx/TestStackedPlot.cxx | 54 +- Charts/Core/Testing/Cxx/TestSurfacePlot.cxx | 6 +- Charts/Core/Testing/Cxx/TestZoomAxis.cxx | 11 +- Charts/Core/vtkAxis.cxx | 279 +- Charts/Core/vtkAxis.h | 128 +- Charts/Core/vtkAxisExtended.cxx | 243 +- Charts/Core/vtkAxisExtended.h | 168 +- Charts/Core/vtkCategoryLegend.cxx | 38 +- Charts/Core/vtkCategoryLegend.h | 31 +- Charts/Core/vtkChart.cxx | 77 +- Charts/Core/vtkChart.h | 63 +- Charts/Core/vtkChartBox.cxx | 152 +- Charts/Core/vtkChartBox.h | 45 +- Charts/Core/vtkChartHistogram2D.cxx | 23 +- Charts/Core/vtkChartHistogram2D.h | 18 +- Charts/Core/vtkChartLegend.cxx | 73 +- Charts/Core/vtkChartLegend.h | 41 +- Charts/Core/vtkChartMatrix.cxx | 123 +- Charts/Core/vtkChartMatrix.h | 25 +- Charts/Core/vtkChartParallelCoordinates.cxx | 189 +- Charts/Core/vtkChartParallelCoordinates.h | 35 +- Charts/Core/vtkChartPie.cxx | 72 +- Charts/Core/vtkChartPie.h | 46 +- Charts/Core/vtkChartXY.cxx | 139 +- Charts/Core/vtkChartXY.h | 35 +- Charts/Core/vtkChartXYZ.cxx | 392 +- Charts/Core/vtkChartXYZ.h | 57 +- Charts/Core/vtkColorLegend.cxx | 81 +- Charts/Core/vtkColorLegend.h | 44 +- .../vtkColorTransferControlPointsItem.cxx | 31 +- .../Core/vtkColorTransferControlPointsItem.h | 17 +- Charts/Core/vtkColorTransferFunctionItem.cxx | 22 +- Charts/Core/vtkColorTransferFunctionItem.h | 4 +- Charts/Core/vtkCompositeControlPointsItem.cxx | 109 +- Charts/Core/vtkCompositeControlPointsItem.h | 28 +- .../Core/vtkCompositeTransferFunctionItem.cxx | 28 +- .../Core/vtkCompositeTransferFunctionItem.h | 4 +- Charts/Core/vtkContextArea.cxx | 99 +- Charts/Core/vtkContextArea.h | 40 +- Charts/Core/vtkContextPolygon.cxx | 35 +- Charts/Core/vtkContextPolygon.h | 12 +- Charts/Core/vtkControlPointsItem.cxx | 319 +- Charts/Core/vtkControlPointsItem.h | 116 +- Charts/Core/vtkInteractiveArea.cxx | 54 +- Charts/Core/vtkInteractiveArea.h | 21 +- Charts/Core/vtkLookupTableItem.cxx | 17 +- Charts/Core/vtkLookupTableItem.h | 9 +- Charts/Core/vtkPiecewiseControlPointsItem.cxx | 18 +- Charts/Core/vtkPiecewiseControlPointsItem.h | 16 +- Charts/Core/vtkPiecewiseFunctionItem.cxx | 22 +- Charts/Core/vtkPiecewiseFunctionItem.h | 8 +- Charts/Core/vtkPiecewisePointHandleItem.cxx | 174 +- Charts/Core/vtkPiecewisePointHandleItem.h | 25 +- Charts/Core/vtkPlot.cxx | 121 +- Charts/Core/vtkPlot.h | 96 +- Charts/Core/vtkPlot3D.cxx | 93 +- Charts/Core/vtkPlot3D.h | 44 +- Charts/Core/vtkPlotArea.cxx | 357 +- Charts/Core/vtkPlotArea.h | 27 +- Charts/Core/vtkPlotBag.cxx | 111 +- Charts/Core/vtkPlotBag.h | 40 +- Charts/Core/vtkPlotBar.cxx | 781 ++- Charts/Core/vtkPlotBar.h | 61 +- Charts/Core/vtkPlotBox.cxx | 80 +- Charts/Core/vtkPlotBox.h | 44 +- Charts/Core/vtkPlotFunctionalBag.cxx | 77 +- Charts/Core/vtkPlotFunctionalBag.h | 36 +- Charts/Core/vtkPlotGrid.cxx | 14 +- Charts/Core/vtkPlotGrid.h | 23 +- Charts/Core/vtkPlotHistogram2D.cxx | 66 +- Charts/Core/vtkPlotHistogram2D.h | 45 +- Charts/Core/vtkPlotLine.cxx | 15 +- Charts/Core/vtkPlotLine.h | 24 +- Charts/Core/vtkPlotLine3D.cxx | 10 +- Charts/Core/vtkPlotLine3D.h | 15 +- Charts/Core/vtkPlotParallelCoordinates.cxx | 89 +- Charts/Core/vtkPlotParallelCoordinates.h | 39 +- Charts/Core/vtkPlotPie.cxx | 114 +- Charts/Core/vtkPlotPie.h | 36 +- Charts/Core/vtkPlotPoints.cxx | 293 +- Charts/Core/vtkPlotPoints.h | 58 +- Charts/Core/vtkPlotPoints3D.cxx | 24 +- Charts/Core/vtkPlotPoints3D.h | 15 +- Charts/Core/vtkPlotStacked.cxx | 796 ++- Charts/Core/vtkPlotStacked.h | 44 +- Charts/Core/vtkPlotSurface.cxx | 74 +- Charts/Core/vtkPlotSurface.h | 36 +- Charts/Core/vtkScalarsToColorsItem.cxx | 58 +- Charts/Core/vtkScalarsToColorsItem.h | 28 +- Charts/Core/vtkScatterPlotMatrix.cxx | 865 ++- Charts/Core/vtkScatterPlotMatrix.h | 57 +- .../Testing/Cxx/TestCategoricalColors.cxx | 47 +- Common/Color/Testing/Cxx/TestColorSeries.cxx | 185 +- .../Cxx/TestColorSeriesLookupTables.cxx | 76 +- Common/Color/Testing/Cxx/TestNamedColors.cxx | 771 +-- Common/Color/vtkColorSeries.cxx | 63 +- Common/Color/vtkColorSeries.h | 51 +- Common/Color/vtkNamedColors.cxx | 1129 ++-- Common/Color/vtkNamedColors.h | 90 +- .../Testing/Cxx/UnitTestParametricSpline.cxx | 176 +- .../vtkCardinalSpline.cxx | 252 +- .../ComputationalGeometry/vtkCardinalSpline.h | 21 +- .../vtkKochanekSpline.cxx | 210 +- .../ComputationalGeometry/vtkKochanekSpline.h | 31 +- .../vtkParametricBohemianDome.cxx | 22 +- .../vtkParametricBohemianDome.h | 128 +- .../vtkParametricBour.cxx | 23 +- .../ComputationalGeometry/vtkParametricBour.h | 93 +- .../vtkParametricBoy.cxx | 10 +- .../ComputationalGeometry/vtkParametricBoy.h | 137 +- .../vtkParametricCatalanMinimal.cxx | 25 +- .../vtkParametricCatalanMinimal.h | 94 +- .../vtkParametricConicSpiral.cxx | 18 +- .../vtkParametricConicSpiral.h | 202 +- .../vtkParametricCrossCap.cxx | 12 +- .../vtkParametricCrossCap.h | 111 +- .../vtkParametricDini.cxx | 12 +- .../ComputationalGeometry/vtkParametricDini.h | 161 +- .../vtkParametricEllipsoid.cxx | 15 +- .../vtkParametricEllipsoid.h | 177 +- .../vtkParametricEnneper.cxx | 13 +- .../vtkParametricEnneper.h | 111 +- .../vtkParametricFigure8Klein.cxx | 17 +- .../vtkParametricFigure8Klein.h | 135 +- .../vtkParametricFunction.cxx | 9 +- .../vtkParametricFunction.h | 51 +- .../vtkParametricHenneberg.cxx | 32 +- .../vtkParametricHenneberg.h | 93 +- .../vtkParametricKlein.cxx | 7 +- .../vtkParametricKlein.h | 111 +- .../vtkParametricKuen.cxx | 42 +- .../ComputationalGeometry/vtkParametricKuen.h | 121 +- .../vtkParametricMobius.cxx | 13 +- .../vtkParametricMobius.h | 134 +- .../vtkParametricPluckerConoid.cxx | 21 +- .../vtkParametricPluckerConoid.h | 117 +- .../vtkParametricPseudosphere.cxx | 18 +- .../vtkParametricPseudosphere.h | 93 +- .../vtkParametricRandomHills.cxx | 57 +- .../vtkParametricRandomHills.h | 432 +- .../vtkParametricRoman.cxx | 21 +- .../vtkParametricRoman.h | 135 +- .../vtkParametricSpline.cxx | 145 +- .../vtkParametricSpline.h | 60 +- .../vtkParametricSuperEllipsoid.cxx | 54 +- .../vtkParametricSuperEllipsoid.h | 210 +- .../vtkParametricSuperToroid.cxx | 53 +- .../vtkParametricSuperToroid.h | 252 +- .../vtkParametricTorus.cxx | 26 +- .../vtkParametricTorus.h | 154 +- Common/Core/SMP/OpenMP/vtkAtomic.cxx | 97 +- .../Core/SMP/OpenMP/vtkSMPThreadLocalImpl.cxx | 70 +- Common/Core/SMP/OpenMP/vtkSMPTools.cxx | 14 +- Common/Core/SMP/Sequential/vtkAtomic.cxx | 88 +- Common/Core/SMP/Sequential/vtkSMPTools.cxx | 4 +- Common/Core/SMP/TBB/vtkSMPTools.cxx | 11 +- .../Testing/Cxx/ExampleDataArrayRangeAPI.cxx | 191 +- .../Cxx/ExampleDataArrayRangeDispatch.cxx | 20 +- Common/Core/Testing/Cxx/TestArrayAPI.cxx | 30 +- .../Testing/Cxx/TestArrayAPIConvenience.cxx | 22 +- Common/Core/Testing/Cxx/TestArrayAPIDense.cxx | 84 +- .../Core/Testing/Cxx/TestArrayAPISparse.cxx | 209 +- Common/Core/Testing/Cxx/TestArrayBool.cxx | 22 +- Common/Core/Testing/Cxx/TestArrayCasting.cxx | 57 +- .../Core/Testing/Cxx/TestArrayDispatchers.cxx | 524 +- Common/Core/Testing/Cxx/TestArrayExtents.cxx | 24 +- .../Testing/Cxx/TestArrayFreeFunctions.cxx | 90 +- .../Cxx/TestArrayInterpolationDense.cxx | 28 +- Common/Core/Testing/Cxx/TestArrayLookup.cxx | 155 +- .../Core/Testing/Cxx/TestArrayNullValues.cxx | 26 +- Common/Core/Testing/Cxx/TestArraySize.cxx | 25 +- .../Cxx/TestArrayUniqueValueDetection.cxx | 64 +- .../Core/Testing/Cxx/TestArrayUserTypes.cxx | 49 +- Common/Core/Testing/Cxx/TestArrayVariants.cxx | 25 +- Common/Core/Testing/Cxx/TestAtomic.cxx | 40 +- Common/Core/Testing/Cxx/TestCollection.cxx | 8 +- .../Testing/Cxx/TestConditionVariable.cxx | 60 +- Common/Core/Testing/Cxx/TestCxxFeatures.cxx | 158 +- Common/Core/Testing/Cxx/TestDataArray.cxx | 157 +- .../Cxx/TestDataArrayComponentNames.cxx | 185 +- .../Testing/Cxx/TestDataArrayIterators.cxx | 50 +- .../Testing/Cxx/TestDataArraySelection.cxx | 2 +- .../Testing/Cxx/TestDataArrayTupleRange.cxx | 610 +- .../Testing/Cxx/TestDataArrayValueRange.cxx | 383 +- .../Core/Testing/Cxx/TestGarbageCollector.cxx | 17 +- .../Testing/Cxx/TestGenericDataArrayAPI.cxx | 400 +- .../Testing/Cxx/TestInformationKeyLookup.cxx | 19 +- Common/Core/Testing/Cxx/TestLogger.cxx | 2 +- Common/Core/Testing/Cxx/TestLookupTable.cxx | 158 +- .../Testing/Cxx/TestLookupTableThreaded.cxx | 21 +- Common/Core/Testing/Cxx/TestMath.cxx | 668 ++- .../Core/Testing/Cxx/TestMersenneTwister.cxx | 111 +- .../Cxx/TestMinimalStandardRandomSequence.cxx | 50 +- Common/Core/Testing/Cxx/TestNew.cxx | 15 +- .../Core/Testing/Cxx/TestOStreamWrapper.cxx | 7 +- Common/Core/Testing/Cxx/TestObjectFactory.cxx | 65 +- Common/Core/Testing/Cxx/TestObservers.cxx | 59 +- .../Testing/Cxx/TestObserversPerformance.cxx | 35 +- Common/Core/Testing/Cxx/TestSMP.cxx | 66 +- .../Core/Testing/Cxx/TestScalarsToColors.cxx | 7 +- .../Cxx/TestScaledSOADataArrayTemplate.cxx | 26 +- Common/Core/Testing/Cxx/TestSmartPointer.cxx | 43 +- Common/Core/Testing/Cxx/TestSortDataArray.cxx | 86 +- .../Testing/Cxx/TestSparseArrayValidation.cxx | 17 +- .../Testing/Cxx/TestSystemInformation.cxx | 25 +- Common/Core/Testing/Cxx/TestTemplateMacro.cxx | 26 +- .../Core/Testing/Cxx/TestTimePointUtility.cxx | 159 +- .../Core/Testing/Cxx/TestUnicodeStringAPI.cxx | 53 +- .../Testing/Cxx/TestUnicodeStringArrayAPI.cxx | 157 +- Common/Core/Testing/Cxx/TestVariant.cxx | 79 +- Common/Core/Testing/Cxx/TestVariantArray.cxx | 32 +- .../Testing/Cxx/TestVariantComparison.cxx | 30 +- Common/Core/Testing/Cxx/TestWeakPointer.cxx | 39 +- .../Testing/Cxx/TestXMLFileOutputWindow.cxx | 79 +- .../Testing/Cxx/UnitTestInformationKeys.cxx | 34 +- Common/Core/Testing/Cxx/UnitTestMath.cxx | 1857 +++--- Common/Core/Testing/Cxx/otherArrays.cxx | 489 +- Common/Core/Testing/Cxx/otherByteSwap.cxx | 172 +- Common/Core/Testing/Cxx/otherStringArray.cxx | 42 +- Common/Core/Testing/Cxx/vtkTestNewVar.cxx | 4 +- Common/Core/Testing/Cxx/vtkTestNewVar.h | 8 +- Common/Core/vtkABI.h | 36 +- Common/Core/vtkAOSDataArrayTemplate.h | 185 +- Common/Core/vtkAOSDataArrayTemplate.txx | 124 +- Common/Core/vtkAbstractArray.cxx | 271 +- Common/Core/vtkAbstractArray.h | 155 +- Common/Core/vtkAndroidOutputWindow.cxx | 24 +- Common/Core/vtkAndroidOutputWindow.h | 8 +- Common/Core/vtkAnimationCue.cxx | 9 +- Common/Core/vtkAnimationCue.h | 33 +- Common/Core/vtkArray.cxx | 34 +- Common/Core/vtkArray.h | 13 +- Common/Core/vtkArrayCoordinates.cxx | 17 +- Common/Core/vtkArrayCoordinates.h | 7 +- Common/Core/vtkArrayDispatch.h | 44 +- Common/Core/vtkArrayDispatch.txx | 569 +- Common/Core/vtkArrayExtents.cxx | 62 +- Common/Core/vtkArrayExtents.h | 7 +- Common/Core/vtkArrayExtentsList.cxx | 19 +- Common/Core/vtkArrayExtentsList.h | 8 +- Common/Core/vtkArrayInterpolate.h | 11 +- Common/Core/vtkArrayInterpolate.txx | 31 +- Common/Core/vtkArrayIterator.h | 6 +- Common/Core/vtkArrayIteratorIncludes.h | 2 +- Common/Core/vtkArrayIteratorTemplate.h | 40 +- Common/Core/vtkArrayIteratorTemplate.txx | 6 +- .../vtkArrayIteratorTemplateInstantiate.cxx | 3 +- Common/Core/vtkArrayPrint.h | 8 +- Common/Core/vtkArrayPrint.txx | 29 +- Common/Core/vtkArrayRange.cxx | 12 +- Common/Core/vtkArrayRange.h | 2 +- Common/Core/vtkArraySort.cxx | 16 +- Common/Core/vtkArraySort.h | 8 +- Common/Core/vtkArrayWeights.cxx | 16 +- Common/Core/vtkArrayWeights.h | 4 +- Common/Core/vtkAssume.h | 37 +- Common/Core/vtkAtomicTypeConcepts.h | 17 +- Common/Core/vtkAutoInit.h | 87 +- Common/Core/vtkBitArray.cxx | 187 +- Common/Core/vtkBitArray.h | 126 +- Common/Core/vtkBitArrayIterator.cxx | 6 +- Common/Core/vtkBitArrayIterator.h | 8 +- Common/Core/vtkBoxMuellerRandomSequence.cxx | 34 +- Common/Core/vtkBoxMuellerRandomSequence.h | 16 +- Common/Core/vtkBreakPoint.cxx | 9 +- Common/Core/vtkBreakPoint.h | 4 +- Common/Core/vtkBuffer.h | 49 +- Common/Core/vtkByteSwap.cxx | 274 +- Common/Core/vtkByteSwap.h | 24 +- Common/Core/vtkCallbackCommand.cxx | 4 +- Common/Core/vtkCallbackCommand.h | 49 +- Common/Core/vtkCharArray.cxx | 2 +- Common/Core/vtkCharArray.h | 7 +- Common/Core/vtkCollection.cxx | 68 +- Common/Core/vtkCollection.h | 71 +- Common/Core/vtkCollectionIterator.cxx | 12 +- Common/Core/vtkCollectionIterator.h | 5 +- Common/Core/vtkCollectionRange.h | 105 +- Common/Core/vtkCommand.cxx | 23 +- Common/Core/vtkCommand.h | 57 +- .../Core/vtkCommonInformationKeyManager.cxx | 18 +- Common/Core/vtkCommonInformationKeyManager.h | 5 +- Common/Core/vtkConditionVariable.cxx | 270 +- Common/Core/vtkConditionVariable.h | 49 +- Common/Core/vtkCriticalSection.cxx | 1 - Common/Core/vtkCriticalSection.h | 7 +- Common/Core/vtkDataArray.cxx | 781 +-- Common/Core/vtkDataArray.h | 196 +- Common/Core/vtkDataArrayAccessor.h | 31 +- Common/Core/vtkDataArrayCollection.h | 27 +- .../Core/vtkDataArrayCollectionIterator.cxx | 9 +- Common/Core/vtkDataArrayCollectionIterator.h | 4 +- Common/Core/vtkDataArrayIteratorMacro.h | 85 +- Common/Core/vtkDataArrayMeta.h | 61 +- Common/Core/vtkDataArrayPrivate.txx | 318 +- Common/Core/vtkDataArrayRange.h | 60 +- Common/Core/vtkDataArraySelection.cxx | 30 +- Common/Core/vtkDataArraySelection.h | 11 +- Common/Core/vtkDataArrayTemplate.h | 5 +- Common/Core/vtkDataArrayTupleRange_AOS.h | 615 +- Common/Core/vtkDataArrayTupleRange_Generic.h | 1192 ++-- Common/Core/vtkDataArrayValueRange_AOS.h | 37 +- Common/Core/vtkDataArrayValueRange_Generic.h | 438 +- Common/Core/vtkDebugLeaks.cxx | 94 +- Common/Core/vtkDebugLeaks.h | 13 +- Common/Core/vtkDebugLeaksManager.cxx | 8 +- Common/Core/vtkDebugLeaksManager.h | 6 +- Common/Core/vtkDenseArray.h | 16 +- Common/Core/vtkDenseArray.txx | 127 +- Common/Core/vtkDoubleArray.cxx | 2 +- Common/Core/vtkDoubleArray.h | 8 +- Common/Core/vtkDynamicLoader.cxx | 8 +- Common/Core/vtkDynamicLoader.h | 4 +- Common/Core/vtkEventData.h | 87 +- Common/Core/vtkEventForwarderCommand.cxx | 5 +- Common/Core/vtkEventForwarderCommand.h | 20 +- Common/Core/vtkFileOutputWindow.cxx | 7 +- Common/Core/vtkFileOutputWindow.h | 4 +- Common/Core/vtkFloatArray.cxx | 2 +- Common/Core/vtkFloatArray.h | 8 +- Common/Core/vtkFloatingPointExceptions.cxx | 12 +- Common/Core/vtkFloatingPointExceptions.h | 4 +- Common/Core/vtkGarbageCollector.cxx | 244 +- Common/Core/vtkGarbageCollector.h | 26 +- Common/Core/vtkGarbageCollectorManager.cxx | 4 +- Common/Core/vtkGarbageCollectorManager.h | 6 +- Common/Core/vtkGaussianRandomSequence.cxx | 6 +- Common/Core/vtkGaussianRandomSequence.h | 4 +- Common/Core/vtkGenericDataArray.cxx | 3 +- Common/Core/vtkGenericDataArray.h | 238 +- Common/Core/vtkGenericDataArray.txx | 385 +- Common/Core/vtkGenericDataArrayLookupHelper.h | 41 +- Common/Core/vtkIOStream.h | 30 +- Common/Core/vtkIOStreamFwd.h | 16 +- Common/Core/vtkIdList.cxx | 84 +- Common/Core/vtkIdList.h | 58 +- Common/Core/vtkIdListCollection.h | 27 +- Common/Core/vtkIdTypeArray.cxx | 2 +- Common/Core/vtkIdTypeArray.h | 19 +- Common/Core/vtkIndent.cxx | 8 +- Common/Core/vtkIndent.h | 9 +- Common/Core/vtkInformation.cxx | 414 +- Common/Core/vtkInformation.h | 178 +- Common/Core/vtkInformationDataObjectKey.cxx | 18 +- Common/Core/vtkInformationDataObjectKey.h | 4 +- Common/Core/vtkInformationDoubleKey.cxx | 24 +- Common/Core/vtkInformationDoubleKey.h | 4 +- Common/Core/vtkInformationDoubleVectorKey.cxx | 71 +- Common/Core/vtkInformationDoubleVectorKey.h | 13 +- Common/Core/vtkInformationIdTypeKey.cxx | 24 +- Common/Core/vtkInformationIdTypeKey.h | 4 +- Common/Core/vtkInformationInformationKey.cxx | 18 +- Common/Core/vtkInformationInformationKey.h | 4 +- .../vtkInformationInformationVectorKey.cxx | 30 +- .../Core/vtkInformationInformationVectorKey.h | 4 +- Common/Core/vtkInformationIntegerKey.cxx | 24 +- Common/Core/vtkInformationIntegerKey.h | 4 +- .../Core/vtkInformationIntegerPointerKey.cxx | 60 +- Common/Core/vtkInformationIntegerPointerKey.h | 7 +- .../Core/vtkInformationIntegerVectorKey.cxx | 83 +- Common/Core/vtkInformationIntegerVectorKey.h | 13 +- Common/Core/vtkInformationInternals.h | 22 +- Common/Core/vtkInformationIterator.cxx | 6 +- Common/Core/vtkInformationIterator.h | 6 +- Common/Core/vtkInformationKey.cxx | 43 +- Common/Core/vtkInformationKey.h | 108 +- Common/Core/vtkInformationKeyLookup.cxx | 24 +- Common/Core/vtkInformationKeyLookup.h | 72 +- Common/Core/vtkInformationKeyVectorKey.cxx | 80 +- Common/Core/vtkInformationKeyVectorKey.h | 8 +- Common/Core/vtkInformationObjectBaseKey.cxx | 31 +- Common/Core/vtkInformationObjectBaseKey.h | 12 +- .../vtkInformationObjectBaseVectorKey.cxx | 200 +- .../Core/vtkInformationObjectBaseVectorKey.h | 41 +- Common/Core/vtkInformationRequestKey.cxx | 12 +- Common/Core/vtkInformationRequestKey.h | 4 +- Common/Core/vtkInformationStringKey.cxx | 20 +- Common/Core/vtkInformationStringKey.h | 6 +- Common/Core/vtkInformationStringVectorKey.cxx | 57 +- Common/Core/vtkInformationStringVectorKey.h | 15 +- Common/Core/vtkInformationUnsignedLongKey.cxx | 33 +- Common/Core/vtkInformationUnsignedLongKey.h | 4 +- Common/Core/vtkInformationVariantKey.cxx | 24 +- Common/Core/vtkInformationVariantKey.h | 4 +- .../Core/vtkInformationVariantVectorKey.cxx | 76 +- Common/Core/vtkInformationVariantVectorKey.h | 11 +- Common/Core/vtkInformationVector.cxx | 55 +- Common/Core/vtkInformationVector.h | 9 +- Common/Core/vtkIntArray.cxx | 2 +- Common/Core/vtkIntArray.h | 7 +- Common/Core/vtkLargeInteger.cxx | 46 +- Common/Core/vtkLargeInteger.h | 23 +- Common/Core/vtkLogger.cxx | 39 +- Common/Core/vtkLogger.h | 31 +- Common/Core/vtkLongArray.cxx | 2 +- Common/Core/vtkLongArray.h | 7 +- Common/Core/vtkLongLongArray.cxx | 2 +- Common/Core/vtkLongLongArray.h | 7 +- Common/Core/vtkLookupTable.cxx | 624 +- Common/Core/vtkLookupTable.h | 113 +- Common/Core/vtkMappedDataArray.h | 76 +- Common/Core/vtkMappedDataArray.txx | 80 +- Common/Core/vtkMath.cxx | 1359 ++--- Common/Core/vtkMath.h | 529 +- Common/Core/vtkMathUtilities.h | 30 +- Common/Core/vtkMersenneTwister.cxx | 112 +- Common/Core/vtkMersenneTwister.h | 9 +- Common/Core/vtkMeta.h | 15 +- .../Core/vtkMinimalStandardRandomSequence.cxx | 47 +- .../Core/vtkMinimalStandardRandomSequence.h | 13 +- Common/Core/vtkMultiThreader.cxx | 236 +- Common/Core/vtkMultiThreader.h | 66 +- Common/Core/vtkMutexLock.cxx | 17 +- Common/Core/vtkMutexLock.h | 30 +- Common/Core/vtkNew.h | 65 +- Common/Core/vtkOStrStreamWrapper.cxx | 8 +- Common/Core/vtkOStrStreamWrapper.h | 5 +- Common/Core/vtkOStreamWrapper.cxx | 35 +- Common/Core/vtkOStreamWrapper.h | 71 +- Common/Core/vtkObject.cxx | 245 +- Common/Core/vtkObject.h | 235 +- Common/Core/vtkObjectBase.cxx | 50 +- Common/Core/vtkObjectBase.h | 34 +- Common/Core/vtkObjectFactory.cxx | 331 +- Common/Core/vtkObjectFactory.h | 140 +- Common/Core/vtkObjectFactoryCollection.cxx | 2 +- Common/Core/vtkObjectFactoryCollection.h | 28 +- Common/Core/vtkOldStyleCallbackCommand.cxx | 2 +- Common/Core/vtkOldStyleCallbackCommand.h | 27 +- Common/Core/vtkOutputWindow.cxx | 36 +- Common/Core/vtkOutputWindow.h | 11 +- Common/Core/vtkOverrideInformation.cxx | 20 +- Common/Core/vtkOverrideInformation.h | 25 +- .../Core/vtkOverrideInformationCollection.h | 27 +- Common/Core/vtkPoints.cxx | 21 +- Common/Core/vtkPoints.h | 91 +- Common/Core/vtkPoints2D.cxx | 31 +- Common/Core/vtkPoints2D.h | 43 +- Common/Core/vtkPriorityQueue.cxx | 90 +- Common/Core/vtkPriorityQueue.h | 42 +- Common/Core/vtkRandomPool.cxx | 192 +- Common/Core/vtkRandomPool.h | 33 +- Common/Core/vtkRandomSequence.cxx | 1 - Common/Core/vtkRandomSequence.h | 4 +- Common/Core/vtkRange.h | 8 +- Common/Core/vtkRangeIterableTraits.h | 11 +- Common/Core/vtkReferenceCount.cxx | 2 +- Common/Core/vtkReferenceCount.h | 8 +- Common/Core/vtkSMPThreadLocalObject.h | 73 +- Common/Core/vtkSMPTools.h | 64 +- Common/Core/vtkSOADataArrayTemplate.h | 112 +- Common/Core/vtkSOADataArrayTemplate.txx | 125 +- Common/Core/vtkScalarsToColors.cxx | 771 +-- Common/Core/vtkScalarsToColors.h | 160 +- Common/Core/vtkScaledSOADataArrayTemplate.h | 116 +- Common/Core/vtkScaledSOADataArrayTemplate.txx | 134 +- Common/Core/vtkSetGet.h | 1302 ++-- Common/Core/vtkShortArray.cxx | 2 +- Common/Core/vtkShortArray.h | 7 +- Common/Core/vtkSignedCharArray.cxx | 2 +- Common/Core/vtkSignedCharArray.h | 7 +- Common/Core/vtkSimpleCriticalSection.cxx | 15 +- Common/Core/vtkSimpleCriticalSection.h | 13 +- Common/Core/vtkSmartPointer.h | 177 +- Common/Core/vtkSmartPointerBase.cxx | 32 +- Common/Core/vtkSmartPointerBase.h | 44 +- Common/Core/vtkSortDataArray.cxx | 252 +- Common/Core/vtkSortDataArray.h | 67 +- Common/Core/vtkSparseArray.h | 6 +- Common/Core/vtkSparseArray.txx | 243 +- Common/Core/vtkStdString.h | 47 +- Common/Core/vtkStringArray.cxx | 288 +- Common/Core/vtkStringArray.h | 103 +- Common/Core/vtkStringOutputWindow.cxx | 3 +- Common/Core/vtkStringOutputWindow.h | 5 +- Common/Core/vtkSystemIncludes.h | 94 +- Common/Core/vtkTemplateAliasMacro.h | 63 +- Common/Core/vtkTestDataArray.h | 56 +- Common/Core/vtkTimePointUtility.cxx | 59 +- Common/Core/vtkTimePointUtility.h | 32 +- Common/Core/vtkTimeStamp.h | 18 +- Common/Core/vtkType.h | 443 +- Common/Core/vtkTypeList.h | 8 +- Common/Core/vtkTypeList.txx | 86 +- Common/Core/vtkTypeTraits.h | 113 +- Common/Core/vtkTypedArray.h | 15 +- Common/Core/vtkTypedArray.txx | 45 +- Common/Core/vtkTypedDataArray.h | 43 +- Common/Core/vtkTypedDataArray.txx | 40 +- Common/Core/vtkTypedDataArrayIterator.h | 51 +- Common/Core/vtkUnicodeString.cxx | 78 +- Common/Core/vtkUnicodeString.h | 6 +- Common/Core/vtkUnicodeStringArray.cxx | 77 +- Common/Core/vtkUnicodeStringArray.h | 41 +- Common/Core/vtkUnsignedCharArray.cxx | 2 +- Common/Core/vtkUnsignedCharArray.h | 7 +- Common/Core/vtkUnsignedIntArray.cxx | 2 +- Common/Core/vtkUnsignedIntArray.h | 7 +- Common/Core/vtkUnsignedLongArray.cxx | 2 +- Common/Core/vtkUnsignedLongArray.h | 7 +- Common/Core/vtkUnsignedLongLongArray.cxx | 2 +- Common/Core/vtkUnsignedLongLongArray.h | 14 +- Common/Core/vtkUnsignedShortArray.cxx | 2 +- Common/Core/vtkUnsignedShortArray.h | 10 +- Common/Core/vtkVariant.cxx | 308 +- Common/Core/vtkVariant.h | 125 +- Common/Core/vtkVariantArray.cxx | 184 +- Common/Core/vtkVariantArray.h | 73 +- Common/Core/vtkVariantCast.h | 53 +- Common/Core/vtkVariantCreate.h | 37 +- Common/Core/vtkVariantExtract.h | 40 +- Common/Core/vtkVariantInlineOperators.h | 119 +- Common/Core/vtkVariantToNumeric.cxx | 2 +- Common/Core/vtkVersion.h | 25 +- Common/Core/vtkVoidArray.cxx | 58 +- Common/Core/vtkVoidArray.h | 39 +- Common/Core/vtkWeakPointer.h | 155 +- Common/Core/vtkWeakPointerBase.cxx | 91 +- Common/Core/vtkWeakPointerBase.h | 40 +- Common/Core/vtkWeakReference.cxx | 3 +- Common/Core/vtkWeakReference.h | 4 +- Common/Core/vtkWin32Header.h | 102 +- Common/Core/vtkWin32OutputWindow.cxx | 163 +- Common/Core/vtkWin32OutputWindow.h | 6 +- .../Core/vtkWin32OutputWindowProcessEncoded.c | 173 +- Common/Core/vtkWin32ProcessOutputWindow.cxx | 46 +- Common/Core/vtkWin32ProcessOutputWindow.h | 5 +- Common/Core/vtkWindow.cxx | 38 +- Common/Core/vtkWindow.h | 86 +- Common/Core/vtkWindows.h | 84 +- Common/Core/vtkWrappingHints.h | 2 +- Common/Core/vtkXMLFileOutputWindow.cxx | 34 +- Common/Core/vtkXMLFileOutputWindow.h | 5 +- .../Testing/Cxx/LagrangeHexahedron.cxx | 134 +- .../Testing/Cxx/LagrangeInterpolation.cxx | 280 +- Common/DataModel/Testing/Cxx/PointLocator.cxx | 97 +- Common/DataModel/Testing/Cxx/TestAMRBox.cxx | 194 +- .../Cxx/TestAngularPeriodicDataArray.cxx | 105 +- .../Testing/Cxx/TestBiQuadraticQuad.cxx | 6 +- .../DataModel/Testing/Cxx/TestBoundingBox.cxx | 64 +- .../DataModel/Testing/Cxx/TestCellArray.cxx | 609 +- .../Testing/Cxx/TestCellIterators.cxx | 285 +- .../DataModel/Testing/Cxx/TestCellLocator.cxx | 146 +- Common/DataModel/Testing/Cxx/TestColor.cxx | 19 +- .../Testing/Cxx/TestCompositeDataSetRange.cxx | 38 +- .../Testing/Cxx/TestCompositeDataSets.cxx | 6 +- .../Testing/Cxx/TestComputeBoundingSphere.cxx | 450 +- .../Testing/Cxx/TestDataArrayDispatcher.cxx | 74 +- .../DataModel/Testing/Cxx/TestDataObject.cxx | 36 +- .../Testing/Cxx/TestDataObjectTreeRange.cxx | 39 +- .../Testing/Cxx/TestDataObjectTypes.cxx | 2 +- .../DataModel/Testing/Cxx/TestDispatchers.cxx | 203 +- .../DataModel/Testing/Cxx/TestFieldList.cxx | 2 +- .../DataModel/Testing/Cxx/TestGenericCell.cxx | 58 +- Common/DataModel/Testing/Cxx/TestGraph.cxx | 32 +- Common/DataModel/Testing/Cxx/TestGraph2.cxx | 40 +- .../Testing/Cxx/TestGraphAttributes.cxx | 18 +- .../Testing/Cxx/TestHigherOrderCell.cxx | 155 +- .../Testing/Cxx/TestImageDataFindCell.cxx | 98 +- .../Cxx/TestImageDataInterpolation.cxx | 176 +- .../Testing/Cxx/TestImageDataOrientation.cxx | 75 +- .../Testing/Cxx/TestImageDataOrientation2.cxx | 23 +- .../Testing/Cxx/TestImageIterator.cxx | 32 +- .../Testing/Cxx/TestInterpolationDerivs.cxx | 43 +- .../Cxx/TestInterpolationFunctions.cxx | 40 +- .../Testing/Cxx/TestKdTreeRepresentation.cxx | 21 +- .../Testing/Cxx/TestLagrangeTetra.cxx | 417 +- .../Testing/Cxx/TestLagrangeTriangle.cxx | 402 +- .../Testing/Cxx/TestLagrangeWedge.cxx | 374 +- .../Testing/Cxx/TestMappedGridDeepCopy.cxx | 164 +- ...TestMeanValueCoordinatesInterpolation1.cxx | 112 +- ...TestMeanValueCoordinatesInterpolation2.cxx | 84 +- Common/DataModel/Testing/Cxx/TestPath.cxx | 8 +- .../Testing/Cxx/TestPentagonalPrism.cxx | 250 +- .../Cxx/TestPiecewiseFunctionLogScale.cxx | 23 +- .../DataModel/Testing/Cxx/TestPixelExtent.cxx | 17 +- Common/DataModel/Testing/Cxx/TestPlane.cxx | 121 +- .../Testing/Cxx/TestPointLocators.cxx | 156 +- .../Testing/Cxx/TestPolyDataRemoveCell.cxx | 61 +- .../Cxx/TestPolyDataRemoveDeletedCells.cxx | 52 +- Common/DataModel/Testing/Cxx/TestPolygon.cxx | 356 +- .../Cxx/TestPolygonBoundedTriangulate.cxx | 27 +- .../DataModel/Testing/Cxx/TestPolyhedron0.cxx | 258 +- .../DataModel/Testing/Cxx/TestPolyhedron1.cxx | 128 +- .../DataModel/Testing/Cxx/TestPolyhedron2.cxx | 13 +- .../DataModel/Testing/Cxx/TestPolyhedron3.cxx | 19 +- .../DataModel/Testing/Cxx/TestPolyhedron4.cxx | 2 +- .../TestPolyhedronCombinatorialContouring.cxx | 42 +- .../Testing/Cxx/TestPolyhedronContouring.cxx | 104 +- .../Testing/Cxx/TestPolyhedronConvexity.cxx | 331 +- .../TestPolyhedronConvexityMultipleCells.cxx | 14 +- .../Testing/Cxx/TestPolyhedronCutter.cxx | 7 +- .../Testing/Cxx/TestQuadraticPolygon.cxx | 147 +- .../Cxx/TestQuadraticPolygonFilters.cxx | 100 +- Common/DataModel/Testing/Cxx/TestRect.cxx | 43 +- .../Testing/Cxx/TestSelectionExpression.cxx | 2 +- .../Testing/Cxx/TestSelectionSubtract.cxx | 28 +- .../Testing/Cxx/TestSmoothErrorMetric.cxx | 76 +- .../Testing/Cxx/TestSortFieldData.cxx | 64 +- .../Testing/Cxx/TestStaticCellLinks.cxx | 85 +- .../Testing/Cxx/TestStaticCellLocator.cxx | 28 +- .../Testing/Cxx/TestStructuredData.cxx | 142 +- Common/DataModel/Testing/Cxx/TestTable.cxx | 24 +- .../Testing/Cxx/TestTreeBFSIterator.cxx | 16 +- .../Testing/Cxx/TestTreeDFSIterator.cxx | 16 +- Common/DataModel/Testing/Cxx/TestTriangle.cxx | 105 +- Common/DataModel/Testing/Cxx/TestVector.cxx | 46 +- .../Testing/Cxx/TestVectorOperators.cxx | 8 +- .../Testing/Cxx/TimePointLocators.cxx | 43 +- .../DataModel/Testing/Cxx/UnitTestCells.cxx | 664 +-- .../Testing/Cxx/UnitTestImplicitDataSet.cxx | 76 +- .../Testing/Cxx/UnitTestImplicitVolume.cxx | 76 +- Common/DataModel/Testing/Cxx/UnitTestLine.cxx | 322 +- .../Cxx/UnitTestPlanesIntersection.cxx | 882 ++- .../Cxx/UnitTestTriangleIntersection.cxx | 429 +- .../Testing/Cxx/otherCellBoundaries.cxx | 522 +- .../Testing/Cxx/otherCellPosition.cxx | 559 +- .../DataModel/Testing/Cxx/otherCellTypes.cxx | 20 +- .../Cxx/otherColorTransferFunction.cxx | 128 +- .../DataModel/Testing/Cxx/otherEmptyCell.cxx | 44 +- .../DataModel/Testing/Cxx/otherFieldData.cxx | 9 +- .../DataModel/Testing/Cxx/otherImageData.cxx | 426 +- .../Testing/Cxx/otherRectilinearGrid.cxx | 466 +- .../Testing/Cxx/otherStructuredGrid.cxx | 509 +- .../Testing/Cxx/otherUniformGrid.cxx | 426 +- .../Testing/Cxx/quadCellConsistency.cxx | 81 +- .../Testing/Cxx/quadraticEvaluation.cxx | 494 +- .../Testing/Cxx/quadraticIntersection.cxx | 393 +- Common/DataModel/vtkAMRBox.cxx | 496 +- Common/DataModel/vtkAMRBox.h | 122 +- Common/DataModel/vtkAMRDataInternals.cxx | 32 +- Common/DataModel/vtkAMRDataInternals.h | 19 +- Common/DataModel/vtkAMRInformation.cxx | 638 +- Common/DataModel/vtkAMRInformation.h | 67 +- Common/DataModel/vtkAMRUtilities.cxx | 303 +- Common/DataModel/vtkAMRUtilities.h | 23 +- Common/DataModel/vtkAbstractCellLinks.cxx | 12 +- Common/DataModel/vtkAbstractCellLinks.h | 34 +- Common/DataModel/vtkAbstractCellLocator.cxx | 160 +- Common/DataModel/vtkAbstractCellLocator.h | 88 +- .../DataModel/vtkAbstractElectronicData.cxx | 5 +- Common/DataModel/vtkAbstractElectronicData.h | 28 +- Common/DataModel/vtkAbstractPointLocator.cxx | 28 +- Common/DataModel/vtkAbstractPointLocator.h | 22 +- .../DataModel/vtkAdjacentVertexIterator.cxx | 4 +- Common/DataModel/vtkAdjacentVertexIterator.h | 21 +- .../DataModel/vtkAngularPeriodicDataArray.h | 25 +- .../DataModel/vtkAngularPeriodicDataArray.txx | 48 +- Common/DataModel/vtkAnimationScene.cxx | 81 +- Common/DataModel/vtkAnimationScene.h | 10 +- Common/DataModel/vtkAnnotation.cxx | 58 +- Common/DataModel/vtkAnnotation.h | 6 +- Common/DataModel/vtkAnnotationLayers.cxx | 23 +- Common/DataModel/vtkAnnotationLayers.h | 5 +- Common/DataModel/vtkArrayData.cxx | 47 +- Common/DataModel/vtkArrayData.h | 9 +- Common/DataModel/vtkArrayListTemplate.h | 211 +- Common/DataModel/vtkArrayListTemplate.txx | 132 +- Common/DataModel/vtkAtom.cxx | 15 +- Common/DataModel/vtkAtom.h | 20 +- Common/DataModel/vtkAttributesErrorMetric.cxx | 175 +- Common/DataModel/vtkAttributesErrorMetric.h | 16 +- Common/DataModel/vtkBSPCuts.cxx | 139 +- Common/DataModel/vtkBSPCuts.h | 58 +- Common/DataModel/vtkBSPIntersections.cxx | 171 +- Common/DataModel/vtkBSPIntersections.h | 67 +- Common/DataModel/vtkBiQuadraticQuad.cxx | 408 +- Common/DataModel/vtkBiQuadraticQuad.h | 73 +- .../vtkBiQuadraticQuadraticHexahedron.cxx | 646 +- .../vtkBiQuadraticQuadraticHexahedron.h | 88 +- .../vtkBiQuadraticQuadraticWedge.cxx | 290 +- .../DataModel/vtkBiQuadraticQuadraticWedge.h | 86 +- Common/DataModel/vtkBiQuadraticTriangle.cxx | 448 +- Common/DataModel/vtkBiQuadraticTriangle.h | 72 +- Common/DataModel/vtkBond.cxx | 19 +- Common/DataModel/vtkBond.h | 17 +- Common/DataModel/vtkBoundingBox.cxx | 255 +- Common/DataModel/vtkBoundingBox.h | 102 +- Common/DataModel/vtkBox.cxx | 369 +- Common/DataModel/vtkBox.h | 46 +- Common/DataModel/vtkCell.cxx | 67 +- Common/DataModel/vtkCell.h | 103 +- Common/DataModel/vtkCell3D.cxx | 237 +- Common/DataModel/vtkCell3D.h | 43 +- Common/DataModel/vtkCellArray.cxx | 307 +- Common/DataModel/vtkCellArray.h | 318 +- Common/DataModel/vtkCellArrayIterator.cxx | 2 +- Common/DataModel/vtkCellArrayIterator.h | 33 +- Common/DataModel/vtkCellData.cxx | 2 +- Common/DataModel/vtkCellData.h | 11 +- Common/DataModel/vtkCellIterator.cxx | 10 +- Common/DataModel/vtkCellIterator.h | 42 +- Common/DataModel/vtkCellLinks.cxx | 91 +- Common/DataModel/vtkCellLinks.h | 69 +- Common/DataModel/vtkCellLocator.cxx | 845 ++- Common/DataModel/vtkCellLocator.h | 78 +- Common/DataModel/vtkCellLocatorStrategy.cxx | 46 +- Common/DataModel/vtkCellLocatorStrategy.h | 20 +- Common/DataModel/vtkCellType.h | 103 +- Common/DataModel/vtkCellTypes.cxx | 86 +- Common/DataModel/vtkCellTypes.h | 53 +- .../DataModel/vtkClosestNPointsStrategy.cxx | 36 +- Common/DataModel/vtkClosestNPointsStrategy.h | 16 +- Common/DataModel/vtkClosestPointStrategy.cxx | 190 +- Common/DataModel/vtkClosestPointStrategy.h | 39 +- Common/DataModel/vtkColor.h | 117 +- Common/DataModel/vtkCompositeDataIterator.cxx | 9 +- Common/DataModel/vtkCompositeDataIterator.h | 15 +- Common/DataModel/vtkCompositeDataSet.cxx | 5 +- Common/DataModel/vtkCompositeDataSet.h | 24 +- .../vtkCompositeDataSetNodeReference.h | 81 +- Common/DataModel/vtkCompositeDataSetRange.h | 95 +- Common/DataModel/vtkCone.cxx | 12 +- Common/DataModel/vtkCone.h | 12 +- Common/DataModel/vtkConvexPointSet.cxx | 234 +- Common/DataModel/vtkConvexPointSet.h | 89 +- Common/DataModel/vtkCubicLine.cxx | 325 +- Common/DataModel/vtkCubicLine.h | 71 +- Common/DataModel/vtkCylinder.cxx | 29 +- Common/DataModel/vtkCylinder.h | 16 +- Common/DataModel/vtkDataArrayDispatcher.h | 61 +- Common/DataModel/vtkDataObject.cxx | 167 +- Common/DataModel/vtkDataObject.h | 65 +- Common/DataModel/vtkDataObjectCollection.h | 29 +- Common/DataModel/vtkDataObjectTree.cxx | 110 +- Common/DataModel/vtkDataObjectTree.h | 12 +- Common/DataModel/vtkDataObjectTreeInternals.h | 11 +- .../DataModel/vtkDataObjectTreeIterator.cxx | 50 +- Common/DataModel/vtkDataObjectTreeIterator.h | 3 +- Common/DataModel/vtkDataObjectTreeRange.h | 99 +- Common/DataModel/vtkDataObjectTypes.cxx | 159 +- Common/DataModel/vtkDataObjectTypes.h | 7 +- Common/DataModel/vtkDataSet.cxx | 226 +- Common/DataModel/vtkDataSet.h | 109 +- Common/DataModel/vtkDataSetAttributes.cxx | 503 +- Common/DataModel/vtkDataSetAttributes.h | 215 +- .../vtkDataSetAttributesFieldList.cxx | 10 +- .../DataModel/vtkDataSetAttributesFieldList.h | 4 +- Common/DataModel/vtkDataSetCellIterator.cxx | 144 +- Common/DataModel/vtkDataSetCellIterator.h | 14 +- Common/DataModel/vtkDataSetCollection.h | 32 +- Common/DataModel/vtkDirectedAcyclicGraph.cxx | 25 +- Common/DataModel/vtkDirectedAcyclicGraph.h | 12 +- Common/DataModel/vtkDirectedGraph.cxx | 16 +- Common/DataModel/vtkDirectedGraph.h | 12 +- Common/DataModel/vtkDispatcher.h | 82 +- Common/DataModel/vtkDispatcher_Private.h | 339 +- .../DataModel/vtkDistributedGraphHelper.cxx | 59 +- Common/DataModel/vtkDistributedGraphHelper.h | 59 +- Common/DataModel/vtkDoubleDispatcher.h | 105 +- Common/DataModel/vtkEdgeListIterator.cxx | 51 +- Common/DataModel/vtkEdgeListIterator.h | 20 +- Common/DataModel/vtkEdgeTable.cxx | 232 +- Common/DataModel/vtkEdgeTable.h | 36 +- Common/DataModel/vtkEmptyCell.cxx | 71 +- Common/DataModel/vtkEmptyCell.h | 56 +- .../DataModel/vtkExplicitStructuredGrid.cxx | 90 +- .../vtkExtractStructuredGridHelper.cxx | 305 +- .../vtkExtractStructuredGridHelper.h | 38 +- Common/DataModel/vtkFieldData.cxx | 248 +- Common/DataModel/vtkFieldData.h | 118 +- Common/DataModel/vtkFindCellStrategy.cxx | 13 +- Common/DataModel/vtkFindCellStrategy.h | 17 +- Common/DataModel/vtkGenericAdaptorCell.cxx | 774 ++- Common/DataModel/vtkGenericAdaptorCell.h | 191 +- Common/DataModel/vtkGenericAttribute.cxx | 5 +- Common/DataModel/vtkGenericAttribute.h | 41 +- .../vtkGenericAttributeCollection.cxx | 223 +- .../DataModel/vtkGenericAttributeCollection.h | 38 +- Common/DataModel/vtkGenericCell.cxx | 336 +- Common/DataModel/vtkGenericCell.h | 166 +- Common/DataModel/vtkGenericCellIterator.cxx | 5 +- Common/DataModel/vtkGenericCellIterator.h | 10 +- .../DataModel/vtkGenericCellTessellator.cxx | 99 +- Common/DataModel/vtkGenericCellTessellator.h | 62 +- Common/DataModel/vtkGenericDataSet.cxx | 58 +- Common/DataModel/vtkGenericDataSet.h | 51 +- Common/DataModel/vtkGenericEdgeTable.cxx | 396 +- Common/DataModel/vtkGenericEdgeTable.h | 195 +- .../vtkGenericInterpolatedVelocityField.cxx | 137 +- .../vtkGenericInterpolatedVelocityField.h | 15 +- Common/DataModel/vtkGenericPointIterator.cxx | 5 +- Common/DataModel/vtkGenericPointIterator.h | 6 +- .../vtkGenericSubdivisionErrorMetric.cxx | 11 +- .../vtkGenericSubdivisionErrorMetric.h | 24 +- Common/DataModel/vtkGeometricErrorMetric.cxx | 132 +- Common/DataModel/vtkGeometricErrorMetric.h | 20 +- Common/DataModel/vtkGraph.cxx | 435 +- Common/DataModel/vtkGraph.h | 141 +- Common/DataModel/vtkGraphEdge.cxx | 2 +- Common/DataModel/vtkGraphEdge.h | 4 +- Common/DataModel/vtkGraphInternals.cxx | 10 +- Common/DataModel/vtkGraphInternals.h | 4 +- Common/DataModel/vtkHexagonalPrism.cxx | 386 +- Common/DataModel/vtkHexagonalPrism.h | 62 +- Common/DataModel/vtkHexahedron.cxx | 520 +- Common/DataModel/vtkHexahedron.h | 64 +- .../vtkHierarchicalBoxDataIterator.cxx | 3 +- .../vtkHierarchicalBoxDataIterator.h | 30 +- .../DataModel/vtkHierarchicalBoxDataSet.cxx | 12 +- Common/DataModel/vtkHierarchicalBoxDataSet.h | 15 +- Common/DataModel/vtkHyperTree.cxx | 310 +- Common/DataModel/vtkHyperTree.h | 121 +- Common/DataModel/vtkHyperTreeCursor.cxx | 2 +- Common/DataModel/vtkHyperTreeCursor.h | 14 +- Common/DataModel/vtkHyperTreeGrid.cxx | 22 +- Common/DataModel/vtkHyperTreeGrid.h | 28 +- Common/DataModel/vtkHyperTreeGridEntry.cxx | 30 +- Common/DataModel/vtkHyperTreeGridEntry.h | 76 +- .../vtkHyperTreeGridGeometryEntry.cxx | 101 +- .../DataModel/vtkHyperTreeGridGeometryEntry.h | 111 +- .../vtkHyperTreeGridGeometryLevelEntry.cxx | 182 +- .../vtkHyperTreeGridGeometryLevelEntry.h | 76 +- .../DataModel/vtkHyperTreeGridLevelEntry.cxx | 20 +- Common/DataModel/vtkHyperTreeGridLevelEntry.h | 96 +- .../vtkHyperTreeGridNonOrientedCursor.cxx | 104 +- .../vtkHyperTreeGridNonOrientedCursor.h | 23 +- ...HyperTreeGridNonOrientedGeometryCursor.cxx | 197 +- ...tkHyperTreeGridNonOrientedGeometryCursor.h | 63 +- ...perTreeGridNonOrientedMooreSuperCursor.cxx | 452 +- ...HyperTreeGridNonOrientedMooreSuperCursor.h | 15 +- ...eeGridNonOrientedMooreSuperCursorLight.cxx | 481 +- ...TreeGridNonOrientedMooreSuperCursorLight.h | 20 +- .../vtkHyperTreeGridNonOrientedSuperCursor.h | 65 +- ...HyperTreeGridNonOrientedSuperCursorLight.h | 140 +- ...eeGridNonOrientedVonNeumannSuperCursor.cxx | 420 +- ...TreeGridNonOrientedVonNeumannSuperCursor.h | 16 +- ...dNonOrientedVonNeumannSuperCursorLight.cxx | 420 +- ...ridNonOrientedVonNeumannSuperCursorLight.h | 16 +- .../vtkHyperTreeGridOrientedCursor.cxx | 66 +- .../vtkHyperTreeGridOrientedCursor.h | 22 +- ...vtkHyperTreeGridOrientedGeometryCursor.cxx | 124 +- .../vtkHyperTreeGridOrientedGeometryCursor.h | 45 +- Common/DataModel/vtkHyperTreeGridScales.h | 47 +- Common/DataModel/vtkHyperTreeGridTools.h | 16 +- Common/DataModel/vtkImageData.cxx | 881 ++- Common/DataModel/vtkImageData.h | 240 +- Common/DataModel/vtkImageIterator.cxx | 4 +- Common/DataModel/vtkImageIterator.h | 47 +- Common/DataModel/vtkImageIterator.txx | 24 +- Common/DataModel/vtkImageTransform.cxx | 374 +- Common/DataModel/vtkImageTransform.h | 19 +- Common/DataModel/vtkImplicitBoolean.cxx | 130 +- Common/DataModel/vtkImplicitBoolean.h | 44 +- Common/DataModel/vtkImplicitDataSet.cxx | 65 +- Common/DataModel/vtkImplicitDataSet.h | 24 +- Common/DataModel/vtkImplicitFunction.cxx | 90 +- Common/DataModel/vtkImplicitFunction.h | 38 +- .../DataModel/vtkImplicitFunctionCollection.h | 25 +- Common/DataModel/vtkImplicitHalo.cxx | 36 +- Common/DataModel/vtkImplicitHalo.h | 18 +- Common/DataModel/vtkImplicitSelectionLoop.cxx | 70 +- Common/DataModel/vtkImplicitSelectionLoop.h | 26 +- Common/DataModel/vtkImplicitSum.cxx | 50 +- Common/DataModel/vtkImplicitSum.h | 16 +- Common/DataModel/vtkImplicitVolume.cxx | 54 +- Common/DataModel/vtkImplicitVolume.h | 22 +- .../DataModel/vtkImplicitWindowFunction.cxx | 50 +- Common/DataModel/vtkImplicitWindowFunction.h | 20 +- Common/DataModel/vtkInEdgeIterator.cxx | 6 +- Common/DataModel/vtkInEdgeIterator.h | 25 +- Common/DataModel/vtkIncrementalOctreeNode.cxx | 540 +- Common/DataModel/vtkIncrementalOctreeNode.h | 198 +- .../vtkIncrementalOctreePointLocator.cxx | 1064 ++-- .../vtkIncrementalOctreePointLocator.h | 150 +- .../DataModel/vtkIncrementalPointLocator.cxx | 6 +- Common/DataModel/vtkIncrementalPointLocator.h | 28 +- ...ionQuadratureSchemeDefinitionVectorKey.cxx | 246 +- ...ationQuadratureSchemeDefinitionVectorKey.h | 43 +- Common/DataModel/vtkIntersectionCounter.h | 32 +- .../vtkIterativeClosestPointTransform.cxx | 83 +- .../vtkIterativeClosestPointTransform.h | 39 +- Common/DataModel/vtkKdNode.cxx | 397 +- Common/DataModel/vtkKdNode.h | 81 +- Common/DataModel/vtkKdTree.cxx | 1838 +++--- Common/DataModel/vtkKdTree.h | 305 +- Common/DataModel/vtkKdTreePointLocator.cxx | 19 +- Common/DataModel/vtkKdTreePointLocator.h | 17 +- Common/DataModel/vtkLagrangeCurve.cxx | 320 +- Common/DataModel/vtkLagrangeCurve.h | 42 +- Common/DataModel/vtkLagrangeHexahedron.cxx | 489 +- Common/DataModel/vtkLagrangeHexahedron.h | 43 +- Common/DataModel/vtkLagrangeInterpolation.cxx | 778 ++- Common/DataModel/vtkLagrangeInterpolation.h | 52 +- Common/DataModel/vtkLagrangeQuadrilateral.cxx | 381 +- Common/DataModel/vtkLagrangeQuadrilateral.h | 41 +- Common/DataModel/vtkLagrangeTetra.cxx | 1145 ++-- Common/DataModel/vtkLagrangeTetra.h | 67 +- Common/DataModel/vtkLagrangeTriangle.cxx | 858 ++- Common/DataModel/vtkLagrangeTriangle.h | 62 +- Common/DataModel/vtkLagrangeWedge.cxx | 707 ++- Common/DataModel/vtkLagrangeWedge.h | 49 +- Common/DataModel/vtkLine.cxx | 438 +- Common/DataModel/vtkLine.h | 92 +- Common/DataModel/vtkLocator.cxx | 18 +- Common/DataModel/vtkLocator.h | 34 +- Common/DataModel/vtkMappedUnstructuredGrid.h | 176 +- .../DataModel/vtkMappedUnstructuredGrid.txx | 86 +- .../vtkMappedUnstructuredGridCellIterator.h | 16 +- .../vtkMappedUnstructuredGridCellIterator.txx | 45 +- .../vtkMarchingCubesTriangleCases.cxx | 512 +- .../DataModel/vtkMarchingSquaresLineCases.cxx | 32 +- .../vtkMeanValueCoordinatesInterpolator.cxx | 322 +- .../vtkMeanValueCoordinatesInterpolator.h | 22 +- Common/DataModel/vtkMergePoints.cxx | 56 +- Common/DataModel/vtkMergePoints.h | 14 +- Common/DataModel/vtkMolecule.cxx | 156 +- Common/DataModel/vtkMolecule.h | 103 +- Common/DataModel/vtkMultiBlockDataSet.cxx | 14 +- Common/DataModel/vtkMultiBlockDataSet.h | 24 +- Common/DataModel/vtkMultiPieceDataSet.cxx | 7 +- Common/DataModel/vtkMultiPieceDataSet.h | 29 +- Common/DataModel/vtkMutableDirectedGraph.cxx | 65 +- Common/DataModel/vtkMutableDirectedGraph.h | 47 +- .../DataModel/vtkMutableUndirectedGraph.cxx | 63 +- Common/DataModel/vtkMutableUndirectedGraph.h | 41 +- Common/DataModel/vtkNonLinearCell.cxx | 4 +- Common/DataModel/vtkNonLinearCell.h | 8 +- .../DataModel/vtkNonMergingPointLocator.cxx | 11 +- Common/DataModel/vtkNonMergingPointLocator.h | 26 +- Common/DataModel/vtkNonOverlappingAMR.cxx | 4 +- Common/DataModel/vtkNonOverlappingAMR.h | 22 +- Common/DataModel/vtkOctreePointLocator.cxx | 667 +-- Common/DataModel/vtkOctreePointLocator.h | 58 +- .../DataModel/vtkOctreePointLocatorNode.cxx | 266 +- Common/DataModel/vtkOctreePointLocatorNode.h | 50 +- Common/DataModel/vtkOrderedTriangulator.cxx | 1003 ++-- Common/DataModel/vtkOrderedTriangulator.h | 130 +- Common/DataModel/vtkOutEdgeIterator.cxx | 6 +- Common/DataModel/vtkOutEdgeIterator.h | 25 +- Common/DataModel/vtkOverlappingAMR.cxx | 108 +- Common/DataModel/vtkOverlappingAMR.h | 42 +- Common/DataModel/vtkPartitionedDataSet.cxx | 15 +- Common/DataModel/vtkPartitionedDataSet.h | 19 +- .../vtkPartitionedDataSetCollection.cxx | 25 +- .../vtkPartitionedDataSetCollection.h | 21 +- Common/DataModel/vtkPath.cxx | 18 +- Common/DataModel/vtkPath.h | 26 +- Common/DataModel/vtkPentagonalPrism.cxx | 517 +- Common/DataModel/vtkPentagonalPrism.h | 58 +- Common/DataModel/vtkPeriodicDataArray.h | 79 +- Common/DataModel/vtkPeriodicDataArray.txx | 259 +- Common/DataModel/vtkPerlinNoise.cxx | 63 +- Common/DataModel/vtkPerlinNoise.h | 18 +- Common/DataModel/vtkPiecewiseFunction.cxx | 424 +- Common/DataModel/vtkPiecewiseFunction.h | 61 +- Common/DataModel/vtkPixel.cxx | 389 +- Common/DataModel/vtkPixel.h | 64 +- Common/DataModel/vtkPixelExtent.cxx | 101 +- Common/DataModel/vtkPixelExtent.h | 308 +- Common/DataModel/vtkPixelTransfer.cxx | 29 +- Common/DataModel/vtkPixelTransfer.h | 161 +- Common/DataModel/vtkPlane.cxx | 112 +- Common/DataModel/vtkPlane.h | 52 +- Common/DataModel/vtkPlaneCollection.cxx | 5 +- Common/DataModel/vtkPlaneCollection.h | 24 +- Common/DataModel/vtkPlanes.cxx | 148 +- Common/DataModel/vtkPlanes.h | 24 +- Common/DataModel/vtkPlanesIntersection.cxx | 384 +- Common/DataModel/vtkPlanesIntersection.h | 47 +- Common/DataModel/vtkPointData.cxx | 8 +- Common/DataModel/vtkPointData.h | 8 +- Common/DataModel/vtkPointLocator.cxx | 774 ++- Common/DataModel/vtkPointLocator.h | 90 +- Common/DataModel/vtkPointSet.cxx | 107 +- Common/DataModel/vtkPointSet.h | 52 +- Common/DataModel/vtkPointSetCellIterator.cxx | 17 +- Common/DataModel/vtkPointSetCellIterator.h | 14 +- Common/DataModel/vtkPointsProjectedHull.cxx | 403 +- Common/DataModel/vtkPointsProjectedHull.h | 202 +- Common/DataModel/vtkPolyData.cxx | 581 +- Common/DataModel/vtkPolyData.h | 210 +- Common/DataModel/vtkPolyDataCollection.cxx | 2 +- Common/DataModel/vtkPolyDataCollection.h | 23 +- Common/DataModel/vtkPolyDataInternals.h | 105 +- Common/DataModel/vtkPolyLine.cxx | 176 +- Common/DataModel/vtkPolyLine.h | 65 +- Common/DataModel/vtkPolyPlane.cxx | 65 +- Common/DataModel/vtkPolyPlane.h | 20 +- Common/DataModel/vtkPolyVertex.cxx | 117 +- Common/DataModel/vtkPolyVertex.h | 60 +- Common/DataModel/vtkPolygon.cxx | 1166 ++-- Common/DataModel/vtkPolygon.h | 129 +- Common/DataModel/vtkPolyhedron.cxx | 534 +- Common/DataModel/vtkPolyhedron.h | 133 +- Common/DataModel/vtkPyramid.cxx | 564 +- Common/DataModel/vtkPyramid.h | 68 +- Common/DataModel/vtkQuad.cxx | 620 +- Common/DataModel/vtkQuad.h | 69 +- Common/DataModel/vtkQuadraticEdge.cxx | 165 +- Common/DataModel/vtkQuadraticEdge.h | 68 +- Common/DataModel/vtkQuadraticHexahedron.cxx | 774 +-- Common/DataModel/vtkQuadraticHexahedron.h | 87 +- Common/DataModel/vtkQuadraticLinearQuad.cxx | 395 +- Common/DataModel/vtkQuadraticLinearQuad.h | 69 +- Common/DataModel/vtkQuadraticLinearWedge.cxx | 483 +- Common/DataModel/vtkQuadraticLinearWedge.h | 84 +- Common/DataModel/vtkQuadraticPolygon.cxx | 209 +- Common/DataModel/vtkQuadraticPolygon.h | 102 +- Common/DataModel/vtkQuadraticPyramid.cxx | 645 +- Common/DataModel/vtkQuadraticPyramid.h | 94 +- Common/DataModel/vtkQuadraticQuad.cxx | 467 +- Common/DataModel/vtkQuadraticQuad.h | 81 +- Common/DataModel/vtkQuadraticTetra.cxx | 399 +- Common/DataModel/vtkQuadraticTetra.h | 77 +- Common/DataModel/vtkQuadraticTriangle.cxx | 322 +- Common/DataModel/vtkQuadraticTriangle.h | 72 +- Common/DataModel/vtkQuadraticWedge.cxx | 584 +- Common/DataModel/vtkQuadraticWedge.h | 90 +- .../vtkQuadratureSchemeDefinition.cxx | 280 +- .../DataModel/vtkQuadratureSchemeDefinition.h | 53 +- Common/DataModel/vtkQuadric.cxx | 55 +- Common/DataModel/vtkQuadric.h | 14 +- Common/DataModel/vtkRect.h | 63 +- Common/DataModel/vtkRectilinearGrid.cxx | 542 +- Common/DataModel/vtkRectilinearGrid.h | 98 +- Common/DataModel/vtkReebGraph.cxx | 2070 ++++--- Common/DataModel/vtkReebGraph.h | 45 +- .../vtkReebGraphSimplificationMetric.cxx | 6 +- .../vtkReebGraphSimplificationMetric.h | 12 +- Common/DataModel/vtkSelection.cxx | 32 +- Common/DataModel/vtkSelection.h | 10 +- Common/DataModel/vtkSelectionNode.cxx | 229 +- Common/DataModel/vtkSelectionNode.h | 29 +- Common/DataModel/vtkSimpleCellTessellator.cxx | 2188 +++---- Common/DataModel/vtkSimpleCellTessellator.h | 109 +- Common/DataModel/vtkSmoothErrorMetric.cxx | 94 +- Common/DataModel/vtkSmoothErrorMetric.h | 13 +- Common/DataModel/vtkSortFieldData.cxx | 41 +- Common/DataModel/vtkSortFieldData.h | 22 +- Common/DataModel/vtkSphere.cxx | 276 +- Common/DataModel/vtkSphere.h | 36 +- Common/DataModel/vtkSpheres.cxx | 76 +- Common/DataModel/vtkSpheres.h | 20 +- Common/DataModel/vtkSpline.cxx | 89 +- Common/DataModel/vtkSpline.h | 54 +- Common/DataModel/vtkStaticCellLinks.cxx | 2 +- Common/DataModel/vtkStaticCellLinks.h | 30 +- Common/DataModel/vtkStaticCellLinksTemplate.h | 47 +- .../DataModel/vtkStaticCellLinksTemplate.txx | 298 +- Common/DataModel/vtkStaticCellLocator.cxx | 916 ++- Common/DataModel/vtkStaticCellLocator.h | 75 +- .../DataModel/vtkStaticEdgeLocatorTemplate.h | 146 +- .../vtkStaticEdgeLocatorTemplate.txx | 32 +- Common/DataModel/vtkStaticPointLocator.cxx | 1041 ++-- Common/DataModel/vtkStaticPointLocator.h | 67 +- Common/DataModel/vtkStaticPointLocator2D.cxx | 1098 ++-- Common/DataModel/vtkStaticPointLocator2D.h | 74 +- Common/DataModel/vtkStructuredData.cxx | 242 +- Common/DataModel/vtkStructuredData.h | 131 +- Common/DataModel/vtkStructuredExtent.h | 40 +- Common/DataModel/vtkStructuredGrid.cxx | 854 ++- Common/DataModel/vtkStructuredGrid.h | 83 +- Common/DataModel/vtkStructuredPoints.h | 12 +- .../vtkStructuredPointsCollection.cxx | 2 +- .../DataModel/vtkStructuredPointsCollection.h | 30 +- Common/DataModel/vtkSuperquadric.cxx | 37 +- Common/DataModel/vtkSuperquadric.h | 37 +- Common/DataModel/vtkTable.cxx | 92 +- Common/DataModel/vtkTable.h | 19 +- Common/DataModel/vtkTetra.cxx | 618 +- Common/DataModel/vtkTetra.h | 89 +- Common/DataModel/vtkTree.cxx | 23 +- Common/DataModel/vtkTree.h | 20 +- Common/DataModel/vtkTreeBFSIterator.cxx | 6 +- Common/DataModel/vtkTreeBFSIterator.h | 6 +- Common/DataModel/vtkTreeDFSIterator.cxx | 26 +- Common/DataModel/vtkTreeDFSIterator.h | 8 +- Common/DataModel/vtkTreeIterator.cxx | 10 +- Common/DataModel/vtkTreeIterator.h | 6 +- .../DataModel/vtkTriQuadraticHexahedron.cxx | 483 +- Common/DataModel/vtkTriQuadraticHexahedron.h | 75 +- Common/DataModel/vtkTriangle.cxx | 721 ++- Common/DataModel/vtkTriangle.h | 142 +- Common/DataModel/vtkTriangleStrip.cxx | 210 +- Common/DataModel/vtkTriangleStrip.h | 64 +- Common/DataModel/vtkUndirectedGraph.cxx | 17 +- Common/DataModel/vtkUndirectedGraph.h | 22 +- Common/DataModel/vtkUniformGrid.cxx | 401 +- Common/DataModel/vtkUniformGrid.h | 76 +- Common/DataModel/vtkUniformGridAMR.cxx | 115 +- Common/DataModel/vtkUniformGridAMR.h | 30 +- .../vtkUniformGridAMRDataIterator.cxx | 83 +- .../DataModel/vtkUniformGridAMRDataIterator.h | 9 +- Common/DataModel/vtkUniformHyperTreeGrid.cxx | 11 +- Common/DataModel/vtkUniformHyperTreeGrid.h | 2 +- Common/DataModel/vtkUnstructuredGrid.cxx | 701 +-- Common/DataModel/vtkUnstructuredGrid.h | 197 +- Common/DataModel/vtkUnstructuredGridBase.cxx | 29 +- Common/DataModel/vtkUnstructuredGridBase.h | 25 +- .../vtkUnstructuredGridCellIterator.cxx | 26 +- .../vtkUnstructuredGridCellIterator.h | 15 +- Common/DataModel/vtkVector.h | 146 +- Common/DataModel/vtkVectorOperators.h | 137 +- Common/DataModel/vtkVertex.cxx | 120 +- Common/DataModel/vtkVertex.h | 62 +- Common/DataModel/vtkVertexListIterator.cxx | 10 +- Common/DataModel/vtkVertexListIterator.h | 17 +- Common/DataModel/vtkVoxel.cxx | 380 +- Common/DataModel/vtkVoxel.h | 64 +- Common/DataModel/vtkWedge.cxx | 614 +- Common/DataModel/vtkWedge.h | 68 +- Common/DataModel/vtkXMLDataElement.cxx | 399 +- Common/DataModel/vtkXMLDataElement.h | 65 +- .../Testing/Cxx/TestCopyAttributeData.cxx | 67 +- .../Cxx/TestImageDataToStructuredGrid.cxx | 162 +- .../Testing/Cxx/TestMetaData.cxx | 21 +- .../Cxx/TestMultiOutputSimpleFilter.cxx | 11 +- .../Testing/Cxx/TestTemporalSupport.cxx | 215 +- .../TestThreadedImageAlgorithmSplitExtent.cxx | 69 +- .../Testing/Cxx/UnitTestSimpleScalarTree.cxx | 34 +- Common/ExecutionModel/vtkAlgorithm.cxx | 558 +- Common/ExecutionModel/vtkAlgorithm.h | 217 +- Common/ExecutionModel/vtkAlgorithmOutput.cxx | 2 +- Common/ExecutionModel/vtkAlgorithmOutput.h | 6 +- .../vtkAnnotationLayersAlgorithm.cxx | 34 +- .../vtkAnnotationLayersAlgorithm.h | 27 +- .../ExecutionModel/vtkArrayDataAlgorithm.cxx | 40 +- Common/ExecutionModel/vtkArrayDataAlgorithm.h | 27 +- ...vtkCachedStreamingDemandDrivenPipeline.cxx | 88 +- .../vtkCachedStreamingDemandDrivenPipeline.h | 23 +- Common/ExecutionModel/vtkCastToConcrete.cxx | 34 +- Common/ExecutionModel/vtkCastToConcrete.h | 12 +- .../vtkCompositeDataPipeline.cxx | 328 +- .../ExecutionModel/vtkCompositeDataPipeline.h | 83 +- .../vtkCompositeDataSetAlgorithm.cxx | 18 +- .../vtkCompositeDataSetAlgorithm.h | 42 +- .../ExecutionModel/vtkDataObjectAlgorithm.cxx | 25 +- .../ExecutionModel/vtkDataObjectAlgorithm.h | 34 +- Common/ExecutionModel/vtkDataSetAlgorithm.cxx | 48 +- Common/ExecutionModel/vtkDataSetAlgorithm.h | 56 +- .../vtkDemandDrivenPipeline.cxx | 483 +- .../ExecutionModel/vtkDemandDrivenPipeline.h | 88 +- .../vtkDirectedGraphAlgorithm.cxx | 40 +- .../vtkDirectedGraphAlgorithm.h | 27 +- Common/ExecutionModel/vtkEnsembleSource.cxx | 25 +- Common/ExecutionModel/vtkEnsembleSource.h | 11 +- Common/ExecutionModel/vtkExecutive.cxx | 263 +- Common/ExecutionModel/vtkExecutive.h | 48 +- .../vtkExplicitStructuredGridAlgorithm.cxx | 22 +- .../vtkExplicitStructuredGridAlgorithm.h | 9 +- .../vtkExtentRCBPartitioner.cxx | 287 +- .../ExecutionModel/vtkExtentRCBPartitioner.h | 387 +- Common/ExecutionModel/vtkExtentSplitter.cxx | 149 +- Common/ExecutionModel/vtkExtentSplitter.h | 9 +- Common/ExecutionModel/vtkExtentTranslator.cxx | 95 +- Common/ExecutionModel/vtkExtentTranslator.h | 51 +- .../vtkFilteringInformationKeyManager.cxx | 18 +- .../vtkFilteringInformationKeyManager.h | 5 +- Common/ExecutionModel/vtkGraphAlgorithm.cxx | 55 +- Common/ExecutionModel/vtkGraphAlgorithm.h | 33 +- .../vtkHierarchicalBoxDataSetAlgorithm.cxx | 17 +- .../vtkHierarchicalBoxDataSetAlgorithm.h | 39 +- .../vtkHyperTreeGridAlgorithm.cxx | 169 +- .../vtkHyperTreeGridAlgorithm.h | 51 +- Common/ExecutionModel/vtkImageAlgorithm.cxx | 197 +- Common/ExecutionModel/vtkImageAlgorithm.h | 61 +- .../ExecutionModel/vtkImageInPlaceFilter.cxx | 42 +- Common/ExecutionModel/vtkImageInPlaceFilter.h | 18 +- .../vtkImageProgressIterator.cxx | 4 +- .../ExecutionModel/vtkImageProgressIterator.h | 20 +- .../vtkImageProgressIterator.txx | 15 +- .../vtkImageToStructuredGrid.cxx | 120 +- .../ExecutionModel/vtkImageToStructuredGrid.h | 62 +- .../vtkImageToStructuredPoints.cxx | 142 +- .../vtkImageToStructuredPoints.h | 19 +- .../vtkInformationDataObjectMetaDataKey.cxx | 9 +- .../vtkInformationDataObjectMetaDataKey.h | 12 +- .../vtkInformationExecutivePortKey.cxx | 59 +- .../vtkInformationExecutivePortKey.h | 6 +- .../vtkInformationExecutivePortVectorKey.cxx | 149 +- .../vtkInformationExecutivePortVectorKey.h | 5 +- .../vtkInformationIntegerRequestKey.cxx | 21 +- .../vtkInformationIntegerRequestKey.h | 21 +- .../ExecutionModel/vtkMoleculeAlgorithm.cxx | 39 +- Common/ExecutionModel/vtkMoleculeAlgorithm.h | 33 +- .../vtkMultiBlockDataSetAlgorithm.cxx | 18 +- .../vtkMultiBlockDataSetAlgorithm.h | 42 +- .../vtkMultiTimeStepAlgorithm.cxx | 57 +- .../vtkMultiTimeStepAlgorithm.h | 40 +- .../vtkNonOverlappingAMRAlgorithm.cxx | 17 +- .../vtkNonOverlappingAMRAlgorithm.h | 54 +- .../vtkOverlappingAMRAlgorithm.cxx | 18 +- .../vtkOverlappingAMRAlgorithm.h | 53 +- Common/ExecutionModel/vtkParallelReader.cxx | 43 +- Common/ExecutionModel/vtkParallelReader.h | 113 +- .../vtkPassInputTypeAlgorithm.cxx | 68 +- .../vtkPassInputTypeAlgorithm.h | 78 +- .../vtkPiecewiseFunctionAlgorithm.cxx | 13 +- .../vtkPiecewiseFunctionAlgorithm.h | 22 +- .../vtkPiecewiseFunctionShiftScale.cxx | 26 +- .../vtkPiecewiseFunctionShiftScale.h | 10 +- .../ExecutionModel/vtkPointSetAlgorithm.cxx | 42 +- Common/ExecutionModel/vtkPointSetAlgorithm.h | 47 +- .../ExecutionModel/vtkPolyDataAlgorithm.cxx | 40 +- Common/ExecutionModel/vtkPolyDataAlgorithm.h | 33 +- Common/ExecutionModel/vtkProgressObserver.cxx | 4 +- Common/ExecutionModel/vtkProgressObserver.h | 6 +- Common/ExecutionModel/vtkReaderAlgorithm.h | 22 +- Common/ExecutionModel/vtkReaderExecutive.cxx | 53 +- Common/ExecutionModel/vtkReaderExecutive.h | 12 +- .../vtkRectilinearGridAlgorithm.cxx | 24 +- .../vtkRectilinearGridAlgorithm.h | 35 +- .../ExecutionModel/vtkSMPProgressObserver.cxx | 2 +- .../ExecutionModel/vtkSMPProgressObserver.h | 11 +- Common/ExecutionModel/vtkScalarTree.cxx | 13 +- Common/ExecutionModel/vtkScalarTree.h | 26 +- .../ExecutionModel/vtkSelectionAlgorithm.cxx | 40 +- Common/ExecutionModel/vtkSelectionAlgorithm.h | 27 +- .../vtkSimpleImageToImageFilter.cxx | 36 +- .../vtkSimpleImageToImageFilter.h | 19 +- Common/ExecutionModel/vtkSimpleReader.cxx | 67 +- Common/ExecutionModel/vtkSimpleReader.h | 120 +- Common/ExecutionModel/vtkSimpleScalarTree.cxx | 200 +- Common/ExecutionModel/vtkSimpleScalarTree.h | 48 +- Common/ExecutionModel/vtkSpanSpace.cxx | 384 +- Common/ExecutionModel/vtkSpanSpace.h | 51 +- Common/ExecutionModel/vtkSphereTree.cxx | 1897 +++--- Common/ExecutionModel/vtkSphereTree.h | 68 +- .../vtkStreamingDemandDrivenPipeline.cxx | 590 +- .../vtkStreamingDemandDrivenPipeline.h | 76 +- .../vtkStructuredGridAlgorithm.cxx | 28 +- .../vtkStructuredGridAlgorithm.h | 35 +- Common/ExecutionModel/vtkTableAlgorithm.cxx | 40 +- Common/ExecutionModel/vtkTableAlgorithm.h | 27 +- .../vtkThreadedCompositeDataPipeline.cxx | 140 +- .../vtkThreadedCompositeDataPipeline.h | 30 +- .../vtkThreadedImageAlgorithm.cxx | 264 +- .../vtkThreadedImageAlgorithm.h | 49 +- Common/ExecutionModel/vtkTreeAlgorithm.cxx | 39 +- Common/ExecutionModel/vtkTreeAlgorithm.h | 27 +- Common/ExecutionModel/vtkTrivialConsumer.h | 7 +- Common/ExecutionModel/vtkTrivialProducer.cxx | 112 +- Common/ExecutionModel/vtkTrivialProducer.h | 15 +- .../vtkUndirectedGraphAlgorithm.cxx | 34 +- .../vtkUndirectedGraphAlgorithm.h | 27 +- .../vtkUniformGridAMRAlgorithm.cxx | 46 +- .../vtkUniformGridAMRAlgorithm.h | 169 +- .../vtkUniformGridPartitioner.cxx | 93 +- .../vtkUniformGridPartitioner.h | 93 +- .../vtkUnstructuredGridAlgorithm.cxx | 34 +- .../vtkUnstructuredGridAlgorithm.h | 35 +- .../vtkUnstructuredGridBaseAlgorithm.cxx | 61 +- .../vtkUnstructuredGridBaseAlgorithm.h | 35 +- .../Math/Testing/Cxx/TestAmoebaMinimizer.cxx | 29 +- Common/Math/Testing/Cxx/TestMatrix3x3.cxx | 44 +- .../Cxx/TestPolynomialSolversUnivariate.cxx | 788 +-- Common/Math/Testing/Cxx/TestQuaternion.cxx | 244 +- Common/Math/vtkAmoebaMinimizer.cxx | 217 +- Common/Math/vtkAmoebaMinimizer.h | 66 +- Common/Math/vtkFunctionSet.cxx | 9 +- Common/Math/vtkFunctionSet.h | 20 +- Common/Math/vtkInitialValueProblemSolver.cxx | 24 +- Common/Math/vtkInitialValueProblemSolver.h | 86 +- Common/Math/vtkMatrix3x3.cxx | 81 +- Common/Math/vtkMatrix3x3.h | 99 +- Common/Math/vtkMatrix4x4.cxx | 142 +- Common/Math/vtkMatrix4x4.h | 137 +- .../Math/vtkPolynomialSolversUnivariate.cxx | 1107 ++-- Common/Math/vtkPolynomialSolversUnivariate.h | 49 +- Common/Math/vtkQuaternion.h | 262 +- Common/Math/vtkQuaternion.txx | 304 +- Common/Math/vtkQuaternionInterpolator.cxx | 100 +- Common/Math/vtkQuaternionInterpolator.h | 22 +- Common/Math/vtkRungeKutta2.cxx | 35 +- Common/Math/vtkRungeKutta2.h | 54 +- Common/Math/vtkRungeKutta4.cxx | 76 +- Common/Math/vtkRungeKutta4.h | 54 +- Common/Math/vtkRungeKutta45.cxx | 153 +- Common/Math/vtkRungeKutta45.h | 58 +- Common/Math/vtkTuple.h | 20 +- .../Misc/Testing/Cxx/TestPolygonBuilder.cxx | 25 +- .../Misc/Testing/Cxx/TestPolygonBuilder2.cxx | 40 +- .../Misc/Testing/Cxx/TestPolygonBuilder3.cxx | 3 +- .../Misc/Testing/Cxx/TestPolygonBuilder4.cxx | 28 +- .../Misc/Testing/Cxx/TestPolygonBuilder5.cxx | 15 +- .../Testing/Cxx/TestResourceFileLocator.cxx | 2 +- .../Testing/Cxx/UnitTestFunctionParser.cxx | 413 +- Common/Misc/vtkContourValues.cxx | 60 +- Common/Misc/vtkContourValues.h | 13 +- Common/Misc/vtkErrorCode.cxx | 30 +- Common/Misc/vtkErrorCode.h | 10 +- Common/Misc/vtkFunctionParser.cxx | 897 ++- Common/Misc/vtkFunctionParser.h | 94 +- Common/Misc/vtkHeap.cxx | 62 +- Common/Misc/vtkHeap.h | 20 +- Common/Misc/vtkPolygonBuilder.cxx | 40 +- Common/Misc/vtkPolygonBuilder.h | 16 +- Common/Misc/vtkResourceFileLocator.cxx | 12 +- Common/Misc/vtkResourceFileLocator.h | 1 - Common/System/Testing/Cxx/TestDirectory.cxx | 11 +- Common/System/Testing/Cxx/otherTimerLog.cxx | 22 +- Common/System/vtkClientSocket.h | 6 +- Common/System/vtkDirectory.cxx | 65 +- Common/System/vtkDirectory.h | 12 +- Common/System/vtkServerSocket.cxx | 2 +- Common/System/vtkServerSocket.h | 6 +- Common/System/vtkSocket.cxx | 204 +- Common/System/vtkSocket.h | 12 +- Common/System/vtkSocketCollection.cxx | 18 +- Common/System/vtkSocketCollection.h | 13 +- Common/System/vtkTestSocklenT.cxx | 10 +- Common/System/vtkThreadMessager.cxx | 8 +- Common/System/vtkThreadMessager.h | 6 +- Common/System/vtkTimerLog.cxx | 228 +- Common/System/vtkTimerLog.h | 125 +- .../Testing/Cxx/TestLandmarkTransform.cxx | 50 +- .../Cxx/TestThinPlateSplineTransform.cxx | 90 +- .../Transforms/Testing/Cxx/TestTransform.cxx | 39 +- Common/Transforms/vtkAbstractTransform.cxx | 316 +- Common/Transforms/vtkAbstractTransform.h | 207 +- Common/Transforms/vtkCylindricalTransform.cxx | 74 +- Common/Transforms/vtkCylindricalTransform.h | 25 +- Common/Transforms/vtkGeneralTransform.cxx | 89 +- Common/Transforms/vtkGeneralTransform.h | 172 +- Common/Transforms/vtkHomogeneousTransform.cxx | 140 +- Common/Transforms/vtkHomogeneousTransform.h | 48 +- Common/Transforms/vtkIdentityTransform.cxx | 95 +- Common/Transforms/vtkIdentityTransform.h | 41 +- Common/Transforms/vtkLandmarkTransform.cxx | 230 +- Common/Transforms/vtkLandmarkTransform.h | 23 +- Common/Transforms/vtkLinearTransform.cxx | 177 +- Common/Transforms/vtkLinearTransform.h | 155 +- .../vtkMatrixToHomogeneousTransform.cxx | 11 +- .../vtkMatrixToHomogeneousTransform.h | 19 +- .../Transforms/vtkMatrixToLinearTransform.cxx | 9 +- .../Transforms/vtkMatrixToLinearTransform.h | 19 +- Common/Transforms/vtkPerspectiveTransform.cxx | 150 +- Common/Transforms/vtkPerspectiveTransform.h | 206 +- Common/Transforms/vtkSphericalTransform.cxx | 83 +- Common/Transforms/vtkSphericalTransform.h | 25 +- .../vtkThinPlateSplineTransform.cxx | 410 +- .../Transforms/vtkThinPlateSplineTransform.h | 63 +- Common/Transforms/vtkTransform.cxx | 132 +- Common/Transforms/vtkTransform.h | 266 +- Common/Transforms/vtkTransform2D.cxx | 81 +- Common/Transforms/vtkTransform2D.h | 62 +- Common/Transforms/vtkTransformCollection.h | 28 +- Common/Transforms/vtkWarpTransform.cxx | 121 +- Common/Transforms/vtkWarpTransform.h | 96 +- .../Testing/Cxx/GenerateBlueObeliskHeader.cxx | 5 +- .../Testing/Cxx/TestBallAndStick.cxx | 58 +- .../Cxx/TestBondColorModeDiscreteByAtom.cxx | 62 +- .../Cxx/TestBondColorModeSingleColor.cxx | 62 +- .../Testing/Cxx/TestCMLMoleculeReader.cxx | 11 +- .../Testing/Cxx/TestCompositeRender.cxx | 62 +- .../Testing/Cxx/TestCustomArrayRadius.cxx | 58 +- .../Chemistry/Testing/Cxx/TestFastRender.cxx | 62 +- .../Testing/Cxx/TestLiquoriceSticks.cxx | 62 +- .../Chemistry/Testing/Cxx/TestMolecule.cxx | 40 +- .../Testing/Cxx/TestMoleculeIOLegacy.cxx | 64 +- .../Cxx/TestMoleculeMapperPropertyUpdate.cxx | 58 +- .../Testing/Cxx/TestMoleculeSelection.cxx | 144 +- .../Testing/Cxx/TestMoleculeToLines.cxx | 6 +- .../Testing/Cxx/TestMultiCylinderOff.cxx | 62 +- .../Testing/Cxx/TestMultiCylinderOn.cxx | 62 +- .../Cxx/TestOpenQubeElectronicData.cxx | 45 +- .../Testing/Cxx/TestOpenQubeMOPACDensity.cxx | 31 +- .../Testing/Cxx/TestOpenQubeMOPACOrbital.cxx | 26 +- .../Testing/Cxx/TestPDBBallAndStick.cxx | 41 +- .../Testing/Cxx/TestPeriodicTable.cxx | 66 +- .../Cxx/TestPointSetToMoleculeFilter.cxx | 4 +- .../Cxx/TestProgrammableElectronicData.cxx | 16 +- .../Testing/Cxx/TestProteinRibbon.cxx | 9 +- .../Testing/Cxx/TestSimpleBondPerceiver.cxx | 33 +- .../Testing/Cxx/TestVASPAnimationReader.cxx | 8 +- .../Cxx/TestVASPTessellationReader.cxx | 8 +- .../Chemistry/Testing/Cxx/TestVDWSpheres.cxx | 62 +- Domains/Chemistry/vtkBlueObeliskData.cxx | 140 +- Domains/Chemistry/vtkBlueObeliskData.h | 46 +- .../Chemistry/vtkBlueObeliskDataParser.cxx | 196 +- Domains/Chemistry/vtkBlueObeliskDataParser.h | 65 +- Domains/Chemistry/vtkCMLMoleculeReader.cxx | 81 +- Domains/Chemistry/vtkCMLMoleculeReader.h | 15 +- Domains/Chemistry/vtkGaussianCubeReader2.cxx | 127 +- Domains/Chemistry/vtkGaussianCubeReader2.h | 21 +- Domains/Chemistry/vtkMoleculeMapper.cxx | 8 +- Domains/Chemistry/vtkMoleculeMapper.h | 33 +- .../Chemistry/vtkMoleculeToAtomBallFilter.cxx | 50 +- .../Chemistry/vtkMoleculeToAtomBallFilter.h | 17 +- .../vtkMoleculeToBondStickFilter.cxx | 68 +- .../Chemistry/vtkMoleculeToBondStickFilter.h | 14 +- .../Chemistry/vtkMoleculeToLinesFilter.cxx | 5 +- .../Chemistry/vtkMoleculeToPolyDataFilter.cxx | 10 +- .../Chemistry/vtkMoleculeToPolyDataFilter.h | 9 +- .../Chemistry/vtkOpenQubeElectronicData.cxx | 179 +- Domains/Chemistry/vtkOpenQubeElectronicData.h | 31 +- .../Chemistry/vtkOpenQubeMoleculeSource.cxx | 45 +- Domains/Chemistry/vtkOpenQubeMoleculeSource.h | 26 +- Domains/Chemistry/vtkPeriodicTable.cxx | 52 +- Domains/Chemistry/vtkPeriodicTable.h | 14 +- .../Chemistry/vtkPointSetToMoleculeFilter.cxx | 9 +- .../Chemistry/vtkPointSetToMoleculeFilter.h | 1 + .../vtkProgrammableElectronicData.cxx | 51 +- .../Chemistry/vtkProgrammableElectronicData.h | 31 +- Domains/Chemistry/vtkProteinRibbonFilter.cxx | 172 +- Domains/Chemistry/vtkProteinRibbonFilter.h | 33 +- Domains/Chemistry/vtkSimpleBondPerceiver.cxx | 8 +- Domains/Chemistry/vtkSimpleBondPerceiver.h | 14 +- Domains/Chemistry/vtkVASPAnimationReader.cxx | 143 +- Domains/Chemistry/vtkVASPAnimationReader.h | 36 +- .../Chemistry/vtkVASPTessellationReader.cxx | 207 +- Domains/Chemistry/vtkVASPTessellationReader.h | 41 +- Domains/Chemistry/vtkXYZMolReader2.cxx | 91 +- Domains/Chemistry/vtkXYZMolReader2.h | 22 +- .../Cxx/TestPDBBallAndStickShadows.cxx | 55 +- .../Cxx/TestPDBBallAndStickShadowsDOFSSAA.cxx | 64 +- .../Cxx/TestPDBBallAndStickTranslucent.cxx | 25 +- .../vtkOpenGLMoleculeMapper.cxx | 23 +- .../vtkOpenGLMoleculeMapper.h | 14 +- .../Testing/Cxx/TestOpenSlideReader.cxx | 12 +- .../Cxx/TestOpenSlideReaderPartial.cxx | 8 +- Domains/Microscopy/vtkOpenSlideReader.cxx | 74 +- Domains/Microscopy/vtkOpenSlideReader.h | 22 +- .../vtkPSimpleBondPerceiver.cxx | 3 +- Examples/AMR/Cxx/AMRCommon.h | 85 +- .../AMR/Cxx/Generate2DAMRDataSetWithPulse.cxx | 139 +- .../AMR/Cxx/Generate3DAMRDataSetWithPulse.cxx | 148 +- Examples/AMR/Cxx/HierarchicalBoxPipeline.cxx | 26 +- Examples/Android/JavaVTK/jni/main.cxx | 102 +- Examples/Android/NativeVTK/jni/main.cxx | 151 +- Examples/Android/VolumeRender/jni/main.cxx | 94 +- .../Cxx/LabeledMesh/LabeledMesh.cxx | 142 +- Examples/Array/Cxx/AdjacencyMatrix.cxx | 12 +- Examples/Array/Cxx/ArrayBasics.cxx | 2 +- Examples/Array/Cxx/ArrayIteration.cxx | 6 +- Examples/Array/Cxx/IdentityMatrix.cxx | 7 +- Examples/Build/vtkLocal/vtkLocalExample.cxx | 2 +- Examples/Build/vtkLocal/vtkLocalExample.h | 2 +- Examples/Build/vtkMy/Common/vtkBar.h | 7 +- .../vtkMy/Common/vtkmyCommonWin32Header.h | 6 +- .../Build/vtkMy/Examples/Cxx/Ex1/vtkmyEx1.cxx | 6 +- .../Build/vtkMy/Examples/Cxx/Ex2/vtkmyEx2.cxx | 10 +- Examples/Build/vtkMy/Imaging/vtkImageFoo.cxx | 52 +- Examples/Build/vtkMy/Imaging/vtkImageFoo.h | 57 +- .../vtkMy/Imaging/vtkmyImagingWin32Header.h | 6 +- Examples/Build/vtkMy/Unsorted/vtkBar2.h | 7 +- .../vtkMy/Unsorted/vtkmyUnsortedWin32Header.h | 6 +- Examples/Charts/Cxx/GraphItem.cxx | 6 +- Examples/Charts/Cxx/PiecewiseItem.cxx | 21 +- Examples/Charts/Cxx/QChartTable.cxx | 36 +- Examples/Charts/Cxx/QScalarsToColors.cxx | 18 +- Examples/Charts/Cxx/vtkGraphItem.cxx | 65 +- Examples/Charts/Cxx/vtkGraphItem.h | 27 +- Examples/DataManipulation/Cxx/Arrays.cxx | 7 +- Examples/DataManipulation/Cxx/Cube.cxx | 18 +- Examples/DataManipulation/Cxx/RGrid.cxx | 34 +- Examples/DataManipulation/Cxx/SGrid.cxx | 2 +- Examples/GUI/Cocoa/BasicVTKView.h | 2 +- Examples/GUI/Cocoa/CustomLayer.mm | 13 +- Examples/GUI/Cocoa/CustomView.h | 6 +- Examples/GUI/Cocoa/CustomView.mm | 15 +- Examples/GUI/Cocoa/MyDocument.mm | 7 +- Examples/GUI/Cocoa/MyWindowController.mm | 49 +- Examples/GUI/Cocoa/main.mm | 2 +- Examples/GUI/Qt/Events/GUI4.cxx | 91 +- Examples/GUI/Qt/Events/GUI4.h | 9 +- .../Qt/FourPaneViewer/QtVTKRenderWindows.cxx | 149 +- .../Qt/FourPaneViewer/QtVTKRenderWindows.h | 16 +- .../FourPaneViewer/QtVTKRenderWindowsApp.cxx | 4 +- .../Qt/GraphicsView/GraphLayoutViewItem.cpp | 5 +- .../GUI/Qt/GraphicsView/GraphLayoutViewItem.h | 2 +- Examples/GUI/Qt/GraphicsView/OpenGLScene.cpp | 55 +- Examples/GUI/Qt/GraphicsView/QBoolAnimation.h | 29 +- .../GUI/Qt/GraphicsView/TreeRingViewItem.cpp | 21 +- .../GUI/Qt/GraphicsView/TreeRingViewItem.h | 2 +- Examples/GUI/Qt/GraphicsView/WebView.cpp | 6 +- Examples/GUI/Qt/GraphicsView/WebView.h | 24 +- Examples/GUI/Qt/GraphicsView/main.cpp | 2 +- Examples/GUI/Qt/ImageViewer/main.cxx | 4 +- Examples/GUI/Qt/SimpleView/SimpleView.cxx | 17 +- Examples/GUI/Qt/SimpleView/SimpleView.h | 10 +- Examples/GUI/Qt/SimpleView/main.cxx | 4 +- .../QtVTKTouchscreenRenderWindows.cxx | 37 +- .../QtVTKTouchscreenRenderWindows.h | 2 - .../QtVTKTouchscreenRenderWindowsApp.cxx | 4 +- Examples/GUI/Win32/SimpleCxx/Win32Cone.cxx | 103 +- Examples/IO/Cxx/DumpXMLFile.cxx | 75 +- Examples/IO/Cxx/ParticleReader.cxx | 10 +- Examples/IO/Cxx/objtovtp.cxx | 12 +- .../ImageProcessing/Cxx/ImageBenchmark.cxx | 502 +- .../Cxx/ImageBenchmarkDriver.cxx | 110 +- Examples/ImageProcessing/Cxx/ImageSlicing.cxx | 85 +- Examples/Infovis/Cxx/CreateTree.cxx | 1 - .../Cxx/CustomLinkView/CustomLinkView.cxx | 123 +- .../Cxx/CustomLinkView/CustomLinkView.h | 22 +- Examples/Infovis/Cxx/CustomLinkView/main.cxx | 4 +- Examples/Infovis/Cxx/EasyView/EasyView.cxx | 38 +- Examples/Infovis/Cxx/EasyView/EasyView.h | 20 +- Examples/Infovis/Cxx/EasyView/main.cxx | 4 +- Examples/Infovis/Cxx/HelloWorld.cxx | 3 +- Examples/Infovis/Cxx/MultiView.cxx | 11 +- Examples/Infovis/Cxx/ParallelBFS.cxx | 12 +- Examples/Infovis/Cxx/StatsView/StatsView.cxx | 84 +- Examples/Infovis/Cxx/StatsView/StatsView.h | 18 +- Examples/Infovis/Cxx/StatsView/main.cxx | 4 +- Examples/Infovis/Cxx/Theme.cxx | 4 +- Examples/Infovis/Cxx/TreeLayout.cxx | 15 +- .../Medical/Cxx/GenerateCubesFromLabels.cxx | 57 +- .../Medical/Cxx/GenerateModelsFromLabels.cxx | 38 +- Examples/Medical/Cxx/Medical1.cxx | 57 +- Examples/Medical/Cxx/Medical2.cxx | 68 +- Examples/Medical/Cxx/Medical3.cxx | 133 +- Examples/Medical/Cxx/Medical4.cxx | 35 +- Examples/Modelling/Cxx/Delaunay3D.cxx | 29 +- Examples/Modelling/Cxx/Delaunay3DAlpha.cxx | 30 +- Examples/Modelling/Cxx/finance.cxx | 162 +- Examples/MultiBlock/Cxx/MultiBlock.cxx | 21 +- .../Generic/Cxx/ParallelIso.cxx | 63 +- .../Generic/Cxx/PipelineParallelism.cxx | 11 +- .../Generic/Cxx/TaskParallelism.cxx | 27 +- .../Generic/Cxx/TaskParallelism.h | 10 +- .../Generic/Cxx/TaskParallelismWithPorts.cxx | 15 +- .../Generic/Cxx/TaskParallelismWithPorts.h | 3 - .../ParallelProcessing/Generic/Cxx/pipe1.cxx | 39 +- .../ParallelProcessing/Generic/Cxx/pipe2.cxx | 8 +- .../ParallelProcessing/Generic/Cxx/task1.cxx | 29 +- .../ParallelProcessing/Generic/Cxx/task2.cxx | 39 +- .../ParallelProcessing/Generic/Cxx/task3.cxx | 30 +- .../ParallelProcessing/Generic/Cxx/task4.cxx | 35 +- Examples/Rendering/Cxx/AmbientSpheres.cxx | 47 +- Examples/Rendering/Cxx/Cylinder.cxx | 16 +- Examples/Rendering/Cxx/DiffuseSpheres.cxx | 47 +- Examples/Rendering/Cxx/SpecularSpheres.cxx | 83 +- .../ExampleDescriptiveStatistics.cxx | 650 +- .../Statistics/ExampleKMeansStatistics.cxx | 154 +- Examples/Tutorial/Step1/Cxx/Cone.cxx | 32 +- Examples/Tutorial/Step2/Cxx/Cone2.cxx | 53 +- Examples/Tutorial/Step3/Cxx/Cone3.cxx | 40 +- Examples/Tutorial/Step4/Cxx/Cone4.cxx | 38 +- Examples/Tutorial/Step5/Cxx/Cone5.cxx | 35 +- Examples/Tutorial/Step6/Cxx/Cone6.cxx | 54 +- .../Cxx/BandedContours.cxx | 38 +- .../Cxx/FilledContours.cxx | 49 +- .../Cxx/TubesWithVaryingRadiusAndColors.cxx | 59 +- .../Cxx/FixedPointVolumeRayCastMapperCT.cxx | 245 +- .../VolumeRendering/Cxx/GPURenderDemo.cxx | 280 +- Examples/Widgets/Cxx/BalloonWidget.cxx | 29 +- Examples/Widgets/Cxx/Slider.cxx | 34 +- Examples/Widgets/Cxx/Slider2D.cxx | 32 +- Examples/Widgets/Cxx/SplineWidget.cxx | 59 +- Examples/Widgets/Cxx/TestSlider2D.cxx | 1 - Examples/iOS/GLPaint/Classes/AppDelegate.h | 4 +- Examples/iOS/GLPaint/Classes/AppDelegate.mm | 35 +- .../iOS/GLPaint/Classes/MyGLKViewController.h | 22 +- .../GLPaint/Classes/MyGLKViewController.mm | 148 +- .../iOS/PlaneView/PlaneView/AppDelegate.h | 5 +- .../PlaneView/SettingsTableViewController.h | 3 +- .../PlaneView/SettingsTableViewController.mm | 75 +- .../PlaneView/PlaneView/VTKViewController.h | 20 +- .../PlaneView/PlaneView/VTKViewController.mm | 160 +- Examples/iOS/Surfaces/Classes/AppDelegate.h | 4 +- Examples/iOS/Surfaces/Classes/AppDelegate.mm | 35 +- .../Surfaces/Classes/MyGLKViewController.h | 22 +- .../Surfaces/Classes/MyGLKViewController.mm | 190 +- .../VTKViewer/VTKViewer/VTKGestureHandler.h | 8 +- .../VTKViewer/VTKViewer/VTKGestureHandler.mm | 388 +- Examples/iOS/VTKViewer/VTKViewer/VTKLoader.mm | 133 +- Examples/iOS/VTKViewer/VTKViewer/VTKView.h | 8 +- Examples/iOS/VTKViewer/VTKViewer/VTKView.mm | 215 +- .../VTKViewer/VTKViewer/VTKViewController.h | 6 +- .../VTKViewer/VTKViewer/VTKViewController.mm | 289 +- .../iOS/VolumeRender/Classes/AppDelegate.h | 4 +- .../iOS/VolumeRender/Classes/AppDelegate.mm | 35 +- .../Classes/MyGLKViewController.h | 22 +- .../Classes/MyGLKViewController.mm | 276 +- Filters/AMR/Testing/Cxx/TestAMRBlanking.cxx | 202 +- .../Cxx/TestAMRGhostLayerStripping.cxx | 354 +- Filters/AMR/Testing/Cxx/TestAMRIterator.cxx | 28 +- .../Cxx/TestAMRSliceFilterCellData.cxx | 206 +- .../Cxx/TestAMRSliceFilterPointData.cxx | 200 +- Filters/AMR/Testing/Cxx/TestImageToAMR.cxx | 82 +- Filters/AMR/vtkAMRCutPlane.cxx | 434 +- Filters/AMR/vtkAMRCutPlane.h | 69 +- Filters/AMR/vtkAMRGaussianPulseSource.cxx | 294 +- Filters/AMR/vtkAMRGaussianPulseSource.h | 102 +- Filters/AMR/vtkAMRResampleFilter.cxx | 894 ++- Filters/AMR/vtkAMRResampleFilter.h | 160 +- Filters/AMR/vtkAMRSliceFilter.cxx | 79 +- Filters/AMR/vtkAMRSliceFilter.h | 61 +- Filters/AMR/vtkAMRToMultiBlockFilter.cxx | 74 +- Filters/AMR/vtkAMRToMultiBlockFilter.h | 29 +- Filters/AMR/vtkImageToAMR.cxx | 337 +- Filters/AMR/vtkImageToAMR.h | 9 +- Filters/AMR/vtkParallelAMRUtilities.cxx | 91 +- Filters/AMR/vtkParallelAMRUtilities.h | 17 +- .../Core/Testing/Cxx/TestAppendArcLength.cxx | 22 +- .../Core/Testing/Cxx/TestAppendDataSets.cxx | 144 +- Filters/Core/Testing/Cxx/TestAppendFilter.cxx | 141 +- .../Core/Testing/Cxx/TestAppendMolecule.cxx | 42 +- .../Core/Testing/Cxx/TestAppendPolyData.cxx | 105 +- .../Core/Testing/Cxx/TestAppendSelection.cxx | 255 +- .../Core/Testing/Cxx/TestArrayCalculator.cxx | 29 +- .../Core/Testing/Cxx/TestAssignAttribute.cxx | 97 +- .../Testing/Cxx/TestBinCellDataFilter.cxx | 235 +- .../TestCategoricalPointDataToCellData.cxx | 93 +- .../TestCategoricalResampleWithDataSet.cxx | 24 +- .../Testing/Cxx/TestCellDataToPointData.cxx | 55 +- Filters/Core/Testing/Cxx/TestCenterOfMass.cxx | 104 +- .../Core/Testing/Cxx/TestCleanPolyData.cxx | 36 +- .../Core/Testing/Cxx/TestCleanPolyData2.cxx | 484 +- Filters/Core/Testing/Cxx/TestClipPolyData.cxx | 36 +- .../Testing/Cxx/TestConnectivityFilter.cxx | 38 +- Filters/Core/Testing/Cxx/TestCutter.cxx | 42 +- .../Cxx/TestDecimatePolylineFilter.cxx | 57 +- Filters/Core/Testing/Cxx/TestDecimatePro.cxx | 24 +- Filters/Core/Testing/Cxx/TestDelaunay2D.cxx | 104 +- .../Cxx/TestDelaunay2DBestFittingPlane.cxx | 104 +- .../Cxx/TestDelaunay2DFindTriangle.cxx | 40 +- .../Core/Testing/Cxx/TestDelaunay2DMeshes.cxx | 24 +- Filters/Core/Testing/Cxx/TestDelaunay3D.cxx | 37 +- .../Core/Testing/Cxx/TestExecutionTimer.cxx | 54 +- .../Cxx/TestExplicitStructuredGridCrop.cxx | 6 +- ...plicitStructuredGridToUnstructuredGrid.cxx | 11 +- Filters/Core/Testing/Cxx/TestFeatureEdges.cxx | 24 +- Filters/Core/Testing/Cxx/TestFlyingEdges.cxx | 8 +- Filters/Core/Testing/Cxx/TestGlyph3D.cxx | 83 +- Filters/Core/Testing/Cxx/TestHedgeHog.cxx | 41 +- .../TestImageDataToExplicitStructuredGrid.cxx | 6 +- .../Cxx/TestImplicitPolyDataDistance.cxx | 25 +- Filters/Core/Testing/Cxx/TestMaskPoints.cxx | 36 +- .../Core/Testing/Cxx/TestNamedComponents.cxx | 67 +- .../Testing/Cxx/TestPointDataToCellData.cxx | 34 +- .../Cxx/TestPolyDataConnectivityFilter.cxx | 45 +- Filters/Core/Testing/Cxx/TestProbeFilter.cxx | 18 +- .../Testing/Cxx/TestProbeFilterImageInput.cxx | 9 +- .../Cxx/TestProbeFilterOutputAttributes.cxx | 5 +- .../Testing/Cxx/TestRemoveDuplicatePolys.cxx | 15 +- .../Core/Testing/Cxx/TestResampleToImage.cxx | 21 +- .../Testing/Cxx/TestResampleToImage2D.cxx | 5 +- .../Testing/Cxx/TestResampleWithDataSet.cxx | 30 +- .../Testing/Cxx/TestResampleWithDataSet2.cxx | 24 +- .../Testing/Cxx/TestResampleWithDataSet3.cxx | 19 +- .../Testing/Cxx/TestSMPPipelineContour.cxx | 24 +- .../Testing/Cxx/TestSmoothPolyDataFilter.cxx | 37 +- Filters/Core/Testing/Cxx/TestStripper.cxx | 20 +- .../Testing/Cxx/TestStructuredGridAppend.cxx | 194 +- Filters/Core/Testing/Cxx/TestThreshold.cxx | 24 +- .../Core/Testing/Cxx/TestThresholdPoints.cxx | 36 +- .../Core/Testing/Cxx/TestTransposeTable.cxx | 2 +- .../Cxx/TestTriangleMeshPointNormals.cxx | 9 +- Filters/Core/Testing/Cxx/TestTubeFilter.cxx | 56 +- .../TestUnstructuredGridQuadricDecimation.cxx | 48 +- ...structuredGridToExplicitStructuredGrid.cxx | 6 +- .../Core/Testing/Cxx/UnitTestMaskPoints.cxx | 71 +- .../Core/Testing/Cxx/UnitTestMergeFilter.cxx | 101 +- Filters/Core/VoronoiKernel.cxx | 18 +- .../Core/vtk3DLinearGridCrinkleExtractor.cxx | 611 +- .../Core/vtk3DLinearGridCrinkleExtractor.h | 51 +- Filters/Core/vtk3DLinearGridInternal.h | 852 +-- Filters/Core/vtk3DLinearGridPlaneCutter.cxx | 725 ++- Filters/Core/vtk3DLinearGridPlaneCutter.h | 47 +- Filters/Core/vtkAppendArcLength.h | 2 +- Filters/Core/vtkAppendCompositeDataLeaves.cxx | 129 +- Filters/Core/vtkAppendCompositeDataLeaves.h | 43 +- Filters/Core/vtkAppendDataSets.cxx | 62 +- Filters/Core/vtkAppendDataSets.h | 17 +- Filters/Core/vtkAppendFilter.cxx | 102 +- Filters/Core/vtkAppendFilter.h | 35 +- Filters/Core/vtkAppendPolyData.cxx | 184 +- Filters/Core/vtkAppendPolyData.h | 54 +- Filters/Core/vtkAppendSelection.cxx | 66 +- Filters/Core/vtkAppendSelection.h | 38 +- Filters/Core/vtkArrayCalculator.cxx | 488 +- Filters/Core/vtkArrayCalculator.h | 144 +- Filters/Core/vtkAssignAttribute.cxx | 163 +- Filters/Core/vtkAssignAttribute.h | 25 +- .../vtkAttributeDataToFieldDataFilter.cxx | 25 +- .../Core/vtkAttributeDataToFieldDataFilter.h | 16 +- Filters/Core/vtkBinCellDataFilter.cxx | 196 +- Filters/Core/vtkBinCellDataFilter.h | 80 +- Filters/Core/vtkCellDataToPointData.cxx | 316 +- Filters/Core/vtkCellDataToPointData.h | 40 +- Filters/Core/vtkCenterOfMass.cxx | 42 +- Filters/Core/vtkCenterOfMass.h | 19 +- Filters/Core/vtkCleanPolyData.cxx | 376 +- Filters/Core/vtkCleanPolyData.h | 65 +- Filters/Core/vtkClipPolyData.cxx | 197 +- Filters/Core/vtkClipPolyData.h | 53 +- Filters/Core/vtkCompositeCutter.cxx | 113 +- Filters/Core/vtkCompositeCutter.h | 15 +- Filters/Core/vtkCompositeDataProbeFilter.cxx | 42 +- Filters/Core/vtkCompositeDataProbeFilter.h | 11 +- Filters/Core/vtkConnectivityFilter.cxx | 306 +- Filters/Core/vtkConnectivityFilter.h | 117 +- Filters/Core/vtkContour3DLinearGrid.cxx | 1170 ++-- Filters/Core/vtkContour3DLinearGrid.h | 109 +- Filters/Core/vtkContourFilter.cxx | 366 +- Filters/Core/vtkContourFilter.h | 124 +- Filters/Core/vtkContourGrid.cxx | 229 +- Filters/Core/vtkContourGrid.h | 100 +- Filters/Core/vtkContourHelper.cxx | 62 +- Filters/Core/vtkContourHelper.h | 23 +- Filters/Core/vtkCutter.cxx | 386 +- Filters/Core/vtkCutter.h | 120 +- Filters/Core/vtkDataObjectGenerator.cxx | 889 ++- Filters/Core/vtkDataObjectGenerator.h | 104 +- Filters/Core/vtkDataObjectToDataSetFilter.cxx | 771 ++- Filters/Core/vtkDataObjectToDataSetFilter.h | 250 +- .../vtkDataSetEdgeSubdivisionCriterion.cxx | 131 +- .../Core/vtkDataSetEdgeSubdivisionCriterion.h | 281 +- Filters/Core/vtkDataSetToDataObjectFilter.cxx | 131 +- Filters/Core/vtkDataSetToDataObjectFilter.h | 55 +- Filters/Core/vtkDecimatePolylineFilter.cxx | 137 +- Filters/Core/vtkDecimatePolylineFilter.h | 33 +- Filters/Core/vtkDecimatePro.cxx | 849 ++- Filters/Core/vtkDecimatePro.h | 210 +- Filters/Core/vtkDelaunay2D.cxx | 961 +-- Filters/Core/vtkDelaunay2D.h | 74 +- Filters/Core/vtkDelaunay3D.cxx | 644 +- Filters/Core/vtkDelaunay3D.h | 94 +- Filters/Core/vtkEdgeSubdivisionCriterion.cxx | 137 +- Filters/Core/vtkEdgeSubdivisionCriterion.h | 293 +- Filters/Core/vtkElevationFilter.cxx | 154 +- Filters/Core/vtkElevationFilter.h | 18 +- Filters/Core/vtkExecutionTimer.cxx | 26 +- Filters/Core/vtkExecutionTimer.h | 6 +- ...plicitStructuredGridToUnstructuredGrid.cxx | 17 +- ...ExplicitStructuredGridToUnstructuredGrid.h | 9 +- Filters/Core/vtkFeatureEdges.cxx | 214 +- Filters/Core/vtkFeatureEdges.h | 57 +- .../vtkFieldDataToAttributeDataFilter.cxx | 596 +- .../Core/vtkFieldDataToAttributeDataFilter.h | 212 +- Filters/Core/vtkFlyingEdges2D.cxx | 611 +- Filters/Core/vtkFlyingEdges2D.h | 46 +- Filters/Core/vtkFlyingEdges3D.cxx | 1002 ++-- Filters/Core/vtkFlyingEdges3D.h | 65 +- Filters/Core/vtkFlyingEdgesPlaneCutter.cxx | 961 +-- Filters/Core/vtkFlyingEdgesPlaneCutter.h | 30 +- Filters/Core/vtkGlyph2D.cxx | 239 +- Filters/Core/vtkGlyph2D.h | 8 +- Filters/Core/vtkGlyph3D.cxx | 359 +- Filters/Core/vtkGlyph3D.h | 186 +- .../Core/vtkGridSynchronizedTemplates3D.cxx | 519 +- Filters/Core/vtkGridSynchronizedTemplates3D.h | 81 +- Filters/Core/vtkHedgeHog.cxx | 78 +- Filters/Core/vtkHedgeHog.h | 34 +- Filters/Core/vtkHull.cxx | 703 ++- Filters/Core/vtkHull.h | 52 +- Filters/Core/vtkIdFilter.cxx | 68 +- Filters/Core/vtkIdFilter.h | 30 +- Filters/Core/vtkImageAppend.cxx | 314 +- Filters/Core/vtkImageAppend.h | 54 +- .../vtkImageDataToExplicitStructuredGrid.cxx | 10 +- .../vtkImageDataToExplicitStructuredGrid.h | 15 +- Filters/Core/vtkImplicitPolyDataDistance.cxx | 80 +- Filters/Core/vtkImplicitPolyDataDistance.h | 17 +- Filters/Core/vtkMarchingCubes.cxx | 386 +- Filters/Core/vtkMarchingCubes.h | 80 +- Filters/Core/vtkMarchingSquares.cxx | 329 +- Filters/Core/vtkMarchingSquares.h | 68 +- Filters/Core/vtkMaskFields.cxx | 342 +- Filters/Core/vtkMaskFields.h | 51 +- Filters/Core/vtkMaskPoints.cxx | 279 +- Filters/Core/vtkMaskPoints.h | 55 +- Filters/Core/vtkMaskPolyData.cxx | 36 +- Filters/Core/vtkMaskPolyData.h | 20 +- Filters/Core/vtkMassProperties.cxx | 177 +- Filters/Core/vtkMassProperties.h | 108 +- Filters/Core/vtkMergeDataObjectFilter.cxx | 65 +- Filters/Core/vtkMergeDataObjectFilter.h | 20 +- Filters/Core/vtkMergeFields.cxx | 150 +- Filters/Core/vtkMergeFields.h | 45 +- Filters/Core/vtkMergeFilter.cxx | 369 +- Filters/Core/vtkMergeFilter.h | 54 +- Filters/Core/vtkMoleculeAppend.cxx | 21 +- Filters/Core/vtkMoleculeAppend.h | 6 +- Filters/Core/vtkMultiObjectMassProperties.cxx | 231 +- Filters/Core/vtkMultiObjectMassProperties.h | 53 +- Filters/Core/vtkPlaneCutter.cxx | 406 +- Filters/Core/vtkPlaneCutter.h | 17 +- Filters/Core/vtkPointDataToCellData.cxx | 97 +- Filters/Core/vtkPointDataToCellData.h | 29 +- .../Core/vtkPolyDataConnectivityFilter.cxx | 288 +- Filters/Core/vtkPolyDataConnectivityFilter.h | 124 +- Filters/Core/vtkPolyDataNormals.cxx | 333 +- Filters/Core/vtkPolyDataNormals.h | 68 +- Filters/Core/vtkProbeFilter.cxx | 392 +- Filters/Core/vtkProbeFilter.h | 61 +- Filters/Core/vtkQuadricClustering.cxx | 508 +- Filters/Core/vtkQuadricClustering.h | 114 +- Filters/Core/vtkQuadricDecimation.cxx | 573 +- Filters/Core/vtkQuadricDecimation.h | 63 +- Filters/Core/vtkRearrangeFields.cxx | 380 +- Filters/Core/vtkRearrangeFields.h | 61 +- .../vtkRectilinearSynchronizedTemplates.cxx | 471 +- .../vtkRectilinearSynchronizedTemplates.h | 82 +- Filters/Core/vtkRemoveDuplicatePolys.cxx | 32 +- Filters/Core/vtkRemoveDuplicatePolys.h | 9 +- Filters/Core/vtkResampleToImage.cxx | 180 +- Filters/Core/vtkResampleToImage.h | 34 +- Filters/Core/vtkResampleWithDataSet.cxx | 115 +- Filters/Core/vtkResampleWithDataSet.h | 28 +- Filters/Core/vtkReverseSense.cxx | 113 +- Filters/Core/vtkReverseSense.h | 22 +- Filters/Core/vtkSimpleElevationFilter.cxx | 123 +- Filters/Core/vtkSimpleElevationFilter.h | 13 +- Filters/Core/vtkSmoothPolyDataFilter.cxx | 440 +- Filters/Core/vtkSmoothPolyDataFilter.h | 65 +- Filters/Core/vtkSphereTreeFilter.cxx | 136 +- Filters/Core/vtkSphereTreeFilter.h | 56 +- Filters/Core/vtkStaticCleanPolyData.cxx | 386 +- Filters/Core/vtkStaticCleanPolyData.h | 53 +- Filters/Core/vtkStreamerBase.cxx | 21 +- Filters/Core/vtkStreamerBase.h | 38 +- Filters/Core/vtkStreamingTessellator.h | 544 +- Filters/Core/vtkStripper.cxx | 254 +- Filters/Core/vtkStripper.h | 30 +- Filters/Core/vtkStructuredGridAppend.cxx | 228 +- Filters/Core/vtkStructuredGridAppend.h | 32 +- .../Core/vtkStructuredGridOutlineFilter.cxx | 97 +- Filters/Core/vtkStructuredGridOutlineFilter.h | 10 +- Filters/Core/vtkSynchronizedTemplates2D.cxx | 217 +- Filters/Core/vtkSynchronizedTemplates2D.h | 44 +- Filters/Core/vtkSynchronizedTemplates3D.cxx | 2543 ++++---- Filters/Core/vtkSynchronizedTemplates3D.h | 82 +- .../Core/vtkSynchronizedTemplatesCutter3D.cxx | 284 +- .../Core/vtkSynchronizedTemplatesCutter3D.h | 17 +- Filters/Core/vtkTensorGlyph.cxx | 244 +- Filters/Core/vtkTensorGlyph.h | 97 +- Filters/Core/vtkThreshold.cxx | 216 +- Filters/Core/vtkThreshold.h | 109 +- Filters/Core/vtkThresholdPoints.cxx | 105 +- Filters/Core/vtkThresholdPoints.h | 33 +- Filters/Core/vtkTransposeTable.cxx | 106 +- Filters/Core/vtkTransposeTable.h | 6 +- Filters/Core/vtkTriangleFilter.cxx | 146 +- Filters/Core/vtkTriangleFilter.h | 27 +- Filters/Core/vtkTriangleMeshPointNormals.cxx | 76 +- Filters/Core/vtkTriangleMeshPointNormals.h | 9 +- Filters/Core/vtkTubeFilter.cxx | 567 +- Filters/Core/vtkTubeFilter.h | 139 +- .../vtkUnstructuredGridQuadricDecimation.cxx | 887 ++- .../vtkUnstructuredGridQuadricDecimation.h | 20 +- ...structuredGridToExplicitStructuredGrid.cxx | 31 +- ...UnstructuredGridToExplicitStructuredGrid.h | 12 +- Filters/Core/vtkVectorDot.cxx | 243 +- Filters/Core/vtkVectorDot.h | 20 +- Filters/Core/vtkVectorNorm.cxx | 161 +- Filters/Core/vtkVectorNorm.h | 37 +- Filters/Core/vtkVoronoi2D.cxx | 514 +- Filters/Core/vtkVoronoi2D.h | 82 +- .../Core/vtkWindowedSincPolyDataFilter.cxx | 438 +- Filters/Core/vtkWindowedSincPolyDataFilter.h | 58 +- .../Testing/Cxx/TestConvertSelection.cxx | 336 +- .../Cxx/TestExtractDataArraysOverTime.cxx | 17 +- .../Cxx/TestExtractRectilinearGrid.cxx | 92 +- .../Testing/Cxx/TestExtractRows.cxx | 17 +- .../Cxx/TestExtractSelectedArraysOverTime.cxx | 28 +- .../Testing/Cxx/TestExtractSelection.cxx | 17 +- .../Cxx/TestExtractThresholdsMultiBlock.cxx | 10 +- .../Testing/Cxx/TestExtractTimeSteps.cxx | 19 +- .../Extraction/Testing/Cxx/TestExtraction.cxx | 351 +- .../Testing/Cxx/TestExtractionExpression.cxx | 123 +- Filters/Extraction/vtkBlockSelector.cxx | 4 +- Filters/Extraction/vtkConvertSelection.cxx | 328 +- Filters/Extraction/vtkConvertSelection.h | 100 +- .../Extraction/vtkExpandMarkedElements.cxx | 3 +- Filters/Extraction/vtkExtractBlock.cxx | 47 +- Filters/Extraction/vtkExtractBlock.h | 14 +- Filters/Extraction/vtkExtractCells.cxx | 8 +- Filters/Extraction/vtkExtractCells.h | 24 +- Filters/Extraction/vtkExtractCellsByType.cxx | 214 +- Filters/Extraction/vtkExtractCellsByType.h | 20 +- Filters/Extraction/vtkExtractDataOverTime.cxx | 77 +- Filters/Extraction/vtkExtractDataOverTime.h | 32 +- Filters/Extraction/vtkExtractDataSets.cxx | 68 +- Filters/Extraction/vtkExtractDataSets.h | 16 +- Filters/Extraction/vtkExtractEdges.cxx | 128 +- Filters/Extraction/vtkExtractEdges.h | 19 +- ...tkExtractExodusGlobalTemporalVariables.cxx | 3 +- Filters/Extraction/vtkExtractGeometry.cxx | 145 +- Filters/Extraction/vtkExtractGeometry.h | 39 +- Filters/Extraction/vtkExtractGrid.cxx | 120 +- Filters/Extraction/vtkExtractGrid.h | 28 +- Filters/Extraction/vtkExtractLevel.cxx | 93 +- Filters/Extraction/vtkExtractLevel.h | 19 +- .../Extraction/vtkExtractPolyDataGeometry.cxx | 191 +- .../Extraction/vtkExtractPolyDataGeometry.h | 42 +- .../Extraction/vtkExtractRectilinearGrid.cxx | 130 +- .../Extraction/vtkExtractRectilinearGrid.h | 28 +- .../vtkExtractSelectedArraysOverTime.cxx | 2 +- .../vtkExtractSelectedArraysOverTime.h | 2 +- .../Extraction/vtkExtractSelectedBlock.cxx | 36 +- Filters/Extraction/vtkExtractSelectedBlock.h | 14 +- Filters/Extraction/vtkExtractSelectedIds.cxx | 391 +- Filters/Extraction/vtkExtractSelectedIds.h | 15 +- .../vtkExtractSelectedLocations.cxx | 135 +- .../Extraction/vtkExtractSelectedLocations.h | 14 +- .../vtkExtractSelectedPolyDataIds.cxx | 58 +- .../vtkExtractSelectedPolyDataIds.h | 10 +- Filters/Extraction/vtkExtractSelectedRows.cxx | 59 +- Filters/Extraction/vtkExtractSelectedRows.h | 12 +- .../vtkExtractSelectedThresholds.cxx | 226 +- .../Extraction/vtkExtractSelectedThresholds.h | 39 +- Filters/Extraction/vtkExtractSelection.cxx | 142 +- Filters/Extraction/vtkExtractSelection.h | 29 +- .../vtkExtractTemporalFieldData.cxx | 51 +- .../Extraction/vtkExtractTemporalFieldData.h | 21 +- .../Extraction/vtkExtractTensorComponents.cxx | 189 +- .../Extraction/vtkExtractTensorComponents.h | 88 +- Filters/Extraction/vtkExtractTimeSteps.cxx | 113 +- Filters/Extraction/vtkExtractTimeSteps.h | 35 +- .../Extraction/vtkExtractUnstructuredGrid.cxx | 163 +- .../Extraction/vtkExtractUnstructuredGrid.h | 62 +- .../Extraction/vtkExtractVectorComponents.cxx | 79 +- .../Extraction/vtkExtractVectorComponents.h | 19 +- Filters/Extraction/vtkFrustumSelector.cxx | 262 +- Filters/Extraction/vtkFrustumSelector.h | 4 +- .../vtkHierarchicalDataExtractDataSets.cxx | 2 +- .../vtkHierarchicalDataExtractDataSets.h | 11 +- .../vtkHierarchicalDataExtractLevel.cxx | 3 +- .../vtkHierarchicalDataExtractLevel.h | 8 +- Filters/Extraction/vtkLocationSelector.cxx | 13 +- .../Extraction/vtkProbeSelectedLocations.cxx | 46 +- .../Extraction/vtkProbeSelectedLocations.h | 13 +- Filters/Extraction/vtkSelector.cxx | 4 +- Filters/Extraction/vtkSelector.h | 2 +- Filters/Extraction/vtkValueSelector.cxx | 89 +- .../Cxx/TestAMRInterpolatedVelocityField.cxx | 63 +- Filters/FlowPaths/Testing/Cxx/TestBSPTree.cxx | 54 +- .../Cxx/TestEvenlySpacedStreamlines2D.cxx | 6 +- .../Cxx/TestLagrangianIntegrationModel.cxx | 242 +- .../Testing/Cxx/TestLagrangianParticle.cxx | 84 +- .../Cxx/TestLagrangianParticleTracker.cxx | 56 +- .../Testing/Cxx/TestParticleTracers.cxx | 284 +- .../Testing/Cxx/TestStreamTracer.cxx | 46 +- .../Testing/Cxx/TestStreamTracerSurface.cxx | 3 +- .../vtkAMRInterpolatedVelocityField.cxx | 104 +- .../vtkAMRInterpolatedVelocityField.h | 30 +- .../vtkAbstractInterpolatedVelocityField.cxx | 313 +- .../vtkAbstractInterpolatedVelocityField.h | 106 +- .../vtkCachingInterpolatedVelocityField.cxx | 195 +- .../vtkCachingInterpolatedVelocityField.h | 73 +- ...tkCellLocatorInterpolatedVelocityField.cxx | 195 +- .../vtkCellLocatorInterpolatedVelocityField.h | 49 +- .../vtkCompositeInterpolatedVelocityField.cxx | 6 +- .../vtkCompositeInterpolatedVelocityField.h | 28 +- .../vtkEvenlySpacedStreamlines2D.cxx | 335 +- .../FlowPaths/vtkEvenlySpacedStreamlines2D.h | 68 +- .../vtkInterpolatedVelocityField.cxx | 64 +- .../FlowPaths/vtkInterpolatedVelocityField.h | 32 +- .../vtkLagrangianBasicIntegrationModel.cxx | 11 +- .../vtkLagrangianBasicIntegrationModel.h | 15 +- Filters/FlowPaths/vtkLagrangianParticle.cxx | 53 +- Filters/FlowPaths/vtkLagrangianParticle.h | 6 +- .../vtkLagrangianParticleTracker.cxx | 12 +- Filters/FlowPaths/vtkModifiedBSPTree.cxx | 798 +-- Filters/FlowPaths/vtkModifiedBSPTree.h | 170 +- Filters/FlowPaths/vtkParticlePathFilter.cxx | 76 +- Filters/FlowPaths/vtkParticlePathFilter.h | 34 +- Filters/FlowPaths/vtkParticleTracer.cxx | 2 +- Filters/FlowPaths/vtkParticleTracer.h | 15 +- Filters/FlowPaths/vtkParticleTracerBase.cxx | 696 ++- Filters/FlowPaths/vtkParticleTracerBase.h | 291 +- Filters/FlowPaths/vtkStreaklineFilter.cxx | 42 +- Filters/FlowPaths/vtkStreaklineFilter.h | 25 +- Filters/FlowPaths/vtkStreamTracer.cxx | 517 +- Filters/FlowPaths/vtkStreamTracer.h | 118 +- .../vtkTemporalInterpolatedVelocityField.cxx | 116 +- .../vtkTemporalInterpolatedVelocityField.h | 29 +- Filters/FlowPaths/vtkTemporalStreamTracer.cxx | 942 +-- Filters/FlowPaths/vtkTemporalStreamTracer.h | 770 ++- .../Testing/Cxx/ArrayExtractFactoredArray.cxx | 15 +- .../Testing/Cxx/ArrayMatricizeArray.cxx | 24 +- .../Cxx/ArrayNormalizeMatrixVectors.cxx | 89 +- .../Testing/Cxx/BoxClipOrientedPointData.cxx | 53 +- .../General/Testing/Cxx/BoxClipPointData.cxx | 50 +- .../General/Testing/Cxx/BoxClipPolyData.cxx | 89 +- .../General/Testing/Cxx/BoxClipTetrahedra.cxx | 97 +- .../Testing/Cxx/BoxClipTriangulate.cxx | 121 +- .../Cxx/BoxClipTriangulateAndInterpolate.cxx | 54 +- .../General/Testing/Cxx/CellTreeLocator.cxx | 18 +- .../Cxx/TestAppendLocationAttributes.cxx | 4 +- .../General/Testing/Cxx/TestAppendPoints.cxx | 69 +- .../TestBooleanOperationPolyDataFilter.cxx | 56 +- .../TestBooleanOperationPolyDataFilter2.cxx | 111 +- .../General/Testing/Cxx/TestCellCenters.cxx | 42 +- .../General/Testing/Cxx/TestCellValidator.cxx | 713 ++- .../Testing/Cxx/TestContourTriangulator.cxx | 42 +- .../Cxx/TestContourTriangulatorCutter.cxx | 45 +- .../Cxx/TestContourTriangulatorMarching.cxx | 42 +- .../General/Testing/Cxx/TestCountFaces.cxx | 35 +- .../General/Testing/Cxx/TestCountVertices.cxx | 35 +- .../Testing/Cxx/TestDataSetGradient.cxx | 57 +- .../Cxx/TestDataSetGradientPrecompute.cxx | 59 +- .../General/Testing/Cxx/TestDateToNumeric.cxx | 11 +- .../Testing/Cxx/TestDeformPointSet.cxx | 128 +- .../Testing/Cxx/TestDensifyPolyData.cxx | 79 +- .../Cxx/TestDistancePolyDataFilter.cxx | 54 +- .../Testing/Cxx/TestGradientAndVorticity.cxx | 597 +- ...TestGraphWeightEuclideanDistanceFilter.cxx | 30 +- .../Cxx/TestIconGlyphFilterGravity.cxx | 202 +- .../Testing/Cxx/TestImageDataToPointSet.cxx | 17 +- .../Cxx/TestIntersectionPolyDataFilter.cxx | 56 +- .../Cxx/TestIntersectionPolyDataFilter2.cxx | 53 +- .../Cxx/TestIntersectionPolyDataFilter3.cxx | 64 +- .../Cxx/TestIntersectionPolyDataFilter4.cxx | 2 +- .../Cxx/TestLoopBooleanPolyDataFilter.cxx | 202 +- .../General/Testing/Cxx/TestPassArrays.cxx | 16 +- .../Testing/Cxx/TestPassSelectedArrays.cxx | 2 +- .../General/Testing/Cxx/TestPassThrough.cxx | 27 +- .../Testing/Cxx/TestQuadraturePoints.cxx | 199 +- .../Cxx/TestRectilinearGridToPointSet.cxx | 29 +- .../Testing/Cxx/TestReflectionFilter.cxx | 55 +- .../Cxx/TestSplitByCellScalarFilter.cxx | 52 +- .../Cxx/TestTableSplitColumnComponents.cxx | 9 +- .../General/Testing/Cxx/TestTessellator.cxx | 1089 ++-- .../Testing/Cxx/TestTransformFilter.cxx | 36 +- .../Cxx/TestTransformPolyDataFilter.cxx | 51 +- .../Testing/Cxx/TestUncertaintyTubeFilter.cxx | 75 +- .../Cxx/TestYoungsMaterialInterface.cxx | 108 +- .../Testing/Cxx/UnitTestMultiThreshold.cxx | 269 +- Filters/General/Testing/Cxx/expCos.cxx | 56 +- Filters/General/vtkAnnotationLink.cxx | 64 +- Filters/General/vtkAnnotationLink.h | 19 +- Filters/General/vtkAppendPoints.cxx | 41 +- Filters/General/vtkAppendPoints.h | 18 +- .../vtkApproximatingSubdivisionFilter.cxx | 128 +- .../vtkApproximatingSubdivisionFilter.h | 24 +- .../General/vtkAreaContourSpectrumFilter.cxx | 154 +- .../General/vtkAreaContourSpectrumFilter.h | 13 +- Filters/General/vtkAxes.cxx | 61 +- Filters/General/vtkAxes.h | 28 +- Filters/General/vtkBlankStructuredGrid.cxx | 71 +- Filters/General/vtkBlankStructuredGrid.h | 30 +- .../vtkBlankStructuredGridWithImage.cxx | 60 +- .../General/vtkBlankStructuredGridWithImage.h | 14 +- Filters/General/vtkBlockIdScalars.cxx | 29 +- Filters/General/vtkBlockIdScalars.h | 9 +- .../vtkBooleanOperationPolyDataFilter.cxx | 175 +- .../vtkBooleanOperationPolyDataFilter.h | 36 +- Filters/General/vtkBoxClipDataSet.cxx | 5277 +++++++++-------- Filters/General/vtkBoxClipDataSet.h | 205 +- Filters/General/vtkBrownianPoints.cxx | 46 +- Filters/General/vtkBrownianPoints.h | 17 +- Filters/General/vtkCellCenters.cxx | 8 +- Filters/General/vtkCellDerivatives.cxx | 182 +- Filters/General/vtkCellDerivatives.h | 53 +- Filters/General/vtkCellTreeLocator.cxx | 1075 ++-- Filters/General/vtkCellTreeLocator.h | 333 +- Filters/General/vtkCellValidator.cxx | 362 +- Filters/General/vtkCellValidator.h | 46 +- Filters/General/vtkClipClosedSurface.cxx | 414 +- Filters/General/vtkClipClosedSurface.h | 102 +- Filters/General/vtkClipConvexPolyData.cxx | 316 +- Filters/General/vtkClipConvexPolyData.h | 24 +- Filters/General/vtkClipDataSet.cxx | 289 +- Filters/General/vtkClipDataSet.h | 63 +- Filters/General/vtkClipVolume.cxx | 418 +- Filters/General/vtkClipVolume.h | 106 +- Filters/General/vtkCoincidentPoints.cxx | 75 +- Filters/General/vtkCoincidentPoints.h | 23 +- Filters/General/vtkContourTriangulator.cxx | 883 +-- Filters/General/vtkContourTriangulator.h | 17 +- Filters/General/vtkCountFaces.cxx | 28 +- Filters/General/vtkCountFaces.h | 12 +- Filters/General/vtkCountVertices.cxx | 28 +- Filters/General/vtkCountVertices.h | 12 +- Filters/General/vtkCursor2D.cxx | 130 +- Filters/General/vtkCursor2D.h | 65 +- Filters/General/vtkCursor3D.cxx | 191 +- Filters/General/vtkCursor3D.h | 69 +- Filters/General/vtkCurvatures.cxx | 508 +- Filters/General/vtkCurvatures.h | 44 +- Filters/General/vtkDataSetGradient.cxx | 143 +- Filters/General/vtkDataSetGradient.h | 23 +- .../General/vtkDataSetGradientPrecompute.cxx | 240 +- .../General/vtkDataSetGradientPrecompute.h | 24 +- Filters/General/vtkDataSetTriangleFilter.cxx | 185 +- Filters/General/vtkDataSetTriangleFilter.h | 18 +- Filters/General/vtkDateToNumeric.cxx | 15 +- Filters/General/vtkDateToNumeric.h | 2 +- Filters/General/vtkDeformPointSet.cxx | 98 +- Filters/General/vtkDeformPointSet.h | 15 +- Filters/General/vtkDensifyPolyData.cxx | 286 +- Filters/General/vtkDensifyPolyData.h | 16 +- Filters/General/vtkDicer.cxx | 50 +- Filters/General/vtkDicer.h | 51 +- Filters/General/vtkDiscreteFlyingEdges2D.cxx | 603 +- Filters/General/vtkDiscreteFlyingEdges2D.h | 46 +- Filters/General/vtkDiscreteFlyingEdges3D.cxx | 1009 ++-- Filters/General/vtkDiscreteFlyingEdges3D.h | 63 +- .../vtkDiscreteFlyingEdgesClipper2D.cxx | 1660 +++--- .../General/vtkDiscreteFlyingEdgesClipper2D.h | 44 +- Filters/General/vtkDiscreteMarchingCubes.cxx | 284 +- Filters/General/vtkDiscreteMarchingCubes.h | 18 +- Filters/General/vtkDistancePolyDataFilter.cxx | 59 +- Filters/General/vtkDistancePolyDataFilter.h | 28 +- Filters/General/vtkEdgePoints.cxx | 133 +- Filters/General/vtkEdgePoints.h | 17 +- Filters/General/vtkExtractArray.cxx | 16 +- Filters/General/vtkExtractArray.h | 8 +- Filters/General/vtkExtractSelectedFrustum.cxx | 588 +- Filters/General/vtkExtractSelectedFrustum.h | 78 +- Filters/General/vtkExtractSelectionBase.cxx | 24 +- Filters/General/vtkExtractSelectionBase.h | 9 +- Filters/General/vtkGradientFilter.cxx | 1314 ++-- Filters/General/vtkGradientFilter.h | 79 +- Filters/General/vtkGraphLayoutFilter.cxx | 153 +- Filters/General/vtkGraphLayoutFilter.h | 20 +- Filters/General/vtkGraphToPoints.cxx | 18 +- Filters/General/vtkGraphToPoints.h | 8 +- .../vtkGraphWeightEuclideanDistanceFilter.cxx | 8 +- .../vtkGraphWeightEuclideanDistanceFilter.h | 8 +- Filters/General/vtkGraphWeightFilter.cxx | 21 +- Filters/General/vtkGraphWeightFilter.h | 8 +- .../vtkHierarchicalDataLevelFilter.cxx | 2 +- .../General/vtkHierarchicalDataLevelFilter.h | 8 +- Filters/General/vtkHyperStreamline.cxx | 439 +- Filters/General/vtkHyperStreamline.h | 97 +- Filters/General/vtkIconGlyphFilter.cxx | 96 +- Filters/General/vtkIconGlyphFilter.h | 98 +- Filters/General/vtkImageDataToPointSet.cxx | 14 +- Filters/General/vtkImageDataToPointSet.h | 20 +- Filters/General/vtkImageMarchingCubes.cxx | 262 +- Filters/General/vtkImageMarchingCubes.h | 77 +- .../vtkInterpolateDataSetAttributes.cxx | 84 +- .../General/vtkInterpolateDataSetAttributes.h | 22 +- .../vtkInterpolatingSubdivisionFilter.cxx | 135 +- .../vtkInterpolatingSubdivisionFilter.h | 21 +- .../General/vtkIntersectionPolyDataFilter.cxx | 1258 ++-- .../General/vtkIntersectionPolyDataFilter.h | 35 +- Filters/General/vtkLevelIdScalars.cxx | 3 +- Filters/General/vtkLevelIdScalars.h | 29 +- Filters/General/vtkLinkEdgels.cxx | 182 +- Filters/General/vtkLinkEdgels.h | 30 +- .../General/vtkLoopBooleanPolyDataFilter.cxx | 842 ++- .../General/vtkLoopBooleanPolyDataFilter.h | 37 +- Filters/General/vtkMarchingContourFilter.cxx | 153 +- Filters/General/vtkMarchingContourFilter.h | 77 +- Filters/General/vtkMatricizeArray.cxx | 36 +- Filters/General/vtkMatricizeArray.h | 8 +- Filters/General/vtkMergeCells.cxx | 6 +- Filters/General/vtkMergeCells.h | 40 +- .../General/vtkMultiBlockDataGroupFilter.cxx | 39 +- .../General/vtkMultiBlockDataGroupFilter.h | 24 +- .../vtkMultiBlockFromTimeSeriesFilter.cxx | 34 +- .../vtkMultiBlockFromTimeSeriesFilter.h | 25 +- Filters/General/vtkMultiBlockMergeFilter.cxx | 44 +- Filters/General/vtkMultiBlockMergeFilter.h | 23 +- Filters/General/vtkMultiThreshold.cxx | 536 +- Filters/General/vtkMultiThreshold.h | 274 +- .../vtkNonOverlappingAMRLevelIdScalars.cxx | 51 +- .../vtkNonOverlappingAMRLevelIdScalars.h | 15 +- Filters/General/vtkNormalizeMatrixVectors.cxx | 41 +- Filters/General/vtkNormalizeMatrixVectors.h | 8 +- Filters/General/vtkOBBDicer.cxx | 119 +- Filters/General/vtkOBBDicer.h | 20 +- Filters/General/vtkOBBTree.cxx | 1055 ++-- Filters/General/vtkOBBTree.h | 78 +- .../vtkOverlappingAMRLevelIdScalars.cxx | 37 +- .../General/vtkOverlappingAMRLevelIdScalars.h | 14 +- Filters/General/vtkPassArrays.cxx | 95 +- Filters/General/vtkPassArrays.h | 18 +- Filters/General/vtkPassThrough.cxx | 42 +- Filters/General/vtkPassThrough.h | 12 +- .../General/vtkPointConnectivityFilter.cxx | 52 +- Filters/General/vtkPointConnectivityFilter.h | 10 +- Filters/General/vtkPolyDataStreamer.cxx | 51 +- Filters/General/vtkPolyDataStreamer.h | 21 +- .../General/vtkPolyDataToReebGraphFilter.cxx | 32 +- .../General/vtkPolyDataToReebGraphFilter.h | 13 +- Filters/General/vtkProbePolyhedron.cxx | 145 +- Filters/General/vtkProbePolyhedron.h | 20 +- .../vtkQuadraturePointInterpolator.cxx | 105 +- .../General/vtkQuadraturePointInterpolator.h | 22 +- .../General/vtkQuadraturePointsGenerator.cxx | 145 +- .../General/vtkQuadraturePointsGenerator.h | 29 +- .../General/vtkQuadraturePointsUtilities.hxx | 83 +- ...vtkQuadratureSchemeDictionaryGenerator.cxx | 182 +- .../vtkQuadratureSchemeDictionaryGenerator.h | 19 +- Filters/General/vtkQuantizePolyDataPoints.cxx | 23 +- Filters/General/vtkQuantizePolyDataPoints.h | 13 +- .../General/vtkRandomAttributeGenerator.cxx | 432 +- Filters/General/vtkRandomAttributeGenerator.h | 174 +- Filters/General/vtkRectilinearGridClip.cxx | 94 +- Filters/General/vtkRectilinearGridClip.h | 28 +- .../General/vtkRectilinearGridToPointSet.cxx | 31 +- .../General/vtkRectilinearGridToPointSet.h | 22 +- .../vtkRectilinearGridToTetrahedra.cxx | 460 +- .../General/vtkRectilinearGridToTetrahedra.h | 69 +- Filters/General/vtkRecursiveDividingCubes.cxx | 171 +- Filters/General/vtkRecursiveDividingCubes.h | 25 +- Filters/General/vtkReflectionFilter.cxx | 761 ++- Filters/General/vtkReflectionFilter.h | 21 +- Filters/General/vtkRotationFilter.cxx | 133 +- Filters/General/vtkRotationFilter.h | 17 +- .../vtkSampleImplicitFunctionFilter.cxx | 157 +- .../General/vtkSampleImplicitFunctionFilter.h | 26 +- Filters/General/vtkShrinkFilter.cxx | 44 +- Filters/General/vtkShrinkFilter.h | 10 +- Filters/General/vtkShrinkPolyData.cxx | 162 +- Filters/General/vtkShrinkPolyData.h | 15 +- .../vtkSpatialRepresentationFilter.cxx | 34 +- .../General/vtkSpatialRepresentationFilter.h | 17 +- Filters/General/vtkSplineFilter.cxx | 219 +- Filters/General/vtkSplineFilter.h | 111 +- .../General/vtkSplitByCellScalarFilter.cxx | 32 +- Filters/General/vtkSplitByCellScalarFilter.h | 7 +- Filters/General/vtkSplitColumnComponents.cxx | 202 +- Filters/General/vtkSplitColumnComponents.h | 29 +- Filters/General/vtkSplitField.cxx | 144 +- Filters/General/vtkSplitField.h | 45 +- Filters/General/vtkStructuredGridClip.cxx | 94 +- Filters/General/vtkStructuredGridClip.h | 28 +- Filters/General/vtkSubPixelPositionEdgels.cxx | 460 +- Filters/General/vtkSubPixelPositionEdgels.h | 25 +- Filters/General/vtkSubdivisionFilter.cxx | 38 +- Filters/General/vtkSubdivisionFilter.h | 11 +- Filters/General/vtkSynchronizeTimeFilter.cxx | 104 +- Filters/General/vtkSynchronizeTimeFilter.h | 13 +- Filters/General/vtkTableBasedClipDataSet.cxx | 2739 ++++----- Filters/General/vtkTableBasedClipDataSet.h | 131 +- Filters/General/vtkTableToPolyData.cxx | 68 +- Filters/General/vtkTableToPolyData.h | 10 +- Filters/General/vtkTableToStructuredGrid.cxx | 85 +- Filters/General/vtkTableToStructuredGrid.h | 14 +- Filters/General/vtkTemporalPathLineFilter.cxx | 362 +- Filters/General/vtkTemporalPathLineFilter.h | 74 +- Filters/General/vtkTemporalStatistics.cxx | 396 +- Filters/General/vtkTemporalStatistics.h | 84 +- Filters/General/vtkTessellatorFilter.cxx | 2104 ++++--- Filters/General/vtkTessellatorFilter.h | 79 +- Filters/General/vtkTimeSourceExample.cxx | 158 +- Filters/General/vtkTimeSourceExample.h | 23 +- Filters/General/vtkTransformFilter.cxx | 146 +- Filters/General/vtkTransformFilter.h | 25 +- .../General/vtkTransformPolyDataFilter.cxx | 97 +- Filters/General/vtkTransformPolyDataFilter.h | 17 +- Filters/General/vtkUncertaintyTubeFilter.cxx | 238 +- Filters/General/vtkUncertaintyTubeFilter.h | 20 +- Filters/General/vtkVertexGlyphFilter.cxx | 29 +- Filters/General/vtkVertexGlyphFilter.h | 15 +- .../vtkVolumeContourSpectrumFilter.cxx | 171 +- .../General/vtkVolumeContourSpectrumFilter.h | 13 +- .../vtkVoxelContoursToSurfaceFilter.cxx | 461 +- .../General/vtkVoxelContoursToSurfaceFilter.h | 50 +- Filters/General/vtkWarpLens.cxx | 79 +- Filters/General/vtkWarpLens.h | 69 +- Filters/General/vtkWarpScalar.cxx | 97 +- Filters/General/vtkWarpScalar.h | 45 +- Filters/General/vtkWarpTo.cxx | 75 +- Filters/General/vtkWarpTo.h | 34 +- Filters/General/vtkWarpVector.cxx | 97 +- Filters/General/vtkWarpVector.h | 21 +- .../General/vtkYoungsMaterialInterface.cxx | 4337 +++++++------- Filters/General/vtkYoungsMaterialInterface.h | 109 +- .../Generic/Testing/Cxx/TestGenericClip.cxx | 75 +- .../Testing/Cxx/TestGenericContourFilter.cxx | 61 +- .../Generic/Testing/Cxx/TestGenericCutter.cxx | 63 +- .../Cxx/TestGenericDataSetTessellator.cxx | 119 +- .../Testing/Cxx/TestGenericGeometryFilter.cxx | 64 +- .../Testing/Cxx/TestGenericGlyph3DFilter.cxx | 69 +- .../Testing/Cxx/TestGenericProbeFilter.cxx | 125 +- .../Testing/Cxx/TestGenericStreamTracer.cxx | 83 +- .../Cxx/UnitTestGenericGeometryFilter.cxx | 364 +- Filters/Generic/Testing/Cxx/otherCreation.cxx | 1556 ++--- Filters/Generic/vtkGenericClip.cxx | 211 +- Filters/Generic/vtkGenericClip.h | 59 +- Filters/Generic/vtkGenericContourFilter.cxx | 174 +- Filters/Generic/vtkGenericContourFilter.h | 51 +- Filters/Generic/vtkGenericCutter.cxx | 165 +- Filters/Generic/vtkGenericCutter.h | 42 +- .../Generic/vtkGenericDataSetTessellator.cxx | 143 +- .../Generic/vtkGenericDataSetTessellator.h | 24 +- Filters/Generic/vtkGenericGeometryFilter.cxx | 240 +- Filters/Generic/vtkGenericGeometryFilter.h | 73 +- Filters/Generic/vtkGenericGlyph3DFilter.cxx | 390 +- Filters/Generic/vtkGenericGlyph3DFilter.h | 172 +- Filters/Generic/vtkGenericOutlineFilter.cxx | 43 +- Filters/Generic/vtkGenericOutlineFilter.h | 12 +- Filters/Generic/vtkGenericProbeFilter.cxx | 142 +- Filters/Generic/vtkGenericProbeFilter.h | 16 +- Filters/Generic/vtkGenericStreamTracer.cxx | 454 +- Filters/Generic/vtkGenericStreamTracer.h | 149 +- .../Cxx/TestDataSetRegionSurfaceFilter.cxx | 83 +- .../Cxx/TestDataSetSurfaceFieldData.cxx | 14 +- ...etSurfaceFilterQuadraticTetsGhostCells.cxx | 3 +- .../TestDataSetSurfaceFilterWith1DGrids.cxx | 20 +- ...estExplicitStructuredGridSurfaceFilter.cxx | 6 +- ...TestExtractSurfaceNonLinearSubdivision.cxx | 10 +- .../Cxx/TestGeometryFilterCellData.cxx | 145 +- .../Cxx/TestImageDataToUniformGrid.cxx | 25 +- .../Cxx/TestLinearToQuadraticCellsFilter.cxx | 88 +- .../Testing/Cxx/TestProjectSphereFilter.cxx | 68 +- .../Cxx/TestRectilinearGridPartitioner.cxx | 42 +- .../Cxx/TestStructuredAMRGridConnectivity.cxx | 440 +- .../Testing/Cxx/TestStructuredAMRNeighbor.cxx | 390 +- .../Cxx/TestStructuredGridConnectivity.cxx | 643 +- .../TestStructuredGridGhostDataGenerator.cxx | 353 +- .../Cxx/TestStructuredGridPartitioner.cxx | 41 +- .../Cxx/TestUniformGridGhostDataGenerator.cxx | 276 +- .../TestUnstructuredGridGeometryFilter.cxx | 3631 ++++++------ ...structuredGridGeometryFilterGhostCells.cxx | 13 +- .../Cxx/UnitTestDataSetSurfaceFilter.cxx | 980 ++- .../Cxx/UnitTestProjectSphereFilter.cxx | 101 +- .../Geometry/vtkAbstractGridConnectivity.cxx | 8 +- .../Geometry/vtkAbstractGridConnectivity.h | 344 +- .../vtkCompositeDataGeometryFilter.cxx | 17 +- .../Geometry/vtkCompositeDataGeometryFilter.h | 17 +- Filters/Geometry/vtkDataSetGhostGenerator.cxx | 73 +- Filters/Geometry/vtkDataSetGhostGenerator.h | 25 +- .../vtkDataSetRegionSurfaceFilter.cxx | 410 +- .../Geometry/vtkDataSetRegionSurfaceFilter.h | 58 +- Filters/Geometry/vtkDataSetSurfaceFilter.cxx | 1070 ++-- Filters/Geometry/vtkDataSetSurfaceFilter.h | 133 +- ...vtkExplicitStructuredGridSurfaceFilter.cxx | 13 +- Filters/Geometry/vtkGeometryFilter.cxx | 653 +- Filters/Geometry/vtkGeometryFilter.h | 74 +- .../vtkHierarchicalDataSetGeometryFilter.cxx | 3 +- .../vtkHierarchicalDataSetGeometryFilter.h | 14 +- .../Geometry/vtkImageDataGeometryFilter.cxx | 292 +- Filters/Geometry/vtkImageDataGeometryFilter.h | 39 +- .../Geometry/vtkImageDataToUniformGrid.cxx | 63 +- Filters/Geometry/vtkImageDataToUniformGrid.h | 27 +- .../vtkLinearToQuadraticCellsFilter.cxx | 98 +- .../vtkLinearToQuadraticCellsFilter.h | 24 +- Filters/Geometry/vtkProjectSphereFilter.cxx | 292 +- Filters/Geometry/vtkProjectSphereFilter.h | 33 +- .../vtkRectilinearGridGeometryFilter.cxx | 239 +- .../vtkRectilinearGridGeometryFilter.h | 13 +- .../vtkRectilinearGridPartitioner.cxx | 115 +- .../Geometry/vtkRectilinearGridPartitioner.h | 41 +- .../vtkStructuredAMRGridConnectivity.cxx | 1903 +++--- .../vtkStructuredAMRGridConnectivity.h | 437 +- Filters/Geometry/vtkStructuredAMRNeighbor.cxx | 168 +- Filters/Geometry/vtkStructuredAMRNeighbor.h | 36 +- .../vtkStructuredGridConnectivity.cxx | 1198 ++-- .../Geometry/vtkStructuredGridConnectivity.h | 644 +- .../vtkStructuredGridGeometryFilter.cxx | 250 +- .../vtkStructuredGridGeometryFilter.h | 17 +- .../vtkStructuredGridGhostDataGenerator.cxx | 97 +- .../vtkStructuredGridGhostDataGenerator.h | 22 +- .../Geometry/vtkStructuredGridPartitioner.cxx | 124 +- .../Geometry/vtkStructuredGridPartitioner.h | 36 +- Filters/Geometry/vtkStructuredNeighbor.cxx | 78 +- Filters/Geometry/vtkStructuredNeighbor.h | 75 +- .../vtkStructuredPointsGeometryFilter.cxx | 7 +- .../vtkStructuredPointsGeometryFilter.h | 9 +- .../vtkUniformGridGhostDataGenerator.cxx | 138 +- .../vtkUniformGridGhostDataGenerator.h | 24 +- .../vtkUnstructuredGridGeometryFilter.cxx | 1007 ++-- .../vtkUnstructuredGridGeometryFilter.h | 102 +- .../Hybrid/Testing/Cxx/TemporalStatistics.cxx | 33 +- .../Testing/Cxx/TestBSplineTransform.cxx | 202 +- .../Testing/Cxx/TestDepthSortPolyData.cxx | 42 +- Filters/Hybrid/Testing/Cxx/TestForceTime.cxx | 32 +- ...idBinary2DAdaptiveDataSetSurfaceFilter.cxx | 53 +- ...2DAdaptiveDataSetSurfaceFilterMaterial.cxx | 56 +- ...dTernary3DAdaptiveDataSetSurfaceFilter.cxx | 67 +- ...3DAdaptiveDataSetSurfaceFilterMaterial.cxx | 82 +- ...structuredAdaptiveDataSetSurfaceFilter.cxx | 69 +- .../Testing/Cxx/TestPolyDataSilhouette.cxx | 48 +- .../Cxx/TestProcrustesAlignmentFilter.cxx | 61 +- .../Cxx/TestTemporalArrayOperatorFilter.cxx | 12 +- .../Testing/Cxx/TestTemporalCacheSimple.cxx | 129 +- .../Testing/Cxx/TestTemporalCacheTemporal.cxx | 63 +- .../Testing/Cxx/TestTemporalFractal.cxx | 39 +- .../vtkAdaptiveDataSetSurfaceFilter.cxx | 4 +- .../Hybrid/vtkAdaptiveDataSetSurfaceFilter.h | 61 +- Filters/Hybrid/vtkBSplineTransform.cxx | 424 +- Filters/Hybrid/vtkBSplineTransform.h | 46 +- Filters/Hybrid/vtkDSPFilterDefinition.cxx | 80 +- Filters/Hybrid/vtkDSPFilterDefinition.h | 42 +- Filters/Hybrid/vtkDSPFilterGroup.cxx | 430 +- Filters/Hybrid/vtkDSPFilterGroup.h | 45 +- Filters/Hybrid/vtkDepthSortPolyData.cxx | 326 +- Filters/Hybrid/vtkDepthSortPolyData.h | 55 +- Filters/Hybrid/vtkEarthSource.cxx | 43 +- Filters/Hybrid/vtkEarthSource.h | 33 +- Filters/Hybrid/vtkFacetReader.cxx | 144 +- Filters/Hybrid/vtkFacetReader.h | 13 +- Filters/Hybrid/vtkForceTime.cxx | 50 +- Filters/Hybrid/vtkForceTime.h | 16 +- Filters/Hybrid/vtkGreedyTerrainDecimation.cxx | 657 +- Filters/Hybrid/vtkGreedyTerrainDecimation.h | 143 +- Filters/Hybrid/vtkGridTransform.cxx | 728 ++- Filters/Hybrid/vtkGridTransform.h | 61 +- Filters/Hybrid/vtkImageToPolyDataFilter.cxx | 858 ++- Filters/Hybrid/vtkImageToPolyDataFilter.h | 126 +- Filters/Hybrid/vtkImplicitModeller.cxx | 498 +- Filters/Hybrid/vtkImplicitModeller.h | 105 +- Filters/Hybrid/vtkPCAAnalysisFilter.cxx | 264 +- Filters/Hybrid/vtkPCAAnalysisFilter.h | 22 +- Filters/Hybrid/vtkPolyDataSilhouette.cxx | 273 +- Filters/Hybrid/vtkPolyDataSilhouette.h | 63 +- .../Hybrid/vtkProcrustesAlignmentFilter.cxx | 211 +- Filters/Hybrid/vtkProcrustesAlignmentFilter.h | 22 +- Filters/Hybrid/vtkProjectedTerrainPath.cxx | 286 +- Filters/Hybrid/vtkProjectedTerrainPath.h | 82 +- Filters/Hybrid/vtkRenderLargeImage.cxx | 193 +- Filters/Hybrid/vtkRenderLargeImage.h | 27 +- .../Hybrid/vtkTemporalArrayOperatorFilter.cxx | 203 +- .../Hybrid/vtkTemporalArrayOperatorFilter.h | 21 +- Filters/Hybrid/vtkTemporalDataSetCache.cxx | 108 +- Filters/Hybrid/vtkTemporalDataSetCache.h | 32 +- Filters/Hybrid/vtkTemporalFractal.cxx | 901 ++- Filters/Hybrid/vtkTemporalFractal.h | 86 +- Filters/Hybrid/vtkTemporalInterpolator.cxx | 295 +- Filters/Hybrid/vtkTemporalInterpolator.h | 43 +- Filters/Hybrid/vtkTemporalShiftScale.cxx | 158 +- Filters/Hybrid/vtkTemporalShiftScale.h | 41 +- Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx | 91 +- Filters/Hybrid/vtkTemporalSnapToTimeStep.h | 35 +- Filters/Hybrid/vtkTransformToGrid.cxx | 172 +- Filters/Hybrid/vtkTransformToGrid.h | 66 +- Filters/Hybrid/vtkWeightedTransformFilter.cxx | 482 +- Filters/Hybrid/vtkWeightedTransformFilter.h | 23 +- .../Testing/Cxx/TestHyperTreeGridBinary2D.cxx | 83 +- .../TestHyperTreeGridBinary2DAxisClipBox.cxx | 97 +- ...stHyperTreeGridBinary2DAxisClipEllipse.cxx | 89 +- ...estHyperTreeGridBinary2DAxisClipPlanes.cxx | 95 +- ...rTreeGridBinary2DAxisReflectionXCenter.cxx | 59 +- ...dBinary2DAxisReflectionXCenterMaterial.cxx | 62 +- ...rTreeGridBinary2DAxisReflectionYCenter.cxx | 59 +- ...dBinary2DAxisReflectionYCenterMaterial.cxx | 62 +- .../TestHyperTreeGridBinary2DCellCenters.cxx | 69 +- ...perTreeGridBinary2DCellCentersMaterial.cxx | 72 +- .../Cxx/TestHyperTreeGridBinary2DContour.cxx | 73 +- ...stHyperTreeGridBinary2DContourMaterial.cxx | 76 +- .../TestHyperTreeGridBinary2DDepthLimiter.cxx | 63 +- ...erTreeGridBinary2DDepthLimiterMaterial.cxx | 66 +- .../Cxx/TestHyperTreeGridBinary2DIJK.cxx | 83 +- ...HyperTreeGridBinary2DInterfaceMaterial.cxx | 76 +- .../Cxx/TestHyperTreeGridBinary2DMaterial.cxx | 86 +- .../TestHyperTreeGridBinary2DMaterialIJK.cxx | 86 +- .../TestHyperTreeGridBinary2DThreshold.cxx | 65 +- ...HyperTreeGridBinary2DThresholdMaterial.cxx | 68 +- .../Cxx/TestHyperTreeGridBinary2DVector.cxx | 81 +- ...ridBinary2DVectorAxisReflectionXCenter.cxx | 85 +- ...ridBinary2DVectorAxisReflectionYCenter.cxx | 85 +- .../Cxx/TestHyperTreeGridBinary3DContour.cxx | 78 +- .../Cxx/TestHyperTreeGridBinary3DGeometry.cxx | 56 +- .../Cxx/TestHyperTreeGridBinaryClipPlanes.cxx | 116 +- ...TestHyperTreeGridBinaryEllipseMaterial.cxx | 116 +- ...GridBinaryHyperbolicParaboloidMaterial.cxx | 90 +- .../Cxx/TestHyperTreeGridTernary2D.cxx | 90 +- .../TestHyperTreeGridTernary2DBiMaterial.cxx | 86 +- ...HyperTreeGridTernary2DFullMaterialBits.cxx | 159 +- .../TestHyperTreeGridTernary2DMaterial.cxx | 100 +- ...TestHyperTreeGridTernary2DMaterialBits.cxx | 124 +- .../TestHyperTreeGridTernary3DAxisClipBox.cxx | 91 +- ...HyperTreeGridTernary3DAxisClipCylinder.cxx | 87 +- ...stHyperTreeGridTernary3DAxisClipPlanes.cxx | 103 +- .../Cxx/TestHyperTreeGridTernary3DAxisCut.cxx | 132 +- ...tHyperTreeGridTernary3DAxisCutMaterial.cxx | 146 +- ...TreeGridTernary3DAxisReflectionXCenter.cxx | 71 +- ...Ternary3DAxisReflectionXCenterMaterial.cxx | 86 +- ...reeGridTernary3DAxisReflectionYZCenter.cxx | 75 +- ...ernary3DAxisReflectionYZCenterMaterial.cxx | 90 +- .../TestHyperTreeGridTernary3DCellCenters.cxx | 77 +- ...erTreeGridTernary3DCellCentersMaterial.cxx | 92 +- .../Cxx/TestHyperTreeGridTernary3DClip.cxx | 79 +- .../Cxx/TestHyperTreeGridTernary3DContour.cxx | 87 +- ...tHyperTreeGridTernary3DContourMaterial.cxx | 102 +- .../TestHyperTreeGridTernary3DDualContour.cxx | 87 +- ...erTreeGridTernary3DDualContourMaterial.cxx | 102 +- .../TestHyperTreeGridTernary3DGeometry.cxx | 65 +- ...GridTernary3DGeometryLargeMaterialBits.cxx | 147 +- ...HyperTreeGridTernary3DGeometryMaterial.cxx | 80 +- ...rTreeGridTernary3DGeometryMaterialBits.cxx | 92 +- .../TestHyperTreeGridTernary3DPlaneCutter.cxx | 91 +- ...tHyperTreeGridTernary3DPlaneCutterDual.cxx | 91 +- ...eeGridTernary3DPlaneCutterDualMaterial.cxx | 106 +- ...erTreeGridTernary3DPlaneCutterMaterial.cxx | 106 +- .../TestHyperTreeGridTernary3DThreshold.cxx | 73 +- ...yperTreeGridTernary3DThresholdMaterial.cxx | 88 +- ...TestHyperTreeGridTernary3DUnstructured.cxx | 71 +- ...rTreeGridTernary3DUnstructuredMaterial.cxx | 86 +- .../Cxx/TestHyperTreeGridTernaryHyperbola.cxx | 120 +- ...TestHyperTreeGridTernarySphereMaterial.cxx | 59 +- ...eeGridTernarySphereMaterialReflections.cxx | 172 +- .../Cxx/TestHyperTreeGridToDualGrid.cxx | 59 +- .../HyperTree/vtkHyperTreeGridAxisClip.cxx | 9 +- Filters/HyperTree/vtkHyperTreeGridAxisClip.h | 53 +- Filters/HyperTree/vtkHyperTreeGridAxisCut.cxx | 112 +- Filters/HyperTree/vtkHyperTreeGridAxisCut.h | 13 +- .../vtkHyperTreeGridAxisReflection.h | 28 +- .../HyperTree/vtkHyperTreeGridCellCenters.cxx | 104 +- .../HyperTree/vtkHyperTreeGridCellCenters.h | 17 +- Filters/HyperTree/vtkHyperTreeGridContour.cxx | 282 +- Filters/HyperTree/vtkHyperTreeGridContour.h | 82 +- .../HyperTree/vtkHyperTreeGridDepthLimiter.h | 2 +- .../vtkHyperTreeGridEvaluateCoarse.cxx | 165 +- .../vtkHyperTreeGridEvaluateCoarse.h | 62 +- .../HyperTree/vtkHyperTreeGridGeometry.cxx | 810 ++- Filters/HyperTree/vtkHyperTreeGridGeometry.h | 45 +- .../HyperTree/vtkHyperTreeGridPlaneCutter.cxx | 419 +- .../HyperTree/vtkHyperTreeGridPlaneCutter.h | 42 +- Filters/HyperTree/vtkHyperTreeGridThreshold.h | 31 +- .../HyperTree/vtkHyperTreeGridToDualGrid.cxx | 814 +-- .../HyperTree/vtkHyperTreeGridToDualGrid.h | 55 +- .../vtkHyperTreeGridToUnstructuredGrid.cxx | 15 +- .../vtkHyperTreeGridToUnstructuredGrid.h | 15 +- .../HyperTree/vtkImageDataToHyperTreeGrid.cxx | 4 +- .../HyperTree/vtkImageDataToHyperTreeGrid.h | 26 +- .../Imaging/vtkComputeHistogram2DOutliers.cxx | 126 +- .../Imaging/vtkComputeHistogram2DOutliers.h | 37 +- Filters/Imaging/vtkExtractHistogram2D.cxx | 180 +- Filters/Imaging/vtkExtractHistogram2D.h | 85 +- .../Imaging/vtkPairwiseExtractHistogram2D.cxx | 137 +- .../Imaging/vtkPairwiseExtractHistogram2D.h | 57 +- .../Testing/Cxx/TestButterflyScalars.cxx | 37 +- .../Testing/Cxx/TestCollisionDetection.cxx | 51 +- .../Cxx/TestNamedColorsIntegration.cxx | 76 +- .../Testing/Cxx/TestPolyDataPointSampler.cxx | 32 +- .../Cxx/TestQuadRotationalExtrusion.cxx | 83 +- .../TestQuadRotationalExtrusionMultiBlock.cxx | 111 +- .../Testing/Cxx/TestRotationalExtrusion.cxx | 72 +- .../Testing/Cxx/TestSelectEnclosedPoints.cxx | 49 +- .../Cxx/TestVolumeOfRevolutionFilter.cxx | 215 +- .../Cxx/UnitTestCollisionDetectionFilter.cxx | 72 +- ...nitTestHausdorffDistancePointSetFilter.cxx | 108 +- .../Cxx/UnitTestSubdivisionFilters.cxx | 125 +- .../Modeling/vtkAdaptiveSubdivisionFilter.cxx | 253 +- .../Modeling/vtkAdaptiveSubdivisionFilter.h | 31 +- .../vtkBandedPolyDataContourFilter.cxx | 658 +- .../Modeling/vtkBandedPolyDataContourFilter.h | 108 +- .../vtkButterflySubdivisionFilter.cxx | 172 +- .../Modeling/vtkButterflySubdivisionFilter.h | 30 +- .../Modeling/vtkCollisionDetectionFilter.cxx | 350 +- .../Modeling/vtkCollisionDetectionFilter.h | 134 +- Filters/Modeling/vtkContourLoopExtraction.cxx | 397 +- Filters/Modeling/vtkContourLoopExtraction.h | 53 +- Filters/Modeling/vtkCookieCutter.cxx | 1826 +++--- Filters/Modeling/vtkCookieCutter.h | 23 +- .../Modeling/vtkDijkstraGraphGeodesicPath.cxx | 169 +- .../Modeling/vtkDijkstraGraphGeodesicPath.h | 40 +- Filters/Modeling/vtkDijkstraGraphInternals.h | 91 +- .../Modeling/vtkDijkstraImageGeodesicPath.cxx | 167 +- .../Modeling/vtkDijkstraImageGeodesicPath.h | 41 +- Filters/Modeling/vtkFillHolesFilter.cxx | 145 +- Filters/Modeling/vtkFillHolesFilter.h | 8 +- Filters/Modeling/vtkFitToHeightMapFilter.cxx | 341 +- Filters/Modeling/vtkFitToHeightMapFilter.h | 65 +- Filters/Modeling/vtkGeodesicPath.cxx | 7 +- Filters/Modeling/vtkGeodesicPath.h | 8 +- Filters/Modeling/vtkGraphGeodesicPath.cxx | 8 +- Filters/Modeling/vtkGraphGeodesicPath.h | 6 +- .../vtkHausdorffDistancePointSetFilter.cxx | 113 +- .../vtkHausdorffDistancePointSetFilter.h | 26 +- .../Modeling/vtkHyperTreeGridOutlineFilter.h | 14 +- Filters/Modeling/vtkLinearExtrusionFilter.cxx | 212 +- Filters/Modeling/vtkLinearExtrusionFilter.h | 51 +- .../Modeling/vtkLinearSubdivisionFilter.cxx | 53 +- Filters/Modeling/vtkLinearSubdivisionFilter.h | 20 +- Filters/Modeling/vtkLoopSubdivisionFilter.cxx | 142 +- Filters/Modeling/vtkLoopSubdivisionFilter.h | 24 +- Filters/Modeling/vtkOutlineFilter.cxx | 213 +- Filters/Modeling/vtkOutlineFilter.h | 47 +- Filters/Modeling/vtkPolyDataPointSampler.cxx | 276 +- Filters/Modeling/vtkPolyDataPointSampler.h | 44 +- Filters/Modeling/vtkProjectedTexture.cxx | 213 +- Filters/Modeling/vtkProjectedTexture.h | 38 +- .../vtkQuadRotationalExtrusionFilter.cxx | 395 +- .../vtkQuadRotationalExtrusionFilter.h | 60 +- Filters/Modeling/vtkRibbonFilter.cxx | 368 +- Filters/Modeling/vtkRibbonFilter.h | 92 +- .../Modeling/vtkRotationalExtrusionFilter.cxx | 241 +- .../Modeling/vtkRotationalExtrusionFilter.h | 31 +- Filters/Modeling/vtkRuledSurfaceFilter.cxx | 282 +- Filters/Modeling/vtkRuledSurfaceFilter.h | 80 +- Filters/Modeling/vtkSectorSource.cxx | 78 +- Filters/Modeling/vtkSectorSource.h | 36 +- Filters/Modeling/vtkSelectEnclosedPoints.cxx | 219 +- Filters/Modeling/vtkSelectEnclosedPoints.h | 63 +- Filters/Modeling/vtkSelectPolyData.cxx | 331 +- Filters/Modeling/vtkSelectPolyData.h | 68 +- Filters/Modeling/vtkSpherePuzzle.cxx | 162 +- Filters/Modeling/vtkSpherePuzzle.h | 12 +- Filters/Modeling/vtkSpherePuzzleArrows.cxx | 108 +- Filters/Modeling/vtkSpherePuzzleArrows.h | 16 +- Filters/Modeling/vtkSubdivideTetra.cxx | 79 +- Filters/Modeling/vtkSubdivideTetra.h | 11 +- .../Modeling/vtkTrimmedExtrusionFilter.cxx | 371 +- Filters/Modeling/vtkTrimmedExtrusionFilter.h | 81 +- .../Modeling/vtkVolumeOfRevolutionFilter.cxx | 327 +- .../Modeling/vtkVolumeOfRevolutionFilter.h | 33 +- .../Testing/Cxx/TestOTDensityMap.cxx | 21 +- .../Testing/Cxx/TestOTKernelSmoothing.cxx | 12 +- Filters/OpenTURNS/vtkOTDensityMap.cxx | 59 +- Filters/OpenTURNS/vtkOTDensityMap.h | 25 +- Filters/OpenTURNS/vtkOTFilter.cxx | 9 +- Filters/OpenTURNS/vtkOTFilter.h | 5 +- Filters/OpenTURNS/vtkOTIncludes.h | 6 +- Filters/OpenTURNS/vtkOTKernelSmoothing.cxx | 10 +- Filters/OpenTURNS/vtkOTKernelSmoothing.h | 7 +- Filters/OpenTURNS/vtkOTScatterPlotMatrix.cxx | 14 +- Filters/OpenTURNS/vtkOTScatterPlotMatrix.h | 9 +- Filters/OpenTURNS/vtkOTUtilities.cxx | 5 +- Filters/OpenTURNS/vtkOTUtilities.h | 2 +- .../Parallel/Testing/Cxx/AggregateDataSet.cxx | 34 +- .../Parallel/Testing/Cxx/DistributedData.cxx | 116 +- .../Testing/Cxx/DistributedDataRenderPass.cxx | 186 +- .../Testing/Cxx/PCellDataToPointData.cxx | 10 +- .../Testing/Cxx/ParallelResampling.cxx | 67 +- .../Testing/Cxx/TestAngularPeriodicFilter.cxx | 4 +- .../Cxx/TestPExtractDataArraysOverTime.cxx | 25 +- .../Testing/Cxx/TransmitImageData.cxx | 91 +- .../Cxx/TransmitImageDataRenderPass.cxx | 131 +- .../Testing/Cxx/TransmitRectilinearGrid.cxx | 90 +- .../Testing/Cxx/TransmitStructuredGrid.cxx | 83 +- .../Testing/Cxx/UnitTestPMaskPoints.cxx | 23 +- .../Parallel/vtkAggregateDataSetFilter.cxx | 28 +- Filters/Parallel/vtkAggregateDataSetFilter.h | 2 +- Filters/Parallel/vtkAngularPeriodicFilter.cxx | 49 +- Filters/Parallel/vtkAngularPeriodicFilter.h | 62 +- Filters/Parallel/vtkBlockDistribution.h | 21 +- Filters/Parallel/vtkCollectGraph.cxx | 91 +- Filters/Parallel/vtkCollectGraph.h | 17 +- Filters/Parallel/vtkCollectPolyData.cxx | 46 +- Filters/Parallel/vtkCollectPolyData.h | 12 +- Filters/Parallel/vtkCollectTable.cxx | 40 +- Filters/Parallel/vtkCollectTable.h | 12 +- Filters/Parallel/vtkCutMaterial.cxx | 64 +- Filters/Parallel/vtkCutMaterial.h | 19 +- Filters/Parallel/vtkDistributedDataFilter.cxx | 77 +- Filters/Parallel/vtkDistributedDataFilter.h | 64 +- Filters/Parallel/vtkDuplicatePolyData.cxx | 69 +- Filters/Parallel/vtkDuplicatePolyData.h | 25 +- Filters/Parallel/vtkExtractCTHPart.cxx | 527 +- Filters/Parallel/vtkExtractCTHPart.h | 50 +- Filters/Parallel/vtkExtractPolyDataPiece.cxx | 129 +- Filters/Parallel/vtkExtractPolyDataPiece.h | 15 +- .../vtkExtractUnstructuredGridPiece.cxx | 218 +- .../vtkExtractUnstructuredGridPiece.h | 24 +- .../Parallel/vtkExtractUserDefinedPiece.cxx | 100 +- Filters/Parallel/vtkExtractUserDefinedPiece.h | 25 +- Filters/Parallel/vtkIntegrateAttributes.cxx | 5 +- Filters/Parallel/vtkIntegrateAttributes.h | 2 +- Filters/Parallel/vtkPCellDataToPointData.cxx | 39 +- Filters/Parallel/vtkPCellDataToPointData.h | 16 +- .../vtkPExtractSelectedArraysOverTime.h | 2 +- Filters/Parallel/vtkPKdTree.cxx | 1241 ++-- Filters/Parallel/vtkPKdTree.h | 150 +- .../Parallel/vtkPLinearExtrusionFilter.cxx | 32 +- Filters/Parallel/vtkPLinearExtrusionFilter.h | 11 +- Filters/Parallel/vtkPMaskPoints.cxx | 9 +- Filters/Parallel/vtkPOutlineCornerFilter.cxx | 34 +- Filters/Parallel/vtkPOutlineCornerFilter.h | 15 +- Filters/Parallel/vtkPOutlineFilter.cxx | 16 +- Filters/Parallel/vtkPOutlineFilter.h | 12 +- .../Parallel/vtkPOutlineFilterInternals.cxx | 90 +- Filters/Parallel/vtkPOutlineFilterInternals.h | 12 +- Filters/Parallel/vtkPPolyDataNormals.cxx | 44 +- Filters/Parallel/vtkPPolyDataNormals.h | 11 +- Filters/Parallel/vtkPProbeFilter.cxx | 70 +- Filters/Parallel/vtkPProbeFilter.h | 15 +- Filters/Parallel/vtkPProjectSphereFilter.cxx | 17 +- Filters/Parallel/vtkPProjectSphereFilter.h | 13 +- Filters/Parallel/vtkPReflectionFilter.cxx | 5 +- Filters/Parallel/vtkPReflectionFilter.h | 8 +- Filters/Parallel/vtkPResampleFilter.cxx | 99 +- Filters/Parallel/vtkPResampleFilter.h | 15 +- Filters/Parallel/vtkPSphereSource.cxx | 101 +- Filters/Parallel/vtkPSphereSource.h | 9 +- Filters/Parallel/vtkPTextureMapToSphere.cxx | 9 +- Filters/Parallel/vtkPTextureMapToSphere.h | 8 +- .../Parallel/vtkPYoungsMaterialInterface.cxx | 39 +- .../Parallel/vtkPYoungsMaterialInterface.h | 14 +- Filters/Parallel/vtkPassThroughFilter.cxx | 24 +- Filters/Parallel/vtkPassThroughFilter.h | 12 +- Filters/Parallel/vtkPeriodicFilter.cxx | 16 +- Filters/Parallel/vtkPeriodicFilter.h | 38 +- Filters/Parallel/vtkPieceRequestFilter.cxx | 38 +- Filters/Parallel/vtkPieceRequestFilter.h | 26 +- Filters/Parallel/vtkPieceScalars.cxx | 28 +- Filters/Parallel/vtkPieceScalars.h | 21 +- Filters/Parallel/vtkPipelineSize.cxx | 143 +- Filters/Parallel/vtkPipelineSize.h | 33 +- Filters/Parallel/vtkProcessIdScalars.cxx | 33 +- Filters/Parallel/vtkProcessIdScalars.h | 22 +- .../vtkRectilinearGridOutlineFilter.cxx | 166 +- .../vtkRectilinearGridOutlineFilter.h | 10 +- Filters/Parallel/vtkRemoveGhosts.cxx | 25 +- Filters/Parallel/vtkRemoveGhosts.h | 17 +- Filters/Parallel/vtkTransmitPolyDataPiece.cxx | 54 +- Filters/Parallel/vtkTransmitPolyDataPiece.h | 12 +- .../vtkTransmitRectilinearGridPiece.cxx | 2 +- .../vtkTransmitRectilinearGridPiece.h | 7 +- .../vtkTransmitStructuredDataPiece.cxx | 67 +- .../Parallel/vtkTransmitStructuredDataPiece.h | 18 +- .../vtkTransmitStructuredGridPiece.cxx | 2 +- .../Parallel/vtkTransmitStructuredGridPiece.h | 7 +- .../vtkTransmitUnstructuredGridPiece.cxx | 72 +- .../vtkTransmitUnstructuredGridPiece.h | 18 +- ...vtkUnstructuredGridGhostCellsGenerator.cxx | 4 +- .../vtkUnstructuredGridGhostCellsGenerator.h | 19 +- .../Testing/Cxx/DIYAggregateDataSet.cxx | 1 - .../Testing/Cxx/TestGenerateGlobalIds.cxx | 21 +- .../Testing/Cxx/TestPResampleToImage.cxx | 9 +- .../TestPResampleToImageCompositeDataSet.cxx | 13 +- .../Testing/Cxx/TestPResampleWithDataSet.cxx | 23 +- .../Testing/Cxx/TestPResampleWithDataSet2.cxx | 51 +- .../Cxx/TestRedistributeDataSetFilter.cxx | 14 +- .../vtkDIYAggregateDataSetFilter.cxx | 23 +- .../vtkDIYAggregateDataSetFilter.h | 25 +- .../ParallelDIY2/vtkDIYKdTreeUtilities.cxx | 39 +- Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h | 5 +- .../ParallelDIY2/vtkExtractSubsetWithSeed.cxx | 107 +- Filters/ParallelDIY2/vtkGenerateGlobalIds.cxx | 9 +- Filters/ParallelDIY2/vtkPResampleToImage.cxx | 198 +- Filters/ParallelDIY2/vtkPResampleToImage.h | 9 +- .../ParallelDIY2/vtkPResampleWithDataSet.cxx | 387 +- .../ParallelDIY2/vtkPResampleWithDataSet.h | 13 +- .../vtkRedistributeDataSetFilter.cxx | 19 +- .../vtkRedistributeDataSetFilter.h | 15 +- .../Cxx/TestPLagrangianParticleTracker.cxx | 36 +- .../Testing/Cxx/TestPParticleTracers.cxx | 227 +- .../Testing/Cxx/TestPStream.cxx | 30 +- .../Testing/Cxx/TestPStreamAMR.cxx | 112 +- .../Testing/Cxx/TestPStreamGeometry.cxx | 96 +- .../Testing/Cxx/TestVectorFieldSource.cxx | 119 +- .../Testing/Cxx/TestVectorFieldSource.h | 18 +- .../vtkPLagrangianParticleTracker.cxx | 19 +- .../vtkPParticlePathFilter.cxx | 53 +- .../vtkPParticlePathFilter.h | 16 +- .../ParallelFlowPaths/vtkPParticleTracer.cxx | 2 +- .../ParallelFlowPaths/vtkPParticleTracer.h | 16 +- .../vtkPParticleTracerBase.cxx | 271 +- .../vtkPParticleTracerBase.h | 40 +- .../vtkPStreaklineFilter.cxx | 18 +- .../ParallelFlowPaths/vtkPStreaklineFilter.h | 17 +- .../ParallelFlowPaths/vtkPStreamTracer.cxx | 1760 +++--- Filters/ParallelFlowPaths/vtkPStreamTracer.h | 27 +- .../vtkPTemporalStreamTracer.cxx | 151 +- .../vtkPTemporalStreamTracer.h | 132 +- .../Testing/Cxx/ParallelConnectivity.cxx | 33 +- .../Cxx/TestPStructuredGridConnectivity.cxx | 325 +- .../TestPStructuredGridGhostDataGenerator.cxx | 428 +- .../TestPUniformGridGhostDataGenerator.cxx | 405 +- ...stPUnstructuredGridGhostCellsGenerator.cxx | 70 +- .../Cxx/UnstructuredGhostZonesCommon.cxx | 256 +- .../Cxx/UnstructuredGhostZonesCommon.h | 6 +- .../vtkPConnectivityFilter.cxx | 318 +- .../ParallelGeometry/vtkPConnectivityFilter.h | 24 +- .../vtkPDataSetGhostGenerator.cxx | 10 +- .../vtkPDataSetGhostGenerator.h | 51 +- .../vtkPDistributedDataFilter.cxx | 1332 ++--- .../vtkPDistributedDataFilter.h | 210 +- .../vtkPStructuredGridConnectivity.cxx | 1286 ++-- .../vtkPStructuredGridConnectivity.h | 227 +- .../vtkPStructuredGridGhostDataGenerator.cxx | 98 +- .../vtkPStructuredGridGhostDataGenerator.h | 19 +- .../vtkPUniformGridGhostDataGenerator.cxx | 172 +- .../vtkPUniformGridGhostDataGenerator.h | 22 +- ...tkPUnstructuredGridGhostCellsGenerator.cxx | 25 +- .../vtkPUnstructuredGridGhostCellsGenerator.h | 24 +- Filters/ParallelImaging/vtkExtractPiece.cxx | 132 +- Filters/ParallelImaging/vtkExtractPiece.h | 46 +- .../vtkMemoryLimitImageDataStreamer.cxx | 47 +- .../vtkMemoryLimitImageDataStreamer.h | 18 +- .../vtkPComputeHistogram2DOutliers.cxx | 31 +- .../vtkPComputeHistogram2DOutliers.h | 14 +- .../vtkPExtractHistogram2D.cxx | 41 +- .../ParallelImaging/vtkPExtractHistogram2D.h | 8 +- .../vtkPPairwiseExtractHistogram2D.cxx | 3 +- .../vtkPPairwiseExtractHistogram2D.h | 7 +- .../vtkTransmitImageDataPiece.cxx | 2 +- .../vtkTransmitImageDataPiece.h | 7 +- .../Cxx/TestDistributedPointCloudFilter.cxx | 14 +- .../Testing/Cxx/TestImplicitConnectivity.cxx | 760 ++- .../vtkDistributedPointCloudFilter.cxx | 76 +- .../vtkDistributedPointCloudFilter.h | 16 +- Filters/ParallelMPI/vtkPExtractGrid.cxx | 130 +- Filters/ParallelMPI/vtkPExtractGrid.h | 33 +- .../vtkPExtractRectilinearGrid.cxx | 141 +- .../ParallelMPI/vtkPExtractRectilinearGrid.h | 14 +- Filters/ParallelMPI/vtkPExtractVOI.cxx | 122 +- Filters/ParallelMPI/vtkPExtractVOI.h | 11 +- .../vtkStructuredImplicitConnectivity.cxx | 1019 ++-- .../vtkStructuredImplicitConnectivity.h | 24 +- .../TestRandomPContingencyStatisticsMPI.cxx | 277 +- .../Cxx/TestRandomPKMeansStatisticsMPI.cxx | 190 +- .../Cxx/TestRandomPMomentStatisticsMPI.cxx | 674 +-- .../Cxx/TestRandomPOrderStatisticsMPI.cxx | 358 +- .../TestRealDataPDescriptiveStatisticsMPI.cxx | 349 +- .../vtkPAutoCorrelativeStatistics.cxx | 84 +- .../vtkPAutoCorrelativeStatistics.h | 14 +- .../vtkPBivariateLinearTableThreshold.cxx | 31 +- .../vtkPBivariateLinearTableThreshold.h | 13 +- .../vtkPContingencyStatistics.cxx | 390 +- .../vtkPContingencyStatistics.h | 26 +- .../vtkPCorrelativeStatistics.cxx | 82 +- .../vtkPCorrelativeStatistics.h | 14 +- .../vtkPDescriptiveStatistics.cxx | 88 +- .../vtkPDescriptiveStatistics.h | 10 +- .../vtkPKMeansStatistics.cxx | 182 +- .../ParallelStatistics/vtkPKMeansStatistics.h | 28 +- .../vtkPMultiCorrelativeStatistics.cxx | 96 +- .../vtkPMultiCorrelativeStatistics.h | 15 +- .../vtkPOrderStatistics.cxx | 282 +- .../ParallelStatistics/vtkPOrderStatistics.h | 26 +- .../ParallelStatistics/vtkPPCAStatistics.cxx | 31 +- .../ParallelStatistics/vtkPPCAStatistics.h | 11 +- .../Testing/Cxx/PCellSizeFilter.cxx | 36 +- .../ParallelVerdict/vtkPCellSizeFilter.cxx | 10 +- Filters/ParallelVerdict/vtkPCellSizeFilter.h | 2 +- Filters/Points/Testing/Cxx/PlotSPHKernels.cxx | 71 +- .../Cxx/TestPointCloudFilterArrays.cxx | 74 +- Filters/Points/Testing/Cxx/TestSPHKernels.cxx | 47 +- .../Points/Testing/Cxx/UnitTestKernels.cxx | 424 +- Filters/Points/vtkBoundedPointSource.cxx | 65 +- Filters/Points/vtkBoundedPointSource.h | 24 +- Filters/Points/vtkConnectedPointsFilter.cxx | 210 +- Filters/Points/vtkConnectedPointsFilter.h | 100 +- Filters/Points/vtkDensifyPointCloudFilter.cxx | 217 +- Filters/Points/vtkDensifyPointCloudFilter.h | 48 +- .../Points/vtkEllipsoidalGaussianKernel.cxx | 85 +- Filters/Points/vtkEllipsoidalGaussianKernel.h | 50 +- .../Points/vtkEuclideanClusterExtraction.cxx | 203 +- .../Points/vtkEuclideanClusterExtraction.h | 113 +- Filters/Points/vtkExtractEnclosedPoints.cxx | 112 +- Filters/Points/vtkExtractEnclosedPoints.h | 30 +- Filters/Points/vtkExtractHierarchicalBins.cxx | 46 +- Filters/Points/vtkExtractHierarchicalBins.h | 24 +- Filters/Points/vtkExtractPointCloudPiece.cxx | 48 +- Filters/Points/vtkExtractPointCloudPiece.h | 14 +- Filters/Points/vtkExtractPoints.cxx | 85 +- Filters/Points/vtkExtractPoints.h | 20 +- Filters/Points/vtkExtractSurface.cxx | 997 ++-- Filters/Points/vtkExtractSurface.h | 36 +- Filters/Points/vtkFitImplicitFunction.cxx | 86 +- Filters/Points/vtkFitImplicitFunction.h | 18 +- Filters/Points/vtkGaussianKernel.cxx | 38 +- Filters/Points/vtkGaussianKernel.h | 18 +- Filters/Points/vtkGeneralizedKernel.cxx | 12 +- Filters/Points/vtkGeneralizedKernel.h | 41 +- .../Points/vtkHierarchicalBinningFilter.cxx | 912 ++- Filters/Points/vtkHierarchicalBinningFilter.h | 32 +- Filters/Points/vtkInterpolationKernel.cxx | 37 +- Filters/Points/vtkInterpolationKernel.h | 17 +- Filters/Points/vtkLinearKernel.cxx | 27 +- Filters/Points/vtkLinearKernel.h | 11 +- Filters/Points/vtkMaskPointsFilter.cxx | 143 +- Filters/Points/vtkMaskPointsFilter.h | 31 +- Filters/Points/vtkPCACurvatureEstimation.cxx | 216 +- Filters/Points/vtkPCACurvatureEstimation.h | 23 +- Filters/Points/vtkPCANormalEstimation.cxx | 322 +- Filters/Points/vtkPCANormalEstimation.h | 56 +- Filters/Points/vtkPointCloudFilter.cxx | 181 +- Filters/Points/vtkPointCloudFilter.h | 28 +- Filters/Points/vtkPointDensityFilter.cxx | 432 +- Filters/Points/vtkPointDensityFilter.h | 104 +- Filters/Points/vtkPointInterpolator.cxx | 405 +- Filters/Points/vtkPointInterpolator.h | 86 +- Filters/Points/vtkPointInterpolator2D.cxx | 236 +- Filters/Points/vtkPointInterpolator2D.h | 18 +- Filters/Points/vtkPointOccupancyFilter.cxx | 194 +- Filters/Points/vtkPointOccupancyFilter.h | 41 +- .../Points/vtkProbabilisticVoronoiKernel.cxx | 41 +- .../Points/vtkProbabilisticVoronoiKernel.h | 11 +- Filters/Points/vtkRadiusOutlierRemoval.cxx | 91 +- Filters/Points/vtkRadiusOutlierRemoval.h | 24 +- Filters/Points/vtkSPHCubicKernel.cxx | 25 +- Filters/Points/vtkSPHCubicKernel.h | 22 +- Filters/Points/vtkSPHInterpolator.cxx | 409 +- Filters/Points/vtkSPHInterpolator.h | 106 +- Filters/Points/vtkSPHKernel.cxx | 77 +- Filters/Points/vtkSPHKernel.h | 62 +- Filters/Points/vtkSPHQuarticKernel.cxx | 28 +- Filters/Points/vtkSPHQuarticKernel.h | 28 +- Filters/Points/vtkSPHQuinticKernel.cxx | 16 +- Filters/Points/vtkSPHQuinticKernel.h | 30 +- Filters/Points/vtkShepardKernel.cxx | 43 +- Filters/Points/vtkShepardKernel.h | 15 +- Filters/Points/vtkSignedDistance.cxx | 247 +- Filters/Points/vtkSignedDistance.h | 38 +- .../Points/vtkStatisticalOutlierRemoval.cxx | 325 +- Filters/Points/vtkStatisticalOutlierRemoval.h | 32 +- Filters/Points/vtkUnsignedDistance.cxx | 369 +- Filters/Points/vtkUnsignedDistance.h | 66 +- Filters/Points/vtkVoronoiKernel.cxx | 14 +- Filters/Points/vtkVoronoiKernel.h | 12 +- Filters/Points/vtkVoxelGrid.cxx | 144 +- Filters/Points/vtkVoxelGrid.h | 52 +- Filters/Points/vtkWendlandQuinticKernel.cxx | 16 +- Filters/Points/vtkWendlandQuinticKernel.h | 23 +- .../Testing/Cxx/TestProgrammableFilter.cxx | 67 +- .../Testing/Cxx/TestProgrammableGlyph.cxx | 61 +- .../vtkProgrammableAttributeDataFilter.cxx | 54 +- .../vtkProgrammableAttributeDataFilter.h | 34 +- .../Programmable/vtkProgrammableFilter.cxx | 98 +- Filters/Programmable/vtkProgrammableFilter.h | 35 +- .../vtkProgrammableGlyphFilter.cxx | 164 +- .../Programmable/vtkProgrammableGlyphFilter.h | 44 +- Filters/Python/vtkPythonAlgorithm.cxx | 37 +- Filters/Python/vtkPythonAlgorithm.h | 12 +- .../ReebGraph/Testing/Cxx/TestReebGraph.cxx | 1156 ++-- .../vtkReebGraphSimplificationFilter.cxx | 28 +- .../vtkReebGraphSimplificationFilter.h | 17 +- .../vtkReebGraphSurfaceSkeletonFilter.cxx | 201 +- .../vtkReebGraphSurfaceSkeletonFilter.h | 13 +- .../vtkReebGraphToJoinSplitTreeFilter.cxx | 212 +- .../vtkReebGraphToJoinSplitTreeFilter.h | 17 +- .../vtkReebGraphVolumeSkeletonFilter.cxx | 201 +- .../vtkReebGraphVolumeSkeletonFilter.h | 16 +- .../vtkUnstructuredGridToReebGraphFilter.cxx | 35 +- .../vtkUnstructuredGridToReebGraphFilter.h | 18 +- Filters/SMP/Testing/Cxx/TestSMPContour.cxx | 34 +- Filters/SMP/Testing/Cxx/TestSMPTransform.cxx | 26 +- Filters/SMP/Testing/Cxx/TestSMPWarp.cxx | 140 +- .../TestThreadedSynchronizedTemplates3D.cxx | 17 +- ...tThreadedSynchronizedTemplatesCutter3D.cxx | 32 +- Filters/SMP/vtkSMPContourGrid.cxx | 223 +- Filters/SMP/vtkSMPContourGrid.h | 15 +- Filters/SMP/vtkSMPContourGridManyPieces.cxx | 125 +- Filters/SMP/vtkSMPContourGridManyPieces.h | 10 +- Filters/SMP/vtkSMPMergePoints.cxx | 96 +- Filters/SMP/vtkSMPMergePoints.h | 31 +- Filters/SMP/vtkSMPMergePolyDataHelper.cxx | 178 +- Filters/SMP/vtkSMPMergePolyDataHelper.h | 32 +- Filters/SMP/vtkSMPTransform.cxx | 121 +- Filters/SMP/vtkSMPTransform.h | 32 +- Filters/SMP/vtkSMPWarpVector.cxx | 50 +- Filters/SMP/vtkSMPWarpVector.h | 22 +- .../vtkThreadedSynchronizedTemplates3D.cxx | 2609 ++++---- .../SMP/vtkThreadedSynchronizedTemplates3D.h | 84 +- ...kThreadedSynchronizedTemplatesCutter3D.cxx | 362 +- ...vtkThreadedSynchronizedTemplatesCutter3D.h | 28 +- .../Cxx/TestCellDistanceSelector2D.cxx | 186 +- .../Cxx/TestCellDistanceSelector3D.cxx | 186 +- .../Testing/Cxx/TestLinearSelector2D.cxx | 31 +- .../Testing/Cxx/TestLinearSelector3D.cxx | 145 +- Filters/Selection/vtkCellDistanceSelector.cxx | 237 +- Filters/Selection/vtkCellDistanceSelector.h | 74 +- Filters/Selection/vtkKdTreeSelector.cxx | 51 +- Filters/Selection/vtkKdTreeSelector.h | 10 +- Filters/Selection/vtkLinearSelector.cxx | 182 +- Filters/Selection/vtkLinearSelector.h | 53 +- .../Testing/Cxx/ArrayAPIDenseCoordinates.cxx | 30 +- .../Testing/Cxx/ArrayDiagonalMatrixSource.cxx | 22 +- Filters/Sources/Testing/Cxx/TestArcSource.cxx | 21 +- .../Testing/Cxx/TestCellTypeSource.cxx | 159 +- .../Sources/Testing/Cxx/TestConeSource.cxx | 21 +- .../Sources/Testing/Cxx/TestCubeSource.cxx | 17 +- .../Testing/Cxx/TestCylinderSource.cxx | 17 +- .../Sources/Testing/Cxx/TestDiskSource.cxx | 17 +- .../Testing/Cxx/TestEllipseArcSource.cxx | 2 +- .../Cxx/TestEllipticalButtonSource.cxx | 18 +- .../Sources/Testing/Cxx/TestFrustumSource.cxx | 21 +- .../Sources/Testing/Cxx/TestGlyphSource2D.cxx | 17 +- .../Cxx/TestGlyphSource2DResolution.cxx | 22 +- .../Sources/Testing/Cxx/TestLineSource.cxx | 33 +- .../Sources/Testing/Cxx/TestMultiBlock.cxx | 29 +- .../Testing/Cxx/TestOutlineCornerSource.cxx | 30 +- .../Sources/Testing/Cxx/TestOutlineSource.cxx | 29 +- .../Cxx/TestParametricFunctionSource.cxx | 18 +- .../Sources/Testing/Cxx/TestPlaneSource.cxx | 21 +- .../Testing/Cxx/TestPlatonicSolidSource.cxx | 26 +- .../Sources/Testing/Cxx/TestPointSource.cxx | 17 +- .../Testing/Cxx/TestPolyLineSource.cxx | 54 +- .../Testing/Cxx/TestPolyPointSource.cxx | 48 +- .../Testing/Cxx/TestProgrammableSource.cxx | 48 +- .../Cxx/TestRandomHyperTreeGridSource.cxx | 21 +- .../Cxx/TestRectangularButtonSource.cxx | 18 +- .../Testing/Cxx/TestRegularPolygonSource.cxx | 22 +- .../Sources/Testing/Cxx/TestSphereSource.cxx | 17 +- .../Testing/Cxx/TestSuperquadricSource.cxx | 22 +- .../Testing/Cxx/TestTessellatedBoxSource.cxx | 24 +- .../Sources/Testing/Cxx/TestTextSource.cxx | 9 +- .../Testing/Cxx/TestTexturedSphereSource.cxx | 14 +- Filters/Sources/vtkArcSource.cxx | 160 +- Filters/Sources/vtkArcSource.h | 44 +- Filters/Sources/vtkArrowSource.cxx | 49 +- Filters/Sources/vtkArrowSource.h | 33 +- Filters/Sources/vtkButtonSource.cxx | 19 +- Filters/Sources/vtkButtonSource.h | 44 +- Filters/Sources/vtkCellTypeSource.cxx | 1388 +++-- Filters/Sources/vtkCellTypeSource.h | 12 +- Filters/Sources/vtkConeSource.cxx | 287 +- Filters/Sources/vtkConeSource.h | 48 +- Filters/Sources/vtkCubeSource.cxx | 144 +- Filters/Sources/vtkCubeSource.h | 35 +- Filters/Sources/vtkCylinderSource.cxx | 150 +- Filters/Sources/vtkCylinderSource.h | 36 +- Filters/Sources/vtkDiagonalMatrixSource.cxx | 60 +- Filters/Sources/vtkDiagonalMatrixSource.h | 8 +- Filters/Sources/vtkDiskSource.cxx | 46 +- Filters/Sources/vtkDiskSource.h | 28 +- Filters/Sources/vtkEllipseArcSource.cxx | 35 +- Filters/Sources/vtkEllipseArcSource.h | 15 +- Filters/Sources/vtkEllipticalButtonSource.cxx | 305 +- Filters/Sources/vtkEllipticalButtonSource.h | 64 +- Filters/Sources/vtkFrustumSource.cxx | 330 +- Filters/Sources/vtkFrustumSource.h | 34 +- Filters/Sources/vtkGlyphSource2D.cxx | 357 +- Filters/Sources/vtkGlyphSource2D.h | 145 +- Filters/Sources/vtkGraphToPolyData.cxx | 67 +- Filters/Sources/vtkGraphToPolyData.h | 8 +- Filters/Sources/vtkHyperTreeGridSource.cxx | 408 +- Filters/Sources/vtkHyperTreeGridSource.h | 83 +- Filters/Sources/vtkLineSource.cxx | 127 +- Filters/Sources/vtkLineSource.h | 30 +- Filters/Sources/vtkOutlineCornerFilter.cxx | 26 +- Filters/Sources/vtkOutlineCornerFilter.h | 13 +- Filters/Sources/vtkOutlineCornerSource.cxx | 54 +- Filters/Sources/vtkOutlineCornerSource.h | 9 +- Filters/Sources/vtkOutlineSource.cxx | 200 +- Filters/Sources/vtkOutlineSource.h | 38 +- .../Sources/vtkParametricFunctionSource.cxx | 149 +- Filters/Sources/vtkParametricFunctionSource.h | 385 +- Filters/Sources/vtkPlaneSource.cxx | 180 +- Filters/Sources/vtkPlaneSource.h | 40 +- Filters/Sources/vtkPlatonicSolidSource.cxx | 270 +- Filters/Sources/vtkPlatonicSolidSource.h | 42 +- Filters/Sources/vtkPointSource.cxx | 60 +- Filters/Sources/vtkPointSource.h | 44 +- Filters/Sources/vtkPolyLineSource.cxx | 15 +- Filters/Sources/vtkPolyLineSource.h | 4 +- Filters/Sources/vtkPolyPointSource.cxx | 15 +- Filters/Sources/vtkPolyPointSource.h | 4 +- .../vtkProgrammableDataObjectSource.cxx | 28 +- .../Sources/vtkProgrammableDataObjectSource.h | 20 +- Filters/Sources/vtkProgrammableSource.cxx | 112 +- Filters/Sources/vtkProgrammableSource.h | 40 +- .../Sources/vtkRandomHyperTreeGridSource.cxx | 66 +- .../Sources/vtkRandomHyperTreeGridSource.h | 23 +- .../Sources/vtkRectangularButtonSource.cxx | 202 +- Filters/Sources/vtkRectangularButtonSource.h | 38 +- Filters/Sources/vtkRegularPolygonSource.cxx | 77 +- Filters/Sources/vtkRegularPolygonSource.h | 48 +- Filters/Sources/vtkSelectionSource.cxx | 209 +- Filters/Sources/vtkSelectionSource.h | 20 +- Filters/Sources/vtkSphereSource.cxx | 126 +- Filters/Sources/vtkSphereSource.h | 54 +- Filters/Sources/vtkSuperquadricSource.cxx | 194 +- Filters/Sources/vtkSuperquadricSource.h | 56 +- Filters/Sources/vtkTessellatedBoxSource.cxx | 509 +- Filters/Sources/vtkTessellatedBoxSource.h | 41 +- Filters/Sources/vtkTextSource.cxx | 128 +- Filters/Sources/vtkTextSource.h | 31 +- Filters/Sources/vtkTexturedSphereSource.cxx | 62 +- Filters/Sources/vtkTexturedSphereSource.h | 34 +- .../Sources/vtkUniformHyperTreeGridSource.cxx | 42 +- .../Sources/vtkUniformHyperTreeGridSource.h | 10 +- .../Cxx/TestAutoCorrelativeStatistics.cxx | 436 +- .../Testing/Cxx/TestComputeQuartiles.cxx | 28 +- .../Testing/Cxx/TestContingencyStatistics.cxx | 328 +- .../Testing/Cxx/TestCorrelativeStatistics.cxx | 578 +- .../Testing/Cxx/TestDescriptiveStatistics.cxx | 650 +- .../Cxx/TestExtractFunctionalBagPlot.cxx | 29 +- .../TestHighestDensityRegionsStatistics.cxx | 26 +- .../Testing/Cxx/TestKMeansStatistics.cxx | 155 +- .../Cxx/TestMultiCorrelativeStatistics.cxx | 107 +- .../Testing/Cxx/TestOrderStatistics.cxx | 445 +- .../Testing/Cxx/TestPCAStatistics.cxx | 284 +- .../vtkAutoCorrelativeStatistics.cxx | 385 +- .../Statistics/vtkAutoCorrelativeStatistics.h | 37 +- .../vtkBivariateLinearTableThreshold.cxx | 135 +- .../vtkBivariateLinearTableThreshold.h | 61 +- Filters/Statistics/vtkComputeQuartiles.cxx | 44 +- Filters/Statistics/vtkComputeQuartiles.h | 10 +- .../Statistics/vtkContingencyStatistics.cxx | 1371 ++--- Filters/Statistics/vtkContingencyStatistics.h | 33 +- .../Statistics/vtkCorrelativeStatistics.cxx | 640 +- Filters/Statistics/vtkCorrelativeStatistics.h | 29 +- .../Statistics/vtkDescriptiveStatistics.cxx | 455 +- Filters/Statistics/vtkDescriptiveStatistics.h | 57 +- .../vtkExtractFunctionalBagPlot.cxx | 40 +- .../Statistics/vtkExtractFunctionalBagPlot.h | 15 +- .../vtkHighestDensityRegionsStatistics.cxx | 81 +- .../vtkHighestDensityRegionsStatistics.h | 39 +- Filters/Statistics/vtkKMeansAssessFunctor.h | 6 +- .../Statistics/vtkKMeansDistanceFunctor.cxx | 139 +- Filters/Statistics/vtkKMeansDistanceFunctor.h | 50 +- .../vtkKMeansDistanceFunctorCalculator.cxx | 42 +- .../vtkKMeansDistanceFunctorCalculator.h | 19 +- Filters/Statistics/vtkKMeansStatistics.cxx | 645 +- Filters/Statistics/vtkKMeansStatistics.h | 108 +- .../vtkMultiCorrelativeStatistics.cxx | 558 +- .../vtkMultiCorrelativeStatistics.h | 41 +- ...kMultiCorrelativeStatisticsAssessFunctor.h | 17 +- Filters/Statistics/vtkOrderStatistics.cxx | 641 +- Filters/Statistics/vtkOrderStatistics.h | 58 +- Filters/Statistics/vtkPCAStatistics.cxx | 653 +- Filters/Statistics/vtkPCAStatistics.h | 71 +- Filters/Statistics/vtkStatisticsAlgorithm.cxx | 209 +- Filters/Statistics/vtkStatisticsAlgorithm.h | 123 +- .../vtkStatisticsAlgorithmPrivate.h | 72 +- Filters/Statistics/vtkStrahlerMetric.cxx | 56 +- Filters/Statistics/vtkStrahlerMetric.h | 21 +- Filters/Statistics/vtkStreamingStatistics.cxx | 78 +- Filters/Statistics/vtkStreamingStatistics.h | 27 +- .../Testing/Cxx/TestScalarsToTexture.cxx | 5 +- Filters/Texture/vtkImplicitTextureCoords.cxx | 119 +- Filters/Texture/vtkImplicitTextureCoords.h | 29 +- Filters/Texture/vtkScalarsToTextureFilter.cxx | 8 +- Filters/Texture/vtkScalarsToTextureFilter.h | 6 +- Filters/Texture/vtkTextureMapToCylinder.cxx | 126 +- Filters/Texture/vtkTextureMapToCylinder.h | 30 +- Filters/Texture/vtkTextureMapToPlane.cxx | 181 +- Filters/Texture/vtkTextureMapToPlane.h | 40 +- Filters/Texture/vtkTextureMapToSphere.cxx | 93 +- Filters/Texture/vtkTextureMapToSphere.h | 27 +- Filters/Texture/vtkThresholdTextureCoords.cxx | 64 +- Filters/Texture/vtkThresholdTextureCoords.h | 35 +- Filters/Texture/vtkTransformTextureCoords.cxx | 85 +- Filters/Texture/vtkTransformTextureCoords.h | 50 +- Filters/Texture/vtkTriangularTCoords.cxx | 108 +- Filters/Texture/vtkTriangularTCoords.h | 9 +- .../Topology/Testing/Cxx/TestFiberSurface.cxx | 17 +- Filters/Topology/vtkFiberSurface.cxx | 5 +- Filters/Topology/vtkFiberSurface.h | 642 +- .../Verdict/Testing/Cxx/CellSizeFilter.cxx | 36 +- Filters/Verdict/Testing/Cxx/MeshQuality.cxx | 418 +- Filters/Verdict/vtkCellQuality.cxx | 280 +- Filters/Verdict/vtkCellQuality.h | 180 +- Filters/Verdict/vtkCellSizeFilter.cxx | 396 +- Filters/Verdict/vtkCellSizeFilter.h | 4 +- Filters/Verdict/vtkMatrixMathFilter.cxx | 127 +- Filters/Verdict/vtkMatrixMathFilter.h | 47 +- Filters/Verdict/vtkMeshQuality.cxx | 1247 ++-- Filters/Verdict/vtkMeshQuality.h | 482 +- GUISupport/MFC/vtkMFCWindow.cpp | 166 +- GUISupport/MFC/vtkMFCWindow.h | 3 +- GUISupport/Qt/Q4VTKWidgetPlugin.cxx | 12 +- GUISupport/Qt/Q4VTKWidgetPlugin.h | 46 +- GUISupport/Qt/QFilterTreeProxyModel.cxx | 20 +- GUISupport/Qt/QFilterTreeProxyModel.h | 7 +- GUISupport/Qt/QVTKApplication.cxx | 17 +- GUISupport/Qt/QVTKApplication.h | 33 +- GUISupport/Qt/QVTKInteractor.cxx | 76 +- GUISupport/Qt/QVTKInteractor.h | 15 +- GUISupport/Qt/QVTKInteractorAdapter.cxx | 533 +- GUISupport/Qt/QVTKInteractorInternal.h | 2 +- GUISupport/Qt/QVTKOpenGLNativeWidget.h | 1 + GUISupport/Qt/QVTKOpenGLWidget.cxx | 16 +- GUISupport/Qt/QVTKOpenGLWidget.h | 5 +- GUISupport/Qt/QVTKOpenGLWindow.cxx | 2 +- GUISupport/Qt/QVTKOpenGLWindow.h | 2 + GUISupport/Qt/QVTKPaintEngine.cxx | 37 +- GUISupport/Qt/QVTKPaintEngine.h | 2 - GUISupport/Qt/QVTKRenderWindowAdapter.cxx | 31 +- GUISupport/Qt/QVTKWidget.cxx | 228 +- GUISupport/Qt/QVTKWidget.h | 35 +- GUISupport/Qt/QVTKWin32Header.h | 12 +- GUISupport/Qt/Testing/Cxx/QTestApp.cxx | 71 +- GUISupport/Qt/Testing/Cxx/QTestApp.h | 22 +- .../Qt/Testing/Cxx/TestQWidgetWidget.cxx | 6 +- GUISupport/Qt/Testing/Cxx/TestQtCommon.cxx | 3 +- GUISupport/Qt/Testing/Cxx/TestQtCommon.h | 3 +- .../Qt/Testing/Cxx/TestQtDebugLeaksView.cxx | 22 +- GUISupport/Qt/Testing/Cxx/TestQtPicking.cxx | 3 +- .../Testing/Cxx/TestQtTableModelAdapter.cxx | 5 +- .../Qt/Testing/Cxx/TestQtTreeModelAdapter.cxx | 9 +- .../Qt/Testing/Cxx/TestWin32QVTKWidget.cxx | 73 +- GUISupport/Qt/vtkEventQtSlotConnect.cxx | 42 +- GUISupport/Qt/vtkEventQtSlotConnect.h | 103 +- GUISupport/Qt/vtkQWidgetRepresentation.cxx | 60 +- GUISupport/Qt/vtkQWidgetRepresentation.h | 33 +- GUISupport/Qt/vtkQWidgetTexture.cxx | 82 +- GUISupport/Qt/vtkQWidgetTexture.h | 18 +- GUISupport/Qt/vtkQWidgetWidget.cxx | 170 +- GUISupport/Qt/vtkQWidgetWidget.h | 18 +- GUISupport/Qt/vtkQtAbstractModelAdapter.h | 44 +- .../Qt/vtkQtAnnotationLayersModelAdapter.cxx | 161 +- .../Qt/vtkQtAnnotationLayersModelAdapter.h | 58 +- GUISupport/Qt/vtkQtConnection.cxx | 59 +- GUISupport/Qt/vtkQtConnection.h | 78 +- GUISupport/Qt/vtkQtDebugLeaksModel.cxx | 53 +- GUISupport/Qt/vtkQtDebugLeaksModel.h | 14 +- GUISupport/Qt/vtkQtDebugLeaksView.cxx | 42 +- GUISupport/Qt/vtkQtDebugLeaksView.h | 8 +- GUISupport/Qt/vtkQtTableModelAdapter.cxx | 138 +- GUISupport/Qt/vtkQtTableModelAdapter.h | 59 +- GUISupport/Qt/vtkQtTreeModelAdapter.cxx | 99 +- GUISupport/Qt/vtkQtTreeModelAdapter.h | 41 +- GUISupport/Qt/vtkTDxQtUnixDevices.cxx | 56 +- GUISupport/Qt/vtkTDxQtUnixDevices.h | 23 +- GUISupport/QtOpenGL/QVTKGraphicsItem.cxx | 98 +- GUISupport/QtOpenGL/QVTKGraphicsItem.h | 139 +- GUISupport/QtOpenGL/QVTKWidget2.cxx | 145 +- GUISupport/QtOpenGL/QVTKWidget2.h | 28 +- .../QtOpenGL/Testing/Cxx/QTestMainWindow.cxx | 12 +- .../QtOpenGL/Testing/Cxx/QTestMainWindow.h | 25 +- .../QtSQL/Testing/Cxx/TestQtSQLDatabase.cxx | 41 +- GUISupport/QtSQL/vtkQtSQLDatabase.cxx | 41 +- GUISupport/QtSQL/vtkQtSQLDatabase.h | 21 +- GUISupport/QtSQL/vtkQtSQLQuery.cxx | 22 +- GUISupport/QtSQL/vtkQtSQLQuery.h | 8 +- GUISupport/QtSQL/vtkQtTimePointUtility.cxx | 12 +- GUISupport/QtSQL/vtkQtTimePointUtility.h | 4 +- .../Testing/Cxx/TestGeoAssignCoordinates.cxx | 5 +- Geovis/Core/Testing/Cxx/TestGeoGraticule.cxx | 80 +- Geovis/Core/Testing/Cxx/TestGeoProjection.cxx | 10 +- Geovis/Core/Testing/Cxx/TestGlobeSource.cxx | 41 +- Geovis/Core/vtkCompassRepresentation.cxx | 283 +- Geovis/Core/vtkCompassRepresentation.h | 65 +- Geovis/Core/vtkCompassWidget.cxx | 161 +- Geovis/Core/vtkCompassWidget.h | 17 +- Geovis/Core/vtkGeoProjection.cxx | 76 +- Geovis/Core/vtkGeoProjection.h | 18 +- Geovis/Core/vtkGeoTransform.cxx | 119 +- Geovis/Core/vtkGeoTransform.h | 33 +- .../Cxx/TestRasterReprojectionFilter.cxx | 7 +- Geovis/GDAL/vtkGDALRasterConverter.cxx | 109 +- Geovis/GDAL/vtkGDALRasterConverter.h | 19 +- Geovis/GDAL/vtkGDALRasterReprojection.cxx | 66 +- Geovis/GDAL/vtkGDALRasterReprojection.h | 8 +- Geovis/GDAL/vtkRasterReprojectionFilter.cxx | 86 +- Geovis/GDAL/vtkRasterReprojectionFilter.h | 18 +- .../Core/vtkADIOS2CoreArraySelection.cxx | 9 +- IO/ADIOS2/Core/vtkADIOS2CoreArraySelection.h | 15 +- IO/ADIOS2/Core/vtkADIOS2CoreTypeTraits.h | 26 +- .../TestADIOS2BPReaderMPIMultiTimeSteps2D.cxx | 31 +- .../TestADIOS2BPReaderMPIMultiTimeSteps3D.cxx | 28 +- .../TestADIOS2BPReaderMPISingleTimeStep.cxx | 29 +- .../TestADIOS2BPReaderMultiTimeSteps2D.cxx | 17 +- .../TestADIOS2BPReaderMultiTimeSteps3D.cxx | 16 +- .../Cxx/TestADIOS2BPReaderSingleTimeStep.cxx | 17 +- .../Testing/Cxx/TestIOADIOS2VTX_VTI3D.cxx | 6 +- .../Testing/Cxx/TestIOADIOS2VTX_VTU3D.cxx | 6 +- IO/ADIOS2/VTX/VTXSchemaManager.h | 84 +- IO/ADIOS2/VTX/common/VTXDataArray.h | 46 +- IO/ADIOS2/VTX/common/VTXHelper.h | 8 +- IO/ADIOS2/VTX/common/VTXHelper.txx | 16 +- IO/ADIOS2/VTX/common/VTXTypes.h | 32 +- IO/ADIOS2/VTX/schema/VTXSchema.h | 12 +- IO/ADIOS2/VTX/schema/VTXSchema.txx | 12 +- IO/ADIOS2/VTX/schema/vtk/VTXvtkVTI.h | 2 +- IO/ADIOS2/VTX/schema/vtk/VTXvtkVTI.txx | 2 +- IO/ADIOS2/VTX/schema/vtk/VTXvtkVTU.h | 2 +- IO/ADIOS2/VTX/schema/vtk/VTXvtkVTU.txx | 41 +- IO/ADIOS2/vtkADIOS2CoreImageReader.cxx | 262 +- IO/ADIOS2/vtkADIOS2CoreImageReader.h | 30 +- IO/ADIOS2/vtkADIOS2VTXReader.h | 33 +- IO/AMR/Testing/Cxx/TestAMRReadWrite.cxx | 9 +- IO/AMR/Testing/Cxx/TestEnzoReader.cxx | 84 +- IO/AMR/vtkAMRBaseParticlesReader.cxx | 138 +- IO/AMR/vtkAMRBaseParticlesReader.h | 88 +- IO/AMR/vtkAMRBaseReader.cxx | 449 +- IO/AMR/vtkAMRBaseReader.h | 106 +- IO/AMR/vtkAMRDataSetCache.cxx | 159 +- IO/AMR/vtkAMRDataSetCache.h | 34 +- IO/AMR/vtkAMREnzoParticlesReader.cxx | 324 +- IO/AMR/vtkAMREnzoParticlesReader.h | 28 +- IO/AMR/vtkAMREnzoReader.cxx | 323 +- IO/AMR/vtkAMREnzoReader.h | 54 +- IO/AMR/vtkAMREnzoReaderInternal.cxx | 861 ++- IO/AMR/vtkAMREnzoReaderInternal.h | 166 +- IO/AMR/vtkAMRFlashParticlesReader.cxx | 279 +- IO/AMR/vtkAMRFlashParticlesReader.h | 19 +- IO/AMR/vtkAMRFlashReader.cxx | 157 +- IO/AMR/vtkAMRFlashReader.h | 30 +- IO/AMR/vtkAMRFlashReaderInternal.cxx | 1383 ++--- IO/AMR/vtkAMRFlashReaderInternal.h | 211 +- IO/AMR/vtkAMReXGridReaderInternal.cxx | 7 +- IO/AMR/vtkAMReXParticlesReader.cxx | 2 +- IO/Asynchronous/vtkThreadedImageWriter.cxx | 3 +- IO/CityGML/Testing/Cxx/TestCityGMLReader.cxx | 14 +- IO/CityGML/vtkCityGMLReader.cxx | 317 +- IO/CityGML/vtkCityGMLReader.h | 13 +- IO/Core/Testing/Cxx/TestArrayDataWriter.cxx | 25 +- IO/Core/Testing/Cxx/TestArrayDenormalized.cxx | 20 +- .../Testing/Cxx/TestArraySerialization.cxx | 96 +- IO/Core/Testing/Cxx/TestCompressLZ4.cxx | 17 +- IO/Core/Testing/Cxx/TestCompressLZMA.cxx | 17 +- IO/Core/Testing/Cxx/TestCompressZLib.cxx | 7 +- IO/Core/Testing/Cxx/TestNumberToString.cxx | 2 +- IO/Core/Testing/Cxx/vtkFortran.h | 52 +- IO/Core/vtkASCIITextCodec.cxx | 49 +- IO/Core/vtkASCIITextCodec.h | 19 +- IO/Core/vtkAbstractParticleWriter.cxx | 13 +- IO/Core/vtkAbstractParticleWriter.h | 24 +- IO/Core/vtkAbstractPolyDataReader.cxx | 5 +- IO/Core/vtkAbstractPolyDataReader.h | 5 +- IO/Core/vtkArrayDataReader.cxx | 28 +- IO/Core/vtkArrayDataReader.h | 10 +- IO/Core/vtkArrayDataWriter.cxx | 29 +- IO/Core/vtkArrayDataWriter.h | 10 +- IO/Core/vtkArrayReader.cxx | 227 +- IO/Core/vtkArrayReader.h | 11 +- IO/Core/vtkArrayWriter.cxx | 234 +- IO/Core/vtkArrayWriter.h | 11 +- IO/Core/vtkBase64InputStream.cxx | 85 +- IO/Core/vtkBase64InputStream.h | 6 +- IO/Core/vtkBase64OutputStream.cxx | 67 +- IO/Core/vtkBase64OutputStream.h | 6 +- IO/Core/vtkBase64Utilities.cxx | 148 +- IO/Core/vtkBase64Utilities.h | 51 +- IO/Core/vtkDataCompressor.cxx | 47 +- IO/Core/vtkDataCompressor.h | 39 +- IO/Core/vtkDelimitedTextWriter.cxx | 77 +- IO/Core/vtkDelimitedTextWriter.h | 13 +- IO/Core/vtkGlobFileNames.cxx | 26 +- IO/Core/vtkGlobFileNames.h | 14 +- IO/Core/vtkInputStream.cxx | 13 +- IO/Core/vtkInputStream.h | 6 +- IO/Core/vtkJavaScriptDataWriter.cxx | 45 +- IO/Core/vtkJavaScriptDataWriter.h | 11 +- IO/Core/vtkLZ4DataCompressor.cxx | 62 +- IO/Core/vtkLZ4DataCompressor.h | 17 +- IO/Core/vtkLZMADataCompressor.cxx | 56 +- IO/Core/vtkLZMADataCompressor.h | 20 +- IO/Core/vtkNumberToString.h | 10 +- IO/Core/vtkOutputStream.cxx | 6 +- IO/Core/vtkOutputStream.h | 6 +- IO/Core/vtkSortFileNames.cxx | 95 +- IO/Core/vtkSortFileNames.h | 25 +- IO/Core/vtkTextCodec.cxx | 89 +- IO/Core/vtkTextCodec.h | 17 +- IO/Core/vtkTextCodecFactory.cxx | 44 +- IO/Core/vtkTextCodecFactory.h | 9 +- IO/Core/vtkUTF16TextCodec.cxx | 162 +- IO/Core/vtkUTF16TextCodec.h | 30 +- IO/Core/vtkUTF8TextCodec.cxx | 43 +- IO/Core/vtkUTF8TextCodec.h | 22 +- IO/Core/vtkWriter.cxx | 47 +- IO/Core/vtkWriter.h | 25 +- IO/Core/vtkZLibDataCompressor.cxx | 46 +- IO/Core/vtkZLibDataCompressor.h | 17 +- IO/EnSight/vtkEnSight6BinaryReader.cxx | 854 ++- IO/EnSight/vtkEnSight6BinaryReader.h | 64 +- IO/EnSight/vtkEnSight6Reader.cxx | 629 +- IO/EnSight/vtkEnSight6Reader.h | 54 +- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 1160 ++-- IO/EnSight/vtkEnSightGoldBinaryReader.h | 76 +- IO/EnSight/vtkEnSightGoldReader.cxx | 754 ++- IO/EnSight/vtkEnSightGoldReader.h | 65 +- IO/EnSight/vtkEnSightMasterServerReader.cxx | 69 +- IO/EnSight/vtkEnSightMasterServerReader.h | 10 +- IO/EnSight/vtkEnSightReader.cxx | 784 ++- IO/EnSight/vtkEnSightReader.h | 157 +- IO/EnSight/vtkGenericEnSightReader.cxx | 562 +- IO/EnSight/vtkGenericEnSightReader.h | 65 +- .../Testing/Cxx/TestExodusAttributes.cxx | 23 +- .../Testing/Cxx/TestExodusIgnoreFileTime.cxx | 22 +- IO/Exodus/Testing/Cxx/TestExodusSideSets.cxx | 28 +- IO/Exodus/Testing/Cxx/TestExodusTetra15.cxx | 11 +- IO/Exodus/Testing/Cxx/TestExodusWedge21.cxx | 11 +- IO/Exodus/Testing/Cxx/TestInSituExodus.cxx | 466 +- .../Testing/Cxx/TestMultiBlockExodusWrite.cxx | 155 +- IO/Exodus/vtkCPExodusIIElementBlock.cxx | 44 +- IO/Exodus/vtkCPExodusIIElementBlock.h | 53 +- .../vtkCPExodusIIElementBlockCellIterator.cxx | 32 +- .../vtkCPExodusIIElementBlockCellIterator.h | 17 +- IO/Exodus/vtkCPExodusIIInSituReader.cxx | 120 +- IO/Exodus/vtkCPExodusIIInSituReader.h | 37 +- .../vtkCPExodusIINodalCoordinatesTemplate.h | 93 +- .../vtkCPExodusIINodalCoordinatesTemplate.txx | 252 +- IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h | 83 +- .../vtkCPExodusIIResultsArrayTemplate.txx | 249 +- IO/Exodus/vtkExodusIICache.cxx | 154 +- IO/Exodus/vtkExodusIICache.h | 122 +- IO/Exodus/vtkExodusIIReader.cxx | 4587 +++++++------- IO/Exodus/vtkExodusIIReader.h | 580 +- IO/Exodus/vtkExodusIIReaderParser.cxx | 82 +- IO/Exodus/vtkExodusIIReaderParser.h | 22 +- IO/Exodus/vtkExodusIIReaderPrivate.h | 834 ++- IO/Exodus/vtkExodusIIReaderVariableCheck.cxx | 269 +- IO/Exodus/vtkExodusIIReaderVariableCheck.h | 80 +- IO/Exodus/vtkExodusIIWriter.cxx | 1898 +++--- IO/Exodus/vtkExodusIIWriter.h | 179 +- IO/Exodus/vtkModelMetadata.cxx | 559 +- IO/Exodus/vtkModelMetadata.h | 419 +- IO/Export/Testing/Cxx/TestGLTFExporter.cxx | 23 +- IO/Export/Testing/Cxx/TestLinePlotGL2PS.cxx | 12 +- IO/Export/Testing/Cxx/TestOBJExporter.cxx | 20 +- IO/Export/Testing/Cxx/TestRIBExporter.cxx | 160 +- .../Testing/Cxx/TestSVGContextExport.cxx | 120 +- .../Testing/Cxx/TestSVGContextShading.cxx | 77 +- .../Cxx/TestSVGExporterContextPolyData.cxx | 45 +- .../Testing/Cxx/TestSingleVTPExporter.cxx | 23 +- IO/Export/Testing/Cxx/UnitTestRIB.cxx | 502 +- IO/Export/Testing/Cxx/X3DTest.cxx | 8 +- IO/Export/vtkExporter.cxx | 72 +- IO/Export/vtkExporter.h | 39 +- IO/Export/vtkGLTFExporter.cxx | 204 +- IO/Export/vtkGLTFExporter.h | 10 +- IO/Export/vtkIVExporter.cxx | 434 +- IO/Export/vtkIVExporter.h | 19 +- IO/Export/vtkJSONDataSetWriter.cxx | 10 +- IO/Export/vtkJSONSceneExporter.cxx | 93 +- IO/Export/vtkOBJExporter.cxx | 149 +- IO/Export/vtkOBJExporter.h | 37 +- IO/Export/vtkOOGLExporter.cxx | 534 +- IO/Export/vtkOOGLExporter.h | 13 +- IO/Export/vtkPOVExporter.cxx | 210 +- IO/Export/vtkPOVExporter.h | 54 +- IO/Export/vtkRIBExporter.cxx | 879 ++- IO/Export/vtkRIBExporter.h | 58 +- IO/Export/vtkRIBLight.cxx | 14 +- IO/Export/vtkRIBLight.h | 18 +- IO/Export/vtkRIBProperty.cxx | 192 +- IO/Export/vtkRIBProperty.h | 44 +- IO/Export/vtkSVGContextDevice2D.cxx | 718 +-- IO/Export/vtkSVGContextDevice2D.h | 144 +- IO/Export/vtkSVGExporter.cxx | 71 +- IO/Export/vtkSVGExporter.h | 84 +- IO/Export/vtkSingleVTPExporter.cxx | 404 +- IO/Export/vtkSingleVTPExporter.h | 22 +- IO/Export/vtkVRMLExporter.cxx | 472 +- IO/Export/vtkVRMLExporter.h | 34 +- IO/Export/vtkX3D.cxx | 348 +- IO/Export/vtkX3D.h | 1038 ++-- IO/Export/vtkX3DExporter.cxx | 418 +- IO/Export/vtkX3DExporter.h | 47 +- IO/Export/vtkX3DExporterFIWriter.cxx | 256 +- IO/Export/vtkX3DExporterFIWriter.h | 12 +- IO/Export/vtkX3DExporterFIWriterHelper.h | 330 +- IO/Export/vtkX3DExporterWriter.cxx | 8 +- IO/Export/vtkX3DExporterWriter.h | 17 +- IO/Export/vtkX3DExporterXMLWriter.cxx | 125 +- IO/Export/vtkX3DExporterXMLWriter.h | 9 +- .../Cxx/TestGL2PSBillboardTextActor3D.cxx | 39 +- .../Testing/Cxx/TestGL2PSContext.cxx | 64 +- .../TestGL2PSExporterMultipleRenderers.cxx | 6 +- .../Testing/Cxx/TestGL2PSExporterRaster.cxx | 14 +- .../Cxx/TestGL2PSExporterVolumeRaster.cxx | 24 +- .../Cxx/TestGL2PSLabeledDataMapper.cxx | 12 +- .../Testing/Cxx/TestGL2PSScalarBar.cxx | 169 +- .../Testing/Cxx/TestGL2PSTextActor.cxx | 29 +- .../Testing/Cxx/TestGL2PSTextActor3D.cxx | 34 +- .../Testing/Cxx/TestGL2PSTextMapper.cxx | 34 +- .../Testing/Cxx/TestStackedPlotGL2PS.cxx | 55 +- IO/ExportGL2PS/vtkGL2PSExporter.cxx | 51 +- IO/ExportGL2PS/vtkGL2PSExporter.h | 74 +- IO/ExportGL2PS/vtkOpenGLGL2PSExporter.cxx | 26 +- IO/ExportGL2PS/vtkOpenGLGL2PSExporter.h | 14 +- .../Testing/Cxx/TestPDFContextExport.cxx | 125 +- .../Testing/Cxx/TestPDFContextShading.cxx | 77 +- .../Cxx/TestPDFExporterContextPolyData.cxx | 44 +- .../Testing/Cxx/TestPDFTransformedText.cxx | 48 +- IO/ExportPDF/vtkPDFContextDevice2D.cxx | 729 +-- IO/ExportPDF/vtkPDFContextDevice2D.h | 127 +- IO/ExportPDF/vtkPDFExporter.cxx | 45 +- IO/ExportPDF/vtkPDFExporter.h | 13 +- .../Testing/Cxx/TestFFMPEGVideoSource.cxx | 13 +- .../Cxx/TestFFMPEGVideoSourceWithAudio.cxx | 146 +- IO/FFMPEG/Testing/Cxx/TestFFMPEGWriter.cxx | 25 +- IO/FFMPEG/vtkFFMPEGVideoSource.cxx | 171 +- IO/FFMPEG/vtkFFMPEGVideoSource.h | 54 +- IO/FFMPEG/vtkFFMPEGWriter.cxx | 289 +- IO/FFMPEG/vtkFFMPEGWriter.h | 10 +- .../Testing/Cxx/TestGDALRasterNoDataValue.cxx | 35 +- IO/GDAL/Testing/Cxx/TestGDALRasterPalette.cxx | 14 +- IO/GDAL/Testing/Cxx/TestGDALRasterReader.cxx | 15 +- IO/GDAL/Testing/Cxx/TestGDALVectorReader.cxx | 17 +- IO/GDAL/vtkGDAL.h | 12 +- IO/GDAL/vtkGDALRasterReader.cxx | 357 +- IO/GDAL/vtkGDALRasterReader.h | 24 +- IO/GDAL/vtkGDALVectorReader.cxx | 489 +- IO/GDAL/vtkGDALVectorReader.h | 26 +- IO/GeoJSON/vtkGeoJSONFeature.cxx | 267 +- IO/GeoJSON/vtkGeoJSONFeature.h | 57 +- IO/GeoJSON/vtkGeoJSONReader.cxx | 109 +- IO/GeoJSON/vtkGeoJSONReader.h | 20 +- IO/GeoJSON/vtkGeoJSONWriter.cxx | 910 ++- IO/GeoJSON/vtkGeoJSONWriter.h | 38 +- IO/Geometry/Testing/Cxx/TestAMRReadWrite.cxx | 34 +- IO/Geometry/Testing/Cxx/TestDataObjectIO.cxx | 38 +- .../Testing/Cxx/TestHoudiniPolyDataWriter.cxx | 208 +- .../Cxx/TestIncrementalOctreePointLocator.cxx | 931 ++- IO/Geometry/Testing/Cxx/TestMFIXReader.cxx | 92 +- .../Testing/Cxx/TestOBJPolyDataWriter.cxx | 26 +- .../Testing/Cxx/TestOBJReaderComments.cxx | 18 +- .../Testing/Cxx/TestOBJReaderGroups.cxx | 54 +- .../Testing/Cxx/TestOBJReaderMaterials.cxx | 27 +- .../Testing/Cxx/TestOBJReaderMultiTexture.cxx | 15 +- .../Cxx/TestOBJReaderNormalsTCoords.cxx | 23 +- .../Testing/Cxx/TestOBJReaderRelative.cxx | 75 +- .../Cxx/TestOBJReaderSingleTexture.cxx | 7 +- .../Testing/Cxx/TestOpenFOAMReader.cxx | 67 +- .../Cxx/TestOpenFOAMReader64BitFloats.cxx | 9 +- .../Testing/Cxx/TestOpenFOAMReaderRegEx.cxx | 101 +- IO/Geometry/Testing/Cxx/TestPTSReader.cxx | 7 +- IO/Geometry/Testing/Cxx/TestProStarReader.cxx | 29 +- IO/Geometry/Testing/Cxx/TestSTLReader.cxx | 21 +- .../Cxx/TestSimplePointsReaderWriter.cxx | 13 +- IO/Geometry/Testing/Cxx/TestTecplotReader.cxx | 89 +- .../Testing/Cxx/TestTecplotReader2.cxx | 5 +- .../Testing/Cxx/TestWindBladeReader.cxx | 37 +- IO/Geometry/Testing/Cxx/UnitTestSTLWriter.cxx | 48 +- .../Cxx/UnstructuredGridCellGradients.cxx | 19 +- .../Cxx/UnstructuredGridFastGradients.cxx | 16 +- .../Testing/Cxx/UnstructuredGridGradients.cxx | 16 +- IO/Geometry/vtkAVSucdReader.cxx | 545 +- IO/Geometry/vtkAVSucdReader.h | 90 +- IO/Geometry/vtkBYUReader.cxx | 227 +- IO/Geometry/vtkBYUReader.h | 52 +- IO/Geometry/vtkBYUWriter.cxx | 187 +- IO/Geometry/vtkBYUWriter.h | 37 +- IO/Geometry/vtkCGMWriter.cxx | 1783 +++--- IO/Geometry/vtkCGMWriter.h | 38 +- IO/Geometry/vtkChacoReader.cxx | 510 +- IO/Geometry/vtkChacoReader.h | 57 +- IO/Geometry/vtkFLUENTReader.cxx | 1227 ++-- IO/Geometry/vtkFLUENTReader.h | 182 +- IO/Geometry/vtkFacetWriter.cxx | 130 +- IO/Geometry/vtkFacetWriter.h | 18 +- IO/Geometry/vtkGAMBITReader.cxx | 360 +- IO/Geometry/vtkGAMBITReader.h | 50 +- IO/Geometry/vtkGLTFDocumentLoader.cxx | 16 +- IO/Geometry/vtkGLTFDocumentLoader.h | 2 +- IO/Geometry/vtkGLTFReader.cxx | 8 +- IO/Geometry/vtkGaussianCubeReader.cxx | 186 +- IO/Geometry/vtkGaussianCubeReader.h | 17 +- IO/Geometry/vtkHoudiniPolyDataWriter.cxx | 452 +- IO/Geometry/vtkHoudiniPolyDataWriter.h | 5 +- IO/Geometry/vtkIVWriter.cxx | 142 +- IO/Geometry/vtkIVWriter.h | 23 +- IO/Geometry/vtkMCubesReader.cxx | 193 +- IO/Geometry/vtkMCubesReader.h | 42 +- IO/Geometry/vtkMCubesWriter.cxx | 73 +- IO/Geometry/vtkMCubesWriter.h | 19 +- IO/Geometry/vtkMFIXReader.cxx | 1613 +++-- IO/Geometry/vtkMFIXReader.h | 148 +- IO/Geometry/vtkMoleculeReaderBase.cxx | 558 +- IO/Geometry/vtkMoleculeReaderBase.h | 38 +- IO/Geometry/vtkOBJReader.cxx | 9 +- IO/Geometry/vtkOBJReader.h | 18 +- IO/Geometry/vtkOpenFOAMReader.cxx | 3143 +++++----- IO/Geometry/vtkOpenFOAMReader.h | 186 +- IO/Geometry/vtkPDBReader.cxx | 44 +- IO/Geometry/vtkPDBReader.h | 7 +- IO/Geometry/vtkPTSReader.cxx | 153 +- IO/Geometry/vtkPTSReader.h | 19 +- IO/Geometry/vtkParticleReader.cxx | 554 +- IO/Geometry/vtkParticleReader.h | 58 +- IO/Geometry/vtkProStarReader.cxx | 186 +- IO/Geometry/vtkProStarReader.h | 20 +- IO/Geometry/vtkSTLReader.cxx | 207 +- IO/Geometry/vtkSTLReader.h | 38 +- IO/Geometry/vtkSTLWriter.cxx | 278 +- IO/Geometry/vtkSTLWriter.h | 41 +- IO/Geometry/vtkTecplotReader.cxx | 1557 +++-- IO/Geometry/vtkTecplotReader.h | 152 +- IO/Geometry/vtkWindBladeReader.cxx | 481 +- IO/Geometry/vtkWindBladeReader.h | 190 +- IO/Geometry/vtkXYZMolReader.cxx | 112 +- IO/Geometry/vtkXYZMolReader.h | 15 +- IO/H5part/vtkH5PartReader.h | 42 +- IO/Image/Testing/Cxx/TestBMPReader.cxx | 24 +- .../Cxx/TestBMPReaderDoNotAllow8BitBMP.cxx | 19 +- .../Testing/Cxx/TestCompressedTIFFReader.cxx | 17 +- IO/Image/Testing/Cxx/TestDICOMImageReader.cxx | 19 +- .../TestDICOMImageReaderFileCollection.cxx | 19 +- IO/Image/Testing/Cxx/TestDataObjectIO.cxx | 17 +- IO/Image/Testing/Cxx/TestImportExport.cxx | 162 +- IO/Image/Testing/Cxx/TestJPEGReader.cxx | 11 +- IO/Image/Testing/Cxx/TestMRCReader.cxx | 23 +- IO/Image/Testing/Cxx/TestMetaIO.cxx | 37 +- IO/Image/Testing/Cxx/TestNIFTI2.cxx | 47 +- .../Testing/Cxx/TestNIFTIReaderAnalyze.cxx | 37 +- .../Testing/Cxx/TestNIFTIReaderWriter.cxx | 107 +- IO/Image/Testing/Cxx/TestNrrdReader.cxx | 9 +- IO/Image/Testing/Cxx/TestOMETIFFReader.cxx | 16 +- IO/Image/Testing/Cxx/TestSEPReader.cxx | 15 +- IO/Image/Testing/Cxx/TestTIFFReader.cxx | 21 +- .../Testing/Cxx/TestTIFFReaderMultiple.cxx | 21 +- IO/Image/Testing/Cxx/TestWriteToMemory.cxx | 22 +- IO/Image/vtkBMPReader.cxx | 216 +- IO/Image/vtkBMPReader.h | 35 +- IO/Image/vtkBMPWriter.cxx | 82 +- IO/Image/vtkBMPWriter.h | 16 +- IO/Image/vtkDEMReader.cxx | 270 +- IO/Image/vtkDEMReader.h | 71 +- IO/Image/vtkDICOMImageReader.cxx | 147 +- IO/Image/vtkDICOMImageReader.h | 26 +- IO/Image/vtkGESignaReader.cxx | 574 +- IO/Image/vtkGESignaReader.h | 20 +- IO/Image/vtkImageExport.cxx | 309 +- IO/Image/vtkImageExport.h | 77 +- IO/Image/vtkImageImport.cxx | 261 +- IO/Image/vtkImageImport.h | 112 +- IO/Image/vtkImageImportExecutive.cxx | 9 +- IO/Image/vtkImageImportExecutive.h | 13 +- IO/Image/vtkImageReader.cxx | 323 +- IO/Image/vtkImageReader.h | 40 +- IO/Image/vtkImageReader2.cxx | 250 +- IO/Image/vtkImageReader2.h | 121 +- IO/Image/vtkImageReader2Collection.cxx | 11 +- IO/Image/vtkImageReader2Collection.h | 15 +- IO/Image/vtkImageReader2Factory.cxx | 60 +- IO/Image/vtkImageReader2Factory.h | 10 +- IO/Image/vtkImageWriter.cxx | 204 +- IO/Image/vtkImageWriter.h | 46 +- IO/Image/vtkJPEGReader.cxx | 130 +- IO/Image/vtkJPEGReader.h | 22 +- IO/Image/vtkJPEGWriter.cxx | 117 +- IO/Image/vtkJPEGWriter.h | 14 +- IO/Image/vtkJSONImageWriter.cxx | 56 +- IO/Image/vtkJSONImageWriter.h | 15 +- IO/Image/vtkMRCReader.cxx | 118 +- IO/Image/vtkMRCReader.h | 11 +- IO/Image/vtkMedicalImageProperties.cxx | 352 +- IO/Image/vtkMedicalImageProperties.h | 108 +- IO/Image/vtkMedicalImageReader2.cxx | 14 +- IO/Image/vtkMedicalImageReader2.h | 8 +- IO/Image/vtkMetaImageReader.cxx | 111 +- IO/Image/vtkMetaImageReader.h | 44 +- IO/Image/vtkMetaImageWriter.cxx | 103 +- IO/Image/vtkMetaImageWriter.h | 27 +- IO/Image/vtkNIFTIImageHeader.cxx | 28 +- IO/Image/vtkNIFTIImageHeader.h | 55 +- IO/Image/vtkNIFTIImagePrivate.h | 400 +- IO/Image/vtkNIFTIImageReader.cxx | 433 +- IO/Image/vtkNIFTIImageReader.h | 37 +- IO/Image/vtkNIFTIImageWriter.cxx | 198 +- IO/Image/vtkNIFTIImageWriter.h | 64 +- IO/Image/vtkNrrdReader.cxx | 254 +- IO/Image/vtkNrrdReader.h | 35 +- IO/Image/vtkOMETIFFReader.cxx | 2 +- IO/Image/vtkPNGReader.cxx | 198 +- IO/Image/vtkPNGReader.h | 24 +- IO/Image/vtkPNGWriter.cxx | 168 +- IO/Image/vtkPNGWriter.h | 13 +- IO/Image/vtkPNMReader.cxx | 80 +- IO/Image/vtkPNMReader.h | 19 +- IO/Image/vtkPNMWriter.cxx | 37 +- IO/Image/vtkPNMWriter.h | 15 +- IO/Image/vtkPostScriptWriter.cxx | 72 +- IO/Image/vtkPostScriptWriter.h | 16 +- IO/Image/vtkSEPReader.cxx | 30 +- IO/Image/vtkSEPReader.h | 23 +- IO/Image/vtkSLCReader.cxx | 308 +- IO/Image/vtkSLCReader.h | 28 +- IO/Image/vtkTIFFReader.cxx | 529 +- IO/Image/vtkTIFFReader.h | 52 +- IO/Image/vtkTIFFWriter.cxx | 132 +- IO/Image/vtkTIFFWriter.h | 27 +- IO/Image/vtkVolume16Reader.cxx | 239 +- IO/Image/vtkVolume16Reader.h | 55 +- IO/Image/vtkVolumeReader.cxx | 26 +- IO/Image/vtkVolumeReader.h | 25 +- IO/Import/Testing/Cxx/TestImportExportOBJ.cxx | 30 +- IO/Import/Testing/Cxx/TestImportOBJ.cxx | 12 +- IO/Import/Testing/Cxx/TestOBJImporter.cxx | 18 +- IO/Import/Testing/Cxx/TestVRMLImporter.cxx | 4 +- IO/Import/Testing/Cxx/TestVRMLNormals.cxx | 8 +- IO/Import/vtk3DS.h | 203 +- IO/Import/vtk3DSImporter.cxx | 994 ++-- IO/Import/vtk3DSImporter.h | 52 +- IO/Import/vtkImporter.cxx | 49 +- IO/Import/vtkImporter.h | 33 +- IO/Import/vtkOBJImporter.cxx | 991 ++-- IO/Import/vtkOBJImporter.h | 16 +- IO/Import/vtkOBJImporterInternals.cxx | 201 +- IO/Import/vtkOBJImporterInternals.h | 75 +- IO/Import/vtkVRML.h | 55 +- IO/Import/vtkVRMLImporter.cxx | 255 +- IO/Import/vtkVRMLImporter.h | 12 +- .../Testing/Cxx/TestBiomTableReader.cxx | 8 +- .../Testing/Cxx/TestDIMACSGraphReader.cxx | 27 +- IO/Infovis/Testing/Cxx/TestDataObjectIO.cxx | 52 +- .../Testing/Cxx/TestDelimitedTextReader.cxx | 50 +- .../Testing/Cxx/TestDelimitedTextReader2.cxx | 18 +- .../Testing/Cxx/TestFixedWidthTextReader.cxx | 59 +- IO/Infovis/Testing/Cxx/TestISIReader.cxx | 23 +- .../Testing/Cxx/TestMultiNewickTreeReader.cxx | 19 +- .../Testing/Cxx/TestNewickTreeReader.cxx | 31 +- .../Testing/Cxx/TestNewickTreeWriter.cxx | 32 +- .../Testing/Cxx/TestPhyloXMLTreeReadWrite.cxx | 136 +- IO/Infovis/Testing/Cxx/TestRISReader.cxx | 34 +- IO/Infovis/Testing/Cxx/TestTulipReader.cxx | 6 +- .../Testing/Cxx/TestTulipReaderClusters.cxx | 6 +- .../Testing/Cxx/TestTulipReaderProperties.cxx | 114 +- IO/Infovis/vtkBiomTableReader.cxx | 204 +- IO/Infovis/vtkBiomTableReader.h | 15 +- IO/Infovis/vtkChacoGraphReader.cxx | 37 +- IO/Infovis/vtkChacoGraphReader.h | 9 +- IO/Infovis/vtkDIMACSGraphReader.cxx | 305 +- IO/Infovis/vtkDIMACSGraphReader.h | 35 +- IO/Infovis/vtkDIMACSGraphWriter.cxx | 25 +- IO/Infovis/vtkDIMACSGraphWriter.h | 8 +- IO/Infovis/vtkDelimitedTextReader.cxx | 318 +- IO/Infovis/vtkDelimitedTextReader.h | 27 +- IO/Infovis/vtkFixedWidthTextReader.cxx | 89 +- IO/Infovis/vtkFixedWidthTextReader.h | 22 +- IO/Infovis/vtkISIReader.cxx | 60 +- IO/Infovis/vtkISIReader.h | 15 +- IO/Infovis/vtkMultiNewickTreeReader.cxx | 59 +- IO/Infovis/vtkMultiNewickTreeReader.h | 23 +- IO/Infovis/vtkNewickTreeReader.cxx | 96 +- IO/Infovis/vtkNewickTreeReader.h | 24 +- IO/Infovis/vtkNewickTreeWriter.cxx | 19 +- IO/Infovis/vtkNewickTreeWriter.h | 14 +- IO/Infovis/vtkPhyloXMLTreeReader.cxx | 231 +- IO/Infovis/vtkPhyloXMLTreeReader.h | 50 +- IO/Infovis/vtkPhyloXMLTreeWriter.cxx | 109 +- IO/Infovis/vtkPhyloXMLTreeWriter.h | 43 +- IO/Infovis/vtkRISReader.cxx | 182 +- IO/Infovis/vtkRISReader.h | 15 +- IO/Infovis/vtkTulipReader.cxx | 37 +- IO/Infovis/vtkTulipReader.h | 9 +- IO/Infovis/vtkXGMLReader.cxx | 89 +- IO/Infovis/vtkXGMLReader.h | 15 +- IO/Infovis/vtkXMLTreeReader.cxx | 93 +- IO/Infovis/vtkXMLTreeReader.h | 15 +- IO/LAS/vtkLASReader.cxx | 84 +- IO/LAS/vtkLASReader.h | 16 +- IO/LSDyna/LSDynaFamily.cxx | 471 +- IO/LSDyna/LSDynaFamily.h | 165 +- IO/LSDyna/LSDynaMetaData.cxx | 44 +- IO/LSDyna/LSDynaMetaData.h | 27 +- IO/LSDyna/Testing/Cxx/TestLSDynaReader.cxx | 15 +- .../Cxx/TestLSDynaReaderDeflection.cxx | 12 +- .../Testing/Cxx/TestLSDynaReaderNoDefl.cxx | 15 +- IO/LSDyna/Testing/Cxx/TestLSDynaReaderSPH.cxx | 12 +- IO/LSDyna/vtkLSDynaPart.cxx | 655 +- IO/LSDyna/vtkLSDynaPart.h | 163 +- IO/LSDyna/vtkLSDynaPartCollection.cxx | 681 +-- IO/LSDyna/vtkLSDynaPartCollection.h | 203 +- IO/LSDyna/vtkLSDynaReader.cxx | 2687 +++++---- IO/LSDyna/vtkLSDynaReader.h | 506 +- IO/LSDyna/vtkLSDynaSummaryParser.cxx | 118 +- IO/LSDyna/vtkLSDynaSummaryParser.h | 16 +- .../Testing/Cxx/TestLegacyArrayMetaData.cxx | 104 +- .../TestLegacyCompositeDataReaderWriter.cxx | 26 +- .../Cxx/TestLegacyGhostCellsImport.cxx | 6 +- IO/Legacy/vtkCompositeDataReader.cxx | 104 +- IO/Legacy/vtkCompositeDataReader.h | 12 +- IO/Legacy/vtkCompositeDataWriter.cxx | 107 +- IO/Legacy/vtkCompositeDataWriter.h | 5 +- IO/Legacy/vtkDataObjectReader.cxx | 31 +- IO/Legacy/vtkDataObjectReader.h | 16 +- IO/Legacy/vtkDataObjectWriter.cxx | 23 +- IO/Legacy/vtkDataObjectWriter.h | 50 +- IO/Legacy/vtkDataReader.cxx | 1510 +++-- IO/Legacy/vtkDataReader.h | 345 +- IO/Legacy/vtkDataSetReader.cxx | 93 +- IO/Legacy/vtkDataSetReader.h | 29 +- IO/Legacy/vtkDataSetWriter.cxx | 32 +- IO/Legacy/vtkDataSetWriter.h | 8 +- IO/Legacy/vtkDataWriter.cxx | 1068 ++-- IO/Legacy/vtkDataWriter.h | 99 +- IO/Legacy/vtkGenericDataObjectReader.cxx | 122 +- IO/Legacy/vtkGenericDataObjectReader.h | 43 +- IO/Legacy/vtkGenericDataObjectWriter.cxx | 14 +- IO/Legacy/vtkGenericDataObjectWriter.h | 8 +- IO/Legacy/vtkGraphReader.cxx | 92 +- IO/Legacy/vtkGraphReader.h | 18 +- IO/Legacy/vtkGraphWriter.cxx | 44 +- IO/Legacy/vtkGraphWriter.h | 10 +- IO/Legacy/vtkLegacyReaderVersion.h | 2 +- IO/Legacy/vtkPixelExtentIO.cxx | 98 +- IO/Legacy/vtkPixelExtentIO.h | 28 +- IO/Legacy/vtkPolyDataReader.cxx | 118 +- IO/Legacy/vtkPolyDataReader.h | 16 +- IO/Legacy/vtkPolyDataWriter.cxx | 33 +- IO/Legacy/vtkPolyDataWriter.h | 8 +- IO/Legacy/vtkRectilinearGridReader.cxx | 224 +- IO/Legacy/vtkRectilinearGridReader.h | 19 +- IO/Legacy/vtkRectilinearGridWriter.cxx | 26 +- IO/Legacy/vtkRectilinearGridWriter.h | 25 +- IO/Legacy/vtkSimplePointsReader.cxx | 17 +- IO/Legacy/vtkSimplePointsReader.h | 9 +- IO/Legacy/vtkSimplePointsWriter.cxx | 23 +- IO/Legacy/vtkSimplePointsWriter.h | 8 +- IO/Legacy/vtkStructuredGridReader.cxx | 208 +- IO/Legacy/vtkStructuredGridReader.h | 20 +- IO/Legacy/vtkStructuredGridWriter.cxx | 25 +- IO/Legacy/vtkStructuredGridWriter.h | 25 +- IO/Legacy/vtkStructuredPointsReader.cxx | 310 +- IO/Legacy/vtkStructuredPointsReader.h | 20 +- IO/Legacy/vtkStructuredPointsWriter.cxx | 40 +- IO/Legacy/vtkStructuredPointsWriter.h | 25 +- IO/Legacy/vtkTableReader.cxx | 44 +- IO/Legacy/vtkTableReader.h | 16 +- IO/Legacy/vtkTableWriter.cxx | 15 +- IO/Legacy/vtkTableWriter.h | 8 +- IO/Legacy/vtkTreeReader.cxx | 77 +- IO/Legacy/vtkTreeReader.h | 16 +- IO/Legacy/vtkTreeWriter.cxx | 27 +- IO/Legacy/vtkTreeWriter.h | 8 +- IO/Legacy/vtkUnstructuredGridReader.cxx | 157 +- IO/Legacy/vtkUnstructuredGridReader.h | 16 +- IO/Legacy/vtkUnstructuredGridWriter.cxx | 42 +- IO/Legacy/vtkUnstructuredGridWriter.h | 11 +- IO/MINC/vtkMINC.h | 224 +- IO/MINC/vtkMINCImageAttributes.cxx | 453 +- IO/MINC/vtkMINCImageAttributes.h | 138 +- IO/MINC/vtkMINCImageReader.cxx | 458 +- IO/MINC/vtkMINCImageReader.h | 40 +- IO/MINC/vtkMINCImageWriter.cxx | 689 +-- IO/MINC/vtkMINCImageWriter.h | 69 +- IO/MINC/vtkMNIObjectReader.cxx | 203 +- IO/MINC/vtkMNIObjectReader.h | 59 +- IO/MINC/vtkMNIObjectWriter.cxx | 171 +- IO/MINC/vtkMNIObjectWriter.h | 65 +- IO/MINC/vtkMNITagPointReader.cxx | 176 +- IO/MINC/vtkMNITagPointReader.h | 73 +- IO/MINC/vtkMNITagPointWriter.cxx | 104 +- IO/MINC/vtkMNITagPointWriter.h | 54 +- IO/MINC/vtkMNITransformReader.cxx | 224 +- IO/MINC/vtkMNITransformReader.h | 61 +- IO/MINC/vtkMNITransformWriter.cxx | 119 +- IO/MINC/vtkMNITransformWriter.h | 45 +- IO/MPIImage/Testing/Cxx/ParallelIso.cxx | 62 +- IO/MPIImage/Testing/Cxx/ParallelIso2.cxx | 62 +- IO/MPIImage/vtkMPIImageReader.cxx | 241 +- IO/MPIImage/vtkMPIImageReader.h | 31 +- IO/MPIImage/vtkPNrrdReader.cxx | 237 +- IO/MPIImage/vtkPNrrdReader.h | 33 +- .../Testing/Cxx/TestPWindBladeReader.cxx | 42 +- .../vtkMPIMultiBlockPLOT3DReader.cxx | 283 +- IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.h | 23 +- IO/MPIParallel/vtkPWindBladeReader.cxx | 199 +- IO/MPIParallel/vtkPWindBladeReader.h | 18 +- .../Testing/Cxx/TestMotionFXCFGReaderCommon.h | 3 +- IO/MotionFX/vtkMotionFXCFGGrammar.h | 104 +- IO/MotionFX/vtkMotionFXCFGReader.cxx | 46 +- IO/Movie/Testing/Cxx/TestAVIWriter.cxx | 20 +- IO/Movie/Testing/Cxx/TestOggTheoraWriter.cxx | 36 +- IO/Movie/vtkAVIWriter.cxx | 131 +- IO/Movie/vtkAVIWriter.h | 13 +- IO/Movie/vtkGenericMovieWriter.cxx | 22 +- IO/Movie/vtkGenericMovieWriter.h | 24 +- IO/MySQL/Testing/Cxx/TestMySQLDatabase.cxx | 300 +- .../Testing/Cxx/TestMySQLTableReadWrite.cxx | 24 +- IO/MySQL/vtkIOMySQL_AutoInit.cxx | 7 +- IO/MySQL/vtkMySQLDatabase.cxx | 272 +- IO/MySQL/vtkMySQLDatabase.h | 45 +- IO/MySQL/vtkMySQLDatabasePrivate.h | 12 +- IO/MySQL/vtkMySQLQuery.cxx | 464 +- IO/MySQL/vtkMySQLQuery.h | 25 +- IO/MySQL/vtkMySQLToTableReader.cxx | 107 +- IO/MySQL/vtkMySQLToTableReader.h | 16 +- IO/MySQL/vtkTableToMySQLWriter.cxx | 71 +- IO/MySQL/vtkTableToMySQLWriter.h | 12 +- IO/NetCDF/Testing/Cxx/SLACMultipleModes.cxx | 48 +- IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx | 30 +- IO/NetCDF/Testing/Cxx/SLACReaderLinear.cxx | 18 +- IO/NetCDF/Testing/Cxx/SLACReaderQuadratic.cxx | 21 +- IO/NetCDF/Testing/Cxx/TestMPASReader.cxx | 35 +- IO/NetCDF/Testing/Cxx/TestNetCDFCAMReader.cxx | 24 +- IO/NetCDF/Testing/Cxx/TestNetCDFPOPReader.cxx | 14 +- IO/NetCDF/vtkMPASReader.cxx | 719 ++- IO/NetCDF/vtkMPASReader.h | 63 +- IO/NetCDF/vtkNetCDFCAMReader.cxx | 461 +- IO/NetCDF/vtkNetCDFCAMReader.h | 30 +- IO/NetCDF/vtkNetCDFCFReader.cxx | 766 ++- IO/NetCDF/vtkNetCDFCFReader.h | 162 +- IO/NetCDF/vtkNetCDFPOPReader.cxx | 188 +- IO/NetCDF/vtkNetCDFPOPReader.h | 29 +- IO/NetCDF/vtkNetCDFReader.cxx | 382 +- IO/NetCDF/vtkNetCDFReader.h | 80 +- IO/NetCDF/vtkSLACParticleReader.cxx | 134 +- IO/NetCDF/vtkSLACParticleReader.h | 29 +- IO/NetCDF/vtkSLACReader.cxx | 680 +-- IO/NetCDF/vtkSLACReader.h | 149 +- IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx | 100 +- IO/ODBC/vtkIOODBC_AutoInit.cxx | 7 +- IO/ODBC/vtkODBCDatabase.cxx | 312 +- IO/ODBC/vtkODBCDatabase.h | 53 +- IO/ODBC/vtkODBCInternals.h | 8 +- IO/ODBC/vtkODBCQuery.cxx | 676 +-- IO/ODBC/vtkODBCQuery.h | 27 +- IO/OggTheora/vtkOggTheoraWriter.cxx | 175 +- IO/OggTheora/vtkOggTheoraWriter.h | 10 +- IO/PDAL/vtkPDALReader.cxx | 128 +- IO/PDAL/vtkPDALReader.h | 14 +- IO/PLY/Testing/Cxx/TestPLYReader.cxx | 21 +- IO/PLY/Testing/Cxx/TestPLYReaderIntensity.cxx | 27 +- .../Testing/Cxx/TestPLYReaderPointCloud.cxx | 39 +- IO/PLY/Testing/Cxx/TestPLYReaderTextureUV.cxx | 24 +- IO/PLY/Testing/Cxx/TestPLYWriter.cxx | 25 +- IO/PLY/Testing/Cxx/TestPLYWriterString.cxx | 31 +- IO/PLY/vtkPLY.cxx | 1374 ++--- IO/PLY/vtkPLY.h | 264 +- IO/PLY/vtkPLYReader.cxx | 359 +- IO/PLY/vtkPLYReader.h | 13 +- IO/PLY/vtkPLYWriter.cxx | 198 +- IO/PLY/vtkPLYWriter.h | 69 +- IO/Parallel/Testing/Cxx/PSLACReaderLinear.cxx | 32 +- .../Testing/Cxx/PSLACReaderQuadratic.cxx | 38 +- .../Testing/Cxx/TestPOpenFOAMReader.cxx | 68 +- IO/Parallel/vtkEnSightWriter.cxx | 1011 ++-- IO/Parallel/vtkEnSightWriter.h | 53 +- IO/Parallel/vtkMultiBlockPLOT3DReader.cxx | 1534 +++-- IO/Parallel/vtkMultiBlockPLOT3DReader.h | 198 +- .../vtkMultiBlockPLOT3DReaderInternals.cxx | 151 +- .../vtkMultiBlockPLOT3DReaderInternals.h | 74 +- IO/Parallel/vtkPChacoReader.cxx | 141 +- IO/Parallel/vtkPChacoReader.h | 31 +- IO/Parallel/vtkPDataSetReader.cxx | 331 +- IO/Parallel/vtkPDataSetReader.h | 64 +- IO/Parallel/vtkPDataSetWriter.cxx | 221 +- IO/Parallel/vtkPDataSetWriter.h | 31 +- IO/Parallel/vtkPImageWriter.cxx | 122 +- IO/Parallel/vtkPImageWriter.h | 22 +- IO/Parallel/vtkPOpenFOAMReader.cxx | 142 +- IO/Parallel/vtkPOpenFOAMReader.h | 35 +- IO/Parallel/vtkPSLACReader.cxx | 681 +-- IO/Parallel/vtkPSLACReader.h | 71 +- IO/Parallel/vtkPlot3DMetaReader.cxx | 177 +- IO/Parallel/vtkPlot3DMetaReader.h | 48 +- .../Testing/Cxx/TestExodusImplicitArrays.cxx | 39 +- IO/ParallelExodus/vtkPExodusIIReader.cxx | 1113 ++-- IO/ParallelExodus/vtkPExodusIIReader.h | 42 +- IO/ParallelExodus/vtkPExodusIIWriter.cxx | 66 +- IO/ParallelExodus/vtkPExodusIIWriter.h | 25 +- .../Testing/Cxx/PLSDynaReader.cxx | 20 +- IO/ParallelLSDyna/vtkPLSDynaReader.cxx | 119 +- IO/ParallelLSDyna/vtkPLSDynaReader.h | 30 +- .../Testing/Cxx/TestPNetCDFPOPReader.cxx | 20 +- IO/ParallelNetCDF/vtkPNetCDFPOPReader.cxx | 397 +- IO/ParallelNetCDF/vtkPNetCDFPOPReader.h | 41 +- .../Cxx/TestParallelUnstructuredGridIO.cxx | 39 +- IO/ParallelXML/vtkXMLPDataObjectWriter.h | 40 +- IO/ParallelXML/vtkXMLPDataSetWriter.cxx | 23 +- IO/ParallelXML/vtkXMLPDataSetWriter.h | 4 +- IO/ParallelXML/vtkXMLPDataWriter.cxx | 5 +- IO/ParallelXML/vtkXMLPDataWriter.h | 2 +- .../vtkXMLPHierarchicalBoxDataWriter.h | 5 +- IO/ParallelXML/vtkXMLPHyperTreeGridWriter.cxx | 7 +- IO/ParallelXML/vtkXMLPImageDataWriter.cxx | 8 +- IO/ParallelXML/vtkXMLPImageDataWriter.h | 6 +- .../vtkXMLPMultiBlockDataWriter.cxx | 112 +- IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h | 17 +- IO/ParallelXML/vtkXMLPPolyDataWriter.cxx | 6 +- IO/ParallelXML/vtkXMLPPolyDataWriter.h | 4 +- .../vtkXMLPRectilinearGridWriter.cxx | 9 +- IO/ParallelXML/vtkXMLPRectilinearGridWriter.h | 4 +- .../vtkXMLPStructuredDataWriter.cxx | 36 +- IO/ParallelXML/vtkXMLPStructuredDataWriter.h | 10 +- .../vtkXMLPStructuredGridWriter.cxx | 6 +- IO/ParallelXML/vtkXMLPStructuredGridWriter.h | 4 +- IO/ParallelXML/vtkXMLPTableWriter.h | 6 +- .../vtkXMLPUniformGridAMRWriter.cxx | 31 +- IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h | 4 +- .../vtkXMLPUnstructuredDataWriter.cxx | 1 - .../vtkXMLPUnstructuredDataWriter.h | 7 +- .../vtkXMLPUnstructuredGridWriter.cxx | 6 +- .../vtkXMLPUnstructuredGridWriter.h | 4 +- .../Testing/Cxx/TestXdmf3Parallel.cxx | 45 +- IO/ParallelXdmf3/vtkPXdmf3Writer.cxx | 38 +- IO/ParallelXdmf3/vtkPXdmf3Writer.h | 21 +- .../Testing/Cxx/TestPostgreSQLDatabase.cxx | 261 +- .../Cxx/TestPostgreSQLTableReadWrite.cxx | 32 +- IO/PostgreSQL/vtkIOPostgreSQL_AutoInit.cxx | 7 +- IO/PostgreSQL/vtkPostgreSQLDatabase.cxx | 330 +- IO/PostgreSQL/vtkPostgreSQLDatabase.h | 127 +- IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h | 41 +- IO/PostgreSQL/vtkPostgreSQLQuery.cxx | 462 +- IO/PostgreSQL/vtkPostgreSQLQuery.h | 23 +- IO/PostgreSQL/vtkPostgreSQLToTableReader.cxx | 107 +- IO/PostgreSQL/vtkPostgreSQLToTableReader.h | 15 +- IO/PostgreSQL/vtkTableToPostgreSQLWriter.cxx | 72 +- IO/PostgreSQL/vtkTableToPostgreSQLWriter.h | 12 +- IO/SQL/Testing/Cxx/TestSQLDatabaseSchema.cxx | 220 +- IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx | 15 +- IO/SQL/Testing/Cxx/TestSQLiteDatabase.cxx | 219 +- .../Testing/Cxx/TestSQLiteTableReadWrite.cxx | 40 +- IO/SQL/vtkDatabaseToTableReader.cxx | 29 +- IO/SQL/vtkDatabaseToTableReader.h | 17 +- IO/SQL/vtkRowQuery.cxx | 19 +- IO/SQL/vtkRowQuery.h | 8 +- IO/SQL/vtkRowQueryToTable.cxx | 10 +- IO/SQL/vtkRowQueryToTable.h | 8 +- IO/SQL/vtkSQLDatabase.cxx | 280 +- IO/SQL/vtkSQLDatabase.h | 51 +- IO/SQL/vtkSQLDatabaseGraphSource.cxx | 114 +- IO/SQL/vtkSQLDatabaseGraphSource.h | 16 +- IO/SQL/vtkSQLDatabaseSchema.cxx | 473 +- IO/SQL/vtkSQLDatabaseSchema.h | 217 +- IO/SQL/vtkSQLDatabaseTableSource.cxx | 69 +- IO/SQL/vtkSQLDatabaseTableSource.h | 10 +- IO/SQL/vtkSQLGraphReader.cxx | 29 +- IO/SQL/vtkSQLGraphReader.h | 15 +- IO/SQL/vtkSQLQuery.cxx | 134 +- IO/SQL/vtkSQLQuery.h | 23 +- IO/SQL/vtkSQLiteDatabase.cxx | 131 +- IO/SQL/vtkSQLiteDatabase.h | 28 +- IO/SQL/vtkSQLiteQuery.cxx | 238 +- IO/SQL/vtkSQLiteQuery.h | 26 +- IO/SQL/vtkSQLiteToTableReader.cxx | 79 +- IO/SQL/vtkSQLiteToTableReader.h | 15 +- IO/SQL/vtkTableToDatabaseWriter.cxx | 37 +- IO/SQL/vtkTableToDatabaseWriter.h | 17 +- IO/SQL/vtkTableToSQLiteWriter.cxx | 67 +- IO/SQL/vtkTableToSQLiteWriter.h | 10 +- IO/SegY/Testing/Cxx/TestSegY2DReader.cxx | 15 +- IO/SegY/Testing/Cxx/TestSegY2DReaderZoom.cxx | 19 +- IO/SegY/Testing/Cxx/TestSegY3DReader.cxx | 3 +- IO/SegY/vtkSegYBinaryHeaderBytesPositions.h | 1 - IO/SegY/vtkSegYReader.cxx | 57 +- IO/SegY/vtkSegYReader.h | 18 +- IO/SegY/vtkSegYReaderInternal.cxx | 117 +- IO/SegY/vtkSegYReaderInternal.h | 9 +- IO/SegY/vtkSegYTraceHeaderBytesPositions.h | 5 +- IO/SegY/vtkSegYTraceReader.cxx | 174 +- IO/SegY/vtkSegYTraceReader.h | 12 +- IO/TRUCHAS/Testing/Cxx/TestTRUCHASReader.cxx | 177 +- IO/TRUCHAS/vtkTRUCHASReader.cxx | 507 +- IO/TRUCHAS/vtkTRUCHASReader.h | 22 +- .../Testing/Cxx/TestTecplotTableReader.cxx | 16 +- IO/TecplotTable/vtkTecplotTableReader.cxx | 195 +- IO/TecplotTable/vtkTecplotTableReader.h | 13 +- IO/VPIC/Testing/Cxx/TestVPICReader.cxx | 12 +- IO/VPIC/vtkVPICReader.cxx | 262 +- IO/VPIC/vtkVPICReader.h | 100 +- IO/VeraOut/vtkVeraOutReader.cxx | 19 +- IO/VeraOut/vtkVeraOutReader.h | 5 +- IO/Video/vtkMILVideoSource.cxx | 255 +- IO/Video/vtkMILVideoSource.h | 113 +- IO/Video/vtkVideoSource.cxx | 314 +- IO/Video/vtkVideoSource.h | 73 +- IO/Video/vtkWin32VideoSource.cxx | 407 +- IO/Video/vtkWin32VideoSource.h | 23 +- IO/XML/Testing/Cxx/TestAMRXMLIO.cxx | 183 +- IO/XML/Testing/Cxx/TestDataObjectXMLIO.cxx | 210 +- .../TestMultiBlockXMLIOWithPartialArrays.cxx | 14 +- ...tMultiBlockXMLIOWithPartialArraysTable.cxx | 18 +- .../Cxx/TestReadDuplicateDataArrayNames.cxx | 127 +- IO/XML/Testing/Cxx/TestXML.cxx | 11 +- IO/XML/Testing/Cxx/TestXMLCInterface.c | 69 +- ...TestXMLCompositeDataReaderDistribution.cxx | 80 +- .../Testing/Cxx/TestXMLGhostCellsImport.cxx | 24 +- ...estXMLHierarchicalBoxDataFileConverter.cxx | 21 +- IO/XML/Testing/Cxx/TestXMLHyperTreeGridIO.cxx | 106 +- .../Cxx/TestXMLMappedUnstructuredGridIO.cxx | 181 +- IO/XML/Testing/Cxx/TestXMLReaderBadData.cxx | 11 +- .../Cxx/TestXMLUnstructuredGridReader.cxx | 20 +- IO/XML/Testing/Cxx/TestXMLWriteRead.cxx | 2 +- .../TestXMLWriterWithDataArrayFallback.cxx | 15 +- IO/XML/vtkRTXMLPolyDataReader.cxx | 58 +- IO/XML/vtkRTXMLPolyDataReader.h | 4 +- IO/XML/vtkXMLCompositeDataReader.cxx | 91 +- IO/XML/vtkXMLCompositeDataReader.h | 26 +- IO/XML/vtkXMLCompositeDataWriter.cxx | 88 +- IO/XML/vtkXMLCompositeDataWriter.h | 25 +- IO/XML/vtkXMLDataObjectWriter.cxx | 16 +- IO/XML/vtkXMLDataObjectWriter.h | 7 +- IO/XML/vtkXMLDataReader.cxx | 98 +- IO/XML/vtkXMLDataReader.h | 32 +- IO/XML/vtkXMLDataSetWriter.cxx | 3 +- IO/XML/vtkXMLDataSetWriter.h | 4 +- IO/XML/vtkXMLFileReadTester.cxx | 12 +- IO/XML/vtkXMLFileReadTester.h | 6 +- IO/XML/vtkXMLGenericDataObjectReader.cxx | 177 +- IO/XML/vtkXMLGenericDataObjectReader.h | 45 +- ...vtkXMLHierarchicalBoxDataFileConverter.cxx | 106 +- .../vtkXMLHierarchicalBoxDataFileConverter.h | 12 +- IO/XML/vtkXMLHierarchicalBoxDataReader.h | 8 +- IO/XML/vtkXMLHierarchicalBoxDataWriter.h | 6 +- IO/XML/vtkXMLHierarchicalDataReader.cxx | 1 - IO/XML/vtkXMLHierarchicalDataReader.h | 9 +- IO/XML/vtkXMLHyperTreeGridReader.h | 7 +- IO/XML/vtkXMLHyperTreeGridWriter.cxx | 67 +- IO/XML/vtkXMLHyperTreeGridWriter.h | 7 +- IO/XML/vtkXMLImageDataReader.cxx | 10 +- IO/XML/vtkXMLImageDataReader.h | 16 +- IO/XML/vtkXMLImageDataWriter.cxx | 5 +- IO/XML/vtkXMLImageDataWriter.h | 6 +- IO/XML/vtkXMLMultiBlockDataReader.cxx | 85 +- IO/XML/vtkXMLMultiBlockDataReader.h | 24 +- IO/XML/vtkXMLMultiBlockDataWriter.cxx | 32 +- IO/XML/vtkXMLMultiBlockDataWriter.h | 12 +- IO/XML/vtkXMLMultiGroupDataReader.cxx | 1 - IO/XML/vtkXMLMultiGroupDataReader.h | 9 +- IO/XML/vtkXMLOffsetsManager.h | 59 +- IO/XML/vtkXMLPDataObjectReader.h | 26 +- IO/XML/vtkXMLPDataReader.h | 28 +- IO/XML/vtkXMLPHyperTreeGridReader.cxx | 2 +- IO/XML/vtkXMLPImageDataReader.cxx | 13 +- IO/XML/vtkXMLPImageDataReader.h | 14 +- IO/XML/vtkXMLPPolyDataReader.cxx | 70 +- IO/XML/vtkXMLPPolyDataReader.h | 10 +- IO/XML/vtkXMLPRectilinearGridReader.cxx | 89 +- IO/XML/vtkXMLPRectilinearGridReader.h | 14 +- IO/XML/vtkXMLPStructuredDataReader.cxx | 263 +- IO/XML/vtkXMLPStructuredDataReader.h | 23 +- IO/XML/vtkXMLPStructuredGridReader.cxx | 26 +- IO/XML/vtkXMLPStructuredGridReader.h | 8 +- IO/XML/vtkXMLPTableReader.cxx | 3 +- IO/XML/vtkXMLPTableReader.h | 34 +- IO/XML/vtkXMLPUnstructuredDataReader.cxx | 91 +- IO/XML/vtkXMLPUnstructuredDataReader.h | 20 +- IO/XML/vtkXMLPUnstructuredGridReader.cxx | 52 +- IO/XML/vtkXMLPUnstructuredGridReader.h | 10 +- ...kXMLPartitionedDataSetCollectionReader.cxx | 16 +- ...vtkXMLPartitionedDataSetCollectionReader.h | 12 +- ...kXMLPartitionedDataSetCollectionWriter.cxx | 33 +- ...vtkXMLPartitionedDataSetCollectionWriter.h | 13 +- IO/XML/vtkXMLPartitionedDataSetReader.cxx | 13 +- IO/XML/vtkXMLPartitionedDataSetReader.h | 9 +- IO/XML/vtkXMLPartitionedDataSetWriter.cxx | 28 +- IO/XML/vtkXMLPartitionedDataSetWriter.h | 10 +- IO/XML/vtkXMLPolyDataReader.cxx | 183 +- IO/XML/vtkXMLPolyDataReader.h | 13 +- IO/XML/vtkXMLPolyDataWriter.cxx | 92 +- IO/XML/vtkXMLPolyDataWriter.h | 12 +- IO/XML/vtkXMLReader.cxx | 430 +- IO/XML/vtkXMLReader.h | 78 +- IO/XML/vtkXMLReaderVersion.h | 2 +- IO/XML/vtkXMLRectilinearGridReader.cxx | 70 +- IO/XML/vtkXMLRectilinearGridReader.h | 14 +- IO/XML/vtkXMLRectilinearGridWriter.cxx | 42 +- IO/XML/vtkXMLRectilinearGridWriter.h | 6 +- IO/XML/vtkXMLStructuredDataReader.cxx | 295 +- IO/XML/vtkXMLStructuredDataReader.h | 25 +- IO/XML/vtkXMLStructuredDataWriter.cxx | 169 +- IO/XML/vtkXMLStructuredDataWriter.h | 20 +- IO/XML/vtkXMLStructuredGridReader.cxx | 70 +- IO/XML/vtkXMLStructuredGridReader.h | 10 +- IO/XML/vtkXMLStructuredGridWriter.cxx | 23 +- IO/XML/vtkXMLStructuredGridWriter.h | 6 +- IO/XML/vtkXMLTableReader.cxx | 4 +- IO/XML/vtkXMLTableReader.h | 52 +- IO/XML/vtkXMLTableWriter.h | 28 +- IO/XML/vtkXMLUniformGridAMRReader.cxx | 248 +- IO/XML/vtkXMLUniformGridAMRReader.h | 20 +- IO/XML/vtkXMLUniformGridAMRWriter.cxx | 48 +- IO/XML/vtkXMLUniformGridAMRWriter.h | 10 +- IO/XML/vtkXMLUnstructuredDataReader.cxx | 481 +- IO/XML/vtkXMLUnstructuredDataReader.h | 30 +- IO/XML/vtkXMLUnstructuredDataWriter.cxx | 331 +- IO/XML/vtkXMLUnstructuredDataWriter.h | 72 +- IO/XML/vtkXMLUnstructuredGridReader.cxx | 160 +- IO/XML/vtkXMLUnstructuredGridReader.h | 13 +- IO/XML/vtkXMLUnstructuredGridWriter.cxx | 75 +- IO/XML/vtkXMLUnstructuredGridWriter.h | 7 +- IO/XML/vtkXMLWriter.cxx | 1013 ++-- IO/XML/vtkXMLWriter.h | 176 +- IO/XML/vtkXMLWriterC.cxx | 989 ++- IO/XML/vtkXMLWriterC.h | 434 +- IO/XML/vtkXMLWriterF.h | 290 +- IO/XMLParser/vtkXMLDataHeaderPrivate.h | 29 +- IO/XMLParser/vtkXMLDataParser.cxx | 501 +- IO/XMLParser/vtkXMLDataParser.h | 75 +- IO/XMLParser/vtkXMLParser.cxx | 134 +- IO/XMLParser/vtkXMLParser.h | 16 +- IO/XMLParser/vtkXMLUtilities.cxx | 169 +- IO/XMLParser/vtkXMLUtilities.h | 51 +- .../Cxx/TestTemporalXdmfReaderWriter.cxx | 35 +- IO/Xdmf2/Testing/Cxx/XdmfTestVTKIO.cxx | 153 +- IO/Xdmf2/vtkSILBuilder.h | 3 +- IO/Xdmf2/vtkXdmfDataArray.cxx | 629 +- IO/Xdmf2/vtkXdmfDataArray.h | 26 +- IO/Xdmf2/vtkXdmfHeavyData.cxx | 849 ++- IO/Xdmf2/vtkXdmfHeavyData.h | 23 +- IO/Xdmf2/vtkXdmfReader.cxx | 205 +- IO/Xdmf2/vtkXdmfReader.h | 59 +- IO/Xdmf2/vtkXdmfReaderInternal.cxx | 224 +- IO/Xdmf2/vtkXdmfReaderInternal.h | 69 +- IO/Xdmf2/vtkXdmfWriter.cxx | 1052 ++-- IO/Xdmf2/vtkXdmfWriter.h | 94 +- IO/Xdmf3/vtkXdmf3ArrayKeeper.cxx | 12 +- IO/Xdmf3/vtkXdmf3ArrayKeeper.h | 15 +- IO/Xdmf3/vtkXdmf3ArraySelection.cxx | 9 +- IO/Xdmf3/vtkXdmf3ArraySelection.h | 15 +- IO/Xdmf3/vtkXdmf3DataSet.cxx | 1331 ++--- IO/Xdmf3/vtkXdmf3DataSet.h | 175 +- IO/Xdmf3/vtkXdmf3HeavyDataHandler.cxx | 275 +- IO/Xdmf3/vtkXdmf3HeavyDataHandler.h | 56 +- IO/Xdmf3/vtkXdmf3LightDataHandler.cxx | 109 +- IO/Xdmf3/vtkXdmf3LightDataHandler.h | 40 +- IO/Xdmf3/vtkXdmf3Reader.cxx | 338 +- IO/Xdmf3/vtkXdmf3Reader.h | 38 +- IO/Xdmf3/vtkXdmf3SILBuilder.h | 4 +- IO/Xdmf3/vtkXdmf3Writer.cxx | 274 +- IO/Xdmf3/vtkXdmf3Writer.h | 40 +- .../Testing/Cxx/ImageQuantizeToIndex.cxx | 25 +- Imaging/Color/vtkImageHSIToRGB.cxx | 70 +- Imaging/Color/vtkImageHSIToRGB.h | 17 +- Imaging/Color/vtkImageHSVToRGB.cxx | 43 +- Imaging/Color/vtkImageHSVToRGB.h | 18 +- Imaging/Color/vtkImageLuminance.cxx | 40 +- Imaging/Color/vtkImageLuminance.h | 22 +- Imaging/Color/vtkImageMapToRGBA.h | 14 +- .../Color/vtkImageMapToWindowLevelColors.cxx | 198 +- .../Color/vtkImageMapToWindowLevelColors.h | 37 +- Imaging/Color/vtkImageQuantizeRGBToIndex.cxx | 458 +- Imaging/Color/vtkImageQuantizeRGBToIndex.h | 58 +- Imaging/Color/vtkImageRGBToHSI.cxx | 53 +- Imaging/Color/vtkImageRGBToHSI.h | 16 +- Imaging/Color/vtkImageRGBToHSV.cxx | 43 +- Imaging/Color/vtkImageRGBToHSV.h | 19 +- Imaging/Color/vtkImageRGBToYIQ.cxx | 56 +- Imaging/Color/vtkImageRGBToYIQ.h | 17 +- Imaging/Color/vtkImageYIQToRGB.cxx | 52 +- Imaging/Color/vtkImageYIQToRGB.h | 15 +- Imaging/Core/Testing/Cxx/FastSplatter.cxx | 39 +- Imaging/Core/Testing/Cxx/ImageAccumulate.cxx | 44 +- .../Core/Testing/Cxx/ImageAccumulateLarge.cxx | 32 +- Imaging/Core/Testing/Cxx/ImageAutoRange.cxx | 45 +- .../Testing/Cxx/ImageBSplineCoefficients.cxx | 61 +- Imaging/Core/Testing/Cxx/ImageHistogram.cxx | 28 +- .../Testing/Cxx/ImageHistogramStatistics.cxx | 43 +- .../Cxx/ImageInterpolateSlidingWindow2D.cxx | 32 +- .../Cxx/ImageInterpolateSlidingWindow3D.cxx | 42 +- Imaging/Core/Testing/Cxx/ImageResize.cxx | 46 +- Imaging/Core/Testing/Cxx/ImageResize3D.cxx | 55 +- .../Core/Testing/Cxx/ImageResizeCropping.cxx | 47 +- Imaging/Core/Testing/Cxx/ImageReslice.cxx | 25 +- Imaging/Core/Testing/Cxx/ImageWeightedSum.cxx | 71 +- Imaging/Core/Testing/Cxx/ImportExport.cxx | 35 +- Imaging/Core/Testing/Cxx/TestBSplineWarp.cxx | 111 +- .../Core/Testing/Cxx/TestImageStencilData.cxx | 143 +- .../Cxx/TestImageStencilDataMethods.cxx | 12 +- .../Testing/Cxx/TestImageStencilIterator.cxx | 87 +- .../Core/Testing/Cxx/TestStencilWithLasso.cxx | 49 +- .../Cxx/TestStencilWithPolyDataContour.cxx | 45 +- .../Cxx/TestStencilWithPolyDataSurface.cxx | 75 +- .../Testing/Cxx/TestUpdateExtentReset.cxx | 19 +- Imaging/Core/vtkAbstractImageInterpolator.cxx | 438 +- Imaging/Core/vtkAbstractImageInterpolator.h | 105 +- Imaging/Core/vtkExtractVOI.cxx | 145 +- Imaging/Core/vtkExtractVOI.h | 35 +- Imaging/Core/vtkImageAppendComponents.cxx | 81 +- Imaging/Core/vtkImageAppendComponents.h | 29 +- Imaging/Core/vtkImageBSplineCoefficients.cxx | 228 +- Imaging/Core/vtkImageBSplineCoefficients.h | 56 +- Imaging/Core/vtkImageBSplineInternals.cxx | 1376 +++-- Imaging/Core/vtkImageBSplineInternals.h | 27 +- Imaging/Core/vtkImageBSplineInterpolator.cxx | 434 +- Imaging/Core/vtkImageBSplineInterpolator.h | 35 +- Imaging/Core/vtkImageBlend.cxx | 439 +- Imaging/Core/vtkImageBlend.h | 76 +- Imaging/Core/vtkImageCacheFilter.cxx | 10 +- Imaging/Core/vtkImageCacheFilter.h | 13 +- Imaging/Core/vtkImageCast.cxx | 42 +- Imaging/Core/vtkImageCast.h | 46 +- Imaging/Core/vtkImageChangeInformation.cxx | 121 +- Imaging/Core/vtkImageChangeInformation.h | 25 +- Imaging/Core/vtkImageClip.cxx | 91 +- Imaging/Core/vtkImageClip.h | 28 +- Imaging/Core/vtkImageConstantPad.cxx | 52 +- Imaging/Core/vtkImageConstantPad.h | 20 +- Imaging/Core/vtkImageDataStreamer.cxx | 37 +- Imaging/Core/vtkImageDataStreamer.h | 27 +- Imaging/Core/vtkImageDecomposeFilter.cxx | 62 +- Imaging/Core/vtkImageDecomposeFilter.h | 24 +- Imaging/Core/vtkImageDifference.cxx | 367 +- Imaging/Core/vtkImageDifference.h | 70 +- Imaging/Core/vtkImageExtractComponents.cxx | 52 +- Imaging/Core/vtkImageExtractComponents.h | 28 +- Imaging/Core/vtkImageFlip.cxx | 28 +- Imaging/Core/vtkImageFlip.h | 11 +- Imaging/Core/vtkImageInterpolator.cxx | 515 +- Imaging/Core/vtkImageInterpolator.h | 44 +- Imaging/Core/vtkImageInterpolatorInternals.h | 53 +- Imaging/Core/vtkImageIterateFilter.cxx | 60 +- Imaging/Core/vtkImageIterateFilter.h | 41 +- Imaging/Core/vtkImageMagnify.cxx | 126 +- Imaging/Core/vtkImageMagnify.h | 40 +- Imaging/Core/vtkImageMapToColors.cxx | 193 +- Imaging/Core/vtkImageMapToColors.h | 50 +- Imaging/Core/vtkImageMask.cxx | 118 +- Imaging/Core/vtkImageMask.h | 65 +- Imaging/Core/vtkImageMirrorPad.cxx | 101 +- Imaging/Core/vtkImageMirrorPad.h | 18 +- Imaging/Core/vtkImagePadFilter.cxx | 83 +- Imaging/Core/vtkImagePadFilter.h | 25 +- Imaging/Core/vtkImagePermute.cxx | 11 +- Imaging/Core/vtkImagePermute.h | 13 +- Imaging/Core/vtkImagePointDataIterator.cxx | 87 +- Imaging/Core/vtkImagePointDataIterator.h | 94 +- Imaging/Core/vtkImagePointIterator.cxx | 13 +- Imaging/Core/vtkImagePointIterator.h | 38 +- Imaging/Core/vtkImageResample.cxx | 42 +- Imaging/Core/vtkImageResample.h | 29 +- Imaging/Core/vtkImageResize.cxx | 521 +- Imaging/Core/vtkImageResize.h | 42 +- Imaging/Core/vtkImageReslice.cxx | 1462 +++-- Imaging/Core/vtkImageReslice.h | 205 +- Imaging/Core/vtkImageResliceToColors.cxx | 51 +- Imaging/Core/vtkImageResliceToColors.h | 36 +- Imaging/Core/vtkImageShiftScale.cxx | 55 +- Imaging/Core/vtkImageShiftScale.h | 61 +- Imaging/Core/vtkImageShrink3D.cxx | 206 +- Imaging/Core/vtkImageShrink3D.h | 52 +- Imaging/Core/vtkImageSincInterpolator.cxx | 640 +- Imaging/Core/vtkImageSincInterpolator.h | 87 +- Imaging/Core/vtkImageStencilAlgorithm.cxx | 47 +- Imaging/Core/vtkImageStencilAlgorithm.h | 25 +- Imaging/Core/vtkImageStencilData.cxx | 461 +- Imaging/Core/vtkImageStencilData.h | 52 +- Imaging/Core/vtkImageStencilIterator.cxx | 4 +- Imaging/Core/vtkImageStencilIterator.h | 68 +- Imaging/Core/vtkImageStencilSource.cxx | 37 +- Imaging/Core/vtkImageStencilSource.h | 14 +- Imaging/Core/vtkImageThreshold.cxx | 78 +- Imaging/Core/vtkImageThreshold.h | 53 +- Imaging/Core/vtkImageTranslateExtent.cxx | 54 +- Imaging/Core/vtkImageTranslateExtent.h | 12 +- Imaging/Core/vtkImageWrapPad.cxx | 100 +- Imaging/Core/vtkImageWrapPad.h | 20 +- Imaging/Core/vtkRTAnalyticSource.cxx | 113 +- Imaging/Core/vtkRTAnalyticSource.h | 21 +- .../Fourier/vtkImageButterworthHighPass.cxx | 48 +- Imaging/Fourier/vtkImageButterworthHighPass.h | 28 +- .../Fourier/vtkImageButterworthLowPass.cxx | 47 +- Imaging/Fourier/vtkImageButterworthLowPass.h | 29 +- Imaging/Fourier/vtkImageFFT.cxx | 78 +- Imaging/Fourier/vtkImageFFT.h | 34 +- Imaging/Fourier/vtkImageFourierCenter.cxx | 62 +- Imaging/Fourier/vtkImageFourierCenter.h | 31 +- Imaging/Fourier/vtkImageFourierFilter.cxx | 76 +- Imaging/Fourier/vtkImageFourierFilter.h | 91 +- Imaging/Fourier/vtkImageIdealHighPass.cxx | 45 +- Imaging/Fourier/vtkImageIdealHighPass.h | 28 +- Imaging/Fourier/vtkImageIdealLowPass.cxx | 47 +- Imaging/Fourier/vtkImageIdealLowPass.h | 28 +- Imaging/Fourier/vtkImageRFFT.cxx | 81 +- Imaging/Fourier/vtkImageRFFT.h | 34 +- Imaging/Fourier/vtkTableFFT.cxx | 32 +- Imaging/Fourier/vtkTableFFT.h | 22 +- .../vtkImageAnisotropicDiffusion2D.cxx | 88 +- .../General/vtkImageAnisotropicDiffusion2D.h | 57 +- .../vtkImageAnisotropicDiffusion3D.cxx | 132 +- .../General/vtkImageAnisotropicDiffusion3D.h | 58 +- Imaging/General/vtkImageCheckerboard.cxx | 52 +- Imaging/General/vtkImageCheckerboard.h | 38 +- Imaging/General/vtkImageCityBlockDistance.cxx | 60 +- Imaging/General/vtkImageCityBlockDistance.h | 22 +- Imaging/General/vtkImageConvolve.cxx | 99 +- Imaging/General/vtkImageConvolve.h | 24 +- Imaging/General/vtkImageCorrelation.cxx | 102 +- Imaging/General/vtkImageCorrelation.h | 36 +- Imaging/General/vtkImageEuclideanDistance.cxx | 407 +- Imaging/General/vtkImageEuclideanDistance.h | 36 +- Imaging/General/vtkImageEuclideanToPolar.cxx | 30 +- Imaging/General/vtkImageEuclideanToPolar.h | 19 +- Imaging/General/vtkImageGaussianSmooth.cxx | 244 +- Imaging/General/vtkImageGaussianSmooth.h | 55 +- Imaging/General/vtkImageGradient.cxx | 128 +- Imaging/General/vtkImageGradient.h | 35 +- Imaging/General/vtkImageGradientMagnitude.cxx | 103 +- Imaging/General/vtkImageGradientMagnitude.h | 26 +- Imaging/General/vtkImageHybridMedian2D.cxx | 101 +- Imaging/General/vtkImageHybridMedian2D.h | 16 +- Imaging/General/vtkImageLaplacian.cxx | 78 +- Imaging/General/vtkImageLaplacian.h | 25 +- Imaging/General/vtkImageMedian3D.cxx | 84 +- Imaging/General/vtkImageMedian3D.h | 17 +- Imaging/General/vtkImageNormalize.cxx | 36 +- Imaging/General/vtkImageNormalize.h | 22 +- Imaging/General/vtkImageRange3D.cxx | 120 +- Imaging/General/vtkImageRange3D.h | 27 +- .../General/vtkImageSeparableConvolution.cxx | 168 +- .../General/vtkImageSeparableConvolution.h | 34 +- Imaging/General/vtkImageSlab.cxx | 186 +- Imaging/General/vtkImageSlab.h | 50 +- Imaging/General/vtkImageSlabReslice.cxx | 17 +- Imaging/General/vtkImageSlabReslice.h | 30 +- Imaging/General/vtkImageSobel2D.cxx | 56 +- Imaging/General/vtkImageSobel2D.h | 23 +- Imaging/General/vtkImageSobel3D.cxx | 105 +- Imaging/General/vtkImageSobel3D.h | 20 +- Imaging/General/vtkImageSpatialAlgorithm.cxx | 53 +- Imaging/General/vtkImageSpatialAlgorithm.h | 33 +- Imaging/General/vtkImageVariance3D.cxx | 127 +- Imaging/General/vtkImageVariance3D.h | 27 +- .../General/vtkSimpleImageFilterExample.cxx | 22 +- Imaging/General/vtkSimpleImageFilterExample.h | 14 +- .../Hybrid/Testing/Cxx/TestImageToPoints.cxx | 41 +- .../Hybrid/Testing/Cxx/TestSampleFunction.cxx | 104 +- Imaging/Hybrid/vtkBooleanTexture.cxx | 84 +- Imaging/Hybrid/vtkBooleanTexture.h | 60 +- Imaging/Hybrid/vtkCheckerboardSplatter.cxx | 627 +- Imaging/Hybrid/vtkCheckerboardSplatter.h | 137 +- Imaging/Hybrid/vtkFastSplatter.cxx | 289 +- Imaging/Hybrid/vtkFastSplatter.h | 99 +- Imaging/Hybrid/vtkGaussianSplatter.cxx | 462 +- Imaging/Hybrid/vtkGaussianSplatter.h | 141 +- Imaging/Hybrid/vtkImageCursor3D.cxx | 33 +- Imaging/Hybrid/vtkImageCursor3D.h | 18 +- Imaging/Hybrid/vtkImageRectilinearWipe.cxx | 127 +- Imaging/Hybrid/vtkImageRectilinearWipe.h | 52 +- Imaging/Hybrid/vtkImageToPoints.cxx | 80 +- Imaging/Hybrid/vtkImageToPoints.h | 34 +- Imaging/Hybrid/vtkPointLoad.cxx | 139 +- Imaging/Hybrid/vtkPointLoad.h | 32 +- Imaging/Hybrid/vtkSampleFunction.cxx | 357 +- Imaging/Hybrid/vtkSampleFunction.h | 82 +- Imaging/Hybrid/vtkShepardMethod.cxx | 487 +- Imaging/Hybrid/vtkShepardMethod.h | 33 +- Imaging/Hybrid/vtkSliceCubes.cxx | 433 +- Imaging/Hybrid/vtkSliceCubes.h | 20 +- .../Hybrid/vtkSurfaceReconstructionFilter.cxx | 511 +- .../Hybrid/vtkSurfaceReconstructionFilter.h | 21 +- Imaging/Hybrid/vtkTriangularTexture.cxx | 76 +- Imaging/Hybrid/vtkTriangularTexture.h | 29 +- Imaging/Hybrid/vtkVoxelModeller.cxx | 187 +- Imaging/Hybrid/vtkVoxelModeller.h | 55 +- Imaging/Math/vtkImageDivergence.cxx | 86 +- Imaging/Math/vtkImageDivergence.h | 19 +- Imaging/Math/vtkImageDotProduct.cxx | 63 +- Imaging/Math/vtkImageDotProduct.h | 27 +- Imaging/Math/vtkImageLogarithmicScale.cxx | 31 +- Imaging/Math/vtkImageLogarithmicScale.h | 18 +- Imaging/Math/vtkImageLogic.cxx | 62 +- Imaging/Math/vtkImageLogic.h | 70 +- Imaging/Math/vtkImageMagnitude.cxx | 39 +- Imaging/Math/vtkImageMagnitude.h | 22 +- Imaging/Math/vtkImageMaskBits.cxx | 60 +- Imaging/Math/vtkImageMaskBits.h | 41 +- Imaging/Math/vtkImageMathematics.cxx | 174 +- Imaging/Math/vtkImageMathematics.h | 128 +- Imaging/Math/vtkImageWeightedSum.cxx | 98 +- Imaging/Math/vtkImageWeightedSum.h | 22 +- .../Cxx/TestImageConnectivityFilter.cxx | 58 +- .../Cxx/TestImageThresholdConnectivity.cxx | 34 +- .../vtkImageConnectivityFilter.cxx | 643 +- .../vtkImageConnectivityFilter.h | 83 +- Imaging/Morphological/vtkImageConnector.cxx | 35 +- Imaging/Morphological/vtkImageConnector.h | 39 +- .../vtkImageContinuousDilate3D.cxx | 127 +- .../vtkImageContinuousDilate3D.h | 23 +- .../vtkImageContinuousErode3D.cxx | 129 +- .../Morphological/vtkImageContinuousErode3D.h | 22 +- .../Morphological/vtkImageDilateErode3D.cxx | 115 +- Imaging/Morphological/vtkImageDilateErode3D.h | 23 +- .../Morphological/vtkImageIslandRemoval2D.cxx | 212 +- .../Morphological/vtkImageIslandRemoval2D.h | 21 +- .../vtkImageNonMaximumSuppression.cxx | 105 +- .../vtkImageNonMaximumSuppression.h | 37 +- Imaging/Morphological/vtkImageOpenClose3D.cxx | 65 +- Imaging/Morphological/vtkImageOpenClose3D.h | 28 +- .../vtkImageSeedConnectivity.cxx | 72 +- .../Morphological/vtkImageSeedConnectivity.h | 27 +- Imaging/Morphological/vtkImageSkeleton2D.cxx | 191 +- Imaging/Morphological/vtkImageSkeleton2D.h | 30 +- .../vtkImageThresholdConnectivity.cxx | 271 +- .../vtkImageThresholdConnectivity.h | 29 +- .../Testing/Cxx/TestOpenGLImageGradient.cxx | 31 +- Imaging/OpenGL2/vtkOpenGLImageGradient.cxx | 53 +- Imaging/OpenGL2/vtkOpenGLImageGradient.h | 18 +- Imaging/Sources/vtkImageCanvasSource2D.cxx | 425 +- Imaging/Sources/vtkImageCanvasSource2D.h | 82 +- Imaging/Sources/vtkImageEllipsoidSource.cxx | 66 +- Imaging/Sources/vtkImageEllipsoidSource.h | 63 +- Imaging/Sources/vtkImageGaussianSource.cxx | 76 +- Imaging/Sources/vtkImageGaussianSource.h | 15 +- Imaging/Sources/vtkImageGridSource.cxx | 95 +- Imaging/Sources/vtkImageGridSource.h | 61 +- Imaging/Sources/vtkImageMandelbrotSource.cxx | 126 +- Imaging/Sources/vtkImageMandelbrotSource.h | 39 +- Imaging/Sources/vtkImageNoiseSource.cxx | 48 +- Imaging/Sources/vtkImageNoiseSource.h | 19 +- Imaging/Sources/vtkImageSinusoidSource.cxx | 74 +- Imaging/Sources/vtkImageSinusoidSource.h | 20 +- Imaging/Statistics/vtkImageAccumulate.cxx | 191 +- Imaging/Statistics/vtkImageAccumulate.h | 36 +- Imaging/Statistics/vtkImageHistogram.cxx | 379 +- Imaging/Statistics/vtkImageHistogram.h | 63 +- .../vtkImageHistogramStatistics.cxx | 59 +- .../Statistics/vtkImageHistogramStatistics.h | 10 +- Imaging/Stencil/vtkImageStencil.cxx | 122 +- Imaging/Stencil/vtkImageStencil.h | 26 +- Imaging/Stencil/vtkImageStencilToImage.cxx | 48 +- Imaging/Stencil/vtkImageStencilToImage.h | 41 +- Imaging/Stencil/vtkImageToImageStencil.cxx | 78 +- Imaging/Stencil/vtkImageToImageStencil.h | 16 +- .../vtkImplicitFunctionToImageStencil.cxx | 44 +- .../vtkImplicitFunctionToImageStencil.h | 11 +- Imaging/Stencil/vtkLassoStencilSource.cxx | 246 +- Imaging/Stencil/vtkLassoStencilSource.h | 27 +- Imaging/Stencil/vtkPolyDataToImageStencil.cxx | 202 +- Imaging/Stencil/vtkPolyDataToImageStencil.h | 19 +- Imaging/Stencil/vtkROIStencilSource.cxx | 174 +- Imaging/Stencil/vtkROIStencilSource.h | 13 +- .../Testing/Cxx/TestVariantSerialization.cxx | 56 +- Infovis/Boost/vtkTryDowncast.h | 75 +- Infovis/Boost/vtkVariantBoostSerialization.h | 161 +- .../Testing/Cxx/BoostArrayLogWeighting.cxx | 73 +- .../Cxx/BoostArrayRandomSparseArraySource.cxx | 34 +- .../Testing/Cxx/TestBoostAdapter.cxx | 25 +- .../Testing/Cxx/TestBoostAlgorithms.cxx | 15 +- .../Cxx/TestBoostBetweennessClustering.cxx | 30 +- .../Cxx/TestBoostBrandesCentrality.cxx | 7 +- .../Cxx/TestBoostDividedEdgeBundling.cxx | 34 +- .../Cxx/TestBoostExtractLargestComponent.cxx | 22 +- .../Testing/Cxx/TestBoostSplitTableField.cxx | 25 +- .../vtkBoostBetweennessClustering.cxx | 269 +- .../vtkBoostBetweennessClustering.h | 25 +- .../vtkBoostBiconnectedComponents.cxx | 36 +- .../vtkBoostBiconnectedComponents.h | 10 +- .../vtkBoostBrandesCentrality.cxx | 85 +- .../vtkBoostBrandesCentrality.h | 17 +- .../vtkBoostBreadthFirstSearch.cxx | 84 +- .../vtkBoostBreadthFirstSearch.h | 25 +- .../vtkBoostBreadthFirstSearchTree.cxx | 105 +- .../vtkBoostBreadthFirstSearchTree.h | 14 +- .../vtkBoostConnectedComponents.cxx | 29 +- .../vtkBoostConnectedComponents.h | 7 +- .../vtkBoostDividedEdgeBundling.cxx | 135 +- .../vtkBoostDividedEdgeBundling.h | 11 +- .../vtkBoostExtractLargestComponent.cxx | 46 +- .../vtkBoostExtractLargestComponent.h | 9 +- .../vtkBoostGraphAdapter.h | 1923 +++--- .../vtkBoostKruskalMinimumSpanningTree.cxx | 47 +- .../vtkBoostKruskalMinimumSpanningTree.h | 22 +- .../vtkBoostLogWeighting.cxx | 50 +- .../vtkBoostLogWeighting.h | 9 +- .../vtkBoostPrimMinimumSpanningTree.cxx | 92 +- .../vtkBoostPrimMinimumSpanningTree.h | 22 +- .../vtkBoostRandomSparseArraySource.cxx | 35 +- .../vtkBoostRandomSparseArraySource.h | 11 +- .../vtkBoostSplitTableField.cxx | 41 +- .../vtkBoostSplitTableField.h | 8 +- .../Testing/Cxx/ArrayDotProductSimilarity.cxx | 24 +- .../Testing/Cxx/ArraySparseArrayToTable.cxx | 18 +- .../Testing/Cxx/ArrayTableToSparseArray.cxx | 15 +- Infovis/Core/Testing/Cxx/ArrayToTable.cxx | 18 +- .../Core/Testing/Cxx/ArrayTransposeMatrix.cxx | 18 +- Infovis/Core/Testing/Cxx/TestArrayNorm.cxx | 21 +- .../Cxx/TestCollapseVerticesByArray.cxx | 89 +- .../Testing/Cxx/TestContinuousScatterPlot.cxx | 5 +- .../Testing/Cxx/TestDataObjectToTable.cxx | 32 +- .../Testing/Cxx/TestExtractSelectedGraph.cxx | 8 +- .../Testing/Cxx/TestExtractSelectedTree.cxx | 58 +- .../Core/Testing/Cxx/TestGraphAlgorithms.cxx | 11 +- .../Testing/Cxx/TestKCoreDecomposition.cxx | 167 +- Infovis/Core/Testing/Cxx/TestMergeGraphs.cxx | 75 +- Infovis/Core/Testing/Cxx/TestMergeTables.cxx | 33 +- .../Core/Testing/Cxx/TestPruneTreeFilter.cxx | 2 +- .../Testing/Cxx/TestRandomGraphSource.cxx | 23 +- Infovis/Core/Testing/Cxx/TestReduceTable.cxx | 14 +- .../Cxx/TestRemoveIsolatedVertices.cxx | 9 +- Infovis/Core/Testing/Cxx/TestStreamGraph.cxx | 2 +- .../Core/Testing/Cxx/TestStringToCategory.cxx | 13 +- .../Core/Testing/Cxx/TestStringToNumeric.cxx | 19 +- Infovis/Core/Testing/Cxx/TestTableToArray.cxx | 18 +- Infovis/Core/Testing/Cxx/TestTableToGraph.cxx | 41 +- .../Core/Testing/Cxx/TestThresholdTable.cxx | 18 +- .../Testing/Cxx/TestTreeDifferenceFilter.cxx | 2 +- Infovis/Core/Testing/Cxx/TestWordCloud.cxx | 4 +- .../Core/Testing/Cxx/UnitTestWordCloud.cxx | 114 +- Infovis/Core/vtkAddMembershipArray.cxx | 76 +- Infovis/Core/vtkAddMembershipArray.h | 12 +- .../Core/vtkAdjacencyMatrixToEdgeTable.cxx | 51 +- Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h | 8 +- Infovis/Core/vtkArrayNorm.cxx | 55 +- Infovis/Core/vtkArrayNorm.h | 8 +- Infovis/Core/vtkArrayToTable.cxx | 140 +- Infovis/Core/vtkArrayToTable.h | 8 +- Infovis/Core/vtkCollapseGraph.cxx | 61 +- Infovis/Core/vtkCollapseGraph.h | 10 +- Infovis/Core/vtkCollapseVerticesByArray.cxx | 246 +- Infovis/Core/vtkCollapseVerticesByArray.h | 194 +- Infovis/Core/vtkContinuousScatterplot.cxx | 13 +- Infovis/Core/vtkContinuousScatterplot.h | 23 +- Infovis/Core/vtkDataObjectToTable.cxx | 30 +- Infovis/Core/vtkDataObjectToTable.h | 10 +- Infovis/Core/vtkDotProductSimilarity.cxx | 166 +- Infovis/Core/vtkDotProductSimilarity.h | 8 +- Infovis/Core/vtkEdgeCenters.cxx | 87 +- Infovis/Core/vtkEdgeCenters.h | 17 +- Infovis/Core/vtkExpandSelectedGraph.cxx | 41 +- Infovis/Core/vtkExpandSelectedGraph.h | 15 +- Infovis/Core/vtkExtractSelectedGraph.cxx | 59 +- Infovis/Core/vtkExtractSelectedGraph.h | 15 +- Infovis/Core/vtkExtractSelectedTree.cxx | 75 +- Infovis/Core/vtkExtractSelectedTree.h | 13 +- Infovis/Core/vtkGenerateIndexArray.cxx | 66 +- Infovis/Core/vtkGenerateIndexArray.h | 18 +- .../Core/vtkGraphHierarchicalBundleEdges.cxx | 79 +- .../Core/vtkGraphHierarchicalBundleEdges.h | 8 +- Infovis/Core/vtkGroupLeafVertices.cxx | 134 +- Infovis/Core/vtkGroupLeafVertices.h | 10 +- Infovis/Core/vtkKCoreDecomposition.cxx | 192 +- Infovis/Core/vtkKCoreDecomposition.h | 10 +- Infovis/Core/vtkMergeColumns.cxx | 29 +- Infovis/Core/vtkMergeColumns.h | 10 +- Infovis/Core/vtkMergeGraphs.cxx | 41 +- Infovis/Core/vtkMergeGraphs.h | 12 +- Infovis/Core/vtkMergeTables.cxx | 56 +- Infovis/Core/vtkMergeTables.h | 10 +- Infovis/Core/vtkMutableGraphHelper.cxx | 2 +- Infovis/Core/vtkMutableGraphHelper.h | 4 +- Infovis/Core/vtkNetworkHierarchy.cxx | 72 +- Infovis/Core/vtkNetworkHierarchy.h | 21 +- Infovis/Core/vtkPipelineGraphSource.cxx | 131 +- Infovis/Core/vtkPipelineGraphSource.h | 16 +- Infovis/Core/vtkPruneTreeFilter.cxx | 24 +- Infovis/Core/vtkPruneTreeFilter.h | 10 +- Infovis/Core/vtkRandomGraphSource.cxx | 54 +- Infovis/Core/vtkRandomGraphSource.h | 15 +- Infovis/Core/vtkReduceTable.cxx | 97 +- Infovis/Core/vtkReduceTable.h | 38 +- Infovis/Core/vtkRemoveHiddenData.cxx | 25 +- Infovis/Core/vtkRemoveHiddenData.h | 10 +- Infovis/Core/vtkRemoveIsolatedVertices.cxx | 23 +- Infovis/Core/vtkRemoveIsolatedVertices.h | 10 +- Infovis/Core/vtkSparseArrayToTable.cxx | 32 +- Infovis/Core/vtkSparseArrayToTable.h | 8 +- Infovis/Core/vtkStreamGraph.cxx | 13 +- Infovis/Core/vtkStreamGraph.h | 10 +- Infovis/Core/vtkStringToCategory.cxx | 47 +- Infovis/Core/vtkStringToCategory.h | 22 +- Infovis/Core/vtkStringToNumeric.cxx | 75 +- Infovis/Core/vtkStringToNumeric.h | 40 +- Infovis/Core/vtkTableToArray.cxx | 43 +- Infovis/Core/vtkTableToArray.h | 9 +- Infovis/Core/vtkTableToGraph.cxx | 200 +- Infovis/Core/vtkTableToGraph.h | 18 +- Infovis/Core/vtkTableToSparseArray.cxx | 53 +- Infovis/Core/vtkTableToSparseArray.h | 9 +- Infovis/Core/vtkTableToTreeFilter.cxx | 29 +- Infovis/Core/vtkTableToTreeFilter.h | 16 +- Infovis/Core/vtkThresholdGraph.cxx | 61 +- Infovis/Core/vtkThresholdGraph.h | 18 +- Infovis/Core/vtkThresholdTable.cxx | 23 +- Infovis/Core/vtkThresholdTable.h | 33 +- Infovis/Core/vtkTransferAttributes.cxx | 108 +- Infovis/Core/vtkTransferAttributes.h | 8 +- Infovis/Core/vtkTransposeMatrix.cxx | 38 +- Infovis/Core/vtkTransposeMatrix.h | 8 +- Infovis/Core/vtkTreeDifferenceFilter.cxx | 88 +- Infovis/Core/vtkTreeDifferenceFilter.h | 24 +- Infovis/Core/vtkTreeFieldAggregator.cxx | 26 +- Infovis/Core/vtkTreeFieldAggregator.h | 8 +- Infovis/Core/vtkTreeLevelsFilter.cxx | 24 +- Infovis/Core/vtkTreeLevelsFilter.h | 8 +- Infovis/Core/vtkVertexDegree.cxx | 30 +- Infovis/Core/vtkVertexDegree.h | 8 +- Infovis/Core/vtkWordCloud.cxx | 441 +- Infovis/Core/vtkWordCloud.h | 411 +- Infovis/Layout/Testing/Cxx/TestArcEdges.cxx | 16 +- .../Testing/Cxx/TestAssignCoordinates.cxx | 5 +- .../Testing/Cxx/TestChacoGraphReader.cxx | 6 +- .../Cxx/TestCirclePackLayoutStrategy.cxx | 10 +- .../Cxx/TestCosmicTreeLayoutStrategy.cxx | 131 +- .../Testing/Cxx/TestGraphLayoutStrategy.cxx | 26 +- .../Testing/Cxx/TestGroupLeafVertices.cxx | 11 +- .../Cxx/TestIncrementalForceLayout.cxx | 4 +- .../Layout/Testing/Cxx/TestKCoreLayout.cxx | 17 +- .../Testing/Cxx/TestKdTreeBoxSelection.cxx | 24 +- .../Testing/Cxx/TestPruneTreeFilter.cxx | 5 +- .../Cxx/TestSimple3DCirclesStrategy.cxx | 101 +- .../Testing/Cxx/TestTreeMapLayoutStrategy.cxx | 7 +- Infovis/Layout/vtkArcParallelEdgeStrategy.cxx | 50 +- Infovis/Layout/vtkArcParallelEdgeStrategy.h | 5 +- Infovis/Layout/vtkAreaLayout.cxx | 58 +- Infovis/Layout/vtkAreaLayout.h | 19 +- Infovis/Layout/vtkAreaLayoutStrategy.cxx | 11 +- Infovis/Layout/vtkAreaLayoutStrategy.h | 13 +- Infovis/Layout/vtkAssignCoordinates.cxx | 62 +- Infovis/Layout/vtkAssignCoordinates.h | 10 +- .../vtkAssignCoordinatesLayoutStrategy.cxx | 2 +- .../vtkAssignCoordinatesLayoutStrategy.h | 5 +- ...vtkAttributeClustering2DLayoutStrategy.cxx | 285 +- .../vtkAttributeClustering2DLayoutStrategy.h | 30 +- Infovis/Layout/vtkBoxLayoutStrategy.cxx | 45 +- Infovis/Layout/vtkBoxLayoutStrategy.h | 19 +- .../vtkCirclePackFrontChainLayoutStrategy.cxx | 579 +- .../vtkCirclePackFrontChainLayoutStrategy.h | 15 +- Infovis/Layout/vtkCirclePackLayout.cxx | 332 +- Infovis/Layout/vtkCirclePackLayout.h | 120 +- .../Layout/vtkCirclePackLayoutStrategy.cxx | 3 +- Infovis/Layout/vtkCirclePackLayoutStrategy.h | 32 +- Infovis/Layout/vtkCirclePackToPolyData.cxx | 66 +- Infovis/Layout/vtkCirclePackToPolyData.h | 21 +- Infovis/Layout/vtkCircularLayoutStrategy.cxx | 7 +- Infovis/Layout/vtkCircularLayoutStrategy.h | 5 +- .../Layout/vtkClustering2DLayoutStrategy.cxx | 243 +- .../Layout/vtkClustering2DLayoutStrategy.h | 32 +- .../Layout/vtkCommunity2DLayoutStrategy.cxx | 236 +- Infovis/Layout/vtkCommunity2DLayoutStrategy.h | 31 +- Infovis/Layout/vtkConeLayoutStrategy.cxx | 109 +- Infovis/Layout/vtkConeLayoutStrategy.h | 32 +- .../Layout/vtkConstrained2DLayoutStrategy.cxx | 206 +- .../Layout/vtkConstrained2DLayoutStrategy.h | 31 +- .../Layout/vtkCosmicTreeLayoutStrategy.cxx | 429 +- Infovis/Layout/vtkCosmicTreeLayoutStrategy.h | 52 +- Infovis/Layout/vtkEdgeLayout.cxx | 29 +- Infovis/Layout/vtkEdgeLayout.h | 16 +- Infovis/Layout/vtkEdgeLayoutStrategy.cxx | 9 +- Infovis/Layout/vtkEdgeLayoutStrategy.h | 14 +- Infovis/Layout/vtkFast2DLayoutStrategy.cxx | 217 +- Infovis/Layout/vtkFast2DLayoutStrategy.h | 32 +- .../Layout/vtkForceDirectedLayoutStrategy.cxx | 92 +- .../Layout/vtkForceDirectedLayoutStrategy.h | 26 +- Infovis/Layout/vtkGeoEdgeStrategy.cxx | 27 +- Infovis/Layout/vtkGeoEdgeStrategy.h | 6 +- Infovis/Layout/vtkGeoMath.cxx | 11 +- Infovis/Layout/vtkGeoMath.h | 8 +- Infovis/Layout/vtkGraphLayout.cxx | 44 +- Infovis/Layout/vtkGraphLayout.h | 11 +- Infovis/Layout/vtkGraphLayoutStrategy.cxx | 35 +- Infovis/Layout/vtkGraphLayoutStrategy.h | 19 +- Infovis/Layout/vtkIncrementalForceLayout.cxx | 89 +- Infovis/Layout/vtkIncrementalForceLayout.h | 14 +- Infovis/Layout/vtkKCoreLayout.cxx | 165 +- Infovis/Layout/vtkKCoreLayout.h | 35 +- Infovis/Layout/vtkPassThroughEdgeStrategy.cxx | 6 +- Infovis/Layout/vtkPassThroughEdgeStrategy.h | 5 +- .../Layout/vtkPassThroughLayoutStrategy.cxx | 10 +- Infovis/Layout/vtkPassThroughLayoutStrategy.h | 9 +- .../Layout/vtkPerturbCoincidentVertices.cxx | 109 +- Infovis/Layout/vtkPerturbCoincidentVertices.h | 19 +- Infovis/Layout/vtkRandomLayoutStrategy.cxx | 44 +- Infovis/Layout/vtkRandomLayoutStrategy.h | 16 +- Infovis/Layout/vtkSimple2DLayoutStrategy.cxx | 111 +- Infovis/Layout/vtkSimple2DLayoutStrategy.h | 20 +- Infovis/Layout/vtkSimple3DCirclesStrategy.cxx | 466 +- Infovis/Layout/vtkSimple3DCirclesStrategy.h | 170 +- .../Layout/vtkSliceAndDiceLayoutStrategy.cxx | 45 +- .../Layout/vtkSliceAndDiceLayoutStrategy.h | 12 +- Infovis/Layout/vtkSpanTreeLayoutStrategy.cxx | 110 +- Infovis/Layout/vtkSpanTreeLayoutStrategy.h | 13 +- Infovis/Layout/vtkSplineGraphEdges.cxx | 148 +- Infovis/Layout/vtkSplineGraphEdges.h | 11 +- Infovis/Layout/vtkSquarifyLayoutStrategy.cxx | 57 +- Infovis/Layout/vtkSquarifyLayoutStrategy.h | 25 +- .../Layout/vtkStackedTreeLayoutStrategy.cxx | 245 +- Infovis/Layout/vtkStackedTreeLayoutStrategy.h | 25 +- Infovis/Layout/vtkTreeLayoutStrategy.cxx | 69 +- Infovis/Layout/vtkTreeLayoutStrategy.h | 8 +- Infovis/Layout/vtkTreeMapLayout.cxx | 55 +- Infovis/Layout/vtkTreeMapLayout.h | 21 +- Infovis/Layout/vtkTreeMapLayoutStrategy.cxx | 21 +- Infovis/Layout/vtkTreeMapLayoutStrategy.h | 10 +- Infovis/Layout/vtkTreeMapToPolyData.cxx | 65 +- Infovis/Layout/vtkTreeMapToPolyData.h | 17 +- Infovis/Layout/vtkTreeOrbitLayoutStrategy.cxx | 38 +- Infovis/Layout/vtkTreeOrbitLayoutStrategy.h | 9 +- Infovis/Layout/vtkTreeRingToPolyData.cxx | 79 +- Infovis/Layout/vtkTreeRingToPolyData.h | 13 +- Interaction/Image/vtkImageViewer.cxx | 213 +- Interaction/Image/vtkImageViewer.h | 70 +- Interaction/Image/vtkImageViewer2.cxx | 286 +- Interaction/Image/vtkImageViewer2.h | 67 +- Interaction/Image/vtkResliceImageViewer.cxx | 281 +- Interaction/Image/vtkResliceImageViewer.h | 62 +- .../vtkResliceImageViewerMeasurements.cxx | 160 +- .../Image/vtkResliceImageViewerMeasurements.h | 49 +- .../Style/vtkInteractorStyleDrawPolygon.cxx | 101 +- .../Style/vtkInteractorStyleDrawPolygon.h | 6 +- .../Style/vtkInteractorStyleFlight.cxx | 475 +- Interaction/Style/vtkInteractorStyleFlight.h | 82 +- Interaction/Style/vtkInteractorStyleImage.cxx | 207 +- Interaction/Style/vtkInteractorStyleImage.h | 27 +- .../Style/vtkInteractorStyleJoystickActor.cxx | 151 +- .../Style/vtkInteractorStyleJoystickActor.h | 17 +- .../vtkInteractorStyleJoystickCamera.cxx | 81 +- .../Style/vtkInteractorStyleJoystickCamera.h | 6 +- .../vtkInteractorStyleMultiTouchCamera.cxx | 94 +- .../vtkInteractorStyleMultiTouchCamera.h | 9 +- .../Style/vtkInteractorStyleRubberBand2D.cxx | 160 +- .../Style/vtkInteractorStyleRubberBand2D.h | 8 +- .../Style/vtkInteractorStyleRubberBand3D.cxx | 139 +- .../Style/vtkInteractorStyleRubberBand3D.h | 11 +- .../vtkInteractorStyleRubberBandPick.cxx | 235 +- .../Style/vtkInteractorStyleRubberBandPick.h | 12 +- .../vtkInteractorStyleRubberBandZoom.cxx | 62 +- .../Style/vtkInteractorStyleRubberBandZoom.h | 7 +- .../Style/vtkInteractorStyleSwitch.cxx | 78 +- Interaction/Style/vtkInteractorStyleSwitch.h | 27 +- .../Style/vtkInteractorStyleTerrain.cxx | 142 +- Interaction/Style/vtkInteractorStyleTerrain.h | 22 +- .../Style/vtkInteractorStyleTrackball.cxx | 9 +- .../Style/vtkInteractorStyleTrackball.h | 6 +- .../vtkInteractorStyleTrackballActor.cxx | 155 +- .../Style/vtkInteractorStyleTrackballActor.h | 17 +- .../vtkInteractorStyleTrackballCamera.cxx | 92 +- .../Style/vtkInteractorStyleTrackballCamera.h | 10 +- .../Style/vtkInteractorStyleUnicam.cxx | 183 +- Interaction/Style/vtkInteractorStyleUnicam.h | 76 +- Interaction/Style/vtkInteractorStyleUser.cxx | 62 +- Interaction/Style/vtkInteractorStyleUser.h | 21 +- .../vtkParallelCoordinatesInteractorStyle.cxx | 125 +- .../vtkParallelCoordinatesInteractorStyle.h | 24 +- Interaction/Widgets/Testing/Cxx/BoxWidget.cxx | 873 ++- .../Widgets/Testing/Cxx/BoxWidget2.cxx | 885 ++- .../Widgets/Testing/Cxx/ImagePlaneWidget.cxx | 727 ++- .../Widgets/Testing/Cxx/ScaledBoxWidget2.cxx | 103 +- .../Testing/Cxx/TerrainPolylineEditor.cxx | 353 +- .../Widgets/Testing/Cxx/TestAffineWidget.cxx | 64 +- .../Widgets/Testing/Cxx/TestAngleWidget2D.cxx | 720 ++- .../Widgets/Testing/Cxx/TestAngleWidget3D.cxx | 1289 ++-- .../Testing/Cxx/TestAxesTransformWidget.cxx | 17 +- .../Widgets/Testing/Cxx/TestBalloonWidget.cxx | 75 +- .../Testing/Cxx/TestBiDimensionalWidget.cxx | 2133 ++++--- .../Widgets/Testing/Cxx/TestBorderWidget.cxx | 1242 ++-- .../Testing/Cxx/TestBrokenLineWidget.cxx | 155 +- .../Widgets/Testing/Cxx/TestButtonWidget.cxx | 836 ++- .../Cxx/TestButtonWidgetMultipleViewports.cxx | 1876 +++--- .../Widgets/Testing/Cxx/TestCameraWidget.cxx | 28 +- .../Widgets/Testing/Cxx/TestCaptionWidget.cxx | 1770 +++--- .../Cxx/TestCellCentersPointPlacer.cxx | 2223 ++++--- .../Cxx/TestCenteredSliderWidget2D.cxx | 59 +- .../Testing/Cxx/TestCheckerboardWidget.cxx | 457 +- .../Cxx/TestCoincidentHandleWidgets.cxx | 280 +- .../Cxx/TestConstrainedHandleWidget.cxx | 64 +- .../Testing/Cxx/TestContourWidget2.cxx | 48 +- .../Cxx/TestDijkstraGraphGeodesicPath.cxx | 283 +- .../Cxx/TestDijkstraImageGeodesicPath.cxx | 248 +- .../Testing/Cxx/TestDistanceWidget.cxx | 1636 ++--- .../Testing/Cxx/TestDistanceWidget3D.cxx | 1614 ++--- .../Testing/Cxx/TestFinitePlaneWidget.cxx | 695 ++- .../TestFixedSizeHandleRepresentation3D.cxx | 1089 ++-- .../Testing/Cxx/TestFocalPlaneContour.cxx | 31 +- .../Widgets/Testing/Cxx/TestHandleWidget.cxx | 1124 ++-- .../Testing/Cxx/TestHandleWidget2D.cxx | 80 +- .../Cxx/TestImageActorContourWidget.cxx | 1487 +++-- .../Testing/Cxx/TestImageTracerWidget.cxx | 594 +- .../Cxx/TestImplicitCylinderWidget.cxx | 496 +- .../Cxx/TestImplicitCylinderWidget2.cxx | 559 +- .../Testing/Cxx/TestImplicitPlaneWidget.cxx | 824 ++- .../Testing/Cxx/TestImplicitPlaneWidget2.cxx | 826 ++- ...ImplicitPlaneWidget2LockNormalToCamera.cxx | 799 ++- .../Testing/Cxx/TestImplicitPlaneWidget2b.cxx | 94 +- .../Testing/Cxx/TestImplicitPlaneWidget3.cxx | 299 +- .../Widgets/Testing/Cxx/TestLightWidget.cxx | 2 +- .../Widgets/Testing/Cxx/TestLineWidget.cxx | 451 +- .../Widgets/Testing/Cxx/TestLineWidget2.cxx | 85 +- .../Testing/Cxx/TestLineWidget2EventLog.h | 776 ++- .../Widgets/Testing/Cxx/TestLogoWidget.cxx | 61 +- .../Cxx/TestLogoWidgetAlphaBlending.cxx | 68 +- .../Cxx/TestLogoWidgetDepthPeeling.cxx | 68 +- ...tMeasurementCubeHandleRepresentation3D.cxx | 30 +- .../Testing/Cxx/TestMultipleViewports.cxx | 9 +- .../Cxx/TestOrientationMarkerWidget.cxx | 716 ++- .../Cxx/TestOrientationMarkerWidget2.cxx | 96 +- .../Testing/Cxx/TestOrientedGlyphContour.cxx | 80 +- .../Widgets/Testing/Cxx/TestOrthoPlanes.cxx | 733 ++- .../Testing/Cxx/TestParallelopipedWidget.cxx | 88 +- .../Cxx/TestPickingManagerSeedWidget.cxx | 543 +- .../Cxx/TestPickingManagerSeedWidget2.cxx | 74 +- .../Testing/Cxx/TestPickingManagerWidgets.cxx | 80 +- .../Widgets/Testing/Cxx/TestPlaneWidget.cxx | 769 ++- .../Testing/Cxx/TestPlaybackWidget.cxx | 43 +- .../Cxx/TestPointHandleRepresentation3D.cxx | 25 +- .../Widgets/Testing/Cxx/TestPointWidget.cxx | 1041 ++-- .../Widgets/Testing/Cxx/TestPolyPlane.cxx | 158 +- .../TestPolygonalHandleRepresentations.cxx | 166 +- ...estPolygonalRepresentationHandleWidget.cxx | 84 +- ...ygonalSurfaceConstrainedDistanceWidget.cxx | 92 +- .../Testing/Cxx/TestPolylineWidget.cxx | 6 +- .../Testing/Cxx/TestProgrammaticPlacement.cxx | 31 +- .../Testing/Cxx/TestProgressBarWidget.cxx | 4 +- .../Cxx/TestProp3DButtonRepresentation.cxx | 3 +- .../Testing/Cxx/TestRectilinearWipeWidget.cxx | 872 ++- .../Testing/Cxx/TestResliceCursorWidget2.cxx | 172 +- .../Testing/Cxx/TestResliceCursorWidget3.cxx | 166 +- .../Testing/Cxx/TestScalarBarWidget.cxx | 1429 +++-- .../Widgets/Testing/Cxx/TestSeedWidget.cxx | 806 ++- .../Widgets/Testing/Cxx/TestSeedWidget2.cxx | 2686 +++++---- ...estSeedWidgetNonUniformRepresentations.cxx | 108 +- .../Widgets/Testing/Cxx/TestSliderWidget.cxx | 980 ++- .../Testing/Cxx/TestSliderWidget2D.cxx | 978 ++- .../Cxx/TestSliderWidgetMultipleViewports.cxx | 223 +- .../Testing/Cxx/TestSphereHandleWidget.cxx | 430 +- .../Cxx/TestSphereWidget2CenterCursor.cxx | 14 +- .../Testing/Cxx/TestSphereWidgetZoomInOut.cxx | 455 +- .../Widgets/Testing/Cxx/TestSplineWidget.cxx | 390 +- .../TestSurfaceConstrainedHandleWidget.cxx | 82 +- .../Testing/Cxx/TestTensorProbeWidget.cxx | 1177 ++-- .../Widgets/Testing/Cxx/TestTextWidget.cxx | 45 +- .../Widgets/Testing/Cxx/WidgetTestingMacros.h | 1573 ++--- .../Cxx/vtkAngleRepresentation2DTest1.cxx | 7 +- .../Cxx/vtkAngleRepresentation3DTest1.cxx | 24 +- .../Testing/Cxx/vtkAngleWidgetTest1.cxx | 15 +- .../Cxx/vtkBalloonRepresentationTest1.cxx | 5 +- .../Testing/Cxx/vtkBalloonWidgetTest1.cxx | 34 +- .../vtkBiDimensionalRepresentation2DTest1.cxx | 96 +- .../Cxx/vtkBiDimensionalWidgetTest1.cxx | 9 +- .../Testing/Cxx/vtkBorderWidgetTest1.cxx | 6 +- .../Cxx/vtkCaptionRepresentationTest1.cxx | 18 +- .../Testing/Cxx/vtkCaptionWidgetTest1.cxx | 8 +- ...strainedPointHandleRepresentationTest1.cxx | 100 +- .../Testing/Cxx/vtkHoverWidgetTest1.cxx | 6 +- .../vtkImplicitPlaneRepresentationTest1.cxx | 6 +- .../Cxx/vtkImplicitPlaneWidget2Test1.cxx | 9 +- .../Cxx/vtkLineRepresentationTest1.cxx | 82 +- .../Testing/Cxx/vtkLineWidget2Test1.cxx | 6 +- ...edPolygonalHandleRepresentation3DTest1.cxx | 9 +- .../vtkPointHandleRepresentation2DTest1.cxx | 28 +- .../vtkPointHandleRepresentation3DTest1.cxx | 15 +- .../Cxx/vtkPolyLineRepresentationTest1.cxx | 62 +- .../Testing/Cxx/vtkPolyLineWidgetTest1.cxx | 11 +- ...tkPolygonalHandleRepresentation3DTest1.cxx | 9 +- .../Cxx/vtkSeedRepresentationTest1.cxx | 29 +- .../Testing/Cxx/vtkSeedWidgetTest1.cxx | 12 +- .../vtkSphereHandleRepresentationTest1.cxx | 26 +- .../Cxx/vtkSplineRepresentationTest1.cxx | 59 +- .../Testing/Cxx/vtkSplineWidget2Test1.cxx | 6 +- .../Cxx/vtkTextRepresentationTest1.cxx | 32 +- .../Testing/Cxx/vtkTextWidgetTest1.cxx | 8 +- Interaction/Widgets/vtk3DWidget.cxx | 82 +- Interaction/Widgets/vtk3DWidget.h | 35 +- ...bstractPolygonalHandleRepresentation3D.cxx | 308 +- ...kAbstractPolygonalHandleRepresentation3D.h | 127 +- Interaction/Widgets/vtkAbstractWidget.cxx | 142 +- Interaction/Widgets/vtkAbstractWidget.h | 42 +- .../Widgets/vtkAffineRepresentation.cxx | 12 +- Interaction/Widgets/vtkAffineRepresentation.h | 38 +- .../Widgets/vtkAffineRepresentation2D.cxx | 395 +- .../Widgets/vtkAffineRepresentation2D.h | 133 +- Interaction/Widgets/vtkAffineWidget.cxx | 113 +- Interaction/Widgets/vtkAffineWidget.h | 21 +- .../Widgets/vtkAngleRepresentation.cxx | 59 +- Interaction/Widgets/vtkAngleRepresentation.h | 55 +- .../Widgets/vtkAngleRepresentation2D.cxx | 103 +- .../Widgets/vtkAngleRepresentation2D.h | 23 +- .../Widgets/vtkAngleRepresentation3D.cxx | 146 +- .../Widgets/vtkAngleRepresentation3D.h | 50 +- Interaction/Widgets/vtkAngleWidget.cxx | 260 +- Interaction/Widgets/vtkAngleWidget.h | 41 +- .../vtkAxesTransformRepresentation.cxx | 60 +- .../Widgets/vtkAxesTransformRepresentation.h | 83 +- .../Widgets/vtkAxesTransformWidget.cxx | 97 +- Interaction/Widgets/vtkAxesTransformWidget.h | 29 +- .../Widgets/vtkBalloonRepresentation.cxx | 229 +- .../Widgets/vtkBalloonRepresentation.h | 111 +- Interaction/Widgets/vtkBalloonWidget.cxx | 196 +- Interaction/Widgets/vtkBalloonWidget.h | 54 +- .../vtkBezierContourLineInterpolator.cxx | 134 +- .../vtkBezierContourLineInterpolator.h | 22 +- .../vtkBiDimensionalRepresentation.cxx | 64 +- .../Widgets/vtkBiDimensionalRepresentation.h | 57 +- .../vtkBiDimensionalRepresentation2D.cxx | 289 +- .../vtkBiDimensionalRepresentation2D.h | 60 +- .../Widgets/vtkBiDimensionalWidget.cxx | 424 +- Interaction/Widgets/vtkBiDimensionalWidget.h | 47 +- .../Widgets/vtkBorderRepresentation.cxx | 178 +- Interaction/Widgets/vtkBorderRepresentation.h | 95 +- Interaction/Widgets/vtkBorderWidget.cxx | 113 +- Interaction/Widgets/vtkBorderWidget.h | 55 +- .../Widgets/vtkBoundedPlanePointPlacer.cxx | 186 +- .../Widgets/vtkBoundedPlanePointPlacer.h | 85 +- Interaction/Widgets/vtkBoxRepresentation.cxx | 994 ++-- Interaction/Widgets/vtkBoxRepresentation.h | 170 +- Interaction/Widgets/vtkBoxWidget.cxx | 799 +-- Interaction/Widgets/vtkBoxWidget.h | 163 +- Interaction/Widgets/vtkBoxWidget2.cxx | 220 +- Interaction/Widgets/vtkBoxWidget2.h | 44 +- Interaction/Widgets/vtkBrokenLineWidget.cxx | 748 ++- Interaction/Widgets/vtkBrokenLineWidget.h | 95 +- .../Widgets/vtkButtonRepresentation.cxx | 33 +- Interaction/Widgets/vtkButtonRepresentation.h | 22 +- Interaction/Widgets/vtkButtonWidget.cxx | 74 +- Interaction/Widgets/vtkButtonWidget.h | 21 +- .../Widgets/vtkCameraRepresentation.cxx | 61 +- Interaction/Widgets/vtkCameraRepresentation.h | 47 +- Interaction/Widgets/vtkCameraWidget.cxx | 16 +- Interaction/Widgets/vtkCameraWidget.h | 13 +- .../Widgets/vtkCaptionRepresentation.cxx | 108 +- .../Widgets/vtkCaptionRepresentation.h | 24 +- Interaction/Widgets/vtkCaptionWidget.cxx | 81 +- Interaction/Widgets/vtkCaptionWidget.h | 21 +- .../Widgets/vtkCellCentersPointPlacer.cxx | 76 +- .../Widgets/vtkCellCentersPointPlacer.h | 46 +- .../vtkCenteredSliderRepresentation.cxx | 269 +- .../Widgets/vtkCenteredSliderRepresentation.h | 72 +- .../Widgets/vtkCenteredSliderWidget.cxx | 101 +- Interaction/Widgets/vtkCenteredSliderWidget.h | 21 +- .../Widgets/vtkCheckerboardRepresentation.cxx | 214 +- .../Widgets/vtkCheckerboardRepresentation.h | 52 +- Interaction/Widgets/vtkCheckerboardWidget.cxx | 133 +- Interaction/Widgets/vtkCheckerboardWidget.h | 27 +- .../Widgets/vtkClosedSurfacePointPlacer.cxx | 191 +- .../Widgets/vtkClosedSurfacePointPlacer.h | 46 +- ...tkConstrainedPointHandleRepresentation.cxx | 222 +- .../vtkConstrainedPointHandleRepresentation.h | 116 +- .../Widgets/vtkContinuousValueWidget.cxx | 84 +- .../Widgets/vtkContinuousValueWidget.h | 20 +- ...vtkContinuousValueWidgetRepresentation.cxx | 13 +- .../vtkContinuousValueWidgetRepresentation.h | 18 +- .../Widgets/vtkContourLineInterpolator.cxx | 33 +- .../Widgets/vtkContourLineInterpolator.h | 19 +- .../Widgets/vtkContourRepresentation.cxx | 737 +-- .../Widgets/vtkContourRepresentation.h | 227 +- Interaction/Widgets/vtkContourWidget.cxx | 386 +- Interaction/Widgets/vtkContourWidget.h | 52 +- .../Widgets/vtkCurveRepresentation.cxx | 305 +- Interaction/Widgets/vtkCurveRepresentation.h | 87 +- ...tkDijkstraImageContourLineInterpolator.cxx | 73 +- .../vtkDijkstraImageContourLineInterpolator.h | 29 +- .../Widgets/vtkDistanceRepresentation.cxx | 88 +- .../Widgets/vtkDistanceRepresentation.h | 72 +- .../Widgets/vtkDistanceRepresentation2D.cxx | 49 +- .../Widgets/vtkDistanceRepresentation2D.h | 24 +- .../Widgets/vtkDistanceRepresentation3D.cxx | 106 +- .../Widgets/vtkDistanceRepresentation3D.h | 62 +- Interaction/Widgets/vtkDistanceWidget.cxx | 250 +- Interaction/Widgets/vtkDistanceWidget.h | 38 +- .../vtkEllipsoidTensorProbeRepresentation.cxx | 77 +- .../vtkEllipsoidTensorProbeRepresentation.h | 48 +- Interaction/Widgets/vtkEvent.cxx | 45 +- Interaction/Widgets/vtkEvent.h | 36 +- .../Widgets/vtkFinitePlaneRepresentation.cxx | 163 +- .../Widgets/vtkFinitePlaneRepresentation.h | 122 +- Interaction/Widgets/vtkFinitePlaneWidget.cxx | 52 +- Interaction/Widgets/vtkFinitePlaneWidget.h | 16 +- .../vtkFixedSizeHandleRepresentation3D.cxx | 23 +- .../vtkFixedSizeHandleRepresentation3D.h | 31 +- .../vtkFocalPlaneContourRepresentation.cxx | 94 +- .../vtkFocalPlaneContourRepresentation.h | 20 +- .../Widgets/vtkFocalPlanePointPlacer.cxx | 79 +- .../Widgets/vtkFocalPlanePointPlacer.h | 32 +- .../Widgets/vtkHandleRepresentation.cxx | 84 +- Interaction/Widgets/vtkHandleRepresentation.h | 49 +- Interaction/Widgets/vtkHandleWidget.cxx | 177 +- Interaction/Widgets/vtkHandleWidget.h | 50 +- Interaction/Widgets/vtkHoverWidget.cxx | 97 +- Interaction/Widgets/vtkHoverWidget.h | 27 +- .../Widgets/vtkImageActorPointPlacer.cxx | 147 +- .../Widgets/vtkImageActorPointPlacer.h | 44 +- .../Widgets/vtkImageCroppingRegionsWidget.cxx | 254 +- .../Widgets/vtkImageCroppingRegionsWidget.h | 65 +- Interaction/Widgets/vtkImageOrthoPlanes.cxx | 203 +- Interaction/Widgets/vtkImageOrthoPlanes.h | 35 +- Interaction/Widgets/vtkImagePlaneWidget.cxx | 1321 ++--- Interaction/Widgets/vtkImagePlaneWidget.h | 272 +- Interaction/Widgets/vtkImageTracerWidget.cxx | 659 +- Interaction/Widgets/vtkImageTracerWidget.h | 192 +- .../vtkImplicitCylinderRepresentation.cxx | 546 +- .../vtkImplicitCylinderRepresentation.h | 193 +- .../Widgets/vtkImplicitCylinderWidget.cxx | 246 +- .../Widgets/vtkImplicitCylinderWidget.h | 23 +- .../vtkImplicitPlaneRepresentation.cxx | 709 +-- .../Widgets/vtkImplicitPlaneRepresentation.h | 229 +- .../Widgets/vtkImplicitPlaneWidget.cxx | 452 +- Interaction/Widgets/vtkImplicitPlaneWidget.h | 189 +- .../Widgets/vtkImplicitPlaneWidget2.cxx | 324 +- Interaction/Widgets/vtkImplicitPlaneWidget2.h | 24 +- .../Widgets/vtkLightRepresentation.cxx | 11 +- Interaction/Widgets/vtkLightRepresentation.h | 2 +- Interaction/Widgets/vtkLineRepresentation.cxx | 359 +- Interaction/Widgets/vtkLineRepresentation.h | 130 +- Interaction/Widgets/vtkLineWidget.cxx | 414 +- Interaction/Widgets/vtkLineWidget.h | 124 +- Interaction/Widgets/vtkLineWidget2.cxx | 188 +- Interaction/Widgets/vtkLineWidget2.h | 35 +- .../vtkLinearContourLineInterpolator.cxx | 8 +- .../vtkLinearContourLineInterpolator.h | 13 +- Interaction/Widgets/vtkLogoRepresentation.cxx | 79 +- Interaction/Widgets/vtkLogoRepresentation.h | 31 +- Interaction/Widgets/vtkLogoWidget.cxx | 5 +- Interaction/Widgets/vtkLogoWidget.h | 13 +- ...kMeasurementCubeHandleRepresentation3D.cxx | 356 +- ...vtkMeasurementCubeHandleRepresentation3D.h | 151 +- .../Widgets/vtkOrientationMarkerWidget.cxx | 392 +- .../Widgets/vtkOrientationMarkerWidget.h | 33 +- .../vtkOrientedGlyphContourRepresentation.cxx | 205 +- .../vtkOrientedGlyphContourRepresentation.h | 100 +- ...edGlyphFocalPlaneContourRepresentation.cxx | 382 +- ...ntedGlyphFocalPlaneContourRepresentation.h | 95 +- ...rientedPolygonalHandleRepresentation3D.cxx | 18 +- ...kOrientedPolygonalHandleRepresentation3D.h | 17 +- .../vtkParallelopipedRepresentation.cxx | 868 ++- .../Widgets/vtkParallelopipedRepresentation.h | 126 +- .../Widgets/vtkParallelopipedWidget.cxx | 251 +- Interaction/Widgets/vtkParallelopipedWidget.h | 41 +- Interaction/Widgets/vtkPlaneWidget.cxx | 618 +- Interaction/Widgets/vtkPlaneWidget.h | 149 +- .../Widgets/vtkPlaybackRepresentation.cxx | 48 +- .../Widgets/vtkPlaybackRepresentation.h | 25 +- Interaction/Widgets/vtkPlaybackWidget.cxx | 19 +- Interaction/Widgets/vtkPlaybackWidget.h | 13 +- .../vtkPointHandleRepresentation2D.cxx | 100 +- .../Widgets/vtkPointHandleRepresentation2D.h | 54 +- .../vtkPointHandleRepresentation3D.cxx | 339 +- .../Widgets/vtkPointHandleRepresentation3D.h | 148 +- Interaction/Widgets/vtkPointPlacer.cxx | 45 +- Interaction/Widgets/vtkPointPlacer.h | 48 +- Interaction/Widgets/vtkPointWidget.cxx | 239 +- Interaction/Widgets/vtkPointWidget.h | 145 +- .../vtkPolyDataContourLineInterpolator.cxx | 6 +- .../vtkPolyDataContourLineInterpolator.h | 24 +- .../Widgets/vtkPolyDataPointPlacer.cxx | 63 +- Interaction/Widgets/vtkPolyDataPointPlacer.h | 41 +- .../Widgets/vtkPolyDataSourceWidget.cxx | 11 +- Interaction/Widgets/vtkPolyDataSourceWidget.h | 12 +- .../Widgets/vtkPolyLineRepresentation.cxx | 99 +- .../Widgets/vtkPolyLineRepresentation.h | 7 +- Interaction/Widgets/vtkPolyLineWidget.cxx | 95 +- Interaction/Widgets/vtkPolyLineWidget.h | 14 +- .../vtkPolygonalHandleRepresentation3D.cxx | 19 +- .../vtkPolygonalHandleRepresentation3D.h | 13 +- ...olygonalSurfaceContourLineInterpolator.cxx | 103 +- ...kPolygonalSurfaceContourLineInterpolator.h | 29 +- .../vtkPolygonalSurfacePointPlacer.cxx | 159 +- .../Widgets/vtkPolygonalSurfacePointPlacer.h | 82 +- .../Widgets/vtkProgressBarRepresentation.cxx | 48 +- .../Widgets/vtkProgressBarRepresentation.h | 14 +- Interaction/Widgets/vtkProgressBarWidget.h | 10 +- .../Widgets/vtkProp3DButtonRepresentation.cxx | 138 +- .../Widgets/vtkProp3DButtonRepresentation.h | 38 +- .../vtkRectilinearWipeRepresentation.cxx | 243 +- .../vtkRectilinearWipeRepresentation.h | 55 +- .../Widgets/vtkRectilinearWipeWidget.cxx | 49 +- .../Widgets/vtkRectilinearWipeWidget.h | 21 +- Interaction/Widgets/vtkResliceCursor.cxx | 235 +- Interaction/Widgets/vtkResliceCursor.h | 90 +- Interaction/Widgets/vtkResliceCursorActor.cxx | 110 +- Interaction/Widgets/vtkResliceCursorActor.h | 41 +- .../vtkResliceCursorLineRepresentation.cxx | 223 +- .../vtkResliceCursorLineRepresentation.h | 59 +- .../Widgets/vtkResliceCursorPicker.cxx | 199 +- Interaction/Widgets/vtkResliceCursorPicker.h | 43 +- .../vtkResliceCursorPolyDataAlgorithm.cxx | 89 +- .../vtkResliceCursorPolyDataAlgorithm.h | 75 +- .../vtkResliceCursorRepresentation.cxx | 399 +- .../Widgets/vtkResliceCursorRepresentation.h | 147 +- ...tkResliceCursorThickLineRepresentation.cxx | 26 +- .../vtkResliceCursorThickLineRepresentation.h | 12 +- .../Widgets/vtkResliceCursorWidget.cxx | 129 +- Interaction/Widgets/vtkResliceCursorWidget.h | 28 +- .../Widgets/vtkScalarBarRepresentation.cxx | 46 +- .../Widgets/vtkScalarBarRepresentation.h | 25 +- Interaction/Widgets/vtkScalarBarWidget.cxx | 33 +- Interaction/Widgets/vtkScalarBarWidget.h | 16 +- Interaction/Widgets/vtkSeedRepresentation.cxx | 96 +- Interaction/Widgets/vtkSeedRepresentation.h | 40 +- Interaction/Widgets/vtkSeedWidget.cxx | 177 +- Interaction/Widgets/vtkSeedWidget.h | 41 +- .../Widgets/vtkSliderRepresentation.cxx | 48 +- Interaction/Widgets/vtkSliderRepresentation.h | 59 +- .../Widgets/vtkSliderRepresentation2D.cxx | 254 +- .../Widgets/vtkSliderRepresentation2D.h | 93 +- .../Widgets/vtkSliderRepresentation3D.cxx | 262 +- .../Widgets/vtkSliderRepresentation3D.h | 98 +- Interaction/Widgets/vtkSliderWidget.cxx | 105 +- Interaction/Widgets/vtkSliderWidget.h | 30 +- .../Widgets/vtkSphereHandleRepresentation.cxx | 146 +- .../Widgets/vtkSphereHandleRepresentation.h | 63 +- .../Widgets/vtkSphereRepresentation.cxx | 287 +- Interaction/Widgets/vtkSphereRepresentation.h | 165 +- Interaction/Widgets/vtkSphereWidget.cxx | 261 +- Interaction/Widgets/vtkSphereWidget.h | 139 +- Interaction/Widgets/vtkSphereWidget2.cxx | 113 +- Interaction/Widgets/vtkSphereWidget2.h | 31 +- .../Widgets/vtkSplineRepresentation.cxx | 120 +- Interaction/Widgets/vtkSplineRepresentation.h | 25 +- Interaction/Widgets/vtkSplineWidget.cxx | 581 +- Interaction/Widgets/vtkSplineWidget.h | 103 +- Interaction/Widgets/vtkSplineWidget2.cxx | 132 +- Interaction/Widgets/vtkSplineWidget2.h | 21 +- .../Widgets/vtkTensorProbeRepresentation.cxx | 75 +- .../Widgets/vtkTensorProbeRepresentation.h | 45 +- Interaction/Widgets/vtkTensorProbeWidget.cxx | 55 +- Interaction/Widgets/vtkTensorProbeWidget.h | 30 +- .../vtkTerrainContourLineInterpolator.cxx | 57 +- .../vtkTerrainContourLineInterpolator.h | 24 +- .../Widgets/vtkTerrainDataPointPlacer.cxx | 50 +- .../Widgets/vtkTerrainDataPointPlacer.h | 40 +- Interaction/Widgets/vtkTextRepresentation.cxx | 134 +- Interaction/Widgets/vtkTextRepresentation.h | 24 +- Interaction/Widgets/vtkTextWidget.cxx | 20 +- Interaction/Widgets/vtkTextWidget.h | 17 +- .../vtkTexturedButtonRepresentation.cxx | 184 +- .../Widgets/vtkTexturedButtonRepresentation.h | 65 +- .../vtkTexturedButtonRepresentation2D.cxx | 151 +- .../vtkTexturedButtonRepresentation2D.h | 50 +- .../Widgets/vtkWidgetCallbackMapper.cxx | 76 +- Interaction/Widgets/vtkWidgetCallbackMapper.h | 38 +- Interaction/Widgets/vtkWidgetEvent.cxx | 12 +- Interaction/Widgets/vtkWidgetEvent.h | 14 +- .../Widgets/vtkWidgetEventTranslator.cxx | 212 +- .../Widgets/vtkWidgetEventTranslator.h | 46 +- .../Widgets/vtkWidgetRepresentation.cxx | 169 +- Interaction/Widgets/vtkWidgetRepresentation.h | 122 +- Interaction/Widgets/vtkWidgetSet.cxx | 22 +- Interaction/Widgets/vtkWidgetSet.h | 50 +- .../Widgets/vtkXYPlotRepresentation.cxx | 408 +- Interaction/Widgets/vtkXYPlotRepresentation.h | 34 +- Interaction/Widgets/vtkXYPlotWidget.cxx | 124 +- Interaction/Widgets/vtkXYPlotWidget.h | 24 +- .../Cxx/TestFieldDataSerialization.cxx | 276 +- .../Testing/Cxx/TestSocketCommunicator.cxx | 22 +- .../Testing/Cxx/TestThreadedTaskQueue.cxx | 6 +- .../Core/Testing/Python/DummyController.cxx | 3 +- Parallel/Core/Testing/Python/SocketClient.cxx | 61 +- Parallel/Core/Testing/Python/SocketServer.cxx | 56 +- Parallel/Core/vtkCommunicator.cxx | 652 +- Parallel/Core/vtkCommunicator.h | 1657 +++--- Parallel/Core/vtkDummyCommunicator.cxx | 2 +- Parallel/Core/vtkDummyCommunicator.h | 18 +- Parallel/Core/vtkDummyController.cxx | 4 +- Parallel/Core/vtkDummyController.h | 12 +- Parallel/Core/vtkFieldDataSerializer.cxx | 330 +- Parallel/Core/vtkFieldDataSerializer.h | 193 +- Parallel/Core/vtkMultiProcessController.cxx | 259 +- Parallel/Core/vtkMultiProcessController.h | 1683 +++--- Parallel/Core/vtkMultiProcessStream.cxx | 473 +- Parallel/Core/vtkMultiProcessStream.h | 71 +- Parallel/Core/vtkPDirectory.cxx | 41 +- Parallel/Core/vtkPDirectory.h | 16 +- Parallel/Core/vtkPSystemTools.cxx | 71 +- Parallel/Core/vtkPSystemTools.h | 22 +- Parallel/Core/vtkProcess.cxx | 15 +- Parallel/Core/vtkProcess.h | 12 +- Parallel/Core/vtkProcessGroup.cxx | 26 +- Parallel/Core/vtkProcessGroup.h | 24 +- Parallel/Core/vtkSocketCommunicator.cxx | 430 +- Parallel/Core/vtkSocketCommunicator.h | 105 +- Parallel/Core/vtkSocketController.cxx | 33 +- Parallel/Core/vtkSocketController.h | 32 +- Parallel/Core/vtkSubCommunicator.cxx | 22 +- Parallel/Core/vtkSubCommunicator.h | 23 +- Parallel/Core/vtkSubGroup.cxx | 368 +- Parallel/Core/vtkSubGroup.h | 61 +- Parallel/Core/vtkThreadedTaskQueue.h | 20 +- Parallel/Core/vtkThreadedTaskQueue.txx | 92 +- Parallel/DIY/vtkDIYExplicitAssigner.h | 3 +- Parallel/DIY/vtkDIYUtilities.cxx | 2 +- Parallel/DIY/vtkDIYUtilities.h | 2 +- .../Cxx/ExerciseMultiProcessController.cxx | 418 +- .../Cxx/ExerciseMultiProcessController.h | 2 +- .../MPI/Testing/Cxx/GenericCommunicator.cxx | 52 +- Parallel/MPI/Testing/Cxx/MPIController.cxx | 45 +- Parallel/MPI/Testing/Cxx/PDirectory.cxx | 11 +- Parallel/MPI/Testing/Cxx/PSystemTools.cxx | 31 +- .../Cxx/TestNonBlockingCommunication.cxx | 42 +- Parallel/MPI/Testing/Cxx/TestPProbe.cxx | 46 +- Parallel/MPI/Testing/Cxx/TestProcess.cxx | 56 +- Parallel/MPI/vtkMPI.h | 19 +- Parallel/MPI/vtkMPICommunicator.cxx | 1023 ++-- Parallel/MPI/vtkMPICommunicator.h | 162 +- Parallel/MPI/vtkMPIController.cxx | 123 +- Parallel/MPI/vtkMPIController.h | 247 +- Parallel/MPI/vtkMPIEventLog.cxx | 17 +- Parallel/MPI/vtkMPIEventLog.h | 10 +- Parallel/MPI/vtkMPIUtilities.cxx | 46 +- Parallel/MPI4Py/vtkMPI4PyCommunicator.cxx | 8 +- Parallel/MPI4Py/vtkMPI4PyCommunicator.h | 3 +- .../Testing/Cxx/TestAxisActor3D.cxx | 41 +- .../Testing/Cxx/TestBarChartActor.cxx | 58 +- .../Testing/Cxx/TestCaptionActor2D.cxx | 6 +- .../Testing/Cxx/TestConvexHull2D.cxx | 67 +- .../Testing/Cxx/TestCornerAnnotation.cxx | 38 +- .../Testing/Cxx/TestCubeAxes2DMode.cxx | 99 +- .../Annotation/Testing/Cxx/TestCubeAxes3.cxx | 40 +- .../Testing/Cxx/TestCubeAxesInnerGridAll.cxx | 44 +- .../Cxx/TestCubeAxesInnerGridClosest.cxx | 44 +- .../Cxx/TestCubeAxesInnerGridFurthest.cxx | 44 +- .../Cxx/TestCubeAxesIntersectionPoint.cxx | 46 +- .../Cxx/TestCubeAxesOrientedBoundingBox.cxx | 44 +- .../Testing/Cxx/TestCubeAxesSticky.cxx | 44 +- .../Cxx/TestCubeAxesStickyCentered.cxx | 44 +- .../Testing/Cxx/TestCubeAxesWithGridLines.cxx | 16 +- .../Cxx/TestCubeAxesWithXInnerGrids.cxx | 12 +- .../Cxx/TestCubeAxesWithXInnerPolys.cxx | 12 +- .../Testing/Cxx/TestCubeAxesWithXLines.cxx | 16 +- .../Cxx/TestCubeAxesWithYInnerGrids.cxx | 12 +- .../Cxx/TestCubeAxesWithYInnerPolys.cxx | 12 +- .../Testing/Cxx/TestCubeAxesWithYLines.cxx | 16 +- .../Cxx/TestCubeAxesWithZInnerGrids.cxx | 12 +- .../Cxx/TestCubeAxesWithZInnerPolys.cxx | 12 +- .../Testing/Cxx/TestCubeAxesWithZLines.cxx | 16 +- .../Testing/Cxx/TestEmptyCornerAnnotation.cxx | 22 +- .../Testing/Cxx/TestLegendBoxActor.cxx | 28 +- .../Testing/Cxx/TestLegendBoxActor2.cxx | 31 +- .../Testing/Cxx/TestLegendScaleActor.cxx | 22 +- .../Testing/Cxx/TestPieChartActor.cxx | 58 +- .../Annotation/Testing/Cxx/TestPolarAxes.cxx | 2 +- .../Annotation/Testing/Cxx/TestScalarBar.cxx | 167 +- .../Testing/Cxx/TestScalarBarAboveBelow.cxx | 2 +- .../Testing/Cxx/TestSpiderPlotActor.cxx | 82 +- .../Testing/Cxx/TestXYPlotActor.cxx | 155 +- .../Annotation/vtkAnnotatedCubeActor.cxx | 355 +- Rendering/Annotation/vtkAnnotatedCubeActor.h | 136 +- Rendering/Annotation/vtkArcPlotter.cxx | 243 +- Rendering/Annotation/vtkArcPlotter.h | 100 +- Rendering/Annotation/vtkAxesActor.cxx | 575 +- Rendering/Annotation/vtkAxesActor.h | 180 +- Rendering/Annotation/vtkAxisActor.cxx | 17 +- Rendering/Annotation/vtkAxisActor.h | 2 +- Rendering/Annotation/vtkAxisActor2D.cxx | 381 +- Rendering/Annotation/vtkAxisActor2D.h | 166 +- Rendering/Annotation/vtkAxisFollower.cxx | 259 +- Rendering/Annotation/vtkAxisFollower.h | 280 +- Rendering/Annotation/vtkBarChartActor.cxx | 303 +- Rendering/Annotation/vtkBarChartActor.h | 86 +- Rendering/Annotation/vtkCaptionActor2D.cxx | 232 +- Rendering/Annotation/vtkCaptionActor2D.h | 97 +- Rendering/Annotation/vtkConvexHull2D.cxx | 145 +- Rendering/Annotation/vtkConvexHull2D.h | 21 +- Rendering/Annotation/vtkCornerAnnotation.cxx | 260 +- Rendering/Annotation/vtkCornerAnnotation.h | 67 +- Rendering/Annotation/vtkCubeAxesActor.cxx | 1269 ++-- Rendering/Annotation/vtkCubeAxesActor.h | 400 +- Rendering/Annotation/vtkCubeAxesActor2D.cxx | 427 +- Rendering/Annotation/vtkCubeAxesActor2D.h | 149 +- .../vtkGraphAnnotationLayersFilter.cxx | 83 +- .../vtkGraphAnnotationLayersFilter.h | 10 +- Rendering/Annotation/vtkLeaderActor2D.cxx | 352 +- Rendering/Annotation/vtkLeaderActor2D.h | 131 +- Rendering/Annotation/vtkLegendBoxActor.cxx | 607 +- Rendering/Annotation/vtkLegendBoxActor.h | 131 +- Rendering/Annotation/vtkLegendScaleActor.cxx | 356 +- Rendering/Annotation/vtkLegendScaleActor.h | 120 +- .../vtkParallelCoordinatesActor.cxx | 241 +- .../Annotation/vtkParallelCoordinatesActor.h | 77 +- Rendering/Annotation/vtkPieChartActor.cxx | 334 +- Rendering/Annotation/vtkPieChartActor.h | 79 +- Rendering/Annotation/vtkPolarAxesActor.cxx | 29 +- Rendering/Annotation/vtkPolarAxesActor.h | 4 +- .../Annotation/vtkProp3DAxisFollower.cxx | 234 +- Rendering/Annotation/vtkProp3DAxisFollower.h | 212 +- Rendering/Annotation/vtkScalarBarActor.cxx | 789 +-- Rendering/Annotation/vtkScalarBarActor.h | 68 +- .../Annotation/vtkScalarBarActorInternal.h | 61 +- Rendering/Annotation/vtkSpiderPlotActor.cxx | 454 +- Rendering/Annotation/vtkSpiderPlotActor.h | 98 +- Rendering/Annotation/vtkXYPlotActor.cxx | 2237 ++++--- Rendering/Annotation/vtkXYPlotActor.h | 395 +- .../Context2D/Testing/Cxx/TestContext2D.cxx | 32 +- .../Testing/Cxx/TestPolyDataToContext.cxx | 41 +- .../Context2D/vtkAbstractContextBufferId.cxx | 10 +- .../Context2D/vtkAbstractContextBufferId.h | 31 +- .../Context2D/vtkAbstractContextItem.cxx | 44 +- Rendering/Context2D/vtkAbstractContextItem.h | 57 +- Rendering/Context2D/vtkBlockItem.cxx | 28 +- Rendering/Context2D/vtkBlockItem.h | 31 +- Rendering/Context2D/vtkBrush.cxx | 19 +- Rendering/Context2D/vtkBrush.h | 35 +- Rendering/Context2D/vtkContext2D.cxx | 336 +- Rendering/Context2D/vtkContext2D.h | 185 +- Rendering/Context2D/vtkContext3D.cxx | 34 +- Rendering/Context2D/vtkContext3D.h | 42 +- Rendering/Context2D/vtkContextActor.cxx | 183 +- Rendering/Context2D/vtkContextActor.h | 16 +- Rendering/Context2D/vtkContextClip.cxx | 16 +- Rendering/Context2D/vtkContextClip.h | 15 +- Rendering/Context2D/vtkContextDevice2D.cxx | 39 +- Rendering/Context2D/vtkContextDevice2D.h | 123 +- Rendering/Context2D/vtkContextDevice3D.cxx | 2 +- Rendering/Context2D/vtkContextDevice3D.h | 43 +- Rendering/Context2D/vtkContextItem.cxx | 2 +- Rendering/Context2D/vtkContextItem.h | 11 +- Rendering/Context2D/vtkContextKeyEvent.cxx | 6 +- Rendering/Context2D/vtkContextKeyEvent.h | 8 +- Rendering/Context2D/vtkContextMapper2D.cxx | 9 +- Rendering/Context2D/vtkContextMapper2D.h | 25 +- Rendering/Context2D/vtkContextMouseEvent.h | 40 +- Rendering/Context2D/vtkContextScene.cxx | 138 +- Rendering/Context2D/vtkContextScene.h | 57 +- Rendering/Context2D/vtkContextScenePrivate.h | 36 +- Rendering/Context2D/vtkContextTransform.cxx | 59 +- Rendering/Context2D/vtkContextTransform.h | 27 +- Rendering/Context2D/vtkImageItem.cxx | 4 +- Rendering/Context2D/vtkImageItem.h | 19 +- .../vtkLabeledContourPolyDataItem.cxx | 307 +- .../Context2D/vtkLabeledContourPolyDataItem.h | 18 +- Rendering/Context2D/vtkMarkerUtilities.cxx | 65 +- Rendering/Context2D/vtkMarkerUtilities.h | 16 +- Rendering/Context2D/vtkPen.cxx | 16 +- Rendering/Context2D/vtkPen.h | 28 +- Rendering/Context2D/vtkPolyDataItem.cxx | 14 +- Rendering/Context2D/vtkPolyDataItem.h | 3 +- Rendering/Context2D/vtkPropItem.cxx | 18 +- Rendering/Context2D/vtkPropItem.h | 20 +- Rendering/Context2D/vtkTooltipItem.cxx | 28 +- Rendering/Context2D/vtkTooltipItem.h | 23 +- .../ContextOpenGL2/vtkOpenGLContextActor.cxx | 21 +- .../ContextOpenGL2/vtkOpenGLContextActor.h | 6 +- .../vtkOpenGLContextBufferId.cxx | 99 +- .../ContextOpenGL2/vtkOpenGLContextBufferId.h | 21 +- .../vtkOpenGLContextDevice2D.cxx | 1232 ++-- .../ContextOpenGL2/vtkOpenGLContextDevice2D.h | 184 +- .../vtkOpenGLContextDevice2DPrivate.h | 344 +- .../vtkOpenGLContextDevice3D.cxx | 308 +- .../ContextOpenGL2/vtkOpenGLContextDevice3D.h | 64 +- .../ContextOpenGL2/vtkOpenGLPropItem.cxx | 23 +- Rendering/ContextOpenGL2/vtkOpenGLPropItem.h | 16 +- Rendering/Core/Testing/Cxx/FrustumClip.cxx | 48 +- Rendering/Core/Testing/Cxx/Mace.cxx | 57 +- Rendering/Core/Testing/Cxx/RGrid.cxx | 106 +- .../Core/Testing/Cxx/RenderNonFinite.cxx | 41 +- .../Core/Testing/Cxx/SurfacePlusEdges.cxx | 5 +- Rendering/Core/Testing/Cxx/TestActor2D.cxx | 5 +- .../Core/Testing/Cxx/TestActor2DTextures.cxx | 50 +- .../Testing/Cxx/TestActorLightingFlag.cxx | 43 +- .../Core/Testing/Cxx/TestAnimationScene.cxx | 192 +- .../Core/Testing/Cxx/TestAreaSelections.cxx | 63 +- .../Core/Testing/Cxx/TestAssemblyBounds.cxx | 75 +- .../Testing/Cxx/TestBareScalarsToColors.cxx | 53 +- .../Core/Testing/Cxx/TestBlockOpacity.cxx | 59 +- .../Core/Testing/Cxx/TestBlockVisibility.cxx | 44 +- .../Cxx/TestColorByCellDataStringArray.cxx | 1 - .../Cxx/TestColorByPointDataStringArray.cxx | 1 - ...stColorByStringArrayDefaultLookupTable.cxx | 1 - .../TestColorTransferFunctionStringArray.cxx | 25 +- .../Cxx/TestCompositeDataPointGaussian.cxx | 32 +- ...estCompositeDataPointGaussianSelection.cxx | 49 +- .../Cxx/TestCompositePolyDataMapper2.cxx | 64 +- ...estCompositePolyDataMapper2CellScalars.cxx | 59 +- ...olyDataMapper2MixedGeometryCellScalars.cxx | 61 +- ...ositePolyDataMapper2MixedGeometryEdges.cxx | 59 +- .../TestCompositePolyDataMapper2Picking.cxx | 161 +- .../TestCompositePolyDataMapper2Scalars.cxx | 60 +- .../Testing/Cxx/TestDirectScalarsToColors.cxx | 72 +- ...TestDiscretizableColorTransferFunction.cxx | 18 +- ...cretizableColorTransferFunctionOpacity.cxx | 31 +- ...izableColorTransferFunctionStringArray.cxx | 28 +- Rendering/Core/Testing/Cxx/TestEdgeFlags.cxx | 33 +- .../Core/Testing/Cxx/TestFollowerPicking.cxx | 419 +- .../Core/Testing/Cxx/TestGlyph3DMapper.cxx | 48 +- .../Core/Testing/Cxx/TestGlyph3DMapper2.cxx | 16 +- .../Testing/Cxx/TestGlyph3DMapperArrow.cxx | 68 +- .../Testing/Cxx/TestGlyph3DMapperIndexing.cxx | 2 +- .../Testing/Cxx/TestGlyph3DMapperMasking.cxx | 61 +- .../Cxx/TestGlyph3DMapperOrientationArray.cxx | 56 +- .../Testing/Cxx/TestGlyph3DMapperPicking.cxx | 147 +- .../Cxx/TestGlyph3DMapperTreeIndexing.cxx | 2 +- ...yph3DMapperTreeIndexingCompositeGlyphs.cxx | 3 +- .../Testing/Cxx/TestGradientBackground.cxx | 3 +- .../Testing/Cxx/TestHiddenLineRemovalPass.cxx | 7 +- .../Cxx/TestHierarchicalBoxPipeline.cxx | 27 +- .../Cxx/TestHomogeneousTransformOfActor.cxx | 30 +- .../Testing/Cxx/TestImageAndAnnotations.cxx | 25 +- .../Cxx/TestInteractorStyleImageProperty.cxx | 53 +- .../Core/Testing/Cxx/TestInteractorTimers.cxx | 37 +- .../Testing/Cxx/TestLabeledContourMapper.cxx | 20 +- ...estLabeledContourMapperWithActorMatrix.cxx | 16 +- Rendering/Core/Testing/Cxx/TestManyActors.cxx | 26 +- .../Testing/Cxx/TestMapVectorsAsRGBColors.cxx | 69 +- .../Testing/Cxx/TestMapVectorsToColors.cxx | 47 +- .../TestMultiBlockPartialArrayFieldData.cxx | 18 +- .../TestMultiBlockPartialArrayPointData.cxx | 17 +- Rendering/Core/Testing/Cxx/TestOSConeCxx.cxx | 20 +- .../Core/Testing/Cxx/TestOffAxisStereo.cxx | 15 +- .../Testing/Cxx/TestOffscreenIsOffscreen.cxx | 2 +- .../Testing/Cxx/TestOnAndOffScreenConeCxx.cxx | 20 +- Rendering/Core/Testing/Cxx/TestOpacity.cxx | 71 +- .../Testing/Cxx/TestOrderedTriangulator.cxx | 214 +- .../Core/Testing/Cxx/TestPickingManager.cxx | 268 +- .../Core/Testing/Cxx/TestPointSelection.cxx | 111 +- .../Cxx/TestPointSelectionWithCellData.cxx | 111 +- .../Core/Testing/Cxx/TestPolygonSelection.cxx | 69 +- .../TestResetCameraVerticalAspectRatio.cxx | 20 +- ...ResetCameraVerticalAspectRatioParallel.cxx | 20 +- .../Testing/Cxx/TestSelectVisiblePoints.cxx | 26 +- .../Cxx/TestSplitViewportStereoHorizontal.cxx | 16 +- .../Testing/Cxx/TestStereoBackgroundLeft.cxx | 6 +- .../Testing/Cxx/TestStereoBackgroundRight.cxx | 6 +- Rendering/Core/Testing/Cxx/TestTDxGeo.cxx | 43 +- .../Testing/Cxx/TestTStripsColorsTCoords.cxx | 57 +- .../Cxx/TestTStripsNormalsColorsTCoords.cxx | 57 +- .../Testing/Cxx/TestTStripsNormalsTCoords.cxx | 39 +- .../Core/Testing/Cxx/TestTStripsTCoords.cxx | 39 +- .../Core/Testing/Cxx/TestTextureRGBA.cxx | 32 +- .../Cxx/TestTextureRGBADepthPeeling.cxx | 37 +- .../Core/Testing/Cxx/TestTextureSize.cxx | 39 +- .../Testing/Cxx/TestTexturedBackground.cxx | 12 +- Rendering/Core/Testing/Cxx/TestTilingCxx.cxx | 25 +- .../Cxx/TestToggleOSWithInteractor.cxx | 31 +- .../Cxx/TestTransformCoordinateUseDouble.cxx | 12 +- ...TestTranslucentImageActorAlphaBlending.cxx | 21 +- .../TestTranslucentImageActorDepthPeeling.cxx | 27 +- .../Cxx/TestTranslucentLUTAlphaBlending.cxx | 34 +- .../Cxx/TestTranslucentLUTDepthPeeling.cxx | 40 +- .../TestTranslucentLUTDepthPeelingPass.cxx | 76 +- ...TestTranslucentLUTTextureAlphaBlending.cxx | 34 +- .../TestTranslucentLUTTextureDepthPeeling.cxx | 40 +- .../Cxx/TestValuePassFloatingPoint.cxx | 70 +- .../Cxx/TestViewDependentErrorMetric.cxx | 149 +- .../Core/Testing/Cxx/otherCoordinate.cxx | 181 +- .../Core/Testing/Cxx/otherLookupTable.cxx | 187 +- .../Cxx/otherLookupTableWithEnabling.cxx | 199 +- .../Core/vtkAbstractHyperTreeGridMapper.cxx | 134 +- .../Core/vtkAbstractHyperTreeGridMapper.h | 35 +- .../Core/vtkAbstractInteractionDevice.cxx | 8 +- Rendering/Core/vtkAbstractInteractionDevice.h | 8 +- Rendering/Core/vtkAbstractMapper.cxx | 75 +- Rendering/Core/vtkAbstractMapper.h | 30 +- Rendering/Core/vtkAbstractMapper3D.cxx | 39 +- Rendering/Core/vtkAbstractMapper3D.h | 25 +- Rendering/Core/vtkAbstractPicker.cxx | 17 +- Rendering/Core/vtkAbstractPicker.h | 57 +- Rendering/Core/vtkAbstractPropPicker.cxx | 47 +- Rendering/Core/vtkAbstractPropPicker.h | 20 +- Rendering/Core/vtkAbstractRenderDevice.cxx | 4 +- Rendering/Core/vtkAbstractRenderDevice.h | 3 +- Rendering/Core/vtkAbstractVolumeMapper.cxx | 39 +- Rendering/Core/vtkAbstractVolumeMapper.h | 62 +- Rendering/Core/vtkActor.cxx | 180 +- Rendering/Core/vtkActor.h | 45 +- Rendering/Core/vtkActor2D.cxx | 56 +- Rendering/Core/vtkActor2D.h | 37 +- Rendering/Core/vtkActor2DCollection.cxx | 89 +- Rendering/Core/vtkActor2DCollection.h | 55 +- Rendering/Core/vtkActorCollection.cxx | 10 +- Rendering/Core/vtkActorCollection.h | 50 +- Rendering/Core/vtkAreaPicker.cxx | 168 +- Rendering/Core/vtkAreaPicker.h | 39 +- Rendering/Core/vtkAssembly.cxx | 190 +- Rendering/Core/vtkAssembly.h | 38 +- Rendering/Core/vtkAssemblyNode.cxx | 12 +- Rendering/Core/vtkAssemblyNode.h | 10 +- Rendering/Core/vtkAssemblyPath.cxx | 42 +- Rendering/Core/vtkAssemblyPath.h | 29 +- Rendering/Core/vtkAssemblyPaths.cxx | 2 +- Rendering/Core/vtkAssemblyPaths.h | 41 +- Rendering/Core/vtkAvatar.cxx | 6 +- Rendering/Core/vtkAvatar.h | 7 +- Rendering/Core/vtkBackgroundColorMonitor.cxx | 38 +- Rendering/Core/vtkBackgroundColorMonitor.h | 12 +- Rendering/Core/vtkBillboardTextActor3D.cxx | 159 +- Rendering/Core/vtkBillboardTextActor3D.h | 32 +- Rendering/Core/vtkCamera.cxx | 753 ++- Rendering/Core/vtkCamera.h | 115 +- Rendering/Core/vtkCameraActor.cxx | 93 +- Rendering/Core/vtkCameraActor.h | 24 +- Rendering/Core/vtkCameraInterpolator.cxx | 252 +- Rendering/Core/vtkCameraInterpolator.h | 43 +- Rendering/Core/vtkCellCenterDepthSort.cxx | 63 +- Rendering/Core/vtkCellCenterDepthSort.h | 26 +- Rendering/Core/vtkCellPicker.cxx | 698 ++- Rendering/Core/vtkCellPicker.h | 108 +- Rendering/Core/vtkColorTransferFunction.cxx | 122 +- Rendering/Core/vtkColorTransferFunction.h | 28 +- .../vtkCompositeDataDisplayAttributes.cxx | 69 +- .../Core/vtkCompositeDataDisplayAttributes.h | 25 +- ...tkCompositeDataDisplayAttributesLegacy.cxx | 73 +- .../vtkCompositeDataDisplayAttributesLegacy.h | 15 +- Rendering/Core/vtkCompositePolyDataMapper.cxx | 166 +- Rendering/Core/vtkCompositePolyDataMapper.h | 16 +- Rendering/Core/vtkCoordinate.cxx | 155 +- Rendering/Core/vtkCoordinate.h | 70 +- Rendering/Core/vtkCuller.cxx | 3 +- Rendering/Core/vtkCuller.h | 5 +- Rendering/Core/vtkCullerCollection.cxx | 2 +- Rendering/Core/vtkCullerCollection.h | 41 +- Rendering/Core/vtkDataSetMapper.cxx | 78 +- Rendering/Core/vtkDataSetMapper.h | 16 +- .../vtkDiscretizableColorTransferFunction.cxx | 123 +- .../vtkDiscretizableColorTransferFunction.h | 50 +- Rendering/Core/vtkDistanceToCamera.cxx | 82 +- Rendering/Core/vtkDistanceToCamera.h | 13 +- Rendering/Core/vtkFXAAOptions.cxx | 34 +- Rendering/Core/vtkFXAAOptions.h | 6 +- Rendering/Core/vtkFlagpoleLabel.cxx | 129 +- Rendering/Core/vtkFlagpoleLabel.h | 34 +- Rendering/Core/vtkFollower.cxx | 77 +- Rendering/Core/vtkFollower.h | 26 +- Rendering/Core/vtkFrameBufferObjectBase.h | 14 +- Rendering/Core/vtkFrustumCoverageCuller.cxx | 173 +- Rendering/Core/vtkFrustumCoverageCuller.h | 45 +- Rendering/Core/vtkGPUInfo.cxx | 19 +- Rendering/Core/vtkGPUInfo.h | 2 +- Rendering/Core/vtkGPUInfoList.cxx | 41 +- Rendering/Core/vtkGPUInfoList.h | 8 +- Rendering/Core/vtkGPUInfoListArray.h | 4 +- .../Core/vtkGenericRenderWindowInteractor.cxx | 13 +- .../Core/vtkGenericRenderWindowInteractor.h | 6 +- .../Core/vtkGenericVertexAttributeMapping.cxx | 29 +- .../Core/vtkGenericVertexAttributeMapping.h | 13 +- Rendering/Core/vtkGlyph3DMapper.cxx | 295 +- Rendering/Core/vtkGlyph3DMapper.h | 83 +- Rendering/Core/vtkGraphMapper.cxx | 185 +- Rendering/Core/vtkGraphMapper.h | 33 +- Rendering/Core/vtkGraphToGlyphs.cxx | 46 +- Rendering/Core/vtkGraphToGlyphs.h | 6 +- Rendering/Core/vtkGraphicsFactory.cxx | 24 +- Rendering/Core/vtkGraphicsFactory.h | 10 +- Rendering/Core/vtkHardwareSelector.cxx | 259 +- Rendering/Core/vtkHardwareSelector.h | 90 +- .../Core/vtkHierarchicalPolyDataMapper.cxx | 2 +- .../Core/vtkHierarchicalPolyDataMapper.h | 4 +- Rendering/Core/vtkImageActor.cxx | 153 +- Rendering/Core/vtkImageActor.h | 37 +- Rendering/Core/vtkImageMapper.cxx | 76 +- Rendering/Core/vtkImageMapper.h | 11 +- Rendering/Core/vtkImageMapper3D.cxx | 387 +- Rendering/Core/vtkImageMapper3D.h | 59 +- Rendering/Core/vtkImageProperty.cxx | 32 +- Rendering/Core/vtkImageProperty.h | 29 +- Rendering/Core/vtkImageSlice.cxx | 129 +- Rendering/Core/vtkImageSlice.h | 34 +- Rendering/Core/vtkImageSliceMapper.cxx | 155 +- Rendering/Core/vtkImageSliceMapper.h | 47 +- Rendering/Core/vtkInteractorEventRecorder.cxx | 179 +- Rendering/Core/vtkInteractorEventRecorder.h | 50 +- Rendering/Core/vtkInteractorObserver.cxx | 118 +- Rendering/Core/vtkInteractorObserver.h | 70 +- Rendering/Core/vtkInteractorStyle.cxx | 713 +-- Rendering/Core/vtkInteractorStyle.h | 130 +- Rendering/Core/vtkInteractorStyle3D.cxx | 121 +- Rendering/Core/vtkInteractorStyle3D.h | 42 +- .../Core/vtkInteractorStyleSwitchBase.cxx | 8 +- Rendering/Core/vtkInteractorStyleSwitchBase.h | 7 +- Rendering/Core/vtkLODProp3D.cxx | 360 +- Rendering/Core/vtkLODProp3D.h | 104 +- Rendering/Core/vtkLabeledContourMapper.cxx | 427 +- Rendering/Core/vtkLabeledContourMapper.h | 48 +- Rendering/Core/vtkLight.cxx | 106 +- Rendering/Core/vtkLight.h | 104 +- Rendering/Core/vtkLightActor.cxx | 148 +- Rendering/Core/vtkLightActor.h | 26 +- Rendering/Core/vtkLightCollection.cxx | 13 +- Rendering/Core/vtkLightCollection.h | 15 +- Rendering/Core/vtkLightKit.cxx | 153 +- Rendering/Core/vtkLightKit.h | 102 +- Rendering/Core/vtkLogLookupTable.cxx | 4 +- Rendering/Core/vtkLogLookupTable.h | 5 +- Rendering/Core/vtkLookupTableWithEnabling.cxx | 211 +- Rendering/Core/vtkLookupTableWithEnabling.h | 27 +- Rendering/Core/vtkMapArrayValues.cxx | 97 +- Rendering/Core/vtkMapArrayValues.h | 41 +- Rendering/Core/vtkMapper.cxx | 409 +- Rendering/Core/vtkMapper.h | 154 +- Rendering/Core/vtkMapper2D.h | 2 +- Rendering/Core/vtkMapperCollection.cxx | 2 +- Rendering/Core/vtkMapperCollection.h | 27 +- Rendering/Core/vtkNoise200x200.h | 11 +- Rendering/Core/vtkObserverMediator.cxx | 48 +- Rendering/Core/vtkObserverMediator.h | 15 +- Rendering/Core/vtkPicker.cxx | 414 +- Rendering/Core/vtkPicker.h | 65 +- Rendering/Core/vtkPickingManager.cxx | 151 +- Rendering/Core/vtkPickingManager.h | 12 +- Rendering/Core/vtkPointGaussianMapper.cxx | 7 +- Rendering/Core/vtkPointGaussianMapper.h | 31 +- Rendering/Core/vtkPointPicker.cxx | 157 +- Rendering/Core/vtkPointPicker.h | 27 +- Rendering/Core/vtkPolyDataMapper.cxx | 90 +- Rendering/Core/vtkPolyDataMapper.h | 30 +- Rendering/Core/vtkPolyDataMapper2D.cxx | 75 +- Rendering/Core/vtkPolyDataMapper2D.h | 46 +- Rendering/Core/vtkProp.cxx | 163 +- Rendering/Core/vtkProp.h | 127 +- Rendering/Core/vtkProp3D.cxx | 242 +- Rendering/Core/vtkProp3D.h | 110 +- Rendering/Core/vtkProp3DCollection.cxx | 2 +- Rendering/Core/vtkProp3DCollection.h | 44 +- Rendering/Core/vtkProp3DFollower.cxx | 85 +- Rendering/Core/vtkProp3DFollower.h | 33 +- Rendering/Core/vtkPropAssembly.cxx | 245 +- Rendering/Core/vtkPropAssembly.h | 38 +- Rendering/Core/vtkPropCollection.cxx | 6 +- Rendering/Core/vtkPropCollection.h | 39 +- Rendering/Core/vtkPropPicker.cxx | 125 +- Rendering/Core/vtkPropPicker.h | 34 +- Rendering/Core/vtkProperty.cxx | 159 +- Rendering/Core/vtkProperty.h | 103 +- Rendering/Core/vtkProperty2D.cxx | 16 +- Rendering/Core/vtkProperty2D.h | 43 +- Rendering/Core/vtkRayCastStructures.h | 19 +- Rendering/Core/vtkRenderPass.cxx | 20 +- Rendering/Core/vtkRenderPass.h | 29 +- Rendering/Core/vtkRenderState.cxx | 27 +- Rendering/Core/vtkRenderState.h | 35 +- Rendering/Core/vtkRenderTimerLog.cxx | 46 +- Rendering/Core/vtkRenderTimerLog.h | 72 +- Rendering/Core/vtkRenderWidget.cxx | 21 +- Rendering/Core/vtkRenderWidget.h | 18 +- Rendering/Core/vtkRenderWindow.cxx | 167 +- Rendering/Core/vtkRenderWindow.h | 290 +- Rendering/Core/vtkRenderWindowCollection.cxx | 2 +- Rendering/Core/vtkRenderWindowCollection.h | 26 +- Rendering/Core/vtkRenderWindowInteractor.cxx | 322 +- Rendering/Core/vtkRenderWindowInteractor.h | 321 +- .../Core/vtkRenderWindowInteractor3D.cxx | 55 +- Rendering/Core/vtkRenderWindowInteractor3D.h | 122 +- Rendering/Core/vtkRenderedAreaPicker.cxx | 67 +- Rendering/Core/vtkRenderedAreaPicker.h | 6 +- Rendering/Core/vtkRenderer.cxx | 766 ++- Rendering/Core/vtkRenderer.h | 267 +- Rendering/Core/vtkRendererCollection.cxx | 18 +- Rendering/Core/vtkRendererCollection.h | 22 +- Rendering/Core/vtkRendererDelegate.cxx | 13 +- Rendering/Core/vtkRendererDelegate.h | 6 +- Rendering/Core/vtkRendererSource.cxx | 165 +- Rendering/Core/vtkRendererSource.h | 20 +- Rendering/Core/vtkRenderingCoreEnums.h | 2 +- Rendering/Core/vtkScenePicker.cxx | 115 +- Rendering/Core/vtkScenePicker.h | 5 +- Rendering/Core/vtkSelectVisiblePoints.cxx | 138 +- Rendering/Core/vtkSelectVisiblePoints.h | 31 +- Rendering/Core/vtkShaderProperty.cxx | 4 +- Rendering/Core/vtkShaderProperty.h | 63 +- Rendering/Core/vtkSkybox.cxx | 4 +- Rendering/Core/vtkSkybox.h | 12 +- Rendering/Core/vtkStringToImage.cxx | 2 +- Rendering/Core/vtkStringToImage.h | 29 +- Rendering/Core/vtkTDxInteractorStyle.cxx | 51 +- Rendering/Core/vtkTDxInteractorStyle.h | 18 +- .../Core/vtkTDxInteractorStyleCamera.cxx | 84 +- Rendering/Core/vtkTDxInteractorStyleCamera.h | 10 +- .../Core/vtkTDxInteractorStyleSettings.cxx | 26 +- .../Core/vtkTDxInteractorStyleSettings.h | 34 +- Rendering/Core/vtkTDxMotionEventInfo.h | 4 +- Rendering/Core/vtkTextActor.cxx | 399 +- Rendering/Core/vtkTextActor.h | 108 +- Rendering/Core/vtkTextActor3D.cxx | 78 +- Rendering/Core/vtkTextActor3D.h | 31 +- Rendering/Core/vtkTextMapper.cxx | 168 +- Rendering/Core/vtkTextMapper.h | 44 +- Rendering/Core/vtkTextProperty.cxx | 46 +- Rendering/Core/vtkTextProperty.h | 108 +- Rendering/Core/vtkTextPropertyCollection.cxx | 2 +- Rendering/Core/vtkTextPropertyCollection.h | 42 +- Rendering/Core/vtkTextRenderer.cxx | 35 +- Rendering/Core/vtkTextRenderer.h | 155 +- Rendering/Core/vtkTexture.cxx | 77 +- Rendering/Core/vtkTexture.h | 34 +- Rendering/Core/vtkTexturedActor2D.cxx | 17 +- Rendering/Core/vtkTexturedActor2D.h | 2 +- .../Core/vtkTransformCoordinateSystems.cxx | 89 +- .../Core/vtkTransformCoordinateSystems.h | 24 +- Rendering/Core/vtkTransformInterpolator.cxx | 190 +- Rendering/Core/vtkTransformInterpolator.h | 49 +- Rendering/Core/vtkTupleInterpolator.cxx | 103 +- Rendering/Core/vtkTupleInterpolator.h | 29 +- Rendering/Core/vtkUniforms.cxx | 46 +- Rendering/Core/vtkUniforms.h | 115 +- .../Core/vtkViewDependentErrorMetric.cxx | 78 +- Rendering/Core/vtkViewDependentErrorMetric.h | 25 +- Rendering/Core/vtkViewport.cxx | 373 +- Rendering/Core/vtkViewport.h | 148 +- Rendering/Core/vtkVisibilitySort.cxx | 13 +- Rendering/Core/vtkVisibilitySort.h | 39 +- Rendering/Core/vtkVolume.cxx | 454 +- Rendering/Core/vtkVolume.h | 76 +- Rendering/Core/vtkVolumeCollection.cxx | 2 +- Rendering/Core/vtkVolumeCollection.h | 30 +- Rendering/Core/vtkVolumeProperty.cxx | 89 +- Rendering/Core/vtkVolumeProperty.h | 188 +- Rendering/Core/vtkWindowLevelLookupTable.cxx | 63 +- Rendering/Core/vtkWindowLevelLookupTable.h | 44 +- Rendering/Core/vtkWindowToImageFilter.cxx | 286 +- Rendering/Core/vtkWindowToImageFilter.h | 35 +- Rendering/Core/vtkWorldPointPicker.cxx | 30 +- Rendering/Core/vtkWorldPointPicker.h | 19 +- Rendering/External/ExternalVTKWidget.cxx | 11 +- Rendering/External/ExternalVTKWidget.h | 4 +- .../Testing/Cxx/TestGLUTRenderWindow.cxx | 54 +- Rendering/External/vtkExternalLight.cxx | 31 +- Rendering/External/vtkExternalLight.h | 11 +- .../External/vtkExternalOpenGLCamera.cxx | 24 +- Rendering/External/vtkExternalOpenGLCamera.h | 9 +- .../vtkExternalOpenGLRenderWindow.cxx | 9 +- .../External/vtkExternalOpenGLRenderWindow.h | 18 +- .../External/vtkExternalOpenGLRenderer.cxx | 48 +- .../External/vtkExternalOpenGLRenderer.h | 16 +- .../Testing/Cxx/TestBillboardTextActor3D.cxx | 45 +- .../Testing/Cxx/TestFTStringToPath.cxx | 23 +- .../Testing/Cxx/TestFlagpoleLabel.cxx | 35 +- .../Testing/Cxx/TestFontDPIScaling.cxx | 2 +- .../Testing/Cxx/TestFreeTypeTextMapper.cxx | 2 +- .../Cxx/TestFreeTypeTextMapperNoMath.cxx | 2 +- .../Testing/Cxx/TestFreeTypeTools.cxx | 13 +- .../Cxx/TestMathTextFreeTypeTextRenderer.cxx | 5 +- ...TestMathTextFreeTypeTextRendererNoMath.cxx | 5 +- .../FreeType/Testing/Cxx/TestTextActor.cxx | 25 +- .../FreeType/Testing/Cxx/TestTextActor3D.cxx | 30 +- .../Cxx/TestTextActor3DAlphaBlending.cxx | 24 +- .../Cxx/TestTextActor3DDepthPeeling.cxx | 30 +- .../Cxx/TestTextActorAlphaBlending.cxx | 21 +- .../Testing/Cxx/TestTextActorDepthPeeling.cxx | 27 +- .../Cxx/TestTextActorScaleModeProp.cxx | 2 +- .../Testing/Cxx/TestTextBoundingBox.cxx | 46 +- .../FreeType/Testing/Cxx/TestTextMapper.cxx | 27 +- .../Testing/Cxx/TestTextOpaquePass.cxx | 18 +- .../FreeType/vtkFreeTypeStringToImage.cxx | 47 +- Rendering/FreeType/vtkFreeTypeStringToImage.h | 33 +- Rendering/FreeType/vtkFreeTypeTools.cxx | 859 ++- Rendering/FreeType/vtkFreeTypeTools.h | 190 +- .../vtkMathTextFreeTypeTextRenderer.cxx | 103 +- .../vtkMathTextFreeTypeTextRenderer.h | 66 +- Rendering/FreeType/vtkMathTextUtilities.cxx | 29 +- Rendering/FreeType/vtkMathTextUtilities.h | 27 +- Rendering/FreeType/vtkScaledTextActor.cxx | 4 +- Rendering/FreeType/vtkScaledTextActor.h | 11 +- .../FreeType/vtkTextRendererStringToImage.cxx | 48 +- .../FreeType/vtkTextRendererStringToImage.h | 40 +- Rendering/FreeType/vtkVectorText.cxx | 25 +- Rendering/FreeType/vtkVectorText.h | 10 +- .../Testing/Cxx/TestSystemFontRendering.cxx | 13 +- .../vtkFontConfigFreeTypeTools.cxx | 82 +- .../vtkFontConfigFreeTypeTools.h | 18 +- .../GL2PSOpenGL2/Testing/Cxx/PNGCompare.cxx | 12 +- .../Testing/Cxx/TestGL2PSAddPolyPrimitive.cxx | 52 +- .../GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.cxx | 483 +- .../GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.h | 92 +- .../Image/Testing/Cxx/TestCellPickerImage.cxx | 61 +- .../Cxx/TestImageResliceMapperAlpha.cxx | 44 +- .../Cxx/TestImageResliceMapperBackground.cxx | 44 +- .../Cxx/TestImageResliceMapperBorder.cxx | 44 +- .../TestImageResliceMapperInterpolation.cxx | 30 +- .../Cxx/TestImageResliceMapperOffAxis.cxx | 34 +- .../Cxx/TestImageResliceMapperOrient3D.cxx | 40 +- .../Cxx/TestImageResliceMapperSlab.cxx | 32 +- .../Testing/Cxx/TestImageSliceMapperAlpha.cxx | 47 +- .../Cxx/TestImageSliceMapperBackground.cxx | 46 +- .../Cxx/TestImageSliceMapperBorder.cxx | 42 +- .../Cxx/TestImageSliceMapperInterpolation.cxx | 30 +- .../Cxx/TestImageSliceMapperOrient2D.cxx | 40 +- .../Cxx/TestImageSliceMapperOrient3D.cxx | 38 +- .../Cxx/TestImageSliceMapperOriented3D.cxx | 31 +- .../Image/Testing/Cxx/TestImageStack.cxx | 53 +- Rendering/Image/vtkDepthImageToPointCloud.cxx | 361 +- Rendering/Image/vtkDepthImageToPointCloud.h | 50 +- Rendering/Image/vtkImageResliceMapper.cxx | 527 +- Rendering/Image/vtkImageResliceMapper.h | 92 +- Rendering/Image/vtkImageSliceCollection.cxx | 22 +- Rendering/Image/vtkImageSliceCollection.h | 32 +- Rendering/Image/vtkImageStack.cxx | 131 +- Rendering/Image/vtkImageStack.h | 50 +- .../Testing/Cxx/TestImageDataLIC2D.cxx | 183 +- .../Testing/Cxx/TestImageDataLIC2D.h | 4 +- .../Cxx/TestStructuredGridLIC2DXSlice.cxx | 17 +- .../Cxx/TestStructuredGridLIC2DYSlice.cxx | 17 +- .../Cxx/TestStructuredGridLIC2DZSlice.cxx | 17 +- .../LICOpenGL2/Testing/Cxx/TestSurfaceLIC.cxx | 65 +- .../Cxx/vtkStructuredGridLIC2DTestDriver.cxx | 172 +- .../Cxx/vtkStructuredGridLIC2DTestDriver.h | 4 +- .../Testing/Cxx/vtkSurfaceLICTestDriver.cxx | 168 +- .../Testing/Cxx/vtkSurfaceLICTestDriver.h | 49 +- .../vtkCompositeSurfaceLICMapper.cxx | 115 +- .../LICOpenGL2/vtkCompositeSurfaceLICMapper.h | 14 +- Rendering/LICOpenGL2/vtkImageDataLIC2D.cxx | 412 +- Rendering/LICOpenGL2/vtkImageDataLIC2D.h | 33 +- Rendering/LICOpenGL2/vtkLICNoiseHelper.cxx | 285 +- Rendering/LICOpenGL2/vtkLICNoiseHelper.h | 79 +- .../vtkLineIntegralConvolution2D.cxx | 1035 ++-- .../LICOpenGL2/vtkLineIntegralConvolution2D.h | 148 +- Rendering/LICOpenGL2/vtkPainterCommunicator.h | 34 +- .../LICOpenGL2/vtkStructuredGridLIC2D.cxx | 406 +- Rendering/LICOpenGL2/vtkStructuredGridLIC2D.h | 60 +- .../LICOpenGL2/vtkSurfaceLICComposite.cxx | 203 +- Rendering/LICOpenGL2/vtkSurfaceLICComposite.h | 138 +- Rendering/LICOpenGL2/vtkSurfaceLICHelper.cxx | 283 +- Rendering/LICOpenGL2/vtkSurfaceLICHelper.h | 72 +- .../LICOpenGL2/vtkSurfaceLICInterface.cxx | 819 +-- Rendering/LICOpenGL2/vtkSurfaceLICInterface.h | 154 +- Rendering/LICOpenGL2/vtkSurfaceLICMapper.cxx | 92 +- Rendering/LICOpenGL2/vtkSurfaceLICMapper.h | 23 +- Rendering/LICOpenGL2/vtkTextureIO.cxx | 69 +- Rendering/LICOpenGL2/vtkTextureIO.h | 49 +- Rendering/LOD/Testing/Cxx/TestLODActor.cxx | 109 +- Rendering/LOD/vtkLODActor.cxx | 62 +- Rendering/LOD/vtkLODActor.h | 6 +- Rendering/LOD/vtkQuadricLODActor.cxx | 58 +- Rendering/LOD/vtkQuadricLODActor.h | 62 +- .../Label/Testing/Cxx/TestClipLabels.cxx | 80 +- .../Testing/Cxx/TestDynamic2DLabelMapper.cxx | 7 +- .../Testing/Cxx/TestLabelPlacementMapper.cxx | 17 +- .../Cxx/TestLabelPlacementMapper2D.cxx | 1165 ++-- ...stLabelPlacementMapperCoincidentPoints.cxx | 104 +- .../Label/Testing/Cxx/TestLabelPlacer.cxx | 84 +- .../Label/Testing/Cxx/TestLabelPlacer2D.cxx | 1182 ++-- .../Cxx/TestLabelPlacerCoincidentPoints.cxx | 126 +- Rendering/Label/vtkDynamic2DLabelMapper.cxx | 276 +- Rendering/Label/vtkDynamic2DLabelMapper.h | 9 +- .../Label/vtkFreeTypeLabelRenderStrategy.cxx | 48 +- .../Label/vtkFreeTypeLabelRenderStrategy.h | 31 +- Rendering/Label/vtkLabelHierarchy.cxx | 1360 ++--- Rendering/Label/vtkLabelHierarchy.h | 61 +- .../Label/vtkLabelHierarchyAlgorithm.cxx | 61 +- Rendering/Label/vtkLabelHierarchyAlgorithm.h | 50 +- .../vtkLabelHierarchyCompositeIterator.cxx | 24 +- .../vtkLabelHierarchyCompositeIterator.h | 18 +- Rendering/Label/vtkLabelHierarchyIterator.cxx | 167 +- Rendering/Label/vtkLabelHierarchyIterator.h | 40 +- Rendering/Label/vtkLabelHierarchyPrivate.h | 151 +- Rendering/Label/vtkLabelPlacementMapper.cxx | 403 +- Rendering/Label/vtkLabelPlacementMapper.h | 72 +- Rendering/Label/vtkLabelPlacer.cxx | 588 +- Rendering/Label/vtkLabelPlacer.h | 132 +- Rendering/Label/vtkLabelRenderStrategy.cxx | 2 +- Rendering/Label/vtkLabelRenderStrategy.h | 53 +- Rendering/Label/vtkLabelSizeCalculator.cxx | 148 +- Rendering/Label/vtkLabelSizeCalculator.h | 22 +- Rendering/Label/vtkLabeledDataMapper.cxx | 370 +- Rendering/Label/vtkLabeledDataMapper.h | 91 +- .../Label/vtkLabeledTreeMapDataMapper.cxx | 344 +- Rendering/Label/vtkLabeledTreeMapDataMapper.h | 54 +- .../Label/vtkPointSetToLabelHierarchy.cxx | 224 +- Rendering/Label/vtkPointSetToLabelHierarchy.h | 32 +- .../Testing/Cxx/TestContextMathTextImage.cxx | 13 +- .../Testing/Cxx/TestGL2PSFontDPIScaling.cxx | 6 +- .../Testing/Cxx/TestGL2PSMathTextActor.cxx | 33 +- .../Testing/Cxx/TestGL2PSMathTextActor3D.cxx | 37 +- .../Testing/Cxx/TestGL2PSMathTextOutput.cxx | 25 +- .../Testing/Cxx/TestGL2PSMathTextScaling.cxx | 12 +- .../Cxx/TestIndexedLookupScalarBar.cxx | 885 ++- .../Testing/Cxx/TestMathTextActor.cxx | 29 +- .../Testing/Cxx/TestMathTextActor3D.cxx | 33 +- .../Testing/Cxx/TestRenderString.cxx | 9 +- .../Cxx/TestScalarBarCombinatorics.cxx | 28 +- .../Testing/Cxx/TestStringToPath.cxx | 23 +- .../vtkMatplotlibMathTextUtilities.cxx | 327 +- .../vtkMatplotlibMathTextUtilities.h | 39 +- .../OpenGL2/Testing/Cxx/TestAppleBug.cxx | 6 +- .../Testing/Cxx/TestBlurAndSobelPasses.cxx | 78 +- .../OpenGL2/Testing/Cxx/TestCoincident.cxx | 55 +- ...stCompositePolyDataMapper2CustomShader.cxx | 90 +- ...TestCompositePolyDataMapper2NaNPartial.cxx | 22 +- ...estCompositePolyDataMapper2Pickability.cxx | 50 +- ...estCompositePolyDataMapper2SharedArray.cxx | 4 +- .../TestCompositePolyDataMapper2Spheres.cxx | 76 +- .../TestCompositePolyDataMapper2Vertices.cxx | 57 +- Rendering/OpenGL2/Testing/Cxx/TestCubeMap.cxx | 65 +- .../OpenGL2/Testing/Cxx/TestCubeMap2.cxx | 73 +- .../Testing/Cxx/TestCubeMapRerender.cxx | 65 +- .../Testing/Cxx/TestDepthOfFieldPass.cxx | 93 +- .../Testing/Cxx/TestDepthPeelingPass.cxx | 75 +- .../Cxx/TestDepthPeelingPassViewport.cxx | 13 +- Rendering/OpenGL2/Testing/Cxx/TestEDLPass.cxx | 32 +- .../Cxx/TestEquirectangularToCubeMap.cxx | 2 +- .../OpenGL2/Testing/Cxx/TestFXAAFilter.cxx | 14 +- Rendering/OpenGL2/Testing/Cxx/TestFloor.cxx | 17 +- .../Testing/Cxx/TestFramebufferHDR.cxx | 89 +- .../Testing/Cxx/TestFramebufferPass.cxx | 98 +- .../Testing/Cxx/TestGaussianBlurPass.cxx | 61 +- .../Cxx/TestGlyph3DMapperCellPicking.cxx | 145 +- .../Testing/Cxx/TestGlyph3DMapperEdges.cxx | 23 +- .../Cxx/TestGlyph3DMapperPickability.cxx | 50 +- .../Cxx/TestLightingMapLuminancePass.cxx | 43 +- .../Cxx/TestLightingMapNormalsPass.cxx | 43 +- .../Testing/Cxx/TestMultiTexturing.cxx | 27 +- .../TestOrderIndependentTranslucentPass.cxx | 70 +- .../Cxx/TestPanoramicProjectionPass.cxx | 3 +- .../OpenGL2/Testing/Cxx/TestPointFillPass.cxx | 98 +- .../Testing/Cxx/TestPointGaussianMapper.cxx | 27 +- .../Cxx/TestPointGaussianMapperOpacity.cxx | 38 +- .../Cxx/TestPointGaussianSelection.cxx | 34 +- .../Testing/Cxx/TestPropPicker2Renderers.cxx | 41 +- .../Cxx/TestRemoveActorNonCurrentContext.cxx | 15 +- .../OpenGL2/Testing/Cxx/TestRenderToImage.cxx | 7 +- Rendering/OpenGL2/Testing/Cxx/TestSRGB.cxx | 25 +- .../OpenGL2/Testing/Cxx/TestSSAAPass.cxx | 32 +- .../OpenGL2/Testing/Cxx/TestSetZBuffer.cxx | 21 +- .../Testing/Cxx/TestShadowMapBakerPass.cxx | 23 +- .../OpenGL2/Testing/Cxx/TestShadowMapPass.cxx | 50 +- .../Testing/Cxx/TestSharedRenderWindow.cxx | 14 +- .../Testing/Cxx/TestSimpleMotionBlur.cxx | 82 +- .../Cxx/TestSobelGradientMagnitudePass.cxx | 74 +- .../OpenGL2/Testing/Cxx/TestSphereMap.cxx | 65 +- .../OpenGL2/Testing/Cxx/TestSpherePoints.cxx | 72 +- .../OpenGL2/Testing/Cxx/TestSphereVertex.cxx | 46 +- .../OpenGL2/Testing/Cxx/TestUserShader.cxx | 96 +- .../OpenGL2/Testing/Cxx/TestUserShader2.cxx | 48 +- .../OpenGL2/Testing/Cxx/TestVBOPLYMapper.cxx | 35 +- .../Testing/Cxx/TestVBOPointsLines.cxx | 8 +- .../OpenGL2/Testing/Cxx/TestValuePass2.cxx | 133 +- .../Testing/Cxx/UnitTestOpenGLUniforms.cxx | 122 +- .../vtkAndroidRenderWindowInteractor.cxx | 138 +- .../vtkAndroidRenderWindowInteractor.h | 36 +- Rendering/OpenGL2/vtkCameraPass.cxx | 66 +- Rendering/OpenGL2/vtkCameraPass.h | 26 +- Rendering/OpenGL2/vtkClearRGBPass.cxx | 21 +- Rendering/OpenGL2/vtkClearRGBPass.h | 16 +- Rendering/OpenGL2/vtkClearZPass.cxx | 13 +- Rendering/OpenGL2/vtkClearZPass.h | 16 +- Rendering/OpenGL2/vtkCocoaGLView.h | 22 +- Rendering/OpenGL2/vtkCocoaGLView.mm | 223 +- .../OpenGL2/vtkCocoaMacOSXSDKCompatibility.h | 57 +- Rendering/OpenGL2/vtkCocoaRenderWindow.h | 71 +- Rendering/OpenGL2/vtkCocoaRenderWindow.mm | 449 +- .../OpenGL2/vtkCocoaRenderWindowInteractor.h | 33 +- .../OpenGL2/vtkCocoaRenderWindowInteractor.mm | 175 +- .../OpenGL2/vtkCompositePolyDataMapper2.cxx | 655 +- .../OpenGL2/vtkCompositePolyDataMapper2.h | 72 +- .../vtkCompositePolyDataMapper2Internal.h | 64 +- Rendering/OpenGL2/vtkDataTransferHelper.cxx | 398 +- Rendering/OpenGL2/vtkDataTransferHelper.h | 39 +- Rendering/OpenGL2/vtkDefaultPass.cxx | 146 +- Rendering/OpenGL2/vtkDefaultPass.h | 29 +- .../OpenGL2/vtkDepthImageProcessingPass.cxx | 101 +- .../OpenGL2/vtkDepthImageProcessingPass.h | 29 +- Rendering/OpenGL2/vtkDepthOfFieldPass.cxx | 152 +- Rendering/OpenGL2/vtkDepthOfFieldPass.h | 28 +- Rendering/OpenGL2/vtkDepthPeelingPass.cxx | 308 +- Rendering/OpenGL2/vtkDepthPeelingPass.h | 69 +- Rendering/OpenGL2/vtkDualDepthPeelingPass.cxx | 1103 ++-- Rendering/OpenGL2/vtkDualDepthPeelingPass.h | 116 +- Rendering/OpenGL2/vtkDummyGPUInfoList.cxx | 8 +- Rendering/OpenGL2/vtkDummyGPUInfoList.h | 2 +- Rendering/OpenGL2/vtkEDLShading.cxx | 223 +- Rendering/OpenGL2/vtkEDLShading.h | 72 +- Rendering/OpenGL2/vtkEGLRenderWindow.cxx | 286 +- Rendering/OpenGL2/vtkEGLRenderWindow.h | 46 +- .../vtkEquirectangularToCubeMapTexture.cxx | 2 +- Rendering/OpenGL2/vtkFramebufferPass.cxx | 112 +- Rendering/OpenGL2/vtkFramebufferPass.h | 20 +- Rendering/OpenGL2/vtkGaussianBlurPass.cxx | 214 +- Rendering/OpenGL2/vtkGaussianBlurPass.h | 22 +- .../OpenGL2/vtkGenericOpenGLRenderWindow.cxx | 80 +- .../OpenGL2/vtkGenericOpenGLRenderWindow.h | 21 +- .../OpenGL2/vtkHiddenLineRemovalPass.cxx | 43 +- Rendering/OpenGL2/vtkHiddenLineRemovalPass.h | 15 +- Rendering/OpenGL2/vtkIOSRenderWindow.h | 84 +- Rendering/OpenGL2/vtkIOSRenderWindow.mm | 130 +- .../OpenGL2/vtkIOSRenderWindowInteractor.h | 31 +- .../OpenGL2/vtkIOSRenderWindowInteractor.mm | 53 +- Rendering/OpenGL2/vtkImageProcessingPass.cxx | 113 +- Rendering/OpenGL2/vtkImageProcessingPass.h | 26 +- Rendering/OpenGL2/vtkLightingMapPass.cxx | 20 +- Rendering/OpenGL2/vtkLightingMapPass.h | 22 +- Rendering/OpenGL2/vtkLightsPass.cxx | 8 +- Rendering/OpenGL2/vtkLightsPass.h | 12 +- Rendering/OpenGL2/vtkOSOpenGLRenderWindow.cxx | 141 +- Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h | 63 +- Rendering/OpenGL2/vtkOpaquePass.cxx | 8 +- Rendering/OpenGL2/vtkOpaquePass.h | 12 +- Rendering/OpenGL2/vtkOpenGL.h | 6 +- Rendering/OpenGL2/vtkOpenGLActor.cxx | 15 +- Rendering/OpenGL2/vtkOpenGLActor.h | 14 +- .../OpenGL2/vtkOpenGLBillboardTextActor3D.cxx | 15 +- .../OpenGL2/vtkOpenGLBillboardTextActor3D.h | 9 +- Rendering/OpenGL2/vtkOpenGLBufferObject.cxx | 15 +- Rendering/OpenGL2/vtkOpenGLBufferObject.h | 27 +- Rendering/OpenGL2/vtkOpenGLCamera.cxx | 38 +- Rendering/OpenGL2/vtkOpenGLCamera.h | 22 +- .../OpenGL2/vtkOpenGLCellToVTKCellMap.cxx | 112 +- Rendering/OpenGL2/vtkOpenGLCellToVTKCellMap.h | 36 +- Rendering/OpenGL2/vtkOpenGLFXAAFilter.cxx | 166 +- Rendering/OpenGL2/vtkOpenGLFXAAFilter.h | 26 +- Rendering/OpenGL2/vtkOpenGLFXAAPass.h | 6 +- .../OpenGL2/vtkOpenGLFramebufferObject.cxx | 705 +-- .../OpenGL2/vtkOpenGLFramebufferObject.h | 164 +- Rendering/OpenGL2/vtkOpenGLGL2PSHelper.cxx | 24 +- Rendering/OpenGL2/vtkOpenGLGL2PSHelper.h | 53 +- Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.cxx | 296 +- Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h | 42 +- Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx | 384 +- Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h | 21 +- .../OpenGL2/vtkOpenGLHardwareSelector.cxx | 65 +- Rendering/OpenGL2/vtkOpenGLHardwareSelector.h | 6 +- Rendering/OpenGL2/vtkOpenGLHelper.cxx | 5 +- Rendering/OpenGL2/vtkOpenGLHelper.h | 10 +- .../OpenGL2/vtkOpenGLImageAlgorithmHelper.cxx | 59 +- .../OpenGL2/vtkOpenGLImageAlgorithmHelper.h | 29 +- Rendering/OpenGL2/vtkOpenGLImageMapper.cxx | 320 +- Rendering/OpenGL2/vtkOpenGLImageMapper.h | 17 +- .../OpenGL2/vtkOpenGLImageSliceMapper.cxx | 328 +- Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h | 39 +- .../OpenGL2/vtkOpenGLIndexBufferObject.cxx | 236 +- .../OpenGL2/vtkOpenGLIndexBufferObject.h | 58 +- .../OpenGL2/vtkOpenGLInstanceCulling.cxx | 154 +- Rendering/OpenGL2/vtkOpenGLInstanceCulling.h | 23 +- .../OpenGL2/vtkOpenGLLabeledContourMapper.cxx | 80 +- .../OpenGL2/vtkOpenGLLabeledContourMapper.h | 22 +- Rendering/OpenGL2/vtkOpenGLLight.cxx | 3 +- Rendering/OpenGL2/vtkOpenGLLight.h | 6 +- .../OpenGL2/vtkOpenGLPointGaussianMapper.cxx | 432 +- .../OpenGL2/vtkOpenGLPointGaussianMapper.h | 34 +- Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx | 1983 +++---- Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h | 233 +- .../OpenGL2/vtkOpenGLPolyDataMapper2D.cxx | 413 +- Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h | 60 +- Rendering/OpenGL2/vtkOpenGLProperty.cxx | 34 +- Rendering/OpenGL2/vtkOpenGLProperty.h | 13 +- Rendering/OpenGL2/vtkOpenGLQuadHelper.cxx | 34 +- Rendering/OpenGL2/vtkOpenGLQuadHelper.h | 7 +- Rendering/OpenGL2/vtkOpenGLRenderPass.cxx | 25 +- Rendering/OpenGL2/vtkOpenGLRenderPass.h | 31 +- Rendering/OpenGL2/vtkOpenGLRenderTimer.cxx | 69 +- Rendering/OpenGL2/vtkOpenGLRenderTimer.h | 2 +- Rendering/OpenGL2/vtkOpenGLRenderTimerLog.cxx | 70 +- Rendering/OpenGL2/vtkOpenGLRenderTimerLog.h | 39 +- .../OpenGL2/vtkOpenGLRenderUtilities.cxx | 74 +- Rendering/OpenGL2/vtkOpenGLRenderUtilities.h | 41 +- Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx | 685 +-- Rendering/OpenGL2/vtkOpenGLRenderWindow.h | 161 +- Rendering/OpenGL2/vtkOpenGLRenderer.cxx | 273 +- Rendering/OpenGL2/vtkOpenGLRenderer.h | 29 +- .../OpenGL2/vtkOpenGLResourceFreeCallback.h | 36 +- Rendering/OpenGL2/vtkOpenGLShaderCache.cxx | 221 +- Rendering/OpenGL2/vtkOpenGLShaderCache.h | 41 +- Rendering/OpenGL2/vtkOpenGLShaderProperty.cxx | 100 +- Rendering/OpenGL2/vtkOpenGLShaderProperty.h | 77 +- Rendering/OpenGL2/vtkOpenGLSkybox.cxx | 166 +- Rendering/OpenGL2/vtkOpenGLSkybox.h | 8 +- Rendering/OpenGL2/vtkOpenGLSphereMapper.cxx | 150 +- Rendering/OpenGL2/vtkOpenGLSphereMapper.h | 31 +- Rendering/OpenGL2/vtkOpenGLState.cxx | 389 +- Rendering/OpenGL2/vtkOpenGLState.h | 228 +- Rendering/OpenGL2/vtkOpenGLStickMapper.cxx | 212 +- Rendering/OpenGL2/vtkOpenGLStickMapper.h | 24 +- Rendering/OpenGL2/vtkOpenGLTextActor.cxx | 17 +- Rendering/OpenGL2/vtkOpenGLTextActor.h | 8 +- Rendering/OpenGL2/vtkOpenGLTextActor3D.cxx | 97 +- Rendering/OpenGL2/vtkOpenGLTextActor3D.h | 8 +- Rendering/OpenGL2/vtkOpenGLTextMapper.cxx | 15 +- Rendering/OpenGL2/vtkOpenGLTextMapper.h | 11 +- Rendering/OpenGL2/vtkOpenGLTexture.cxx | 144 +- Rendering/OpenGL2/vtkOpenGLTexture.h | 25 +- Rendering/OpenGL2/vtkOpenGLUniforms.cxx | 735 +-- Rendering/OpenGL2/vtkOpenGLUniforms.h | 115 +- .../OpenGL2/vtkOpenGLVertexArrayObject.cxx | 109 +- .../OpenGL2/vtkOpenGLVertexArrayObject.h | 39 +- .../OpenGL2/vtkOpenGLVertexBufferObject.cxx | 158 +- .../OpenGL2/vtkOpenGLVertexBufferObject.h | 63 +- .../vtkOpenGLVertexBufferObjectCache.cxx | 17 +- .../vtkOpenGLVertexBufferObjectCache.h | 13 +- .../vtkOpenGLVertexBufferObjectGroup.cxx | 99 +- .../vtkOpenGLVertexBufferObjectGroup.h | 45 +- .../vtkOrderIndependentTranslucentPass.cxx | 167 +- .../vtkOrderIndependentTranslucentPass.h | 44 +- Rendering/OpenGL2/vtkOverlayPass.cxx | 8 +- Rendering/OpenGL2/vtkOverlayPass.h | 12 +- Rendering/OpenGL2/vtkPBRIrradianceTexture.cxx | 2 +- Rendering/OpenGL2/vtkPBRPrefilterTexture.cxx | 5 +- .../OpenGL2/vtkPanoramicProjectionPass.cxx | 9 +- .../OpenGL2/vtkPanoramicProjectionPass.h | 2 +- Rendering/OpenGL2/vtkPixelBufferObject.cxx | 385 +- Rendering/OpenGL2/vtkPixelBufferObject.h | 108 +- Rendering/OpenGL2/vtkPointFillPass.cxx | 119 +- Rendering/OpenGL2/vtkPointFillPass.h | 30 +- Rendering/OpenGL2/vtkProbeOpenGLVersion.cxx | 2 +- Rendering/OpenGL2/vtkRenderPassCollection.cxx | 18 +- Rendering/OpenGL2/vtkRenderPassCollection.h | 18 +- Rendering/OpenGL2/vtkRenderStepsPass.cxx | 38 +- Rendering/OpenGL2/vtkRenderStepsPass.h | 40 +- Rendering/OpenGL2/vtkRenderbuffer.cxx | 71 +- Rendering/OpenGL2/vtkRenderbuffer.h | 33 +- Rendering/OpenGL2/vtkSSAAPass.cxx | 135 +- Rendering/OpenGL2/vtkSSAAPass.h | 28 +- Rendering/OpenGL2/vtkSSAOPass.cxx | 79 +- Rendering/OpenGL2/vtkSequencePass.cxx | 26 +- Rendering/OpenGL2/vtkSequencePass.h | 16 +- Rendering/OpenGL2/vtkShader.cxx | 8 +- Rendering/OpenGL2/vtkShader.h | 2 +- Rendering/OpenGL2/vtkShaderProgram.cxx | 224 +- Rendering/OpenGL2/vtkShaderProgram.h | 126 +- Rendering/OpenGL2/vtkShadowMapBakerPass.cxx | 366 +- Rendering/OpenGL2/vtkShadowMapBakerPass.h | 78 +- Rendering/OpenGL2/vtkShadowMapPass.cxx | 229 +- Rendering/OpenGL2/vtkShadowMapPass.h | 76 +- Rendering/OpenGL2/vtkSimpleMotionBlurPass.cxx | 150 +- Rendering/OpenGL2/vtkSimpleMotionBlurPass.h | 28 +- .../OpenGL2/vtkSobelGradientMagnitudePass.cxx | 268 +- .../OpenGL2/vtkSobelGradientMagnitudePass.h | 27 +- Rendering/OpenGL2/vtkStateStorage.h | 34 +- Rendering/OpenGL2/vtkTestOpenGLVersion.cxx | 124 +- Rendering/OpenGL2/vtkTestOpenGLVersion.h | 5 +- Rendering/OpenGL2/vtkTextureObject.cxx | 850 +-- Rendering/OpenGL2/vtkTextureObject.h | 197 +- Rendering/OpenGL2/vtkTextureUnitManager.cxx | 60 +- Rendering/OpenGL2/vtkTextureUnitManager.h | 11 +- Rendering/OpenGL2/vtkToneMappingPass.cxx | 38 +- Rendering/OpenGL2/vtkToneMappingPass.h | 2 +- Rendering/OpenGL2/vtkTransformFeedback.cxx | 53 +- Rendering/OpenGL2/vtkTransformFeedback.h | 31 +- Rendering/OpenGL2/vtkTranslucentPass.cxx | 8 +- Rendering/OpenGL2/vtkTranslucentPass.h | 12 +- Rendering/OpenGL2/vtkValuePass.cxx | 375 +- Rendering/OpenGL2/vtkValuePass.h | 48 +- Rendering/OpenGL2/vtkVolumetricPass.cxx | 8 +- Rendering/OpenGL2/vtkVolumetricPass.h | 12 +- .../OpenGL2/vtkWin32OpenGLRenderWindow.cxx | 442 +- .../OpenGL2/vtkWin32OpenGLRenderWindow.h | 84 +- .../vtkWin32RenderWindowInteractor.cxx | 474 +- .../OpenGL2/vtkWin32RenderWindowInteractor.h | 38 +- Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx | 595 +- Rendering/OpenGL2/vtkXOpenGLRenderWindow.h | 97 +- .../OpenGL2/vtkXRenderWindowInteractor.cxx | 399 +- .../OpenGL2/vtkXRenderWindowInteractor.h | 43 +- Rendering/OpenVR/Testing/Cxx/Medical.cxx | 34 +- Rendering/OpenVR/Testing/Cxx/TestAvatar.cxx | 13 +- Rendering/OpenVR/Testing/Cxx/TestDragon.cxx | 17 +- Rendering/OpenVR/vtkOpenGLAvatar.cxx | 120 +- Rendering/OpenVR/vtkOpenGLAvatar.h | 14 +- Rendering/OpenVR/vtkOpenVRCamera.cxx | 155 +- Rendering/OpenVR/vtkOpenVRCamera.h | 31 +- Rendering/OpenVR/vtkOpenVRControlsHelper.cxx | 216 +- Rendering/OpenVR/vtkOpenVRControlsHelper.h | 71 +- Rendering/OpenVR/vtkOpenVRDefaultOverlay.cxx | 195 +- Rendering/OpenVR/vtkOpenVRDefaultOverlay.h | 4 +- Rendering/OpenVR/vtkOpenVRFollower.cxx | 50 +- Rendering/OpenVR/vtkOpenVRFollower.h | 6 +- Rendering/OpenVR/vtkOpenVRHardwarePicker.cxx | 31 +- Rendering/OpenVR/vtkOpenVRHardwarePicker.h | 35 +- Rendering/OpenVR/vtkOpenVRInteractorStyle.cxx | 369 +- Rendering/OpenVR/vtkOpenVRInteractorStyle.h | 126 +- .../OpenVR/vtkOpenVRMenuRepresentation.cxx | 128 +- .../OpenVR/vtkOpenVRMenuRepresentation.h | 70 +- Rendering/OpenVR/vtkOpenVRMenuWidget.cxx | 99 +- Rendering/OpenVR/vtkOpenVRMenuWidget.h | 71 +- Rendering/OpenVR/vtkOpenVRModel.cxx | 100 +- Rendering/OpenVR/vtkOpenVRModel.h | 45 +- Rendering/OpenVR/vtkOpenVROverlay.cxx | 176 +- Rendering/OpenVR/vtkOpenVROverlay.h | 66 +- Rendering/OpenVR/vtkOpenVROverlayInternal.h | 48 +- .../OpenVR/vtkOpenVRPanelRepresentation.cxx | 226 +- .../OpenVR/vtkOpenVRPanelRepresentation.h | 88 +- Rendering/OpenVR/vtkOpenVRPanelWidget.cxx | 51 +- Rendering/OpenVR/vtkOpenVRPanelWidget.h | 50 +- Rendering/OpenVR/vtkOpenVRPropPicker.cxx | 11 +- Rendering/OpenVR/vtkOpenVRPropPicker.h | 13 +- Rendering/OpenVR/vtkOpenVRRay.cxx | 53 +- Rendering/OpenVR/vtkOpenVRRay.h | 16 +- Rendering/OpenVR/vtkOpenVRRenderWindow.cxx | 456 +- Rendering/OpenVR/vtkOpenVRRenderWindow.h | 201 +- .../vtkOpenVRRenderWindowInteractor.cxx | 328 +- .../OpenVR/vtkOpenVRRenderWindowInteractor.h | 49 +- Rendering/OpenVR/vtkOpenVRRenderer.cxx | 126 +- Rendering/OpenVR/vtkOpenVRRenderer.h | 20 +- Rendering/Parallel/Testing/Cxx/PrmMagnify.cxx | 124 +- .../Testing/Cxx/TestClientServerRendering.cxx | 71 +- .../Testing/Cxx/TestParallelRendering.cxx | 44 +- .../Testing/Cxx/TestSimplePCompositeZPass.cxx | 222 +- .../Parallel/vtkClientServerCompositePass.cxx | 19 +- .../Parallel/vtkClientServerCompositePass.h | 16 +- .../vtkClientServerSynchronizedRenderers.cxx | 16 +- .../vtkClientServerSynchronizedRenderers.h | 7 +- Rendering/Parallel/vtkCompositeRGBAPass.cxx | 372 +- Rendering/Parallel/vtkCompositeRGBAPass.h | 36 +- .../Parallel/vtkCompositeRenderManager.cxx | 24 +- .../Parallel/vtkCompositeRenderManager.h | 22 +- Rendering/Parallel/vtkCompositeZPass.cxx | 464 +- Rendering/Parallel/vtkCompositeZPass.h | 32 +- .../vtkCompositedSynchronizedRenderers.cxx | 28 +- .../vtkCompositedSynchronizedRenderers.h | 7 +- Rendering/Parallel/vtkCompositer.cxx | 28 +- Rendering/Parallel/vtkCompositer.h | 20 +- Rendering/Parallel/vtkCompressCompositer.cxx | 227 +- Rendering/Parallel/vtkCompressCompositer.h | 32 +- Rendering/Parallel/vtkImageRenderManager.cxx | 10 +- Rendering/Parallel/vtkImageRenderManager.h | 12 +- Rendering/Parallel/vtkPHardwareSelector.cxx | 12 +- Rendering/Parallel/vtkPHardwareSelector.h | 3 +- .../Parallel/vtkParallelRenderManager.cxx | 803 ++- Rendering/Parallel/vtkParallelRenderManager.h | 144 +- .../Parallel/vtkSynchronizedRenderWindows.cxx | 107 +- .../Parallel/vtkSynchronizedRenderWindows.h | 6 +- .../Parallel/vtkSynchronizedRenderers.cxx | 343 +- Rendering/Parallel/vtkSynchronizedRenderers.h | 16 +- Rendering/Parallel/vtkTreeCompositer.cxx | 76 +- Rendering/Parallel/vtkTreeCompositer.h | 12 +- Rendering/ParallelLIC/vtkMPIPixelTT.cxx | 8 +- Rendering/ParallelLIC/vtkMPIPixelTT.h | 23 +- Rendering/ParallelLIC/vtkMPIPixelView.h | 44 +- .../vtkPLineIntegralConvolution2D.cxx | 50 +- .../vtkPLineIntegralConvolution2D.h | 30 +- .../ParallelLIC/vtkPPainterCommunicator.cxx | 100 +- .../ParallelLIC/vtkPPainterCommunicator.h | 38 +- Rendering/ParallelLIC/vtkPPixelTransfer.cxx | 64 +- Rendering/ParallelLIC/vtkPPixelTransfer.h | 450 +- .../ParallelLIC/vtkPSurfaceLICComposite.cxx | 948 ++- .../ParallelLIC/vtkPSurfaceLICComposite.h | 112 +- .../ParallelLIC/vtkPSurfaceLICInterface.cxx | 89 +- .../ParallelLIC/vtkPSurfaceLICInterface.h | 15 +- Rendering/ParallelLIC/vtkParallelTimer.cxx | 324 +- Rendering/ParallelLIC/vtkParallelTimer.h | 106 +- Rendering/PythonContext2D/vtkPythonItem.cxx | 34 +- Rendering/PythonContext2D/vtkPythonItem.h | 12 +- .../Qt/Testing/Cxx/TestQtInitialization.cxx | 14 +- Rendering/Qt/vtkQImageToImageSource.cxx | 93 +- Rendering/Qt/vtkQImageToImageSource.h | 24 +- Rendering/Qt/vtkQtInitialization.cxx | 4 +- Rendering/Qt/vtkQtInitialization.h | 10 +- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 158 +- Rendering/Qt/vtkQtLabelRenderStrategy.h | 33 +- .../Qt/vtkQtLabelRenderStrategyInternals.h | 9 +- Rendering/Qt/vtkQtStringToImage.cxx | 50 +- Rendering/Qt/vtkQtStringToImage.h | 33 +- Rendering/Qt/vtkQtTreeRingLabelMapper.cxx | 391 +- Rendering/Qt/vtkQtTreeRingLabelMapper.h | 62 +- .../Testing/Cxx/TestCategoricalMaterials.cxx | 50 +- .../Testing/Cxx/TestCategoricalMultiBlock.cxx | 58 +- .../Cxx/TestGPURayCastCameraInside.cxx | 1762 +++--- ...TestGPURayCastCameraInsideSmallSpacing.cxx | 2888 +++++---- .../Testing/Cxx/TestGPURayCastCellData.cxx | 11 +- .../Cxx/TestGPURayCastMapperBenchmark.cxx | 32 +- .../TestGPURayCastMapperSampleDistance.cxx | 17 +- .../Cxx/TestGPURayCastPerspectiveParallel.cxx | 79 +- .../Cxx/TestGPURayCastPositionalLights.cxx | 20 +- .../Cxx/TestGPURayCastVolumeLightKit.cxx | 12 +- .../Cxx/TestGPURayCastVolumePolyData.cxx | 18 +- .../Testing/Cxx/TestGPURayCastVolumeScale.cxx | 12 +- .../Cxx/TestGPURayCastVolumeUpdate.cxx | 366 +- .../Cxx/TestGPUVolumeRayCastMapper.cxx | 2429 ++++---- .../Testing/Cxx/TestMultipleBackends.cxx | 57 +- .../Cxx/TestOSPRayAMRVolumeRenderer.cxx | 11 +- .../Testing/Cxx/TestOSPRayAmbient.cxx | 23 +- .../Testing/Cxx/TestOSPRayCache.cxx | 40 +- .../Testing/Cxx/TestOSPRayComposite.cxx | 66 +- .../TestOSPRayCompositePolyDataMapper2.cxx | 58 +- .../Testing/Cxx/TestOSPRayDepthOfField.cxx | 10 +- .../Testing/Cxx/TestOSPRayDynamicObject.cxx | 45 +- .../Testing/Cxx/TestOSPRayDynamicScene.cxx | 37 +- .../Testing/Cxx/TestOSPRayImplicits.cxx | 81 +- .../Testing/Cxx/TestOSPRayLayers.cxx | 15 +- .../Testing/Cxx/TestOSPRayLights.cxx | 120 +- .../Testing/Cxx/TestOSPRayMultiBlock.cxx | 31 +- ...tOSPRayMultiBlockPartialArrayFieldData.cxx | 18 +- .../Testing/Cxx/TestOSPRayOrthographic.cxx | 28 +- .../RayTracing/Testing/Cxx/TestOSPRayPass.cxx | 32 +- .../Testing/Cxx/TestOSPRayRenderMesh.cxx | 286 +- .../Testing/Cxx/TestOSPRayRotatedNormals.cxx | 17 +- .../Testing/Cxx/TestOSPRayScalarBar.cxx | 51 +- .../Testing/Cxx/TestOSPRayStereo.cxx | 16 +- .../Cxx/TestOSPRayTetrahedraMapper.cxx | 43 +- .../TestOSPRayTetrahedraMapperMixedCells.cxx | 45 +- .../Testing/Cxx/TestOSPRayTiling.cxx | 27 +- .../RayTracing/Testing/Cxx/TestOSPRayTime.cxx | 25 +- .../Testing/Cxx/TestOSPRayVolumeRenderer.cxx | 17 +- .../Testing/Cxx/TestOSPRayWindow.cxx | 20 +- .../Testing/Cxx/TestPathTracerBackground.cxx | 74 +- .../Testing/Cxx/TestPathTracerLuminous.cxx | 51 +- .../Cxx/TestPathTracerMaterialLibrary.cxx | 38 +- .../Testing/Cxx/TestPathTracerMaterials.cxx | 371 +- .../Testing/Cxx/TestPathTracerShadows.cxx | 47 +- .../Testing/Cxx/TestRendererType.cxx | 57 +- .../Testing/Cxx/TestSmartVolumeMapper.cxx | 17 +- .../Testing/Cxx/vtkOSPRayTestInteractor.cxx | 158 +- .../Testing/Cxx/vtkOSPRayTestInteractor.h | 18 +- .../vtkOSPRayAMRVolumeMapperNode.cxx | 172 +- .../RayTracing/vtkOSPRayAMRVolumeMapperNode.h | 11 +- Rendering/RayTracing/vtkOSPRayActorNode.cxx | 63 +- Rendering/RayTracing/vtkOSPRayActorNode.h | 22 +- Rendering/RayTracing/vtkOSPRayCache.h | 53 +- Rendering/RayTracing/vtkOSPRayCameraNode.cxx | 49 +- Rendering/RayTracing/vtkOSPRayCameraNode.h | 5 +- .../vtkOSPRayCompositePolyDataMapper2Node.cxx | 83 +- .../vtkOSPRayCompositePolyDataMapper2Node.h | 36 +- Rendering/RayTracing/vtkOSPRayLightNode.cxx | 77 +- Rendering/RayTracing/vtkOSPRayLightNode.h | 17 +- .../RayTracing/vtkOSPRayMaterialHelpers.cxx | 110 +- .../RayTracing/vtkOSPRayMaterialHelpers.h | 64 +- .../RayTracing/vtkOSPRayMaterialLibrary.cxx | 153 +- Rendering/RayTracing/vtkOSPRayPass.cxx | 269 +- Rendering/RayTracing/vtkOSPRayPass.h | 34 +- .../vtkOSPRayPolyDataMapperNode.cxx | 1723 +++--- .../RayTracing/vtkOSPRayPolyDataMapperNode.h | 22 +- .../RayTracing/vtkOSPRayRendererNode.cxx | 890 ++- Rendering/RayTracing/vtkOSPRayRendererNode.h | 106 +- .../vtkOSPRayTetrahedraMapperNode.cxx | 122 +- .../vtkOSPRayTetrahedraMapperNode.h | 16 +- .../RayTracing/vtkOSPRayViewNodeFactory.cxx | 45 +- .../RayTracing/vtkOSPRayViewNodeFactory.h | 5 +- .../RayTracing/vtkOSPRayVolumeMapper.cxx | 15 +- Rendering/RayTracing/vtkOSPRayVolumeMapper.h | 19 +- .../RayTracing/vtkOSPRayVolumeMapperNode.cxx | 153 +- .../RayTracing/vtkOSPRayVolumeMapperNode.h | 17 +- Rendering/RayTracing/vtkOSPRayVolumeNode.cxx | 14 +- Rendering/RayTracing/vtkOSPRayVolumeNode.h | 5 +- Rendering/RayTracing/vtkOSPRayWindowNode.cxx | 23 +- Rendering/RayTracing/vtkOSPRayWindowNode.h | 5 +- .../SceneGraph/Testing/Cxx/UnitTests.cxx | 74 +- Rendering/SceneGraph/vtkActorNode.cxx | 11 +- Rendering/SceneGraph/vtkActorNode.h | 7 +- Rendering/SceneGraph/vtkCameraNode.cxx | 8 +- Rendering/SceneGraph/vtkCameraNode.h | 5 +- Rendering/SceneGraph/vtkLightNode.cxx | 8 +- Rendering/SceneGraph/vtkLightNode.h | 5 +- Rendering/SceneGraph/vtkMapperNode.cxx | 33 +- Rendering/SceneGraph/vtkMapperNode.h | 8 +- .../SceneGraph/vtkPolyDataMapperNode.cxx | 533 +- Rendering/SceneGraph/vtkPolyDataMapperNode.h | 20 +- Rendering/SceneGraph/vtkRendererNode.cxx | 12 +- Rendering/SceneGraph/vtkRendererNode.h | 7 +- Rendering/SceneGraph/vtkViewNode.cxx | 75 +- Rendering/SceneGraph/vtkViewNode.h | 38 +- .../SceneGraph/vtkViewNodeCollection.cxx | 19 +- Rendering/SceneGraph/vtkViewNodeCollection.h | 16 +- Rendering/SceneGraph/vtkViewNodeFactory.cxx | 29 +- Rendering/SceneGraph/vtkViewNodeFactory.h | 13 +- Rendering/SceneGraph/vtkVolumeMapperNode.cxx | 8 +- Rendering/SceneGraph/vtkVolumeMapperNode.h | 7 +- Rendering/SceneGraph/vtkVolumeNode.cxx | 11 +- Rendering/SceneGraph/vtkVolumeNode.h | 5 +- Rendering/SceneGraph/vtkWindowNode.cxx | 8 +- Rendering/SceneGraph/vtkWindowNode.h | 22 +- Rendering/Tk/vtkCocoaTkUtilities.h | 8 +- Rendering/Tk/vtkCocoaTkUtilities.mm | 6 +- Rendering/Tk/vtkPythonTkWidgetsInit.cxx | 23 +- Rendering/Tk/vtkTcl.h | 6 +- Rendering/Tk/vtkTclUtil.h | 76 +- Rendering/Tk/vtkTk.h | 6 +- Rendering/Tk/vtkTkImageViewerWidget.cxx | 458 +- Rendering/Tk/vtkTkImageViewerWidget.h | 10 +- Rendering/Tk/vtkTkImageViewerWidgetPython.cxx | 1 - Rendering/Tk/vtkTkRenderWidget.cxx | 734 ++- Rendering/Tk/vtkTkRenderWidget.h | 10 +- .../Testing/Cxx/ProjectedTetrahedraZoomIn.cxx | 17 +- .../Testing/Cxx/TestFinalColorWindowLevel.cxx | 44 +- .../TestFixedPointRayCastLightComponents.cxx | 79 +- .../Testing/Cxx/TestGPURayCastAdditive.cxx | 76 +- .../Testing/Cxx/TestGPURayCastAverageIP.cxx | 72 +- .../Testing/Cxx/TestGPURayCastBlendModes.cxx | 13 +- .../Cxx/TestGPURayCastCameraInside.cxx | 1757 +++--- .../TestGPURayCastCameraInsideClipping.cxx | 13 +- ...stCameraInsideNonUniformScaleTransform.cxx | 8 +- ...TestGPURayCastCameraInsideSmallSpacing.cxx | 1689 +++--- ...stGPURayCastCameraInsideTransformation.cxx | 27 +- .../Testing/Cxx/TestGPURayCastClipping.cxx | 9 +- .../Cxx/TestGPURayCastClippingPolyData.cxx | 20 +- .../TestGPURayCastClippingUserTransform.cxx | 62 +- .../Cxx/TestGPURayCastCompositeBinaryMask.cxx | 100 +- .../TestGPURayCastCompositeBinaryMask1.cxx | 36 +- .../Cxx/TestGPURayCastCompositeMask.cxx | 111 +- .../Cxx/TestGPURayCastCompositeMaskBlend.cxx | 116 +- .../Cxx/TestGPURayCastCompositeToMIP.cxx | 86 +- .../Testing/Cxx/TestGPURayCastCropping.cxx | 92 +- .../Testing/Cxx/TestGPURayCastCropping1.cxx | 11 +- .../Cxx/TestGPURayCastDataTypesMIP.cxx | 337 +- .../Cxx/TestGPURayCastDataTypesMinIP.cxx | 329 +- ...CastDependentComponentsLightParameters.cxx | 47 +- .../TestGPURayCastFourComponentsAdditive.cxx | 43 +- .../TestGPURayCastFourComponentsAverage.cxx | 43 +- .../TestGPURayCastFourComponentsComposite.cxx | 47 +- ...ayCastFourComponentsCompositeStreaming.cxx | 61 +- ...RayCastFourComponentsDependentGradient.cxx | 11 +- .../Cxx/TestGPURayCastFourComponentsMIP.cxx | 47 +- .../Cxx/TestGPURayCastFourComponentsMinIP.cxx | 50 +- .../Cxx/TestGPURayCastGradientOpacity.cxx | 8 +- .../TestGPURayCastGradientOpacityLight.cxx | 9 +- .../Cxx/TestGPURayCastImageSampleXY.cxx | 22 +- ...stIndependentComponentsLightParameters.cxx | 15 +- .../TestGPURayCastIndependentVectorMode.cxx | 25 +- .../Testing/Cxx/TestGPURayCastLabelMap.cxx | 14 +- ...stGPURayCastLargeColorTransferFunction.cxx | 43 +- .../Cxx/TestGPURayCastMIPBinaryMask.cxx | 87 +- .../Cxx/TestGPURayCastMIPToComposite.cxx | 85 +- .../Cxx/TestGPURayCastMapperBenchmark.cxx | 20 +- .../TestGPURayCastMapperSampleDistance.cxx | 14 +- .../TestGPURayCastMultiVolumeAddRemove.cxx | 42 +- .../Cxx/TestGPURayCastMultiVolumeCellData.cxx | 33 +- .../TestGPURayCastMultiVolumeOverlapping.cxx | 61 +- .../TestGPURayCastMultiVolumeTransfer2D.cxx | 33 +- .../Cxx/TestGPURayCastNearestDataTypesMIP.cxx | 204 +- .../Cxx/TestGPURayCastOrientedVolume.cxx | 12 +- .../Cxx/TestGPURayCastPerspectiveParallel.cxx | 76 +- .../Cxx/TestGPURayCastPositionalLights.cxx | 25 +- .../Cxx/TestGPURayCastReleaseResources.cxx | 14 +- .../Cxx/TestGPURayCastRenderDepthToImage.cxx | 18 +- .../Cxx/TestGPURayCastRenderDepthToImage2.cxx | 6 +- .../Cxx/TestGPURayCastRenderToTexture.cxx | 18 +- .../Cxx/TestGPURayCastShadedClipping.cxx | 36 +- .../TestGPURayCastThreeComponentsAdditive.cxx | 1365 ++--- ...stGPURayCastThreeComponentsIndependent.cxx | 1365 ++--- .../Testing/Cxx/TestGPURayCastTransfer2D.cxx | 20 +- .../TestGPURayCastTwoComponentsDependent.cxx | 1452 +++-- ...URayCastTwoComponentsDependentGradient.cxx | 8 +- .../TestGPURayCastTwoComponentsGradient.cxx | 8 +- ...TestGPURayCastTwoComponentsIndependent.cxx | 1010 ++-- .../Cxx/TestGPURayCastVolumeDepthPass.cxx | 12 +- .../Cxx/TestGPURayCastVolumeLightKit.cxx | 11 +- .../Cxx/TestGPURayCastVolumeOrientation.cxx | 8 +- .../Cxx/TestGPURayCastVolumePicking.cxx | 91 +- .../Testing/Cxx/TestGPURayCastVolumePlane.cxx | 2202 ++++--- .../Cxx/TestGPURayCastVolumePolyData.cxx | 19 +- .../Cxx/TestGPURayCastVolumeRotation.cxx | 11 +- .../Testing/Cxx/TestGPURayCastVolumeScale.cxx | 11 +- .../Cxx/TestGPURayCastVolumeUpdate.cxx | 366 +- .../Cxx/TestGPUVolumeRayCastMapper.cxx | 2425 ++++---- .../Testing/Cxx/TestMinIntensityRendering.cxx | 47 +- .../Testing/Cxx/TestMultiBlockMapper.cxx | 11 +- .../Testing/Cxx/TestProjectedTetrahedra.cxx | 44 +- .../Cxx/TestProjectedTetrahedraOffscreen.cxx | 7 +- .../Cxx/TestProjectedTetrahedraTransform.cxx | 6 +- .../Cxx/TestRemoveVolumeNonCurrentContext.cxx | 1025 ++-- .../Testing/Cxx/TestSmartVolumeMapper.cxx | 68 +- .../Cxx/TestSmartVolumeMapperWindowLevel.cxx | 1119 ++-- Rendering/Volume/vtkBlockSortHelper.h | 147 +- Rendering/Volume/vtkDirectionEncoder.cxx | 3 +- Rendering/Volume/vtkDirectionEncoder.h | 21 +- .../Volume/vtkEncodedGradientEstimator.cxx | 212 +- .../Volume/vtkEncodedGradientEstimator.h | 131 +- Rendering/Volume/vtkEncodedGradientShader.cxx | 347 +- Rendering/Volume/vtkEncodedGradientShader.h | 66 +- .../vtkFiniteDifferenceGradientEstimator.cxx | 217 +- .../vtkFiniteDifferenceGradientEstimator.h | 18 +- .../Volume/vtkFixedPointRayCastImage.cxx | 106 +- Rendering/Volume/vtkFixedPointRayCastImage.h | 74 +- ...xedPointVolumeRayCastCompositeGOHelper.cxx | 570 +- ...FixedPointVolumeRayCastCompositeGOHelper.h | 22 +- ...intVolumeRayCastCompositeGOShadeHelper.cxx | 648 +- ...PointVolumeRayCastCompositeGOShadeHelper.h | 22 +- ...FixedPointVolumeRayCastCompositeHelper.cxx | 455 +- ...tkFixedPointVolumeRayCastCompositeHelper.h | 22 +- ...PointVolumeRayCastCompositeShadeHelper.cxx | 525 +- ...edPointVolumeRayCastCompositeShadeHelper.h | 22 +- .../vtkFixedPointVolumeRayCastHelper.cxx | 4 +- .../Volume/vtkFixedPointVolumeRayCastHelper.h | 2273 +++---- .../vtkFixedPointVolumeRayCastMIPHelper.cxx | 488 +- .../vtkFixedPointVolumeRayCastMIPHelper.h | 20 +- .../vtkFixedPointVolumeRayCastMapper.cxx | 2378 ++++---- .../Volume/vtkFixedPointVolumeRayCastMapper.h | 652 +- .../Volume/vtkGPUVolumeRayCastMapper.cxx | 325 +- Rendering/Volume/vtkGPUVolumeRayCastMapper.h | 166 +- Rendering/Volume/vtkMultiVolume.cxx | 41 +- Rendering/Volume/vtkMultiVolume.h | 33 +- Rendering/Volume/vtkOSPRayVolumeInterface.cxx | 9 +- Rendering/Volume/vtkOSPRayVolumeInterface.h | 16 +- .../Volume/vtkProjectedTetrahedraMapper.cxx | 316 +- .../Volume/vtkProjectedTetrahedraMapper.h | 36 +- .../Volume/vtkRayCastImageDisplayHelper.cxx | 5 +- .../Volume/vtkRayCastImageDisplayHelper.h | 45 +- .../vtkRecursiveSphereDirectionEncoder.cxx | 221 +- .../vtkRecursiveSphereDirectionEncoder.h | 54 +- .../Volume/vtkSphericalDirectionEncoder.cxx | 72 +- .../Volume/vtkSphericalDirectionEncoder.h | 26 +- ...tkUnstructuredGridBunykRayCastFunction.cxx | 675 +-- .../vtkUnstructuredGridBunykRayCastFunction.h | 111 +- ...structuredGridHomogeneousRayIntegrator.cxx | 135 +- ...UnstructuredGridHomogeneousRayIntegrator.h | 41 +- ...vtkUnstructuredGridLinearRayIntegrator.cxx | 411 +- .../vtkUnstructuredGridLinearRayIntegrator.h | 43 +- ...kUnstructuredGridPartialPreIntegration.cxx | 294 +- ...vtkUnstructuredGridPartialPreIntegration.h | 117 +- .../vtkUnstructuredGridPreIntegration.cxx | 192 +- .../vtkUnstructuredGridPreIntegration.h | 90 +- .../vtkUnstructuredGridVolumeMapper.cxx | 26 +- .../Volume/vtkUnstructuredGridVolumeMapper.h | 34 +- ...kUnstructuredGridVolumeRayCastFunction.cxx | 3 +- ...vtkUnstructuredGridVolumeRayCastFunction.h | 30 +- ...kUnstructuredGridVolumeRayCastIterator.cxx | 9 +- ...vtkUnstructuredGridVolumeRayCastIterator.h | 18 +- ...vtkUnstructuredGridVolumeRayCastMapper.cxx | 467 +- .../vtkUnstructuredGridVolumeRayCastMapper.h | 131 +- ...vtkUnstructuredGridVolumeRayIntegrator.cxx | 3 +- .../vtkUnstructuredGridVolumeRayIntegrator.h | 14 +- .../vtkUnstructuredGridVolumeZSweepMapper.cxx | 4526 +++++++------- .../vtkUnstructuredGridVolumeZSweepMapper.h | 154 +- Rendering/Volume/vtkVolumeMapper.cxx | 79 +- Rendering/Volume/vtkVolumeMapper.h | 101 +- Rendering/Volume/vtkVolumeOutlineSource.cxx | 274 +- Rendering/Volume/vtkVolumeOutlineSource.h | 79 +- Rendering/Volume/vtkVolumePicker.cxx | 149 +- Rendering/Volume/vtkVolumePicker.h | 23 +- ...tkVolumeRayCastSpaceLeapingImageFilter.cxx | 519 +- .../vtkVolumeRayCastSpaceLeapingImageFilter.h | 150 +- Rendering/VolumeAMR/vtkAMRVolumeMapper.cxx | 151 +- Rendering/VolumeAMR/vtkAMRVolumeMapper.h | 110 +- .../Testing/Cxx/TestGPURayCastCellData.cxx | 12 +- .../Cxx/TestGPURayCastDepthPeeling.cxx | 56 +- .../TestGPURayCastDepthPeelingBlendModes.cxx | 15 +- .../TestGPURayCastDepthPeelingBoxWidget.cxx | 47 +- .../Cxx/TestGPURayCastDepthPeelingClip.cxx | 55 +- .../Cxx/TestGPURayCastDepthPeelingOpaque.cxx | 18 +- .../TestGPURayCastDepthPeelingTransVol.cxx | 18 +- ...RayCastDepthPeelingTransparentPolyData.cxx | 57 +- .../Testing/Cxx/TestGPURayCastIsosurface.cxx | 7 +- .../Testing/Cxx/TestGPURayCastJittering.cxx | 18 +- .../Cxx/TestGPURayCastTextureStreaming.cxx | 25 +- .../TestGPURayCastTextureStreamingMask.cxx | 112 +- .../Cxx/TestGPURayCastToggleJittering.cxx | 18 +- .../Testing/Cxx/TestGPURayCastUserShader.cxx | 32 +- .../Testing/Cxx/TestGPURayCastUserShader2.cxx | 9 +- .../vtkMultiBlockVolumeMapper.cxx | 54 +- .../VolumeOpenGL2/vtkMultiBlockVolumeMapper.h | 16 +- .../vtkOpenGLGPUVolumeRayCastMapper.cxx | 1493 ++--- .../vtkOpenGLGPUVolumeRayCastMapper.h | 113 +- .../vtkOpenGLProjectedTetrahedraMapper.cxx | 583 +- .../vtkOpenGLProjectedTetrahedraMapper.h | 54 +- .../vtkOpenGLRayCastImageDisplayHelper.cxx | 166 +- .../vtkOpenGLRayCastImageDisplayHelper.h | 50 +- .../vtkOpenGLVolumeGradientOpacityTable.cxx | 27 +- .../vtkOpenGLVolumeGradientOpacityTable.h | 10 +- .../vtkOpenGLVolumeLookupTable.cxx | 68 +- .../vtkOpenGLVolumeLookupTable.h | 31 +- .../vtkOpenGLVolumeLookupTables.h | 2 +- .../vtkOpenGLVolumeLookupTables.txx | 14 +- ...eMaskGradientOpacityTransferFunction2D.cxx | 31 +- ...umeMaskGradientOpacityTransferFunction2D.h | 22 +- .../vtkOpenGLVolumeMaskTransferFunction2D.cxx | 28 +- .../vtkOpenGLVolumeMaskTransferFunction2D.h | 19 +- .../vtkOpenGLVolumeOpacityTable.cxx | 35 +- .../vtkOpenGLVolumeOpacityTable.h | 16 +- .../VolumeOpenGL2/vtkOpenGLVolumeRGBTable.cxx | 20 +- .../VolumeOpenGL2/vtkOpenGLVolumeRGBTable.h | 7 +- .../vtkOpenGLVolumeTransferFunction2D.cxx | 39 +- .../vtkOpenGLVolumeTransferFunction2D.h | 19 +- .../VolumeOpenGL2/vtkSmartVolumeMapper.cxx | 245 +- .../VolumeOpenGL2/vtkSmartVolumeMapper.h | 117 +- .../VolumeOpenGL2/vtkVolumeInputHelper.cxx | 211 +- .../VolumeOpenGL2/vtkVolumeInputHelper.h | 39 +- Rendering/VolumeOpenGL2/vtkVolumeMask.h | 399 +- .../VolumeOpenGL2/vtkVolumeShaderComposer.h | 3172 +++++----- Rendering/VolumeOpenGL2/vtkVolumeStateRAII.h | 112 +- Rendering/VolumeOpenGL2/vtkVolumeTexture.cxx | 305 +- Rendering/VolumeOpenGL2/vtkVolumeTexture.h | 75 +- Testing/Core/vtkPermuteOptions.h | 58 +- Testing/Core/vtkTestConditionals.txx | 167 +- Testing/Core/vtkTestDriver.h | 2 +- Testing/Core/vtkTestErrorObserver.h | 105 +- Testing/Core/vtkTestUtilities.h | 71 +- Testing/Core/vtkWindowsTestUtilities.h | 11 +- Testing/GenericBridge/vtkBridgeAttribute.cxx | 257 +- Testing/GenericBridge/vtkBridgeAttribute.h | 49 +- Testing/GenericBridge/vtkBridgeCell.cxx | 441 +- Testing/GenericBridge/vtkBridgeCell.h | 104 +- .../GenericBridge/vtkBridgeCellIterator.cxx | 119 +- Testing/GenericBridge/vtkBridgeCellIterator.h | 57 +- .../vtkBridgeCellIteratorOnCellBoundaries.cxx | 136 +- .../vtkBridgeCellIteratorOnCellBoundaries.h | 24 +- .../vtkBridgeCellIteratorOnCellList.cxx | 56 +- .../vtkBridgeCellIteratorOnCellList.h | 25 +- .../vtkBridgeCellIteratorOnDataSet.cxx | 69 +- .../vtkBridgeCellIteratorOnDataSet.h | 25 +- .../vtkBridgeCellIteratorOne.cxx | 154 +- .../GenericBridge/vtkBridgeCellIteratorOne.h | 29 +- .../vtkBridgeCellIteratorStrategy.cxx | 12 +- .../vtkBridgeCellIteratorStrategy.h | 10 +- Testing/GenericBridge/vtkBridgeDataSet.cxx | 319 +- Testing/GenericBridge/vtkBridgeDataSet.h | 36 +- Testing/GenericBridge/vtkBridgeExport.h | 16 +- .../GenericBridge/vtkBridgePointIterator.cxx | 47 +- .../GenericBridge/vtkBridgePointIterator.h | 24 +- .../vtkBridgePointIteratorOnCell.cxx | 32 +- .../vtkBridgePointIteratorOnCell.h | 16 +- .../vtkBridgePointIteratorOnDataSet.cxx | 30 +- .../vtkBridgePointIteratorOnDataSet.h | 19 +- .../vtkBridgePointIteratorOne.cxx | 31 +- .../GenericBridge/vtkBridgePointIteratorOne.h | 15 +- Testing/IOSQL/DatabaseSchemaWith2Tables.cxx | 70 +- Testing/IOSQL/DatabaseSchemaWith2Tables.h | 26 +- .../vtkMultiBaselineRegressionTest.h | 18 +- Testing/Rendering/vtkRegressionTestImage.h | 7 +- Testing/Rendering/vtkTesting.cxx | 316 +- Testing/Rendering/vtkTesting.h | 54 +- Testing/Rendering/vtkTestingInteractor.cxx | 16 +- Testing/Rendering/vtkTestingInteractor.h | 15 +- Testing/Rendering/vtkTestingObjectFactory.cxx | 10 +- Testing/Rendering/vtkTestingObjectFactory.h | 12 +- Utilities/Benchmarks/GLBenchmarking.cxx | 107 +- Utilities/Benchmarks/TimingTests.cxx | 7 +- Utilities/Benchmarks/vtkRenderTimingTests.h | 367 +- Utilities/Benchmarks/vtkRenderTimings.cxx | 225 +- Utilities/Benchmarks/vtkRenderTimings.h | 54 +- Utilities/DICOMParser/DICOMAppHelper.cxx | 1010 ++-- Utilities/DICOMParser/DICOMAppHelper.h | 376 +- Utilities/DICOMParser/DICOMCallback.h | 56 +- Utilities/DICOMParser/DICOMConfig.h | 34 +- Utilities/DICOMParser/DICOMFile.cxx | 113 +- Utilities/DICOMParser/DICOMFile.h | 87 +- Utilities/DICOMParser/DICOMParser.cxx | 468 +- Utilities/DICOMParser/DICOMParser.h | 157 +- Utilities/DICOMParser/DICOMParserMap.h | 82 +- Utilities/DICOMParser/DICOMTypes.h | 6 +- Utilities/Java/vtkJavaAwt.h | 98 +- Utilities/Java/vtkJavaUtil.cxx | 240 +- Utilities/Java/vtkJavaUtil.h | 85 +- .../OutputWindowProcess/vtkEncodeExecutable.c | 60 +- .../vtkWin32OutputWindowProcess.c | 116 +- Utilities/Python/vtkPython.h | 60 +- .../vtkPythonInteractiveInterpreter.h | 2 +- .../vtkPythonInterpreter.cxx | 46 +- .../PythonInterpreter/vtkPythonInterpreter.h | 3 +- .../vtkPythonStdStreamCaptureHelper.h | 5 +- Utilities/octree/octree/octree.h | 144 +- Utilities/octree/octree/octree.txx | 248 +- Utilities/octree/octree/octree_cursor.h | 58 +- Utilities/octree/octree/octree_cursor.txx | 355 +- Utilities/octree/octree/octree_iterator.h | 65 +- Utilities/octree/octree/octree_iterator.txx | 343 +- Utilities/octree/octree/octree_node.h | 52 +- Utilities/octree/octree/octree_node.txx | 306 +- Utilities/octree/octree/octree_path.h | 50 +- Utilities/octree/octree/octree_path.txx | 200 +- Views/Context2D/vtkContextInteractorStyle.cxx | 66 +- Views/Context2D/vtkContextInteractorStyle.h | 28 +- Views/Context2D/vtkContextView.cxx | 4 +- Views/Context2D/vtkContextView.h | 6 +- Views/Core/vtkConvertSelectionDomain.cxx | 64 +- Views/Core/vtkConvertSelectionDomain.h | 15 +- Views/Core/vtkDataRepresentation.cxx | 92 +- Views/Core/vtkDataRepresentation.h | 62 +- Views/Core/vtkEmptyRepresentation.cxx | 7 +- Views/Core/vtkEmptyRepresentation.h | 12 +- Views/Core/vtkRenderViewBase.cxx | 20 +- Views/Core/vtkRenderViewBase.h | 4 +- Views/Core/vtkView.cxx | 47 +- Views/Core/vtkView.h | 25 +- Views/Core/vtkViewTheme.cxx | 101 +- Views/Core/vtkViewTheme.h | 43 +- .../Cxx/TestCoincidentGraphLayoutView.cxx | 15 +- Views/Infovis/Testing/Cxx/TestColumnTree.cxx | 2 +- .../Testing/Cxx/TestConeLayoutStrategy.cxx | 11 +- .../Testing/Cxx/TestGraphLayoutView.cxx | 2080 ++++--- .../Testing/Cxx/TestHierarchicalGraphView.cxx | 15 +- Views/Infovis/Testing/Cxx/TestIcicleView.cxx | 9 +- .../Testing/Cxx/TestIconGlyphFilter.cxx | 33 +- .../Cxx/TestInteractorStyleTreeMapHover.cxx | 1102 ++-- .../Infovis/Testing/Cxx/TestNetworkViews.cxx | 33 +- .../Cxx/TestParallelCoordinatesView.cxx | 35 +- .../Testing/Cxx/TestQtLabelStrategy.cxx | 22 +- .../Testing/Cxx/TestQtTreeRingLabeler.cxx | 13 +- Views/Infovis/Testing/Cxx/TestRenderView.cxx | 2001 ++++--- .../Cxx/TestSpanTreeLayoutStrategy.cxx | 11 +- .../Testing/Cxx/TestTanglegramItem.cxx | 4 +- Views/Infovis/Testing/Cxx/TestTreeMapView.cxx | 14 +- .../Infovis/Testing/Cxx/TestTreeRingView.cxx | 25 +- Views/Infovis/vtkApplyColors.cxx | 170 +- Views/Infovis/vtkApplyColors.h | 15 +- Views/Infovis/vtkApplyIcons.cxx | 42 +- Views/Infovis/vtkApplyIcons.h | 25 +- Views/Infovis/vtkDendrogramItem.cxx | 306 +- Views/Infovis/vtkDendrogramItem.h | 52 +- Views/Infovis/vtkGraphItem.cxx | 86 +- Views/Infovis/vtkGraphItem.h | 44 +- Views/Infovis/vtkGraphLayoutView.cxx | 107 +- Views/Infovis/vtkGraphLayoutView.h | 52 +- Views/Infovis/vtkHeatmapItem.cxx | 245 +- Views/Infovis/vtkHeatmapItem.h | 50 +- .../Infovis/vtkHierarchicalGraphPipeline.cxx | 28 +- Views/Infovis/vtkHierarchicalGraphPipeline.h | 24 +- Views/Infovis/vtkHierarchicalGraphView.cxx | 13 +- Views/Infovis/vtkHierarchicalGraphView.h | 4 +- Views/Infovis/vtkIcicleView.cxx | 12 +- Views/Infovis/vtkIcicleView.h | 4 +- .../vtkInteractorStyleAreaSelectHover.cxx | 65 +- .../vtkInteractorStyleAreaSelectHover.h | 17 +- .../vtkInteractorStyleTreeMapHover.cxx | 58 +- .../Infovis/vtkInteractorStyleTreeMapHover.h | 18 +- ...llelCoordinatesHistogramRepresentation.cxx | 242 +- ...rallelCoordinatesHistogramRepresentation.h | 34 +- .../vtkParallelCoordinatesRepresentation.cxx | 848 ++- .../vtkParallelCoordinatesRepresentation.h | 83 +- Views/Infovis/vtkParallelCoordinatesView.cxx | 544 +- Views/Infovis/vtkParallelCoordinatesView.h | 68 +- Views/Infovis/vtkRenderView.cxx | 152 +- Views/Infovis/vtkRenderView.h | 47 +- .../vtkRenderedGraphRepresentation.cxx | 228 +- .../Infovis/vtkRenderedGraphRepresentation.h | 124 +- .../vtkRenderedHierarchyRepresentation.cxx | 23 +- .../vtkRenderedHierarchyRepresentation.h | 62 +- Views/Infovis/vtkRenderedRepresentation.cxx | 4 +- Views/Infovis/vtkRenderedRepresentation.h | 10 +- .../vtkRenderedSurfaceRepresentation.cxx | 50 +- .../vtkRenderedSurfaceRepresentation.h | 21 +- .../vtkRenderedTreeAreaRepresentation.cxx | 186 +- .../vtkRenderedTreeAreaRepresentation.h | 92 +- Views/Infovis/vtkSCurveSpline.cxx | 131 +- Views/Infovis/vtkSCurveSpline.h | 17 +- Views/Infovis/vtkTanglegramItem.cxx | 160 +- Views/Infovis/vtkTanglegramItem.h | 41 +- Views/Infovis/vtkTreeAreaView.cxx | 10 +- Views/Infovis/vtkTreeAreaView.h | 4 +- Views/Infovis/vtkTreeHeatmapItem.cxx | 156 +- Views/Infovis/vtkTreeHeatmapItem.h | 42 +- Views/Infovis/vtkTreeMapView.cxx | 6 +- Views/Infovis/vtkTreeMapView.h | 7 +- Views/Infovis/vtkTreeRingView.cxx | 3 +- Views/Infovis/vtkTreeRingView.h | 4 +- Views/Infovis/vtkViewUpdater.cxx | 5 +- Views/Infovis/vtkViewUpdater.h | 5 +- Views/Qt/Testing/Cxx/TestVtkQtTableView.cxx | 4 +- Views/Qt/vtkQtAnnotationView.cxx | 38 +- Views/Qt/vtkQtAnnotationView.h | 9 +- Views/Qt/vtkQtListView.cxx | 64 +- Views/Qt/vtkQtListView.h | 13 +- Views/Qt/vtkQtRecordView.cxx | 34 +- Views/Qt/vtkQtRecordView.h | 12 +- Views/Qt/vtkQtTableRepresentation.cxx | 63 +- Views/Qt/vtkQtTableRepresentation.h | 30 +- Views/Qt/vtkQtTableView.cxx | 121 +- Views/Qt/vtkQtTableView.h | 13 +- Views/Qt/vtkQtTreeView.cxx | 110 +- Views/Qt/vtkQtTreeView.h | 51 +- Views/Qt/vtkQtView.cxx | 13 +- Views/Qt/vtkQtView.h | 12 +- Web/Core/vtkDataEncoder.cxx | 573 +- Web/Core/vtkDataEncoder.h | 13 +- Web/Core/vtkObjectIdMap.cxx | 20 +- Web/Core/vtkObjectIdMap.h | 3 +- Web/Core/vtkWebApplication.cxx | 164 +- Web/Core/vtkWebApplication.h | 20 +- Web/Core/vtkWebInteractionEvent.cxx | 16 +- Web/Core/vtkWebInteractionEvent.h | 3 +- Web/Core/vtkWebUtilities.cxx | 29 +- Web/Core/vtkWebUtilities.h | 8 +- Web/WebGLExporter/vtkPVWebGLExporter.cxx | 37 +- Web/WebGLExporter/vtkPVWebGLExporter.h | 6 +- Web/WebGLExporter/vtkWebGLDataSet.cxx | 112 +- Web/WebGLExporter/vtkWebGLDataSet.h | 12 +- Web/WebGLExporter/vtkWebGLExporter.cxx | 286 +- Web/WebGLExporter/vtkWebGLExporter.h | 35 +- Web/WebGLExporter/vtkWebGLObject.cxx | 25 +- Web/WebGLExporter/vtkWebGLObject.h | 37 +- Web/WebGLExporter/vtkWebGLPolyData.cxx | 423 +- Web/WebGLExporter/vtkWebGLPolyData.h | 13 +- Web/WebGLExporter/vtkWebGLWidget.cxx | 79 +- Web/WebGLExporter/vtkWebGLWidget.h | 31 +- Wrapping/Python/vtkPythonAppInit.cxx | 33 +- Wrapping/PythonCore/PyVTKEnum.cxx | 12 +- Wrapping/PythonCore/PyVTKEnum.h | 8 +- Wrapping/PythonCore/PyVTKExtras.cxx | 35 +- Wrapping/PythonCore/PyVTKExtras.h | 2 +- Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 175 +- Wrapping/PythonCore/PyVTKMethodDescriptor.h | 10 +- Wrapping/PythonCore/PyVTKNamespace.cxx | 109 +- Wrapping/PythonCore/PyVTKNamespace.h | 15 +- Wrapping/PythonCore/PyVTKObject.cxx | 317 +- Wrapping/PythonCore/PyVTKObject.h | 92 +- Wrapping/PythonCore/PyVTKReference.cxx | 1228 ++-- Wrapping/PythonCore/PyVTKReference.h | 29 +- Wrapping/PythonCore/PyVTKSpecialObject.cxx | 74 +- Wrapping/PythonCore/PyVTKSpecialObject.h | 50 +- Wrapping/PythonCore/PyVTKTemplate.cxx | 290 +- Wrapping/PythonCore/PyVTKTemplate.h | 11 +- Wrapping/PythonCore/vtkPythonArgs.cxx | 674 +-- Wrapping/PythonCore/vtkPythonArgs.h | 745 ++- Wrapping/PythonCore/vtkPythonCommand.cxx | 52 +- Wrapping/PythonCore/vtkPythonCommand.h | 15 +- Wrapping/PythonCore/vtkPythonCompatibility.h | 52 +- Wrapping/PythonCore/vtkPythonOverload.cxx | 129 +- Wrapping/PythonCore/vtkPythonOverload.h | 12 +- Wrapping/PythonCore/vtkPythonUtil.cxx | 329 +- Wrapping/PythonCore/vtkPythonUtil.h | 88 +- Wrapping/PythonCore/vtkSmartPyObject.cxx | 29 +- Wrapping/PythonCore/vtkSmartPyObject.h | 20 +- Wrapping/Tools/vtkHTML.c | 130 +- Wrapping/Tools/vtkParse.h | 134 +- Wrapping/Tools/vtkParseData.c | 418 +- Wrapping/Tools/vtkParseData.h | 502 +- Wrapping/Tools/vtkParseExtras.c | 538 +- Wrapping/Tools/vtkParseExtras.h | 396 +- Wrapping/Tools/vtkParseHierarchy.c | 508 +- Wrapping/Tools/vtkParseHierarchy.h | 260 +- Wrapping/Tools/vtkParseJava.c | 632 +- Wrapping/Tools/vtkParseJavaBeans.c | 485 +- Wrapping/Tools/vtkParseMain.c | 117 +- Wrapping/Tools/vtkParseMain.h | 59 +- Wrapping/Tools/vtkParseMangle.c | 128 +- Wrapping/Tools/vtkParseMangle.h | 33 +- Wrapping/Tools/vtkParseMerge.c | 185 +- Wrapping/Tools/vtkParseMerge.h | 86 +- Wrapping/Tools/vtkParsePreprocess.c | 1045 ++-- Wrapping/Tools/vtkParsePreprocess.h | 354 +- Wrapping/Tools/vtkParseString.c | 556 +- Wrapping/Tools/vtkParseString.h | 408 +- Wrapping/Tools/vtkParseType.h | 269 +- Wrapping/Tools/vtkPrint.c | 64 +- Wrapping/Tools/vtkWrap.c | 519 +- Wrapping/Tools/vtkWrap.h | 509 +- Wrapping/Tools/vtkWrapHierarchy.c | 312 +- Wrapping/Tools/vtkWrapJava.c | 1008 ++-- Wrapping/Tools/vtkWrapPython.c | 265 +- Wrapping/Tools/vtkWrapPythonClass.c | 241 +- Wrapping/Tools/vtkWrapPythonClass.h | 16 +- Wrapping/Tools/vtkWrapPythonConstant.c | 248 +- Wrapping/Tools/vtkWrapPythonConstant.h | 8 +- Wrapping/Tools/vtkWrapPythonEnum.c | 137 +- Wrapping/Tools/vtkWrapPythonEnum.h | 16 +- Wrapping/Tools/vtkWrapPythonInit.c | 213 +- Wrapping/Tools/vtkWrapPythonMethod.c | 797 +-- Wrapping/Tools/vtkWrapPythonMethod.h | 13 +- Wrapping/Tools/vtkWrapPythonMethodDef.c | 1001 ++-- Wrapping/Tools/vtkWrapPythonMethodDef.h | 9 +- Wrapping/Tools/vtkWrapPythonNamespace.c | 32 +- Wrapping/Tools/vtkWrapPythonNamespace.h | 3 +- Wrapping/Tools/vtkWrapPythonOverload.c | 182 +- Wrapping/Tools/vtkWrapPythonOverload.h | 15 +- Wrapping/Tools/vtkWrapPythonTemplate.c | 160 +- Wrapping/Tools/vtkWrapPythonTemplate.h | 4 +- Wrapping/Tools/vtkWrapPythonType.c | 392 +- Wrapping/Tools/vtkWrapPythonType.h | 7 +- Wrapping/Tools/vtkWrapText.c | 292 +- Wrapping/Tools/vtkWrapText.h | 80 +- 6996 files changed, 421242 insertions(+), 473441 deletions(-) diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMCleanGrid.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMCleanGrid.cxx index 0abc46ae9f..2e50809d43 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMCleanGrid.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMCleanGrid.cxx @@ -25,8 +25,7 @@ #include "vtkRenderWindowInteractor.h" #include "vtkRenderer.h" - -int TestVTKMCleanGrid(int argc, char *argv[]) +int TestVTKMCleanGrid(int argc, char* argv[]) { vtkNew wavelet; wavelet->SetWholeExtent(-10, 10, -10, 10, -10, 10); diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMClip.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMClip.cxx index cb21d72669..cb144ba853 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMClip.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMClip.cxx @@ -32,10 +32,11 @@ #include "vtkSphereSource.h" #include "vtkUnstructuredGrid.h" -namespace { +namespace +{ template -void GenerateScalars(DataSetT *dataset, bool negate) +void GenerateScalars(DataSetT* dataset, bool negate) { vtkIdType numPoints = dataset->GetNumberOfPoints(); @@ -48,8 +49,7 @@ void GenerateScalars(DataSetT *dataset, bool negate) for (vtkIdType i = 0; i < numPoints; ++i) { dataset->GetPoint(i, point); - scalars->SetTypedComponent(i, 0, (negate ?-point[0] - point[1] - : point[0] + point[1])); + scalars->SetTypedComponent(i, 0, (negate ? -point[0] - point[1] : point[0] + point[1])); } dataset->GetPointData()->SetScalars(scalars); } @@ -66,7 +66,7 @@ int TestVTKMClip(int, char*[]) sphereSource->SetThetaResolution(50); sphereSource->SetPhiResolution(50); sphereSource->Update(); - vtkPolyData *sphere = sphereSource->GetOutput(); + vtkPolyData* sphere = sphereSource->GetOutput(); GenerateScalars(sphere, false); // Clip at zero: @@ -104,7 +104,7 @@ int TestVTKMClip(int, char*[]) vtkNew tetrahedralizer; tetrahedralizer->SetInputConnection(imageToPoints->GetOutputPort()); tetrahedralizer->Update(); - vtkUnstructuredGrid *tets = tetrahedralizer->GetOutput(); + vtkUnstructuredGrid* tets = tetrahedralizer->GetOutput(); GenerateScalars(tets, true); // Clip at zero: @@ -129,7 +129,7 @@ int TestVTKMClip(int, char*[]) renderer->AddActor(tetActor); // Third dataset tests imagedata. This should produce an unstructured grid: - vtkImageData *image = imageSource->GetOutput(); + vtkImageData* image = imageSource->GetOutput(); GenerateScalars(image, false); vtkNew imageClipper; @@ -159,10 +159,10 @@ int TestVTKMClip(int, char*[]) iren->SetRenderWindow(renWin); renWin->AddRenderer(renderer); - renWin->SetSize(500,500); - renderer->GetActiveCamera()->SetPosition(0,0,1); - renderer->GetActiveCamera()->SetFocalPoint(0,0,0); - renderer->GetActiveCamera()->SetViewUp(0,1,0); + renWin->SetSize(500, 500); + renderer->GetActiveCamera()->SetPosition(0, 0, 1); + renderer->GetActiveCamera()->SetFocalPoint(0, 0, 0); + renderer->GetActiveCamera()->SetViewUp(0, 1, 0); renderer->ResetCamera(); renWin->Render(); diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMClipWithImplicitFunction.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMClipWithImplicitFunction.cxx index e06182af9a..ff4900e6a8 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMClipWithImplicitFunction.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMClipWithImplicitFunction.cxx @@ -28,7 +28,6 @@ #include "vtkRenderer.h" #include "vtkSphere.h" - int TestVTKMClipWithImplicitFunction(int argc, char* argv[]) { vtkNew wavelet; diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMCoordinateSystemTransform.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMCoordinateSystemTransform.cxx index e8368196da..8f63fa3613 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMCoordinateSystemTransform.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMCoordinateSystemTransform.cxx @@ -19,7 +19,8 @@ #include "vtkPolyData.h" #include "vtkSmartPointer.h" -namespace { +namespace +{ const double pi = 3.14159265358979323846264338327950288; const double twoPi = 6.28318530717958647692528676655900576; const int dim = 5; @@ -28,20 +29,20 @@ const double tolerance = 0.0001; bool ArePointsWithinTolerance(double v1, double v2) { - if(v1 == v2 || fabs(v1)+fabs(v2) < tolerance) + if (v1 == v2 || fabs(v1) + fabs(v2) < tolerance) { return true; } - if(v1 == 0.0) + if (v1 == 0.0) { - if(fabs(v2) < tolerance) + if (fabs(v2) < tolerance) { return true; } return false; } - if(fabs(fabs(v1) - fabs(v2)) < tolerance) + if (fabs(fabs(v1) - fabs(v2)) < tolerance) { return true; } @@ -65,14 +66,12 @@ void MakeTestDataSet(vtkPolyData* pd, const CoordinateType& coordType) { for (vtkIdType i = 0; i < dim; ++i) { - double z = - static_cast(i) / static_cast(dim - 1); + double z = static_cast(i) / static_cast(dim - 1); for (vtkIdType j = 0; j < dim; ++j) { - double x = - static_cast(j) / static_cast(dim - 1); + double x = static_cast(j) / static_cast(dim - 1); double y = (x * x + z * z) / 2.0f; - pcoords->SetTuple3(i*dim + j,x + 0, y + 0, z + 0); + pcoords->SetTuple3(i * dim + j, x + 0, y + 0, z + 0); } } } @@ -81,67 +80,60 @@ void MakeTestDataSet(vtkPolyData* pd, const CoordinateType& coordType) double R = 1.0f; for (vtkIdType i = 0; i < dim; i++) { - double Z = - static_cast(i) / static_cast(dim - 1); + double Z = static_cast(i) / static_cast(dim - 1); for (vtkIdType j = 0; j < dim; j++) { - double Theta = twoPi * - (static_cast(j) / static_cast(dim - 1)); - pcoords->SetTuple3(i*dim + j, R, Theta, Z); + double Theta = twoPi * (static_cast(j) / static_cast(dim - 1)); + pcoords->SetTuple3(i * dim + j, R, Theta, Z); } } } else if (coordType == CoordinateType::SPH) { - //Spherical coordinates have some degenerate cases, so provide some good cases. + // Spherical coordinates have some degenerate cases, so provide some good cases. double R = 1.0f; - std::vector Thetas = { - eps, pi / 4, pi / 3, pi / 2, pi - eps - }; - std::vector Phis = { - eps, twoPi / 4, twoPi / 3, twoPi / 2, twoPi - eps - }; + std::vector Thetas = { eps, pi / 4, pi / 3, pi / 2, pi - eps }; + std::vector Phis = { eps, twoPi / 4, twoPi / 3, twoPi / 2, twoPi - eps }; for (std::size_t i = 0; i < Thetas.size(); i++) { for (std::size_t j = 0; j < Phis.size(); j++) { - pcoords->SetTuple3(static_cast(i*dim + j), R, Thetas[i], Phis[j]); + pcoords->SetTuple3(static_cast(i * dim + j), R, Thetas[i], Phis[j]); } } } pd->GetPoints()->SetData(pcoords); } -void ValidateCoordTransform(vtkPolyData* pd, vtkPolyData* pdTrans, - const std::vector& isAngle) +void ValidateCoordTransform(vtkPolyData* pd, vtkPolyData* pdTrans, const std::vector& isAngle) { vtkPoints* pdPoints = pd->GetPoints(); vtkPoints* pdTransPoints = pdTrans->GetPoints(); assert(pdPoints->GetNumberOfPoints() == pdTransPoints->GetNumberOfPoints()); - for (vtkIdType i=0; i < pdPoints->GetNumberOfPoints(); i++) + for (vtkIdType i = 0; i < pdPoints->GetNumberOfPoints(); i++) { double* point = pdPoints->GetPoint(i); double* pointTrans = pdTransPoints->GetPoint(i); bool isEqual = true; - for (size_t j=0; j <3; j++) + for (size_t j = 0; j < 3; j++) { if (isAngle[j]) { isEqual &= (ArePointsWithinTolerance(point[j], pointTrans[j]) || - ArePointsWithinTolerance(point[j] + static_cast(twoPi), pointTrans[j]) || - ArePointsWithinTolerance(point[j], pointTrans[j] + static_cast(twoPi))); + ArePointsWithinTolerance(point[j] + static_cast(twoPi), pointTrans[j]) || + ArePointsWithinTolerance(point[j], pointTrans[j] + static_cast(twoPi))); } else { isEqual &= ArePointsWithinTolerance(point[j], pointTrans[j]); } - if (isEqual==false) + if (isEqual == false) { - std::cerr << "i=" << i << " is wrong! result value=" << pointTrans[j] << - " target value=" << point[j] <::GetNumberOfComponents(vtkmPortal.Get(0)), + TEST_VERIFY(numberOfComponents == + internal::FlattenVec::GetNumberOfComponents( + vtkmPortal.Get(0)), "Number of components don't match"); for (vtkIdType i = 0; i < length; ++i) @@ -66,9 +69,9 @@ void TestWithArrayHandle(const ArrayHandleType& vtkmArray) for (int j = 0; j < numberOfComponents; ++j) { auto comp = internal::FlattenVec::GetComponent(val, j); - TEST_VERIFY (IsEqualFloat(tuple[j], static_cast(comp)), "values don't match"); - TEST_VERIFY (IsEqualFloat(vtkArray->GetComponent(i, j), static_cast(comp)), - "values don't match"); + TEST_VERIFY(IsEqualFloat(tuple[j], static_cast(comp)), "values don't match"); + TEST_VERIFY(IsEqualFloat(vtkArray->GetComponent(i, j), static_cast(comp)), + "values don't match"); } } } @@ -86,11 +89,12 @@ try std::cout << "Passed\n"; std::cout << "Testing with ArrayHandleConstant\n"; - TestWithArrayHandle(vtkm::cont::make_ArrayHandleConstant(vtkm::Vec, 3>{{1.0f, 2.0f, 3.0f}}, 10)); + TestWithArrayHandle(vtkm::cont::make_ArrayHandleConstant( + vtkm::Vec, 3>{ { 1.0f, 2.0f, 3.0f } }, 10)); std::cout << "Passed\n"; std::cout << "Testing with ArrayHandleUniformPointCoordinates\n"; - TestWithArrayHandle(vtkm::cont::ArrayHandleUniformPointCoordinates(vtkm::Id3{3})); + TestWithArrayHandle(vtkm::cont::ArrayHandleUniformPointCoordinates(vtkm::Id3{ 3 })); std::cout << "Passed\n"; return EXIT_SUCCESS; diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMDataSet.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMDataSet.cxx index 2ad78fc0e6..950cf6eb33 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMDataSet.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMDataSet.cxx @@ -32,7 +32,8 @@ class TestError { public: TestError(const std::string& message, int line) - : Message(message), Line(line) + : Message(message) + , Line(line) { } @@ -48,7 +49,9 @@ private: #define RAISE_TEST_ERROR(msg) throw TestError((msg), __LINE__) -#define TEST_VERIFY(cond, msg) if (!(cond)) RAISE_TEST_ERROR((msg)) +#define TEST_VERIFY(cond, msg) \ + if (!(cond)) \ + RAISE_TEST_ERROR((msg)) inline bool IsEqualFloat(double a, double b, double e = 1e-6f) { @@ -68,14 +71,12 @@ inline void TestEqualCells(vtkCell* c1, vtkCell* c2) inline void TestEqualVtkArrays(vtkAbstractArray* a1, vtkAbstractArray* a2) { - TEST_VERIFY(std::string(a1->GetName()) == std::string(a2->GetName()), - "Array names don't match"); - TEST_VERIFY(a1->GetDataType() == a2->GetDataType(), - "Array data-types don't match"); - TEST_VERIFY(a1->GetNumberOfTuples() == a2->GetNumberOfTuples(), - "Array number of tuples don't match"); + TEST_VERIFY(std::string(a1->GetName()) == std::string(a2->GetName()), "Array names don't match"); + TEST_VERIFY(a1->GetDataType() == a2->GetDataType(), "Array data-types don't match"); + TEST_VERIFY( + a1->GetNumberOfTuples() == a2->GetNumberOfTuples(), "Array number of tuples don't match"); TEST_VERIFY(a1->GetNumberOfComponents() == a2->GetNumberOfComponents(), - "Array number of components don't match"); + "Array number of components don't match"); auto da1 = vtkDataArray::SafeDownCast(a1); auto da2 = vtkDataArray::SafeDownCast(a2); @@ -86,23 +87,23 @@ inline void TestEqualVtkArrays(vtkAbstractArray* a1, vtkAbstractArray* a2) da1->GetRange(range1, i); da2->GetRange(range2, i); TEST_VERIFY(IsEqualFloat(range1[0], range2[0]) && IsEqualFloat(range1[1], range2[1]), - "Array ranges don't match"); + "Array ranges don't match"); } } void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) { - TEST_VERIFY(dsVtk->GetNumberOfPoints() == dsVtkm->GetNumberOfPoints(), - "Number of points don't match"); - TEST_VERIFY(dsVtk->GetNumberOfCells() == dsVtkm->GetNumberOfCells(), - "Number of cells don't match"); + TEST_VERIFY( + dsVtk->GetNumberOfPoints() == dsVtkm->GetNumberOfPoints(), "Number of points don't match"); + TEST_VERIFY( + dsVtk->GetNumberOfCells() == dsVtkm->GetNumberOfCells(), "Number of cells don't match"); double bounds1[6], bounds2[6]; dsVtk->GetBounds(bounds1); dsVtkm->GetBounds(bounds2); TEST_VERIFY(IsEqualFloat(bounds1[0], bounds2[0]) && IsEqualFloat(bounds1[1], bounds2[1]) && - IsEqualFloat(bounds1[2], bounds2[2]) && IsEqualFloat(bounds1[3], bounds2[3]) && - IsEqualFloat(bounds1[4], bounds2[4]) && IsEqualFloat(bounds1[5], bounds2[5]), - "Bounds don't match"); + IsEqualFloat(bounds1[2], bounds2[2]) && IsEqualFloat(bounds1[3], bounds2[3]) && + IsEqualFloat(bounds1[4], bounds2[4]) && IsEqualFloat(bounds1[5], bounds2[5]), + "Bounds don't match"); vtkIdType numPoints = dsVtk->GetNumberOfPoints(); for (vtkIdType i = 0; i < numPoints; ++i) @@ -110,10 +111,9 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) double x1[3], x2[3]; dsVtk->GetPoint(i, x1); dsVtkm->GetPoint(i, x2); - TEST_VERIFY(IsEqualFloat(x1[0], x2[0]) && - IsEqualFloat(x1[1], x2[1]) && - IsEqualFloat(x1[2], x2[2]), - "'GetPoint` results don't match"); + TEST_VERIFY( + IsEqualFloat(x1[0], x2[0]) && IsEqualFloat(x1[1], x2[1]) && IsEqualFloat(x1[2], x2[2]), + "'GetPoint` results don't match"); vtkNew cellIds1, cellIds2; dsVtk->GetPointCells(i, cellIds1); @@ -121,11 +121,10 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) cellIds1->Sort(); cellIds2->Sort(); TEST_VERIFY(cellIds1->GetNumberOfIds() == cellIds2->GetNumberOfIds(), - "`GetPointCells` results don't match"); + "`GetPointCells` results don't match"); for (vtkIdType j = 0; j < cellIds1->GetNumberOfIds(); ++j) { - TEST_VERIFY(cellIds1->GetId(j) == cellIds2->GetId(j), - "`GetPointCells` results don't match"); + TEST_VERIFY(cellIds1->GetId(j) == cellIds2->GetId(j), "`GetPointCells` results don't match"); } } @@ -143,27 +142,24 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) dsVtk->GetCellBounds(i, bds1); dsVtkm->GetCellBounds(i, bds2); TEST_VERIFY(IsEqualFloat(bds1[0], bds2[0]) && IsEqualFloat(bds1[1], bds2[1]) && - IsEqualFloat(bds1[2], bds2[2]) && IsEqualFloat(bds1[3], bds2[3]) && - IsEqualFloat(bds1[4], bds2[4]) && IsEqualFloat(bds1[5], bds2[5]), - "Cell bounds don't match"); + IsEqualFloat(bds1[2], bds2[2]) && IsEqualFloat(bds1[3], bds2[3]) && + IsEqualFloat(bds1[4], bds2[4]) && IsEqualFloat(bds1[5], bds2[5]), + "Cell bounds don't match"); - TEST_VERIFY(dsVtk->GetCellType(i) == dsVtkm->GetCellType(i), - "Cell types don't match"); + TEST_VERIFY(dsVtk->GetCellType(i) == dsVtkm->GetCellType(i), "Cell types don't match"); vtkNew ptIds1, ptIds2; dsVtk->GetCellPoints(i, ptIds1); dsVtkm->GetCellPoints(i, ptIds2); for (vtkIdType j = 0; j < ptIds1->GetNumberOfIds(); ++j) { - TEST_VERIFY(ptIds1->GetId(j) == ptIds2->GetId(j), - "`GetCellPoints` results don't match"); + TEST_VERIFY(ptIds1->GetId(j) == ptIds2->GetId(j), "`GetCellPoints` results don't match"); } } std::default_random_engine engine; - std::uniform_real_distribution d1(bounds1[0], bounds1[1]), - d2(bounds1[2], bounds1[3]), - d3(bounds1[4], bounds1[5]); + std::uniform_real_distribution d1(bounds1[0], bounds1[1]), d2(bounds1[2], bounds1[3]), + d3(bounds1[4], bounds1[5]); static constexpr int numSamples = 100; for (int i = 0; i < numSamples; ++i) { @@ -177,9 +173,9 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) double x1[3], x2[3]; dsVtk->GetPoint(pid1, x1); dsVtkm->GetPoint(pid1, x2); - TEST_VERIFY(IsEqualFloat(vtkMath::Distance2BetweenPoints(x, x1), - vtkMath::Distance2BetweenPoints(x, x2)), - "`FindPoint` results don't match"); + TEST_VERIFY(IsEqualFloat( + vtkMath::Distance2BetweenPoints(x, x1), vtkMath::Distance2BetweenPoints(x, x2)), + "`FindPoint` results don't match"); } int subId = 0; @@ -192,7 +188,7 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) // the boundary of those cells if (cid1 != cid2) { - if ( cid2 >= 0 ) + if (cid2 >= 0) { // check if the point is inside or close to the vtkmDataSet found cell vtkCell* cell = dsVtk->GetCell(cid2); @@ -200,7 +196,7 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) if (cell->EvaluatePosition(x, nullptr, subId, pcoords, dist2, weights) == 0) // outside? { TEST_VERIFY(IsEqualFloat(cell->GetParametricDistance(pcoords), 0.0, 1e-3), - "`FindCell` incorrect result by vtkmDataSet"); + "`FindCell` incorrect result by vtkmDataSet"); } } } @@ -211,14 +207,12 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) else { TEST_VERIFY(IsEqualFloat(pcoords1[0], pcoords2[0]) && - IsEqualFloat(pcoords1[1], pcoords2[1]) && - IsEqualFloat(pcoords1[2], pcoords2[2]), - "`FindCell` pcoords don't match"); + IsEqualFloat(pcoords1[1], pcoords2[1]) && IsEqualFloat(pcoords1[2], pcoords2[2]), + "`FindCell` pcoords don't match"); int count = dsVtk->GetCell(cid1)->GetNumberOfPoints(); for (int j = 0; j < count; ++j) { - TEST_VERIFY(IsEqualFloat(weights1[j], weights2[j]), - "`FindCell` weights don't match"); + TEST_VERIFY(IsEqualFloat(weights1[j], weights2[j]), "`FindCell` weights don't match"); } } } @@ -226,26 +220,23 @@ void TestDataSets(vtkDataSet* dsVtk, vtkDataSet* dsVtkm) // test fields int numPointFields = dsVtk->GetPointData()->GetNumberOfArrays(); TEST_VERIFY(numPointFields == dsVtkm->GetPointData()->GetNumberOfArrays(), - "Number of point-fields don't match"); + "Number of point-fields don't match"); for (int i = 0; i < numPointFields; ++i) { - TestEqualVtkArrays(dsVtk->GetPointData()->GetArray(i), - dsVtkm->GetPointData()->GetArray(i)); + TestEqualVtkArrays(dsVtk->GetPointData()->GetArray(i), dsVtkm->GetPointData()->GetArray(i)); } int numCellFields = dsVtk->GetCellData()->GetNumberOfArrays(); TEST_VERIFY(numCellFields == dsVtkm->GetCellData()->GetNumberOfArrays(), - "Number of cell-fields don't match"); + "Number of cell-fields don't match"); for (int i = 0; i < numCellFields; ++i) { - TestEqualVtkArrays(dsVtk->GetCellData()->GetArray(i), - dsVtkm->GetCellData()->GetArray(i)); + TestEqualVtkArrays(dsVtk->GetCellData()->GetArray(i), dsVtkm->GetCellData()->GetArray(i)); } } //----------------------------------------------------------------------------- -inline void CoordsCopy(const vtkm::cont::CoordinateSystem& coords, - vtkPoints* points) +inline void CoordsCopy(const vtkm::cont::CoordinateSystem& coords, vtkPoints* points) { auto ptsPortal = coords.GetData().GetPortalConstControl(); auto numPoints = coords.GetNumberOfPoints(); @@ -261,9 +252,8 @@ inline void CoordsCopy(const vtkm::cont::CoordinateSystem& coords, } } -inline void FieldCopy(const vtkm::cont::ArrayHandle& src, - const char* name, - vtkFloatArray* dst) +inline void FieldCopy( + const vtkm::cont::ArrayHandle& src, const char* name, vtkFloatArray* dst) { auto portal = src.GetPortalConstControl(); vtkm::Id length = portal.GetNumberOfValues(); @@ -291,12 +281,10 @@ void TestUniformDataSet() auto spacing = portal.GetSpacing(); vtkNew pointField, cellField; - FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), - "pointvar", - pointField); - FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), - "cellvar", - cellField); + FieldCopy(dataset.GetField("pointvar").GetData().Cast >(), + "pointvar", pointField); + FieldCopy(dataset.GetField("cellvar").GetData().Cast >(), + "cellvar", cellField); vtkNew imageData; imageData->SetDimensions(dims[0], dims[1], dims[2]); @@ -320,18 +308,16 @@ void TestUniformDataSet() void TestCurvilinearDataSet() { auto dataset = Maker.Make3DRegularDataSet0(); - auto dims = dataset.GetCellSet().Cast>().GetPointDimensions(); + auto dims = dataset.GetCellSet().Cast >().GetPointDimensions(); vtkNew points; CoordsCopy(dataset.GetCoordinateSystem(), points); vtkNew pointField, cellField; - FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), - "pointvar", - pointField); - FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), - "cellvar", - cellField); + FieldCopy(dataset.GetField("pointvar").GetData().Cast >(), + "pointvar", pointField); + FieldCopy(dataset.GetField("cellvar").GetData().Cast >(), + "cellvar", cellField); vtkNew dsVtk; dsVtk->SetDimensions(dims[0], dims[1], dims[2]); @@ -370,12 +356,10 @@ void TestExplicitDataSet() } vtkNew pointField, cellField; - FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), - "pointvar", - pointField); - FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), - "cellvar", - cellField); + FieldCopy(dataset.GetField("pointvar").GetData().Cast >(), + "pointvar", pointField); + FieldCopy(dataset.GetField("cellvar").GetData().Cast >(), + "cellvar", cellField); vtkNew dsVtk; dsVtk->SetPoints(points); diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMExternalFaces.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMExternalFaces.cxx index 7b909b581f..7bd73cdb56 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMExternalFaces.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMExternalFaces.cxx @@ -37,11 +37,10 @@ #include "vtkDataArray.h" #include "vtkPointData.h" +namespace +{ -namespace { - -bool Convert2DUnstructuredGridToPolyData(vtkUnstructuredGrid *in, - vtkPolyData *out) +bool Convert2DUnstructuredGridToPolyData(vtkUnstructuredGrid* in, vtkPolyData* out) { vtkIdType numCells = in->GetNumberOfCells(); out->AllocateEstimate(numCells, 1); @@ -49,11 +48,10 @@ bool Convert2DUnstructuredGridToPolyData(vtkUnstructuredGrid *in, for (vtkIdType i = 0; i < numCells; ++i) { - vtkCell *cell = in->GetCell(i); + vtkCell* cell = in->GetCell(i); if (cell->GetCellType() != VTK_TRIANGLE && cell->GetCellType() != VTK_QUAD) { - std::cout << "Error: Unexpected cell type: " << cell->GetCellType() - << "\n"; + std::cout << "Error: Unexpected cell type: " << cell->GetCellType() << "\n"; return false; } out->InsertNextCell(cell->GetCellType(), cell->GetPointIds()); @@ -115,14 +113,13 @@ int TestVTKMExternalFaces(int argc, char* argv[]) if (result->GetNumberOfPoints() >= numInputPoints) { std::cout << "Expecting the number of points in the output to be less " - << "than the input (" - << result->GetNumberOfPoints() << ">=" - << numInputPoints << ")\n"; + << "than the input (" << result->GetNumberOfPoints() << ">=" << numInputPoints + << ")\n"; return 1; } if (result->GetCellData()->GetArray("RandomCellVectors")->GetNumberOfTuples() != - result->GetNumberOfCells()) + result->GetNumberOfCells()) { std::cout << "Expecting a cell field with number of entries equal to " << "the number of cells"; @@ -136,7 +133,6 @@ int TestVTKMExternalFaces(int argc, char* argv[]) return 1; } - // render results double scalarRange[2]; polydata->GetPointData()->GetArray("RTData")->GetRange(scalarRange); diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradient.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradient.cxx index e1668c9d6f..832e8fa8cf 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradient.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradient.cxx @@ -35,252 +35,243 @@ namespace { - double Tolerance = 0.00001; +double Tolerance = 0.00001; //----------------------------------------------------------------------------- - int IsGradientCorrect(vtkDoubleArray* gradients, - vtkDoubleArray* correct) +int IsGradientCorrect(vtkDoubleArray* gradients, vtkDoubleArray* correct) +{ + int numberOfComponents = gradients->GetNumberOfComponents(); + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) { - int numberOfComponents = gradients->GetNumberOfComponents(); - for(vtkIdType i=0;iGetNumberOfTuples();i++) + bool invalid = false; + for (int j = 0; j < numberOfComponents; j++) { - bool invalid = false; - for(int j=0;jGetTypedComponent(i, j); - double expected = correct->GetTypedComponent(i, j); + double value = gradients->GetTypedComponent(i, j); + double expected = correct->GetTypedComponent(i, j); - if( (value - expected) > Tolerance) - { - invalid = true; - } + if ((value - expected) > Tolerance) + { + invalid = true; } + } + + if (invalid) + { + std::vector values; + values.resize(numberOfComponents); + std::vector expected; + expected.resize(numberOfComponents); + + gradients->GetTypedTuple(i, values.data()); + correct->GetTypedTuple(i, expected.data()); - if(invalid) + std::cout << "Gradient[ " << i << " ] should look like: " << std::endl; + std::cout << expected[0] << ", " << expected[1] << ", " << expected[2] << std::endl; + if (numberOfComponents > 3) { - std::vector values; values.resize(numberOfComponents); - std::vector expected; expected.resize(numberOfComponents); - - gradients->GetTypedTuple(i, values.data()); - correct->GetTypedTuple(i, expected.data()); - - std::cout << "Gradient[ " << i << " ] should look like: " << std::endl; - std::cout << expected[0] << ", " << expected[1] << ", " << expected[2] << std::endl; - if(numberOfComponents > 3) - { - std::cout << expected[3] << ", " << expected[4] << ", " << expected[5] << std::endl; - std::cout << expected[6] << ", " << expected[7] << ", " << expected[8] << std::endl; - } - - std::cout << "Gradient[ " << i << " ] actually looks like: " << std::endl; - std::cout << values[0] << ", " << values[1] << ", " << values[2] << std::endl; - if(numberOfComponents > 3) - { - std::cout << values[3] << ", " << values[4] << ", " << values[5] << std::endl; - std::cout << values[6] << ", " << values[7] << ", " << values[8] << std::endl; - } - std::cout << std::endl; + std::cout << expected[3] << ", " << expected[4] << ", " << expected[5] << std::endl; + std::cout << expected[6] << ", " << expected[7] << ", " << expected[8] << std::endl; } - if(i>10 && invalid) + std::cout << "Gradient[ " << i << " ] actually looks like: " << std::endl; + std::cout << values[0] << ", " << values[1] << ", " << values[2] << std::endl; + if (numberOfComponents > 3) { - return 0; + std::cout << values[3] << ", " << values[4] << ", " << values[5] << std::endl; + std::cout << values[6] << ", " << values[7] << ", " << values[8] << std::endl; } + std::cout << std::endl; + } + + if (i > 10 && invalid) + { + return 0; } - return 1; } + return 1; +} //----------------------------------------------------------------------------- // we assume that the gradients are correct and so we can compute the "real" // vorticity from it - int IsVorticityCorrect(vtkDoubleArray* gradients, vtkDoubleArray* vorticity) +int IsVorticityCorrect(vtkDoubleArray* gradients, vtkDoubleArray* vorticity) +{ + if (gradients->GetNumberOfComponents() != 9 || vorticity->GetNumberOfComponents() != 3) { - if(gradients->GetNumberOfComponents() != 9 || - vorticity->GetNumberOfComponents() != 3) + vtkGenericWarningMacro("Bad number of components."); + return 0; + } + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) + { + double* g = gradients->GetTuple(i); + double* v = vorticity->GetTuple(i); + if (!test_equal(v[0], g[7] - g[5])) { - vtkGenericWarningMacro("Bad number of components."); + vtkGenericWarningMacro("Bad vorticity[0] value " + << v[0] << " " << g[7] - g[5] << " difference is " << (v[0] - g[7] + g[5])); return 0; } - for(vtkIdType i=0;iGetNumberOfTuples();i++) + else if (!test_equal(v[1], g[2] - g[6])) { - double* g = gradients->GetTuple(i); - double* v = vorticity->GetTuple(i); - if(!test_equal(v[0], g[7]-g[5])) - { - vtkGenericWarningMacro("Bad vorticity[0] value " << v[0] << " " << - g[7]-g[5] << " difference is " << (v[0]-g[7]+g[5])); - return 0; - } - else if(!test_equal(v[1], g[2]-g[6])) - { - vtkGenericWarningMacro("Bad vorticity[1] value " << v[1] << " " << - g[2]-g[6] << " difference is " << (v[1]-g[2]+g[6])); - return 0; - } - else if(!test_equal(v[2], g[3]-g[1])) - { - vtkGenericWarningMacro("Bad vorticity[2] value " << v[2] << " " << - g[3]-g[1] << " difference is " << (v[2]-g[3]+g[1])); - return 0; - } + vtkGenericWarningMacro("Bad vorticity[1] value " + << v[1] << " " << g[2] - g[6] << " difference is " << (v[1] - g[2] + g[6])); + return 0; + } + else if (!test_equal(v[2], g[3] - g[1])) + { + vtkGenericWarningMacro("Bad vorticity[2] value " + << v[2] << " " << g[3] - g[1] << " difference is " << (v[2] - g[3] + g[1])); + return 0; } - - return 1; } + return 1; +} + //----------------------------------------------------------------------------- // we assume that the gradients are correct and so we can compute the "real" // Q criterion from it - int IsQCriterionCorrect(vtkDoubleArray* gradients, vtkDoubleArray* qCriterion) +int IsQCriterionCorrect(vtkDoubleArray* gradients, vtkDoubleArray* qCriterion) +{ + if (gradients->GetNumberOfComponents() != 9 || qCriterion->GetNumberOfComponents() != 1) { - if(gradients->GetNumberOfComponents() != 9 || - qCriterion->GetNumberOfComponents() != 1) + vtkGenericWarningMacro("Bad number of components."); + return 0; + } + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) + { + double* g = gradients->GetTuple(i); + double qc = qCriterion->GetValue(i); + + double t1 = .25 * + ((g[7] - g[5]) * (g[7] - g[5]) + (g[3] - g[1]) * (g[3] - g[1]) + + (g[2] - g[6]) * (g[2] - g[6])); + double t2 = .5 * + (g[0] * g[0] + g[4] * g[4] + g[8] * g[8] + + .5 * + ((g[3] + g[1]) * (g[3] + g[1]) + (g[6] + g[2]) * (g[6] + g[2]) + + (g[7] + g[5]) * (g[7] + g[5]))); + + if (!test_equal(qc, t1 - t2)) { - vtkGenericWarningMacro("Bad number of components."); + vtkGenericWarningMacro( + "Bad Q-criterion value " << qc << " " << t1 - t2 << " difference is " << (qc - t1 + t2)); return 0; } - for(vtkIdType i=0;iGetNumberOfTuples();i++) - { - double* g = gradients->GetTuple(i); - double qc = qCriterion->GetValue(i); - - double t1 = .25*( - (g[7]-g[5])*(g[7]-g[5]) + - (g[3]-g[1])*(g[3]-g[1]) + - (g[2]-g[6])*(g[2]-g[6]) ); - double t2 = .5 * ( g[0]*g[0]+g[4]*g[4]+ - g[8]*g[8]+ .5 *( - (g[3]+g[1])*(g[3]+g[1]) + - (g[6]+g[2])*(g[6]+g[2]) + - (g[7]+g[5])*(g[7]+g[5]) ) ); - - if(!test_equal(qc, t1 - t2)) - { - vtkGenericWarningMacro("Bad Q-criterion value " << qc << " " << - t1-t2 << " difference is " << (qc-t1+t2)); - return 0; - } - } - - return 1; } + return 1; +} + //----------------------------------------------------------------------------- // we assume that the gradients are correct and so we can compute the "real" // divergence from it - int IsDivergenceCorrect(vtkDoubleArray* gradients, vtkDoubleArray* divergence) +int IsDivergenceCorrect(vtkDoubleArray* gradients, vtkDoubleArray* divergence) +{ + if (gradients->GetNumberOfComponents() != 9 || divergence->GetNumberOfComponents() != 1) + { + vtkGenericWarningMacro("Bad number of components."); + return 0; + } + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) { - if(gradients->GetNumberOfComponents() != 9 || - divergence->GetNumberOfComponents() != 1) + double* g = gradients->GetTuple(i); + double div = divergence->GetValue(i); + double gValue = g[0] + g[4] + g[8]; + + if (!test_equal(div, gValue)) { - vtkGenericWarningMacro("Bad number of components."); + vtkGenericWarningMacro( + "Bad divergence value " << div << " " << gValue << " difference is " << (div - gValue)); return 0; } - for(vtkIdType i=0;iGetNumberOfTuples();i++) - { - double* g = gradients->GetTuple(i); - double div = divergence->GetValue(i); - double gValue = g[0]+g[4]+g[8]; - - if(!test_equal(div, gValue)) - { - vtkGenericWarningMacro("Bad divergence value " << div << " " << - gValue << " difference is " << (div-gValue)); - return 0; - } - } - - return 1; } + return 1; +} + //----------------------------------------------------------------------------- - int PerformTest(vtkDataSet* grid) +int PerformTest(vtkDataSet* grid) +{ + // Cleaning out the existing field data so that I can replace it with + // an analytic function that I know the gradient of + grid->GetPointData()->Initialize(); + const char fieldName[] = "LinearField"; + + vtkNew calculator; + calculator->SetInputData(grid); + calculator->SetResultArrayName(fieldName); + calculator->SetFunction("coordsY*iHat+coordsX*jHat+coordsZ*kHat"); + calculator->SetAttributeTypeToPointData(); + calculator->AddCoordinateScalarVariable("coordsX", 0); + calculator->AddCoordinateScalarVariable("coordsY", 1); + calculator->AddCoordinateScalarVariable("coordsZ", 2); + + const char resultName[] = "Result"; + + vtkNew pointGradients; + pointGradients->SetInputConnection(calculator->GetOutputPort()); + pointGradients->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); + pointGradients->SetResultArrayName(resultName); + + vtkNew correctPointGradients; + correctPointGradients->SetInputConnection(calculator->GetOutputPort()); + correctPointGradients->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); + correctPointGradients->SetResultArrayName(resultName); + + pointGradients->Update(); + correctPointGradients->Update(); + + vtkDoubleArray* gradPointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointGradients->GetOutput())->GetPointData()->GetArray(resultName)); + + vtkDoubleArray* correctPointArray = + vtkArrayDownCast(vtkDataSet::SafeDownCast(correctPointGradients->GetOutput()) + ->GetPointData() + ->GetArray(resultName)); + + if (!IsGradientCorrect(gradPointArray, correctPointArray)) { - // Cleaning out the existing field data so that I can replace it with - // an analytic function that I know the gradient of - grid->GetPointData()->Initialize(); - const char fieldName[] = "LinearField"; - - vtkNew calculator; - calculator->SetInputData(grid); - calculator->SetResultArrayName(fieldName); - calculator->SetFunction("coordsY*iHat+coordsX*jHat+coordsZ*kHat"); - calculator->SetAttributeTypeToPointData(); - calculator->AddCoordinateScalarVariable("coordsX", 0); - calculator->AddCoordinateScalarVariable("coordsY", 1); - calculator->AddCoordinateScalarVariable("coordsZ", 2); - - const char resultName[] = "Result"; - - vtkNew pointGradients; - pointGradients->SetInputConnection(calculator->GetOutputPort()); - pointGradients->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); - pointGradients->SetResultArrayName(resultName); - - vtkNew correctPointGradients; - correctPointGradients->SetInputConnection(calculator->GetOutputPort()); - correctPointGradients->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); - correctPointGradients->SetResultArrayName(resultName); - - pointGradients->Update(); - correctPointGradients->Update(); - - vtkDoubleArray* gradPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointGradients->GetOutput())->GetPointData()->GetArray(resultName)); - - vtkDoubleArray* correctPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - correctPointGradients->GetOutput())->GetPointData()->GetArray(resultName)); - - if(!IsGradientCorrect(gradPointArray, correctPointArray)) - { - return EXIT_FAILURE; - } - - vtkNew pointVorticity; - pointVorticity->SetInputConnection(calculator->GetOutputPort()); - pointVorticity->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); - pointVorticity->SetResultArrayName(resultName); - pointVorticity->SetComputeVorticity(1); - pointVorticity->SetComputeQCriterion(1); - pointVorticity->SetComputeDivergence(1); - pointVorticity->Update(); - - // point stuff - vtkDoubleArray* vorticityPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointVorticity->GetOutput())->GetPointData()->GetArray("Vorticity")); - if(!IsVorticityCorrect(gradPointArray, vorticityPointArray)) - { - return EXIT_FAILURE; - } + return EXIT_FAILURE; + } - vtkDoubleArray* divergencePointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointVorticity->GetOutput())->GetPointData()->GetArray("Divergence")); - if(!IsDivergenceCorrect(gradPointArray, divergencePointArray)) - { - return EXIT_FAILURE; - } + vtkNew pointVorticity; + pointVorticity->SetInputConnection(calculator->GetOutputPort()); + pointVorticity->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); + pointVorticity->SetResultArrayName(resultName); + pointVorticity->SetComputeVorticity(1); + pointVorticity->SetComputeQCriterion(1); + pointVorticity->SetComputeDivergence(1); + pointVorticity->Update(); + + // point stuff + vtkDoubleArray* vorticityPointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointVorticity->GetOutput())->GetPointData()->GetArray("Vorticity")); + if (!IsVorticityCorrect(gradPointArray, vorticityPointArray)) + { + return EXIT_FAILURE; + } - vtkDoubleArray* qCriterionPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointVorticity->GetOutput())->GetPointData()->GetArray("Q-criterion")); - if(!IsQCriterionCorrect(gradPointArray, qCriterionPointArray)) - { - return EXIT_FAILURE; - } + vtkDoubleArray* divergencePointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointVorticity->GetOutput())->GetPointData()->GetArray("Divergence")); + if (!IsDivergenceCorrect(gradPointArray, divergencePointArray)) + { + return EXIT_FAILURE; + } - return EXIT_SUCCESS; + vtkDoubleArray* qCriterionPointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointVorticity->GetOutput())->GetPointData()->GetArray("Q-criterion")); + if (!IsQCriterionCorrect(gradPointArray, qCriterionPointArray)) + { + return EXIT_FAILURE; } + + return EXIT_SUCCESS; +} } // end local namespace //----------------------------------------------------------------------------- -int TestVTKMGradient(int /* argc */, char * /* argv */ []) +int TestVTKMGradient(int /* argc */, char* /* argv */[]) { vtkDataSet* grid = nullptr; @@ -291,7 +282,7 @@ int TestVTKMGradient(int /* argc */, char * /* argv */ []) grid = vtkDataSet::SafeDownCast(wavelet->GetOutput()); - if(PerformTest(grid)) + if (PerformTest(grid)) { return EXIT_FAILURE; } @@ -302,18 +293,18 @@ int TestVTKMGradient(int /* argc */, char * /* argv */ []) ug->Update(); grid = vtkDataSet::SafeDownCast(ug->GetOutput()); - if(PerformTest(grid)) + if (PerformTest(grid)) { return EXIT_FAILURE; } - //now try with 2D wavelets + // now try with 2D wavelets wavelet->SetWholeExtent(-10, 10, -10, 10, 0, 0); wavelet->SetCenter(0, 0, 0); wavelet->Update(); grid = vtkDataSet::SafeDownCast(wavelet->GetOutput()); - if(PerformTest(grid)) + if (PerformTest(grid)) { return EXIT_FAILURE; } @@ -322,7 +313,7 @@ int TestVTKMGradient(int /* argc */, char * /* argv */ []) ug->Update(); grid = vtkDataSet::SafeDownCast(ug->GetOutput()); - if(PerformTest(grid)) + if (PerformTest(grid)) { return EXIT_FAILURE; } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradientAndVorticity.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradientAndVorticity.cxx index aab02e416a..59fba472dc 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradientAndVorticity.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMGradientAndVorticity.cxx @@ -33,381 +33,363 @@ #include #include -#define VTK_CREATE(type, var) \ - vtkSmartPointer var = vtkSmartPointer::New() +#define VTK_CREATE(type, var) vtkSmartPointer var = vtkSmartPointer::New() namespace { - double Tolerance = 0.00001; +double Tolerance = 0.00001; //----------------------------------------------------------------------------- - void CreateCellData(vtkDataSet* grid, int numberOfComponents, int offset, - const char* arrayName) +void CreateCellData(vtkDataSet* grid, int numberOfComponents, int offset, const char* arrayName) +{ + vtkIdType numberOfCells = grid->GetNumberOfCells(); + VTK_CREATE(vtkDoubleArray, array); + array->SetNumberOfComponents(numberOfComponents); + array->SetNumberOfTuples(numberOfCells); + std::vector tupleValues(numberOfComponents); + double point[3], parametricCenter[3], weights[100]; + for (vtkIdType i = 0; i < numberOfCells; i++) { - vtkIdType numberOfCells = grid->GetNumberOfCells(); - VTK_CREATE(vtkDoubleArray, array); - array->SetNumberOfComponents(numberOfComponents); - array->SetNumberOfTuples(numberOfCells); - std::vector tupleValues(numberOfComponents); - double point[3], parametricCenter[3], weights[100]; - for(vtkIdType i=0;iGetCell(i); - cell->GetParametricCenter(parametricCenter); - int subId = 0; - cell->EvaluateLocation(subId, parametricCenter, point, weights); - for(int j=0;jSetTypedTuple(i, &tupleValues[0]); + vtkCell* cell = grid->GetCell(i); + cell->GetParametricCenter(parametricCenter); + int subId = 0; + cell->EvaluateLocation(subId, parametricCenter, point, weights); + for (int j = 0; j < numberOfComponents; j++) + { // +offset makes the curl/vorticity nonzero + tupleValues[j] = point[(j + offset) % 3]; } - array->SetName(arrayName); - grid->GetCellData()->AddArray(array); + array->SetTypedTuple(i, &tupleValues[0]); } + array->SetName(arrayName); + grid->GetCellData()->AddArray(array); +} //----------------------------------------------------------------------------- - void CreatePointData(vtkDataSet* grid, int numberOfComponents, int offset, - const char* arrayName) +void CreatePointData(vtkDataSet* grid, int numberOfComponents, int offset, const char* arrayName) +{ + vtkIdType numberOfPoints = grid->GetNumberOfPoints(); + VTK_CREATE(vtkDoubleArray, array); + array->SetNumberOfComponents(numberOfComponents); + array->SetNumberOfTuples(numberOfPoints); + std::vector tupleValues(numberOfComponents); + double point[3]; + for (vtkIdType i = 0; i < numberOfPoints; i++) { - vtkIdType numberOfPoints = grid->GetNumberOfPoints(); - VTK_CREATE(vtkDoubleArray, array); - array->SetNumberOfComponents(numberOfComponents); - array->SetNumberOfTuples(numberOfPoints); - std::vector tupleValues(numberOfComponents); - double point[3]; - for(vtkIdType i=0;iGetPoint(i, point); - for(int j=0;jSetTypedTuple(i, &tupleValues[0]); + grid->GetPoint(i, point); + for (int j = 0; j < numberOfComponents; j++) + { // +offset makes the curl/vorticity nonzero + tupleValues[j] = point[(j + offset) % 3]; } - array->SetName(arrayName); - grid->GetPointData()->AddArray(array); + array->SetTypedTuple(i, &tupleValues[0]); } + array->SetName(arrayName); + grid->GetPointData()->AddArray(array); +} //----------------------------------------------------------------------------- - int IsGradientCorrect(vtkDoubleArray* gradients, - vtkDoubleArray* correct) +int IsGradientCorrect(vtkDoubleArray* gradients, vtkDoubleArray* correct) +{ + int numberOfComponents = gradients->GetNumberOfComponents(); + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) { - int numberOfComponents = gradients->GetNumberOfComponents(); - for(vtkIdType i=0;iGetNumberOfTuples();i++) + bool invalid = false; + for (int j = 0; j < numberOfComponents; j++) { - bool invalid = false; - for(int j=0;jGetTypedComponent(i, j); - double expected = correct->GetTypedComponent(i, j); + double value = gradients->GetTypedComponent(i, j); + double expected = correct->GetTypedComponent(i, j); - if( (value - expected) > Tolerance) - { - invalid = true; - } + if ((value - expected) > Tolerance) + { + invalid = true; } + } - if(invalid) + if (invalid) + { + std::vector values; + values.resize(numberOfComponents); + std::vector expected; + expected.resize(numberOfComponents); + + gradients->GetTypedTuple(i, values.data()); + correct->GetTypedTuple(i, expected.data()); + + std::cout << "Gradient[ i ] should look like: " << std::endl; + std::cout << expected[0] << ", " << expected[1] << ", " << expected[2] << std::endl; + if (numberOfComponents > 3) { - std::vector values; values.resize(numberOfComponents); - std::vector expected; expected.resize(numberOfComponents); - - gradients->GetTypedTuple(i, values.data()); - correct->GetTypedTuple(i, expected.data()); - - std::cout << "Gradient[ i ] should look like: " << std::endl; - std::cout << expected[0] << ", " << expected[1] << ", " << expected[2] << std::endl; - if(numberOfComponents > 3) - { - std::cout << expected[3] << ", " << expected[4] << ", " << expected[5] << std::endl; - std::cout << expected[6] << ", " << expected[7] << ", " << expected[8] << std::endl; - } - - std::cout << "Gradient[ i ] actually looks like: " << std::endl; - std::cout << values[0] << ", " << values[1] << ", " << values[2] << std::endl; - if(numberOfComponents > 3) - { - std::cout << values[3] << ", " << values[4] << ", " << values[5] << std::endl; - std::cout << values[6] << ", " << values[7] << ", " << values[8] << std::endl; - } - std::cout << std::endl; + std::cout << expected[3] << ", " << expected[4] << ", " << expected[5] << std::endl; + std::cout << expected[6] << ", " << expected[7] << ", " << expected[8] << std::endl; } - if(i>10 && invalid) + std::cout << "Gradient[ i ] actually looks like: " << std::endl; + std::cout << values[0] << ", " << values[1] << ", " << values[2] << std::endl; + if (numberOfComponents > 3) { - return 0; + std::cout << values[3] << ", " << values[4] << ", " << values[5] << std::endl; + std::cout << values[6] << ", " << values[7] << ", " << values[8] << std::endl; } + std::cout << std::endl; + } + + if (i > 10 && invalid) + { + return 0; } - return 1; } + return 1; +} //----------------------------------------------------------------------------- // we assume that the gradients are correct and so we can compute the "real" // vorticity from it - int IsVorticityCorrect(vtkDoubleArray* gradients, vtkDoubleArray* vorticity) +int IsVorticityCorrect(vtkDoubleArray* gradients, vtkDoubleArray* vorticity) +{ + if (gradients->GetNumberOfComponents() != 9 || vorticity->GetNumberOfComponents() != 3) + { + vtkGenericWarningMacro("Bad number of components."); + return 0; + } + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) { - if(gradients->GetNumberOfComponents() != 9 || - vorticity->GetNumberOfComponents() != 3) + double* g = gradients->GetTuple(i); + double* v = vorticity->GetTuple(i); + if (!test_equal(v[0], g[7] - g[5])) { - vtkGenericWarningMacro("Bad number of components."); + vtkGenericWarningMacro("Bad vorticity[0] value " + << v[0] << " " << g[7] - g[5] << " difference is " << (v[0] - g[7] + g[5])); return 0; } - for(vtkIdType i=0;iGetNumberOfTuples();i++) + else if (!test_equal(v[1], g[2] - g[6])) { - double* g = gradients->GetTuple(i); - double* v = vorticity->GetTuple(i); - if(!test_equal(v[0], g[7]-g[5])) - { - vtkGenericWarningMacro("Bad vorticity[0] value " << v[0] << " " << - g[7]-g[5] << " difference is " << (v[0]-g[7]+g[5])); - return 0; - } - else if(!test_equal(v[1], g[2]-g[6])) - { - vtkGenericWarningMacro("Bad vorticity[1] value " << v[1] << " " << - g[2]-g[6] << " difference is " << (v[1]-g[2]+g[6])); - return 0; - } - else if(!test_equal(v[2], g[3]-g[1])) - { - vtkGenericWarningMacro("Bad vorticity[2] value " << v[2] << " " << - g[3]-g[1] << " difference is " << (v[2]-g[3]+g[1])); - return 0; - } + vtkGenericWarningMacro("Bad vorticity[1] value " + << v[1] << " " << g[2] - g[6] << " difference is " << (v[1] - g[2] + g[6])); + return 0; + } + else if (!test_equal(v[2], g[3] - g[1])) + { + vtkGenericWarningMacro("Bad vorticity[2] value " + << v[2] << " " << g[3] - g[1] << " difference is " << (v[2] - g[3] + g[1])); + return 0; } - - return 1; } + return 1; +} + //----------------------------------------------------------------------------- // we assume that the gradients are correct and so we can compute the "real" // Q criterion from it - int IsQCriterionCorrect(vtkDoubleArray* gradients, vtkDoubleArray* qCriterion) +int IsQCriterionCorrect(vtkDoubleArray* gradients, vtkDoubleArray* qCriterion) +{ + if (gradients->GetNumberOfComponents() != 9 || qCriterion->GetNumberOfComponents() != 1) + { + vtkGenericWarningMacro("Bad number of components."); + return 0; + } + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) { - if(gradients->GetNumberOfComponents() != 9 || - qCriterion->GetNumberOfComponents() != 1) + double* g = gradients->GetTuple(i); + double qc = qCriterion->GetValue(i); + + double t1 = .25 * + ((g[7] - g[5]) * (g[7] - g[5]) + (g[3] - g[1]) * (g[3] - g[1]) + + (g[2] - g[6]) * (g[2] - g[6])); + double t2 = .5 * + (g[0] * g[0] + g[4] * g[4] + g[8] * g[8] + + .5 * + ((g[3] + g[1]) * (g[3] + g[1]) + (g[6] + g[2]) * (g[6] + g[2]) + + (g[7] + g[5]) * (g[7] + g[5]))); + + if (!test_equal(qc, t1 - t2)) { - vtkGenericWarningMacro("Bad number of components."); + vtkGenericWarningMacro( + "Bad Q-criterion value " << qc << " " << t1 - t2 << " difference is " << (qc - t1 + t2)); return 0; } - for(vtkIdType i=0;iGetNumberOfTuples();i++) - { - double* g = gradients->GetTuple(i); - double qc = qCriterion->GetValue(i); - - double t1 = .25*( - (g[7]-g[5])*(g[7]-g[5]) + - (g[3]-g[1])*(g[3]-g[1]) + - (g[2]-g[6])*(g[2]-g[6]) ); - double t2 = .5 * ( g[0]*g[0]+g[4]*g[4]+ - g[8]*g[8]+ .5 *( - (g[3]+g[1])*(g[3]+g[1]) + - (g[6]+g[2])*(g[6]+g[2]) + - (g[7]+g[5])*(g[7]+g[5]) ) ); - - if(!test_equal(qc, t1 - t2)) - { - vtkGenericWarningMacro("Bad Q-criterion value " << qc << " " << - t1-t2 << " difference is " << (qc-t1+t2)); - return 0; - } - } - - return 1; } + return 1; +} + //----------------------------------------------------------------------------- // we assume that the gradients are correct and so we can compute the "real" // divergence from it - int IsDivergenceCorrect(vtkDoubleArray* gradients, vtkDoubleArray* divergence) +int IsDivergenceCorrect(vtkDoubleArray* gradients, vtkDoubleArray* divergence) +{ + if (gradients->GetNumberOfComponents() != 9 || divergence->GetNumberOfComponents() != 1) + { + vtkGenericWarningMacro("Bad number of components."); + return 0; + } + for (vtkIdType i = 0; i < gradients->GetNumberOfTuples(); i++) { - if(gradients->GetNumberOfComponents() != 9 || - divergence->GetNumberOfComponents() != 1) + double* g = gradients->GetTuple(i); + double div = divergence->GetValue(i); + double gValue = g[0] + g[4] + g[8]; + + if (!test_equal(div, gValue)) { - vtkGenericWarningMacro("Bad number of components."); + vtkGenericWarningMacro( + "Bad divergence value " << div << " " << gValue << " difference is " << (div - gValue)); return 0; } - for(vtkIdType i=0;iGetNumberOfTuples();i++) - { - double* g = gradients->GetTuple(i); - double div = divergence->GetValue(i); - double gValue = g[0]+g[4]+g[8]; - - if(!test_equal(div, gValue)) - { - vtkGenericWarningMacro("Bad divergence value " << div << " " << - gValue << " difference is " << (div-gValue)); - return 0; - } - } - - return 1; } + return 1; +} + //----------------------------------------------------------------------------- - int PerformTest(vtkDataSet* grid) +int PerformTest(vtkDataSet* grid) +{ + // Cleaning out the existing field data so that I can replace it with + // an analytic function that I know the gradient of + grid->GetPointData()->Initialize(); + grid->GetCellData()->Initialize(); + const char fieldName[] = "LinearField"; + int offset = 1; + const int numberOfComponents = 3; + CreateCellData(grid, numberOfComponents, offset, fieldName); + CreatePointData(grid, numberOfComponents, offset, fieldName); + + const char resultName[] = "Result"; + + VTK_CREATE(vtkmGradient, cellGradients); + cellGradients->SetInputData(grid); + cellGradients->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName); + cellGradients->SetResultArrayName(resultName); + + VTK_CREATE(vtkGradientFilter, correctCellGradients); + correctCellGradients->SetInputData(grid); + correctCellGradients->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName); + correctCellGradients->SetResultArrayName(resultName); + + VTK_CREATE(vtkmGradient, pointGradients); + pointGradients->SetInputData(grid); + pointGradients->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); + pointGradients->SetResultArrayName(resultName); + + VTK_CREATE(vtkGradientFilter, correctPointGradients); + correctPointGradients->SetInputData(grid); + correctPointGradients->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); + correctPointGradients->SetResultArrayName(resultName); + + cellGradients->Update(); + pointGradients->Update(); + + correctCellGradients->Update(); + correctPointGradients->Update(); + + vtkDoubleArray* gradCellArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(cellGradients->GetOutput())->GetCellData()->GetArray(resultName)); + + vtkDoubleArray* correctCellArray = + vtkArrayDownCast(vtkDataSet::SafeDownCast(correctCellGradients->GetOutput()) + ->GetCellData() + ->GetArray(resultName)); + + if (!grid->IsA("vtkStructuredGrid")) { - // Cleaning out the existing field data so that I can replace it with - // an analytic function that I know the gradient of - grid->GetPointData()->Initialize(); - grid->GetCellData()->Initialize(); - const char fieldName[] = "LinearField"; - int offset = 1; - const int numberOfComponents = 3; - CreateCellData(grid, numberOfComponents, offset, fieldName); - CreatePointData(grid, numberOfComponents, offset, fieldName); - - const char resultName[] = "Result"; - - VTK_CREATE(vtkmGradient, cellGradients); - cellGradients->SetInputData(grid); - cellGradients->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName); - cellGradients->SetResultArrayName(resultName); - - VTK_CREATE(vtkGradientFilter, correctCellGradients); - correctCellGradients->SetInputData(grid); - correctCellGradients->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName); - correctCellGradients->SetResultArrayName(resultName); - - VTK_CREATE(vtkmGradient, pointGradients); - pointGradients->SetInputData(grid); - pointGradients->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); - pointGradients->SetResultArrayName(resultName); - - VTK_CREATE(vtkGradientFilter, correctPointGradients); - correctPointGradients->SetInputData(grid); - correctPointGradients->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); - correctPointGradients->SetResultArrayName(resultName); - - cellGradients->Update(); - pointGradients->Update(); - - correctCellGradients->Update(); - correctPointGradients->Update(); - - vtkDoubleArray* gradCellArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - cellGradients->GetOutput())->GetCellData()->GetArray(resultName)); - - vtkDoubleArray* correctCellArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - correctCellGradients->GetOutput())->GetCellData()->GetArray(resultName)); - - if(!grid->IsA("vtkStructuredGrid")) + // ignore cell gradients on structured grids as the version for + // VTK-m differs from VTK. Once VTK-m is able to do stencil based + // gradients for point and cells, we can enable this check. + if (!IsGradientCorrect(gradCellArray, correctCellArray)) { - // ignore cell gradients on structured grids as the version for - // VTK-m differs from VTK. Once VTK-m is able to do stencil based - // gradients for point and cells, we can enable this check. - if(!IsGradientCorrect(gradCellArray, correctCellArray)) - { - return EXIT_FAILURE; - } + return EXIT_FAILURE; } + } - vtkDoubleArray* gradPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointGradients->GetOutput())->GetPointData()->GetArray(resultName)); - - vtkDoubleArray* correctPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - correctPointGradients->GetOutput())->GetPointData()->GetArray(resultName)); + vtkDoubleArray* gradPointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointGradients->GetOutput())->GetPointData()->GetArray(resultName)); - if(!IsGradientCorrect(gradPointArray, correctPointArray)) - { - return EXIT_FAILURE; - } + vtkDoubleArray* correctPointArray = + vtkArrayDownCast(vtkDataSet::SafeDownCast(correctPointGradients->GetOutput()) + ->GetPointData() + ->GetArray(resultName)); - // now check on the vorticity calculations - VTK_CREATE(vtkmGradient, cellVorticity); - cellVorticity->SetInputData(grid); - cellVorticity->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName); - cellVorticity->SetResultArrayName(resultName); - cellVorticity->SetComputeVorticity(1); - cellVorticity->Update(); - - VTK_CREATE(vtkmGradient, pointVorticity); - pointVorticity->SetInputData(grid); - pointVorticity->SetInputScalars( - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); - pointVorticity->SetResultArrayName(resultName); - pointVorticity->SetComputeVorticity(1); - pointVorticity->SetComputeQCriterion(1); - pointVorticity->SetComputeDivergence(1); - pointVorticity->Update(); - - // cell stuff - vtkDoubleArray* vorticityCellArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - cellVorticity->GetOutput())->GetCellData()->GetArray("Vorticity")); - if(!IsVorticityCorrect(gradCellArray, vorticityCellArray)) - { - return EXIT_FAILURE; - } + if (!IsGradientCorrect(gradPointArray, correctPointArray)) + { + return EXIT_FAILURE; + } - // point stuff - vtkDoubleArray* vorticityPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointVorticity->GetOutput())->GetPointData()->GetArray("Vorticity")); - if(!IsVorticityCorrect(gradPointArray, vorticityPointArray)) - { - return EXIT_FAILURE; - } + // now check on the vorticity calculations + VTK_CREATE(vtkmGradient, cellVorticity); + cellVorticity->SetInputData(grid); + cellVorticity->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName); + cellVorticity->SetResultArrayName(resultName); + cellVorticity->SetComputeVorticity(1); + cellVorticity->Update(); + + VTK_CREATE(vtkmGradient, pointVorticity); + pointVorticity->SetInputData(grid); + pointVorticity->SetInputScalars(vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName); + pointVorticity->SetResultArrayName(resultName); + pointVorticity->SetComputeVorticity(1); + pointVorticity->SetComputeQCriterion(1); + pointVorticity->SetComputeDivergence(1); + pointVorticity->Update(); + + // cell stuff + vtkDoubleArray* vorticityCellArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(cellVorticity->GetOutput())->GetCellData()->GetArray("Vorticity")); + if (!IsVorticityCorrect(gradCellArray, vorticityCellArray)) + { + return EXIT_FAILURE; + } - vtkDoubleArray* divergencePointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointVorticity->GetOutput())->GetPointData()->GetArray("Divergence")); - if(!IsDivergenceCorrect(gradPointArray, divergencePointArray)) - { - return EXIT_FAILURE; - } + // point stuff + vtkDoubleArray* vorticityPointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointVorticity->GetOutput())->GetPointData()->GetArray("Vorticity")); + if (!IsVorticityCorrect(gradPointArray, vorticityPointArray)) + { + return EXIT_FAILURE; + } - vtkDoubleArray* qCriterionPointArray = vtkArrayDownCast( - vtkDataSet::SafeDownCast( - pointVorticity->GetOutput())->GetPointData()->GetArray("Q-criterion")); - if(!IsQCriterionCorrect(gradPointArray, qCriterionPointArray)) - { - return EXIT_FAILURE; - } + vtkDoubleArray* divergencePointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointVorticity->GetOutput())->GetPointData()->GetArray("Divergence")); + if (!IsDivergenceCorrect(gradPointArray, divergencePointArray)) + { + return EXIT_FAILURE; + } - return EXIT_SUCCESS; + vtkDoubleArray* qCriterionPointArray = vtkArrayDownCast( + vtkDataSet::SafeDownCast(pointVorticity->GetOutput())->GetPointData()->GetArray("Q-criterion")); + if (!IsQCriterionCorrect(gradPointArray, qCriterionPointArray)) + { + return EXIT_FAILURE; } + + return EXIT_SUCCESS; +} } // end local namespace //----------------------------------------------------------------------------- -int TestVTKMGradientAndVorticity(int argc, char *argv[]) +int TestVTKMGradientAndVorticity(int argc, char* argv[]) { int i; // Need to get the data root. - const char *data_root = nullptr; - for (i = 0; i < argc-1; i++) + const char* data_root = nullptr; + for (i = 0; i < argc - 1; i++) { if (strcmp("-D", argv[i]) == 0) { - data_root = argv[i+1]; + data_root = argv[i + 1]; break; } } if (!data_root) { - vtkGenericWarningMacro( - "Need to specify the directory to VTK_DATA_ROOT with -D ."); + vtkGenericWarningMacro("Need to specify the directory to VTK_DATA_ROOT with -D ."); return EXIT_FAILURE; } - vtkStdString filename(std::string(data_root)+"/Data/SampleStructGrid.vtk"); + vtkStdString filename(std::string(data_root) + "/Data/SampleStructGrid.vtk"); VTK_CREATE(vtkStructuredGridReader, structuredGridReader); structuredGridReader->SetFileName(filename.c_str()); structuredGridReader->Update(); - vtkDataSet* grid = vtkDataSet::SafeDownCast( - structuredGridReader->GetOutput()); + vtkDataSet* grid = vtkDataSet::SafeDownCast(structuredGridReader->GetOutput()); - if(PerformTest(grid)) + if (PerformTest(grid)) { return EXIT_FAILURE; } @@ -416,7 +398,7 @@ int TestVTKMGradientAndVorticity(int argc, char *argv[]) VTK_CREATE(vtkUnstructuredGrid, ug); ug->SetPoints(vtkStructuredGrid::SafeDownCast(grid)->GetPoints()); ug->Allocate(grid->GetNumberOfCells()); - for(vtkIdType id=0;idGetNumberOfCells();id++) + for (vtkIdType id = 0; id < grid->GetNumberOfCells(); id++) { vtkCell* cell = grid->GetCell(id); ug->InsertNextCell(cell->GetCellType(), cell->GetPointIds()); diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMHistogram.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMHistogram.cxx index ad362a5f49..ae3af25ff3 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMHistogram.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMHistogram.cxx @@ -35,11 +35,12 @@ #include "vtkTable.h" #include "vtkUnstructuredGrid.h" -namespace { +namespace +{ const int xVerts = 20; const int yVerts = 50; -void AddArrayToVTKData(std::string scalarName, vtkDataSetAttributes* pd, - double* data, vtkIdType size) +void AddArrayToVTKData( + std::string scalarName, vtkDataSetAttributes* pd, double* data, vtkIdType size) { vtkNew scalars; scalars->SetArray(data, size, 1); @@ -47,7 +48,7 @@ void AddArrayToVTKData(std::string scalarName, vtkDataSetAttributes* pd, pd->AddArray(scalars); } -void MakeStatDistDataSet (vtkDataSet* dataset) +void MakeStatDistDataSet(vtkDataSet* dataset) { const int nVerts = xVerts * yVerts; @@ -247,57 +248,58 @@ void MakeStatDistDataSet (vtkDataSet* dataset) // Due to the fact that SetScalars API on vtkDataSetAttributes would add the array // and replace it with the existing scalars, we need to add data as point arrays, then // switch active scalars when needed. - AddArrayToVTKData("p_poission", pd, poisson, nVerts); - AddArrayToVTKData("p_normal", pd, normal, nVerts); + AddArrayToVTKData("p_poission", pd, poisson, nVerts); + AddArrayToVTKData("p_normal", pd, normal, nVerts); AddArrayToVTKData("p_chiSquare", pd, chiSquare, nVerts); - AddArrayToVTKData("p_uniform", pd, uniform, nVerts); + AddArrayToVTKData("p_uniform", pd, uniform, nVerts); // Set cell scalars - AddArrayToVTKData("c_poission", cd, poisson, nCells); - AddArrayToVTKData("c_normal", cd, normal, nCells); + AddArrayToVTKData("c_poission", cd, poisson, nCells); + AddArrayToVTKData("c_normal", cd, normal, nCells); AddArrayToVTKData("c_chiSquare", cd, chiSquare, nCells); - AddArrayToVTKData("c_uniform", cd, uniform, nCells); + AddArrayToVTKData("c_uniform", cd, uniform, nCells); // Add a simple data to test custom data range and center bins around min and max - static double simpleData[6] = {0, 2, 4, 6, 8, 10}; + static double simpleData[6] = { 0, 2, 4, 6, 8, 10 }; AddArrayToVTKData("simple_data", pd, simpleData, 6); } void VerifyHistogram(vtkmHistogram* filter, bool verifyPointData) { vtkTable* table = vtkTable::SafeDownCast(filter->GetOutput()); - assert (table != nullptr); - vtkDoubleArray* binExtents = vtkDoubleArray::SafeDownCast(table->GetRowData()->GetArray("bin_extents")); + assert(table != nullptr); + vtkDoubleArray* binExtents = + vtkDoubleArray::SafeDownCast(table->GetRowData()->GetArray("bin_extents")); if (binExtents == nullptr) { - std::cout << "bin_extents is missing from the result vtkTable" <GetNumberOfComponents() == 1); assert(static_cast(binExtents->GetNumberOfTuples()) == filter->GetNumberOfBins()); - vtkDataArray* binValues = vtkDataArray::SafeDownCast(table->GetRowData()-> - GetAbstractArray("bin_values")); + vtkDataArray* binValues = + vtkDataArray::SafeDownCast(table->GetRowData()->GetAbstractArray("bin_values")); assert(binValues != nullptr); double sum = 0; vtkIdType numberOfBins = static_cast(filter->GetNumberOfBins()); - for (vtkIdType i =0; i < numberOfBins; i++) + for (vtkIdType i = 0; i < numberOfBins; i++) { - sum += binValues->GetComponent(i,0); + sum += binValues->GetComponent(i, 0); } - double rightSum = verifyPointData ? xVerts * yVerts : (xVerts - 1) * (yVerts -1); - assert (sum == rightSum); + double rightSum = verifyPointData ? xVerts * yVerts : (xVerts - 1) * (yVerts - 1); + assert(sum == rightSum); if (sum != rightSum) { std::cout << "sum does not much!" << std::endl; } } -void testHistogramWithPointData (vtkmHistogram* filter, bool isPointType) +void testHistogramWithPointData(vtkmHistogram* filter, bool isPointType) { - int fieldAsso = isPointType ? vtkDataObject::FIELD_ASSOCIATION_POINTS : - vtkDataObject::FIELD_ASSOCIATION_CELLS; + int fieldAsso = + isPointType ? vtkDataObject::FIELD_ASSOCIATION_POINTS : vtkDataObject::FIELD_ASSOCIATION_CELLS; std::string prefix = isPointType ? "p_" : "c_"; filter->SetNumberOfBins(10); std::string scalarName = prefix + "poission"; @@ -308,22 +310,19 @@ void testHistogramWithPointData (vtkmHistogram* filter, bool isPointType) filter->SetNumberOfBins(100); scalarName = prefix + "normal"; - filter->SetInputArrayToProcess(0, 0, 0, - fieldAsso, scalarName.c_str()); + filter->SetInputArrayToProcess(0, 0, 0, fieldAsso, scalarName.c_str()); filter->Update(); VerifyHistogram(filter, isPointType); filter->SetNumberOfBins(1); scalarName = prefix + "chiSquare"; - filter->SetInputArrayToProcess(0, 0, 0, - fieldAsso, scalarName.c_str()); + filter->SetInputArrayToProcess(0, 0, 0, fieldAsso, scalarName.c_str()); filter->Update(); VerifyHistogram(filter, isPointType); filter->SetNumberOfBins(1000000); scalarName = prefix + "uniform"; - filter->SetInputArrayToProcess(0, 0, 0, - fieldAsso, scalarName.c_str()); + filter->SetInputArrayToProcess(0, 0, 0, fieldAsso, scalarName.c_str()); filter->Update(); VerifyHistogram(filter, isPointType); } @@ -352,22 +351,20 @@ int TestVTKMHistogram(int, char*[]) filter->SetCenterBinsAroundMinAndMax(true); filter->SetUseCustomBinRanges(true); filter->SetCustomBinRange(2, 8); - filter->SetInputArrayToProcess(0, 0, 0, - vtkDataObject::FIELD_ASSOCIATION_POINTS, - "simple_data"); + filter->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "simple_data"); filter->Update(); vtkTable* sdTable = vtkTable::SafeDownCast(filter->GetOutput()); assert(sdTable != nullptr); - vtkDoubleArray* binExtents = vtkDoubleArray::SafeDownCast( - sdTable->GetRowData()->GetArray("bin_extents")); - double binExtentsResult[4] = {2, 4, 6, 8}; - double binValuesResult[4] = {2, 1, 1, 2}; + vtkDoubleArray* binExtents = + vtkDoubleArray::SafeDownCast(sdTable->GetRowData()->GetArray("bin_extents")); + double binExtentsResult[4] = { 2, 4, 6, 8 }; + double binValuesResult[4] = { 2, 1, 1, 2 }; for (vtkIdType i = 0; i < binExtents->GetNumberOfTuples(); i++) { assert(binExtents->GetComponent(i, 0) == binExtentsResult[i]); if (binExtents->GetComponent(i, 0) != binExtentsResult[i]) { - std::cout << "bin_extents result does match at i=" << i <GetRowData()->GetAbstractArray("bin_values")); assert(binValues != nullptr); for (vtkIdType i = 0; i < binValues->GetNumberOfTuples(); i++) { assert(binValues->GetComponent(i, 0) == binValuesResult[i]); if (binValues->GetComponent(i, 0) != binValuesResult[i]) { - std::cout << "bin_values result does match at i=" << i < png; png->SetInputConnection(w2i->GetOutputPort()); @@ -309,8 +309,7 @@ void RunBenchmark(int gridSize) #ifdef FORCE_VTKM_DEVICE - vtkm::cont::RuntimeDeviceTracker tracker = - vtkm::cont::GetRuntimeDeviceTracker(); + vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker(); // Run VTKm vtkSmartPointer vtkmResultSerial; @@ -368,56 +367,48 @@ void RunBenchmark(int gridSize) vtkResult = generator.Result; } - std::cerr << "Results for a " - << gridSize << "x" << gridSize << "x" << gridSize << " grid.\n" - << "Input dataset has " << input->GetNumberOfPoints() << " points " - "and " << input->GetNumberOfCells() << " cells.\n"; + std::cerr << "Results for a " << gridSize << "x" << gridSize << "x" << gridSize << " grid.\n" + << "Input dataset has " << input->GetNumberOfPoints() + << " points " + "and " + << input->GetNumberOfCells() << " cells.\n"; #ifdef FORCE_VTKM_DEVICE - std::cerr << "vtkmLevelOfDetail (serial, average clustered points): " - << vtkmTimeSerial << " seconds, " - << vtkmResultSerial->GetNumberOfPoints() << " points, " + std::cerr << "vtkmLevelOfDetail (serial, average clustered points): " << vtkmTimeSerial + << " seconds, " << vtkmResultSerial->GetNumberOfPoints() << " points, " << vtkmResultSerial->GetNumberOfCells() << " cells.\n"; #ifdef VTKM_ENABLE_TBB if (tbbDeviceValid) { - std::cerr << "vtkmLevelOfDetail (tbb, average clustered points): " - << vtkmTimeTBB << " seconds, " - << vtkmResultTBB->GetNumberOfPoints() << " points, " + std::cerr << "vtkmLevelOfDetail (tbb, average clustered points): " << vtkmTimeTBB + << " seconds, " << vtkmResultTBB->GetNumberOfPoints() << " points, " << vtkmResultTBB->GetNumberOfCells() << " cells.\n"; } #endif // VTKM_ENABLE_TBB #else // !FORCE_VTKM_DEVICE - std::cerr << "vtkmLevelOfDetail (average clustered points): " - << vtkmTime << " seconds, " - << vtkmResult->GetNumberOfPoints() << " points, " - << vtkmResult->GetNumberOfCells() << " cells.\n"; + std::cerr << "vtkmLevelOfDetail (average clustered points): " << vtkmTime << " seconds, " + << vtkmResult->GetNumberOfPoints() << " points, " << vtkmResult->GetNumberOfCells() + << " cells.\n"; #endif // !FORCE_VTKM_DEVICE - std::cerr << "vtkQuadricClustering (average clustered points): " - << vtkTimeAvePts << " seconds, " + std::cerr << "vtkQuadricClustering (average clustered points): " << vtkTimeAvePts << " seconds, " << vtkResultAvePts->GetNumberOfPoints() << " points, " << vtkResultAvePts->GetNumberOfCells() << " cells.\n" - << "vtkQuadricClustering (reuse input points): " - << vtkTime << " seconds, " - << vtkResult->GetNumberOfPoints() << " points, " - << vtkResult->GetNumberOfCells() << " cells.\n"; + << "vtkQuadricClustering (reuse input points): " << vtkTime << " seconds, " + << vtkResult->GetNumberOfPoints() << " points, " << vtkResult->GetNumberOfCells() + << " cells.\n"; #ifdef FORCE_VTKM_DEVICE #ifdef VTKM_ENABLE_TBB - RenderResults(gridSize, input, - vtkmTimeTBB, vtkmResultTBB, - vtkTime, vtkResult); + RenderResults(gridSize, input, vtkmTimeTBB, vtkmResultTBB, vtkTime, vtkResult); #endif // VTKM_ENABLE_TBB -#else // !FORCE_VTKM_DEVICE - RenderResults(gridSize, input, - vtkmTime, vtkmResult, - vtkTime, vtkResult); +#else // !FORCE_VTKM_DEVICE + RenderResults(gridSize, input, vtkmTime, vtkmResult, vtkTime, vtkResult); #endif // !FORCE_VTKM_DEVICE } @@ -432,7 +423,7 @@ void RunBenchmarks() } // end anon namespace -int TestVTKMLevelOfDetail(int argc, char *argv[]) +int TestVTKMLevelOfDetail(int argc, char* argv[]) { bool doBenchmarks = false; @@ -461,8 +452,7 @@ int TestVTKMLevelOfDetail(int argc, char *argv[]) //--------------------------------------------------- // Load file and make only triangles //--------------------------------------------------- - char* fname = - vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cow.vtp"); + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cow.vtp"); vtkNew reader; reader->SetFileName(fname); delete[] fname; @@ -477,25 +467,25 @@ int TestVTKMLevelOfDetail(int argc, char *argv[]) // levels of subdivision to make sure it is working properly //--------------------------------------------------- - std::vector< vtkNew > levelOfDetails(4); - std::vector< vtkNew > surfaces(4); - std::vector< vtkNew > mappers(4); - std::vector< vtkNew > actors(4); + std::vector > levelOfDetails(4); + std::vector > surfaces(4); + std::vector > mappers(4); + std::vector > actors(4); - for (int i=0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { levelOfDetails[i]->SetInputConnection(clean->GetOutputPort()); - //subdivision levels of 16, 32, 48, 64 - levelOfDetails[i]->SetNumberOfXDivisions( ((i+1) * 16) ); - levelOfDetails[i]->SetNumberOfYDivisions( ((i+1) * 16) ); - levelOfDetails[i]->SetNumberOfZDivisions( ((i+1) * 16)); + // subdivision levels of 16, 32, 48, 64 + levelOfDetails[i]->SetNumberOfXDivisions(((i + 1) * 16)); + levelOfDetails[i]->SetNumberOfYDivisions(((i + 1) * 16)); + levelOfDetails[i]->SetNumberOfZDivisions(((i + 1) * 16)); surfaces[i]->SetInputConnection(levelOfDetails[i]->GetOutputPort()); mappers[i]->SetInputConnection(surfaces[i]->GetOutputPort()); actors[i]->SetMapper(mappers[i]); - actors[i]->SetPosition((i % 2) * 10, -(i / 2) * 10, 0); + actors[i]->SetPosition((i % 2) * 10, -(i / 2) * 10, 0); ren->AddActor(actors[i]); } @@ -508,7 +498,7 @@ int TestVTKMLevelOfDetail(int argc, char *argv[]) renWin->Render(); int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) + if (retVal == vtkRegressionTester::DO_INTERACTOR) { iren->Start(); retVal = vtkRegressionTester::PASSED; diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes.cxx index 55c3eac1d7..393675ca25 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes.cxx @@ -30,8 +30,8 @@ namespace { -template -int RunVTKPipeline(T *t, int argc, char* argv[]) +template +int RunVTKPipeline(T* t, int argc, char* argv[]) { vtkNew ren; vtkNew renWin; @@ -43,10 +43,9 @@ int RunVTKPipeline(T *t, int argc, char* argv[]) vtkNew cubes; cubes->SetInputConnection(t->GetOutputPort()); - cubes->SetInputArrayToProcess( - 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "Iterations"); + cubes->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "Iterations"); cubes->SetNumberOfContours(1); - cubes->SetValue(0,50.5f); + cubes->SetValue(0, 50.5f); cubes->ComputeScalarsOn(); cubes->ComputeNormalsOn(); @@ -65,13 +64,13 @@ int RunVTKPipeline(T *t, int argc, char* argv[]) renWin->Render(); int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) - { + if (retVal == vtkRegressionTester::DO_INTERACTOR) + { iren->Start(); retVal = vtkRegressionTester::PASSED; - } + } - vtkDataSet *output = cubes->GetOutput(); + vtkDataSet* output = cubes->GetOutput(); if (!output->GetPointData()->GetNormals()) { @@ -79,7 +78,7 @@ int RunVTKPipeline(T *t, int argc, char* argv[]) return EXIT_FAILURE; } - vtkDataArray *cellvar = output->GetCellData()->GetArray("Vertex Count"); + vtkDataArray* cellvar = output->GetCellData()->GetArray("Vertex Count"); if (!cellvar) { std::cerr << "Cell data missing.\n"; @@ -89,8 +88,8 @@ int RunVTKPipeline(T *t, int argc, char* argv[]) if (cellvar->GetNumberOfTuples() != output->GetNumberOfCells()) { std::cerr << "Mapped cell field does not match number of output cells.\n" - << "Expected: " << output->GetNumberOfCells() << " Actual: " - << cellvar->GetNumberOfTuples() << "\n"; + << "Expected: " << output->GetNumberOfCells() + << " Actual: " << cellvar->GetNumberOfTuples() << "\n"; return EXIT_FAILURE; } @@ -99,15 +98,13 @@ int RunVTKPipeline(T *t, int argc, char* argv[]) } // Anonymous namespace - - int TestVTKMMarchingCubes(int argc, char* argv[]) { - //create the sample grid + // create the sample grid vtkNew src; - src->SetWholeExtent(0,250,0,250,0,250); + src->SetWholeExtent(0, 250, 0, 250, 0, 250); - //create a secondary field for interpolation + // create a secondary field for interpolation vtkNew elevation; elevation->SetInputConnection(src->GetOutputPort()); elevation->SetScalarRange(0.0, 1.0); @@ -117,6 +114,6 @@ int TestVTKMMarchingCubes(int argc, char* argv[]) vtkNew countVerts; countVerts->SetInputConnection(elevation->GetOutputPort()); - //run the pipeline - return RunVTKPipeline(countVerts.GetPointer(),argc,argv); + // run the pipeline + return RunVTKPipeline(countVerts.GetPointer(), argc, argv); } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes2.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes2.cxx index 00d61f5054..0239c0d17a 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes2.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMMarchingCubes2.cxx @@ -48,8 +48,7 @@ int TestVTKMMarchingCubes2(int argc, char* argv[]) vtkNew cg; cg->SetInputConnection(ev->GetOutputPort()); - cg->SetInputArrayToProcess( - 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "RTData"); + cg->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "RTData"); cg->SetValue(0, 200.0); cg->SetValue(1, 220.0); cg->ComputeScalarsOn(); @@ -70,11 +69,11 @@ int TestVTKMMarchingCubes2(int argc, char* argv[]) renWin->Render(); int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) - { + if (retVal == vtkRegressionTester::DO_INTERACTOR) + { iren->Start(); retVal = vtkRegressionTester::PASSED; - } + } if (!cg->GetOutput()->GetPointData()->GetNormals()) { diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMNDHistogram.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMNDHistogram.cxx index adfa278c60..3ea4c777f1 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMNDHistogram.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMNDHistogram.cxx @@ -29,19 +29,21 @@ #include "vtkSparseArray.h" #include "vtkTable.h" -namespace { -static const std::vector arrayNames = {"temperature0", "temperature1", - "temperature2", "temperature3"}; -static const std::vector> resultBins = - {{0, 0, 1, 1, 2, 2, 3, 3}, - {0, 1, 1, 2, 2, 3, 3, 4}, - {0, 1, 2, 2, 3, 4, 4, 5}, - {0, 1, 2, 3, 3, 4, 5, 6},}; -static const std::vector resultFrequency = {2, 1, 1, 1, 1, 1, 1, 2}; +namespace +{ +static const std::vector arrayNames = { "temperature0", "temperature1", "temperature2", + "temperature3" }; +static const std::vector > resultBins = { + { 0, 0, 1, 1, 2, 2, 3, 3 }, + { 0, 1, 1, 2, 2, 3, 3, 4 }, + { 0, 1, 2, 2, 3, 4, 4, 5 }, + { 0, 1, 2, 3, 3, 4, 5, 6 }, +}; +static const std::vector resultFrequency = { 2, 1, 1, 1, 1, 1, 1, 2 }; static const int nData = 10; -static const std::vector bins = {4,5,6,7}; -void AddArrayToVTKData(std::string scalarName, vtkDataSetAttributes* pd, - double* data, vtkIdType size) +static const std::vector bins = { 4, 5, 6, 7 }; +void AddArrayToVTKData( + std::string scalarName, vtkDataSetAttributes* pd, double* data, vtkIdType size) { vtkNew scalars; scalars->SetArray(data, size, 1); @@ -76,7 +78,7 @@ int TestVTKMNDHistogram(int, char*[]) vtkNew filter; filter->SetInputData(ds); size_t index = 0; - for (const auto& an: arrayNames) + for (const auto& an : arrayNames) { filter->AddFieldAndBin(an, bins[index++]); } @@ -90,33 +92,31 @@ int TestVTKMNDHistogram(int, char*[]) // Validate the delta and range auto range = filter->GetDataRange(i); double delta = filter->GetBinDelta(i); - if (range.first != 0.0 || range.second != (i+1)* 9) + if (range.first != 0.0 || range.second != (i + 1) * 9) { - std::cout << "array index=" << i << " does not have right range" <* sa = static_cast*>(arrayData->GetArray(0)); + vtkSparseArray* sa = static_cast*>(arrayData->GetArray(0)); vtkArrayCoordinates coordinates; - const vtkIdType dimensions = sa->GetDimensions(); // 4 + const vtkIdType dimensions = sa->GetDimensions(); // 4 const vtkIdType non_null_size = sa->GetNonNullSize(); // 8 - for(vtkIdType n = 0; n != non_null_size; ++n) + for (vtkIdType n = 0; n != non_null_size; ++n) { sa->GetCoordinatesN(n, coordinates); - for(vtkIdType d = 0; d != dimensions; ++d) + for (vtkIdType d = 0; d != dimensions; ++d) { assert(coordinates[d] == static_cast(resultBins[d][n])); if (coordinates[d] != static_cast(resultBins[d][n])) { - std::cout << "value does not match at index " << n << - " dimension " << d <GetValue(coordinates)); } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointElevation.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointElevation.cxx index 353a5caac0..62aa3cc685 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointElevation.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointElevation.cxx @@ -36,65 +36,65 @@ namespace { - int RunVTKPipeline(vtkPlaneSource* plane, int argc, char* argv[]) - { - vtkNew ren; - vtkNew renWin; - vtkNew iren; +int RunVTKPipeline(vtkPlaneSource* plane, int argc, char* argv[]) +{ + vtkNew ren; + vtkNew renWin; + vtkNew iren; - renWin->AddRenderer(ren); - iren->SetRenderWindow(renWin); + renWin->AddRenderer(ren); + iren->SetRenderWindow(renWin); - vtkNew tf; - tf->SetInputConnection(plane->GetOutputPort()); - tf->Update(); + vtkNew tf; + tf->SetInputConnection(plane->GetOutputPort()); + tf->Update(); - vtkNew pd; - pd->CopyStructure(tf->GetOutput()); - vtkIdType numPts = pd->GetNumberOfPoints(); - vtkPoints* oldPts = tf->GetOutput()->GetPoints(); - vtkNew newPts; - newPts->SetNumberOfPoints(numPts); - for (vtkIdType i = 0; i < numPts; i++) - { - auto pt = oldPts->GetPoint(i); - auto r = sqrt(pow(pt[0],2) + pow(pt[1], 2)); - auto z = 1.5 * cos (2* r); - newPts->SetPoint(i, pt[0], pt[1], z); - } - pd->SetPoints(newPts); + vtkNew pd; + pd->CopyStructure(tf->GetOutput()); + vtkIdType numPts = pd->GetNumberOfPoints(); + vtkPoints* oldPts = tf->GetOutput()->GetPoints(); + vtkNew newPts; + newPts->SetNumberOfPoints(numPts); + for (vtkIdType i = 0; i < numPts; i++) + { + auto pt = oldPts->GetPoint(i); + auto r = sqrt(pow(pt[0], 2) + pow(pt[1], 2)); + auto z = 1.5 * cos(2 * r); + newPts->SetPoint(i, pt[0], pt[1], z); + } + pd->SetPoints(newPts); - vtkNew pe; - pe->SetInputData(pd); - pe->SetLowPoint(0, 0, -1.5); - pe->SetHighPoint(0, 0, 1.5); - pe->SetScalarRange(-1.5, 1.5); + vtkNew pe; + pe->SetInputData(pd); + pe->SetLowPoint(0, 0, -1.5); + pe->SetHighPoint(0, 0, 1.5); + pe->SetScalarRange(-1.5, 1.5); - vtkNew mapper; - mapper->SetInputConnection(pe->GetOutputPort()); - mapper->ScalarVisibilityOn(); - mapper->SelectColorArray("elevation"); + vtkNew mapper; + mapper->SetInputConnection(pe->GetOutputPort()); + mapper->ScalarVisibilityOn(); + mapper->SelectColorArray("elevation"); - vtkNew actor; - actor->SetMapper(mapper); + vtkNew actor; + actor->SetMapper(mapper); - // Add the actor to the renderer, set the background and size - ren->AddActor(actor); + // Add the actor to the renderer, set the background and size + ren->AddActor(actor); - ren->SetBackground(0, 0, 0); - vtkNew camera; - camera->SetPosition(1, 50, 50); - ren->SetActiveCamera(camera); - renWin->Render(); + ren->SetBackground(0, 0, 0); + vtkNew camera; + camera->SetPosition(1, 50, 50); + ren->SetActiveCamera(camera); + renWin->Render(); - int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) - { - iren->Start(); - retVal = vtkRegressionTester::PASSED; - } - return (!retVal); + int retVal = vtkRegressionTestImage(renWin); + if (retVal == vtkRegressionTester::DO_INTERACTOR) + { + iren->Start(); + retVal = vtkRegressionTester::PASSED; } + return (!retVal); +} } // Anonymous namespace int TestVTKMPointElevation(int argc, char* argv[]) diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointTransform.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointTransform.cxx index 12ca63b57c..710a5eae44 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointTransform.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMPointTransform.cxx @@ -35,63 +35,63 @@ #include "vtkTriangleFilter.h" #include "vtkmPointTransform.h" +namespace +{ +int RunVTKPipeline(vtkPlaneSource* plane, int argc, char* argv[]) +{ + vtkNew ren; + vtkNew renWin; + vtkNew iren; -namespace { - int RunVTKPipeline(vtkPlaneSource* plane, int argc, char* argv[]) - { - vtkNew ren; - vtkNew renWin; - vtkNew iren; - - renWin->AddRenderer(ren); - iren->SetRenderWindow(renWin); + renWin->AddRenderer(ren); + iren->SetRenderWindow(renWin); - vtkNew tf; - tf->SetInputConnection(plane->GetOutputPort()); - tf->Update(); + vtkNew tf; + tf->SetInputConnection(plane->GetOutputPort()); + tf->Update(); - vtkNew pd; - pd->CopyStructure(tf->GetOutput()); - vtkIdType numPts = pd->GetNumberOfPoints(); - vtkPoints* oldPts = tf->GetOutput()->GetPoints(); - vtkNew newPts; - newPts->SetNumberOfPoints(numPts); - for (vtkIdType i = 0; i < numPts; i++) - { - auto pt = oldPts->GetPoint(i); - auto r = sqrt(pow(pt[0],2) + pow(pt[1], 2)); - auto z = 1.5 * cos (2* r); - newPts->SetPoint(i, pt[0], pt[1], z); - } - pd->SetPoints(newPts); + vtkNew pd; + pd->CopyStructure(tf->GetOutput()); + vtkIdType numPts = pd->GetNumberOfPoints(); + vtkPoints* oldPts = tf->GetOutput()->GetPoints(); + vtkNew newPts; + newPts->SetNumberOfPoints(numPts); + for (vtkIdType i = 0; i < numPts; i++) + { + auto pt = oldPts->GetPoint(i); + auto r = sqrt(pow(pt[0], 2) + pow(pt[1], 2)); + auto z = 1.5 * cos(2 * r); + newPts->SetPoint(i, pt[0], pt[1], z); + } + pd->SetPoints(newPts); - vtkNew pf; - pf->SetInputData(pd); - vtkNew transformMatrix; - transformMatrix->RotateX(30); - transformMatrix->RotateY(60); - transformMatrix->RotateZ(90); - pf->SetTransform(transformMatrix); + vtkNew pf; + pf->SetInputData(pd); + vtkNew transformMatrix; + transformMatrix->RotateX(30); + transformMatrix->RotateY(60); + transformMatrix->RotateZ(90); + pf->SetTransform(transformMatrix); - vtkNew mapper; - mapper->SetInputConnection(pf->GetOutputPort()); + vtkNew mapper; + mapper->SetInputConnection(pf->GetOutputPort()); - vtkNew actor; - actor->SetMapper(mapper); + vtkNew actor; + actor->SetMapper(mapper); - ren->AddActor(actor); + ren->AddActor(actor); - ren->SetBackground(0.0, 0.0, 0.0); - renWin->Render(); + ren->SetBackground(0.0, 0.0, 0.0); + renWin->Render(); - int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) - { - iren->Start(); - retVal = vtkRegressionTester::PASSED; - } - return (!retVal); + int retVal = vtkRegressionTestImage(renWin); + if (retVal == vtkRegressionTester::DO_INTERACTOR) + { + iren->Start(); + retVal = vtkRegressionTester::PASSED; } + return (!retVal); +} } int TestVTKMPointTransform(int argc, char* argv[]) diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMPolyDataNormals.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMPolyDataNormals.cxx index 053fe08713..a8c7ee3671 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMPolyDataNormals.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMPolyDataNormals.cxx @@ -33,11 +33,10 @@ #include "vtkSmartPointer.h" #include "vtkTriangleFilter.h" - namespace { -void MakeInputDataSet(vtkPolyData *ds) +void MakeInputDataSet(vtkPolyData* ds) { vtkNew cylinder; cylinder->SetRadius(1.0); @@ -84,7 +83,6 @@ int TestVTKMPolyDataNormals(int argc, char* argv[]) cylinderProperty->SetColor(0.3, 0.3, 0.3); cylinderActor->SetProperty(cylinderProperty); - vtkNew arrow; // point normals @@ -108,7 +106,6 @@ int TestVTKMPolyDataNormals(int argc, char* argv[]) pnRenderer->GetActiveCamera()->SetPosition(0.0, 4.5, 7.5); pnRenderer->ResetCameraClippingRange(); - // cell normals vtkNew cells; cells->SetInputConnection(normals->GetOutputPort()); @@ -133,7 +130,6 @@ int TestVTKMPolyDataNormals(int argc, char* argv[]) cnRenderer->GetActiveCamera()->SetPosition(0.0, 8.0, 0.1); cnRenderer->ResetCameraClippingRange(); - // render vtkNew renWin; renWin->SetSize(600, 300); diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMProbe.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMProbe.cxx index 2df9551080..494d8860b8 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMProbe.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMProbe.cxx @@ -27,8 +27,7 @@ namespace { static int inputDim = 9; static int sourceDim = 4; -void populatePointAndCellArray(vtkFloatArray* pointArray, - vtkFloatArray* cellArray) +void populatePointAndCellArray(vtkFloatArray* pointArray, vtkFloatArray* cellArray) { pointArray->SetNumberOfValues(sourceDim * sourceDim); pointArray->SetName("pointdata"); @@ -38,11 +37,10 @@ void populatePointAndCellArray(vtkFloatArray* pointArray, } cellArray->SetName("celldata"); cellArray->SetNumberOfValues((sourceDim - 1) * (sourceDim - 1)); - for (vtkIdType i = 0; i < static_cast((sourceDim-1) * (sourceDim-1)); i++) + for (vtkIdType i = 0; i < static_cast((sourceDim - 1) * (sourceDim - 1)); i++) { cellArray->SetValue(i, 0.7f * i); } - } const std::vector& GetExpectedPointData() @@ -108,10 +106,9 @@ void TestResultArray(vtkDataArray* result, const std::vector& expected) { if ((result->GetComponent(0, i) - expected[static_cast(i)]) > 1e-5) { - std::cout << "Array " << result->GetName() << " has wrong value" << - " at index " << i << ". result value="<< - result->GetComponent(0, i) << " expected value=" << - expected[static_cast(i)] << std::endl; + std::cout << "Array " << result->GetName() << " has wrong value" + << " at index " << i << ". result value=" << result->GetComponent(0, i) + << " expected value=" << expected[static_cast(i)] << std::endl; } assert((result->GetComponent(0, i) - expected[static_cast(i)]) < 1e-5); } @@ -124,12 +121,12 @@ int TestVTKMProbe(int, char*[]) vtkNew input; input->SetOrigin(0.7, 0.7, 0.0); input->SetSpacing(0.35, 0.35, 1.0); - input->SetExtent(0, inputDim -1, 0, inputDim -1, 0, 0); + input->SetExtent(0, inputDim - 1, 0, inputDim - 1, 0, 0); vtkNew source; source->SetOrigin(0.0, 0.0, 0.0); source->SetSpacing(1.0, 1.0, 1.0); - source->SetExtent(0, sourceDim -1, 0, sourceDim -1, 0, 0); + source->SetExtent(0, sourceDim - 1, 0, sourceDim - 1, 0, 0); vtkNew pointArray, cellArray; populatePointAndCellArray(pointArray, cellArray); @@ -144,13 +141,9 @@ int TestVTKMProbe(int, char*[]) probe->Update(); vtkDataSet* result = probe->GetOutput(); - TestResultArray(result->GetPointData()->GetArray(pointArray->GetName()), - GetExpectedPointData()); - TestResultArray(result->GetCellData()->GetArray(cellArray->GetName()), - GetExpectedCellData()); - TestResultArray(result->GetPointData()->GetArray("validPoint"), - GetExpectedHiddenPoints()); - TestResultArray(result->GetCellData()->GetArray("validCell"), - GetExpectedHiddenCells()); + TestResultArray(result->GetPointData()->GetArray(pointArray->GetName()), GetExpectedPointData()); + TestResultArray(result->GetCellData()->GetArray(cellArray->GetName()), GetExpectedCellData()); + TestResultArray(result->GetPointData()->GetArray("validPoint"), GetExpectedHiddenPoints()); + TestResultArray(result->GetCellData()->GetArray("validCell"), GetExpectedHiddenCells()); return 0; } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold.cxx index be7c2c29f6..aea670a37e 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold.cxx @@ -33,82 +33,82 @@ namespace { - void fillElevationArray(vtkFloatArray* elven, vtkImageData* grid) +void fillElevationArray(vtkFloatArray* elven, vtkImageData* grid) +{ + elven->SetName("Elevation"); + const vtkIdType size = grid->GetNumberOfPoints(); + elven->SetNumberOfValues(size); + double pos[3] = { 0, 0, 0 }; + for (vtkIdType i = 0; i < size; ++i) { - elven->SetName("Elevation"); - const vtkIdType size = grid->GetNumberOfPoints(); - elven->SetNumberOfValues(size); - double pos[3]={0,0,0}; - for(vtkIdType i=0; i < size; ++i) - { - grid->GetPoint(i,pos); - elven->SetValue(i,sqrt(vtkMath::Dot(pos,pos))); - } + grid->GetPoint(i, pos); + elven->SetValue(i, sqrt(vtkMath::Dot(pos, pos))); } +} - int RunVTKPipeline(vtkImageData* grid, int argc, char* argv[]) - { - vtkNew ren; - vtkNew renWin; - vtkNew iren; +int RunVTKPipeline(vtkImageData* grid, int argc, char* argv[]) +{ + vtkNew ren; + vtkNew renWin; + vtkNew iren; - renWin->AddRenderer(ren); - iren->SetRenderWindow(renWin); + renWin->AddRenderer(ren); + iren->SetRenderWindow(renWin); - //compute an elevation array - vtkNew elevationPoints; - fillElevationArray(elevationPoints, grid); - grid->GetPointData()->AddArray(elevationPoints); + // compute an elevation array + vtkNew elevationPoints; + fillElevationArray(elevationPoints, grid); + grid->GetPointData()->AddArray(elevationPoints); - vtkNew producer; - producer->SetOutput(grid); + vtkNew producer; + producer->SetOutput(grid); - vtkNew threshold; - threshold->SetInputConnection(producer->GetOutputPort()); - threshold->SetPointsDataTypeToFloat(); - threshold->AllScalarsOn(); - threshold->ThresholdBetween(0,100); - threshold->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,"Elevation"); + vtkNew threshold; + threshold->SetInputConnection(producer->GetOutputPort()); + threshold->SetPointsDataTypeToFloat(); + threshold->AllScalarsOn(); + threshold->ThresholdBetween(0, 100); + threshold->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "Elevation"); - vtkNew surface; - surface->SetInputConnection(threshold->GetOutputPort()); + vtkNew surface; + surface->SetInputConnection(threshold->GetOutputPort()); - vtkNew mapper; - mapper->SetInputConnection(surface->GetOutputPort()); - mapper->ScalarVisibilityOn(); - mapper->SetScalarModeToUsePointFieldData(); - mapper->SelectColorArray("Elevation"); - mapper->SetScalarRange(0.0, 100.0); + vtkNew mapper; + mapper->SetInputConnection(surface->GetOutputPort()); + mapper->ScalarVisibilityOn(); + mapper->SetScalarModeToUsePointFieldData(); + mapper->SelectColorArray("Elevation"); + mapper->SetScalarRange(0.0, 100.0); - vtkNew actor; - actor->SetMapper(mapper); - actor->GetProperty()->SetAmbient(1.0); - actor->GetProperty()->SetDiffuse(0.0); + vtkNew actor; + actor->SetMapper(mapper); + actor->GetProperty()->SetAmbient(1.0); + actor->GetProperty()->SetDiffuse(0.0); - ren->AddActor(actor); - ren->ResetCamera(); - renWin->Render(); + ren->AddActor(actor); + ren->ResetCamera(); + renWin->Render(); - int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) - { - iren->Start(); - retVal = vtkRegressionTester::PASSED; - } - return (!retVal); + int retVal = vtkRegressionTestImage(renWin); + if (retVal == vtkRegressionTester::DO_INTERACTOR) + { + iren->Start(); + retVal = vtkRegressionTester::PASSED; } + return (!retVal); +} } // Anonymous namespace int TestVTKMThreshold(int argc, char* argv[]) { - //create the sample grid + // create the sample grid vtkNew grid; int dim = 128; grid->SetOrigin(0.0, 0.0, 0.0); grid->SetSpacing(1.0, 1.0, 1.0); - grid->SetExtent(0, dim-1,0, dim-1,0, dim-1); + grid->SetExtent(0, dim - 1, 0, dim - 1, 0, dim - 1); - //run the pipeline + // run the pipeline return RunVTKPipeline(grid, argc, argv); } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold2.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold2.cxx index 2ba0752f5c..6848a67ff8 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold2.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMThreshold2.cxx @@ -28,8 +28,7 @@ #include "vtkRenderer.h" #include "vtkmThreshold.h" - -int TestVTKMThreshold2(int argc, char *argv[]) +int TestVTKMThreshold2(int argc, char* argv[]) { vtkNew ren; vtkNew renWin; @@ -51,12 +50,11 @@ int TestVTKMThreshold2(int argc, char *argv[]) vtkNew threshold; threshold->SetInputConnection(elevation->GetOutputPort()); - threshold->SetInputArrayToProcess( - 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "RTData"); + threshold->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "RTData"); - double L=100; - double U=200; - threshold->ThresholdBetween(L,U); + double L = 100; + double U = 200; + threshold->ThresholdBetween(L, U); threshold->SetAllScalars(0); threshold->Update(); @@ -81,10 +79,10 @@ int TestVTKMThreshold2(int argc, char *argv[]) renWin->Render(); int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) + if (retVal == vtkRegressionTester::DO_INTERACTOR) { - iren->Start(); - retVal = vtkRegressionTester::PASSED; + iren->Start(); + retVal = vtkRegressionTester::PASSED; } return (!retVal); } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMTriangleMeshPointNormals.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMTriangleMeshPointNormals.cxx index f693401ad4..2a8cd3968c 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMTriangleMeshPointNormals.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMTriangleMeshPointNormals.cxx @@ -30,8 +30,7 @@ int TestVTKMTriangleMeshPointNormals(int argc, char* argv[]) { - vtkSmartPointer testHelper = - vtkSmartPointer::New(); + vtkSmartPointer testHelper = vtkSmartPointer::New(); testHelper->AddArguments(argc, argv); if (!testHelper->IsFlagSpecified("-D")) { @@ -87,9 +86,9 @@ int TestVTKMTriangleMeshPointNormals(int argc, char* argv[]) renderer->ResetCamera(); // renderwindow, interactor - vtkNew renWin ; + vtkNew renWin; renWin->AddRenderer(renderer); - renWin->SetSize(300,300); + renWin->SetSize(300, 300); renWin->SetMultiSamples(0); vtkNew iren; iren->SetRenderWindow(renWin); @@ -102,7 +101,7 @@ int TestVTKMTriangleMeshPointNormals(int argc, char* argv[]) { vtkNew iStyle; iren->SetInteractorStyle(iStyle); - renWin->SetSize(1000,1000); + renWin->SetSize(1000, 1000); iren->Start(); } diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpScalar.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpScalar.cxx index aeb83acd77..0b39489500 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpScalar.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpScalar.cxx @@ -44,13 +44,12 @@ int TestVTKMWarpScalar(int argc, char* argv[]) // Define viewport ranges // (xmin, ymin, xmax, ymax) - double leftViewport[4] = {0.0, 0.0, 0.33, 1.0}; - double centerViewport[4] = {0.33, 0.0, .66, 1.0}; - double rightViewport[4] = {0.66, 0.0, 1.0, 1.0}; + double leftViewport[4] = { 0.0, 0.0, 0.33, 1.0 }; + double centerViewport[4] = { 0.33, 0.0, .66, 1.0 }; + double rightViewport[4] = { 0.66, 0.0, 1.0, 1.0 }; /// First window - xy plane - vtkSmartPointer xySource = - vtkSmartPointer::New(); + vtkSmartPointer xySource = vtkSmartPointer::New(); xySource->SetWholeExtent(-100, 100, -100, 100, 1, 1); xySource->SetCenter(0, 0, 0); xySource->SetMaximum(255); @@ -72,10 +71,10 @@ int TestVTKMWarpScalar(int argc, char* argv[]) vtkPointSet* points = xyWarpScalar->GetOutput(); for (vtkIdType i = 0; i < points->GetNumberOfPoints(); i++) { - assert (points->GetPoint(i)[2] == 3.0); + assert(points->GetPoint(i)[2] == 3.0); if (points->GetPoint(i)[2] != 3.0) { - std::cout << "XYPlane result is wrong at i=" << i <SetNumberOfValues(dataNormalSourceOutput->GetNumberOfPoints()); @@ -111,8 +109,8 @@ int TestVTKMWarpScalar(int argc, char* argv[]) vtkNew dataNormalWarpScalar; dataNormalWarpScalar->SetScaleFactor(2); dataNormalWarpScalar->SetInputData(dataNormalSource->GetOutput()); - dataNormalWarpScalar->SetInputArrayToProcess(0,0,0, - vtkDataObject::FIELD_ASSOCIATION_POINTS, "scalarfactor"); + dataNormalWarpScalar->SetInputArrayToProcess( + 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "scalarfactor"); vtkNew dataNormalMapper; dataNormalMapper->SetInputConnection(dataNormalWarpScalar->GetOutputPort()); @@ -126,7 +124,7 @@ int TestVTKMWarpScalar(int argc, char* argv[]) /// Third window - custom normal vtkSmartPointer customNormalSource = - vtkSmartPointer::New(); + vtkSmartPointer::New(); customNormalSource->SetWholeExtent(-100, 100, -100, 100, 1, 1); customNormalSource->SetCenter(0, 0, 0); customNormalSource->SetMaximum(255); @@ -153,7 +151,6 @@ int TestVTKMWarpScalar(int argc, char* argv[]) customNormalRen->SetBackground(0.3, 0.2, 0.5); customNormalRen->AddActor(customNormalActor); - xyplaneRen->ResetCamera(); dataNormalRen->ResetCamera(); customNormalRen->ResetCamera(); @@ -161,7 +158,7 @@ int TestVTKMWarpScalar(int argc, char* argv[]) renWin->Render(); int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) + if (retVal == vtkRegressionTester::DO_INTERACTOR) { iren->Start(); retVal = vtkRegressionTester::PASSED; diff --git a/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpVector.cxx b/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpVector.cxx index 6353ebd0b0..fdb36d6d0e 100644 --- a/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpVector.cxx +++ b/Accelerators/Vtkm/Testing/Cxx/TestVTKMWarpVector.cxx @@ -44,12 +44,11 @@ int TestVTKMWarpVector(int argc, char* argv[]) // Define viewport ranges // (xmin, ymin, xmax, ymax) - double leftViewport[4] = {0.0, 0.0, 0.5, 1.0}; - double centerViewport[4] = {0.5, 0.0, 1.0, 1.0}; + double leftViewport[4] = { 0.0, 0.0, 0.5, 1.0 }; + double centerViewport[4] = { 0.5, 0.0, 1.0, 1.0 }; /// First window - xy plane - vtkSmartPointer xySource = - vtkSmartPointer::New(); + vtkSmartPointer xySource = vtkSmartPointer::New(); xySource->SetWholeExtent(-100, 100, -100, 100, 1, 1); xySource->SetCenter(0, 0, 0); xySource->SetMaximum(255); @@ -66,7 +65,7 @@ int TestVTKMWarpVector(int argc, char* argv[]) xyVector->SetNumberOfComponents(3); xyVector->SetName("scalarVector"); xyVector->SetNumberOfTuples(xySource->GetOutput()->GetNumberOfPoints()); - for(vtkIdType i = 0; i < xySource->GetOutput()->GetNumberOfPoints(); i++) + for (vtkIdType i = 0; i < xySource->GetOutput()->GetNumberOfPoints(); i++) { xyVector->SetTuple3(i, 0.0, 0.0, 1.0); } @@ -77,8 +76,8 @@ int TestVTKMWarpVector(int argc, char* argv[]) xyWarpVector->SetInputConnection(xySource->GetOutputPort()); // Create a scalarVector array - xyWarpVector->SetInputArrayToProcess(0,0,0, vtkDataObject::FIELD_ASSOCIATION_POINTS, - "scalarVector"); + xyWarpVector->SetInputArrayToProcess( + 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "scalarVector"); xyWarpVector->Update(); vtkNew xyplaneMapper; @@ -93,19 +92,18 @@ int TestVTKMWarpVector(int argc, char* argv[]) xyplaneRen->AddActor(xyplaneActor); /// Second window - data normal - vtkSmartPointer dataNormalSource = - vtkSmartPointer::New(); + vtkSmartPointer dataNormalSource = vtkSmartPointer::New(); dataNormalSource->SetRadius(100); dataNormalSource->SetThetaResolution(20); dataNormalSource->SetPhiResolution(20); dataNormalSource->Update(); - auto dataNormalSourceOutput = dataNormalSource->GetOutput(); + auto dataNormalSourceOutput = dataNormalSource->GetOutput(); vtkNew dataNormalWarpVector; dataNormalWarpVector->SetScaleFactor(5); dataNormalWarpVector->SetInputData(dataNormalSource->GetOutput()); - dataNormalWarpVector->SetInputArrayToProcess(0,0,0, - vtkDataObject::POINT, dataNormalSourceOutput->GetPointData()->GetNormals()->GetName()); + dataNormalWarpVector->SetInputArrayToProcess( + 0, 0, 0, vtkDataObject::POINT, dataNormalSourceOutput->GetPointData()->GetNormals()->GetName()); vtkNew dataNormalMapper; dataNormalMapper->SetInputConnection(dataNormalWarpVector->GetOutputPort()); @@ -124,7 +122,7 @@ int TestVTKMWarpVector(int argc, char* argv[]) renWin->Render(); int retVal = vtkRegressionTestImage(renWin); - if(retVal == vtkRegressionTester::DO_INTERACTOR) + if (retVal == vtkRegressionTester::DO_INTERACTOR) { iren->Start(); retVal = vtkRegressionTester::PASSED; diff --git a/Accelerators/Vtkm/vtkmAverageToCells.cxx b/Accelerators/Vtkm/vtkmAverageToCells.cxx index 520ba32e41..fb3c810379 100644 --- a/Accelerators/Vtkm/vtkmAverageToCells.cxx +++ b/Accelerators/Vtkm/vtkmAverageToCells.cxx @@ -32,36 +32,28 @@ vtkStandardNewMacro(vtkmAverageToCells); //------------------------------------------------------------------------------ -vtkmAverageToCells::vtkmAverageToCells() -{ -} +vtkmAverageToCells::vtkmAverageToCells() {} //------------------------------------------------------------------------------ -vtkmAverageToCells::~vtkmAverageToCells() -{ -} +vtkmAverageToCells::~vtkmAverageToCells() {} //------------------------------------------------------------------------------ int vtkmAverageToCells::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkDataSet* output = - vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* output = vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); output->ShallowCopy(input); // grab the input array to process to determine the field we want to average int association = this->GetInputArrayAssociation(0, inputVector); auto fieldArray = this->GetInputArrayToProcess(0, inputVector); - if (association != vtkDataObject::FIELD_ASSOCIATION_POINTS || - fieldArray == nullptr || - fieldArray->GetName() == nullptr || fieldArray->GetName()[0] == '\0') + if (association != vtkDataObject::FIELD_ASSOCIATION_POINTS || fieldArray == nullptr || + fieldArray->GetName() == nullptr || fieldArray->GetName()[0] == '\0') { vtkErrorMacro(<< "Invalid field: Requires a point field with a valid name."); return 0; @@ -84,8 +76,7 @@ int vtkmAverageToCells::RequestData(vtkInformation* vtkNotUsed(request), auto result = filter.Execute(in, policy); // convert back the dataset to VTK, and add the field as a cell field - vtkDataArray* resultingArray = - fromvtkm::Convert(result.GetCellField(fieldName)); + vtkDataArray* resultingArray = fromvtkm::Convert(result.GetCellField(fieldName)); if (resultingArray == nullptr) { vtkErrorMacro(<< "Unable to convert result array from VTK-m to VTK"); diff --git a/Accelerators/Vtkm/vtkmAverageToCells.h b/Accelerators/Vtkm/vtkmAverageToCells.h index 8cd4fd1285..c5dc417cfa 100644 --- a/Accelerators/Vtkm/vtkmAverageToCells.h +++ b/Accelerators/Vtkm/vtkmAverageToCells.h @@ -23,7 +23,7 @@ * values of all points used by particular cell. This filter will also * pass through any existing point and cell arrays. * -*/ + */ #ifndef vtkmAverageToCells_h #define vtkmAverageToCells_h @@ -42,8 +42,7 @@ protected: vtkmAverageToCells(); ~vtkmAverageToCells(); - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmAverageToCells(const vtkmAverageToCells&) = delete; diff --git a/Accelerators/Vtkm/vtkmAverageToPoints.cxx b/Accelerators/Vtkm/vtkmAverageToPoints.cxx index f774ccbf72..10aa41bb25 100644 --- a/Accelerators/Vtkm/vtkmAverageToPoints.cxx +++ b/Accelerators/Vtkm/vtkmAverageToPoints.cxx @@ -33,36 +33,28 @@ vtkStandardNewMacro(vtkmAverageToPoints); //------------------------------------------------------------------------------ -vtkmAverageToPoints::vtkmAverageToPoints() -{ -} +vtkmAverageToPoints::vtkmAverageToPoints() {} //------------------------------------------------------------------------------ -vtkmAverageToPoints::~vtkmAverageToPoints() -{ -} +vtkmAverageToPoints::~vtkmAverageToPoints() {} //------------------------------------------------------------------------------ -int vtkmAverageToPoints::RequestData(vtkInformation *vtkNotUsed(request), - vtkInformationVector **inputVector, - vtkInformationVector *outputVector) +int vtkmAverageToPoints::RequestData(vtkInformation* vtkNotUsed(request), + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { - vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); - vtkInformation *outInfo = outputVector->GetInformationObject(0); - vtkDataSet *input = vtkDataSet::SafeDownCast( - inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); + vtkInformation* outInfo = outputVector->GetInformationObject(0); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkDataSet* output = vtkDataSet::SafeDownCast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* output = vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); output->ShallowCopy(input); - //grab the input array to process to determine the field we want to average + // grab the input array to process to determine the field we want to average int association = this->GetInputArrayAssociation(0, inputVector); auto fieldArray = this->GetInputArrayToProcess(0, inputVector); - if (association != vtkDataObject::FIELD_ASSOCIATION_CELLS || - fieldArray == nullptr || - fieldArray->GetName() == nullptr || fieldArray->GetName()[0] == '\0') + if (association != vtkDataObject::FIELD_ASSOCIATION_CELLS || fieldArray == nullptr || + fieldArray->GetName() == nullptr || fieldArray->GetName()[0] == '\0') { vtkErrorMacro(<< "Invalid field: Requires a cell field with a valid name."); return 0; @@ -72,7 +64,7 @@ int vtkmAverageToPoints::RequestData(vtkInformation *vtkNotUsed(request), try { - //convert the input dataset to a vtkm::cont::DataSet + // convert the input dataset to a vtkm::cont::DataSet vtkm::cont::DataSet in = tovtkm::Convert(input); auto field = tovtkm::Convert(fieldArray, association); in.AddField(field); @@ -80,13 +72,12 @@ int vtkmAverageToPoints::RequestData(vtkInformation *vtkNotUsed(request), vtkmInputFilterPolicy policy; vtkm::filter::PointAverage filter; filter.SetActiveField(fieldName, vtkm::cont::Field::Association::CELL_SET); - filter.SetOutputFieldName(fieldName); //should we expose this control? + filter.SetOutputFieldName(fieldName); // should we expose this control? auto result = filter.Execute(in, policy); // convert back the dataset to VTK, and add the field as a point field - vtkDataArray* resultingArray = - fromvtkm::Convert(result.GetPointField(fieldName)); + vtkDataArray* resultingArray = fromvtkm::Convert(result.GetPointField(fieldName)); if (resultingArray == nullptr) { vtkErrorMacro(<< "Unable to convert result array from VTK-m to VTK"); @@ -108,5 +99,5 @@ int vtkmAverageToPoints::RequestData(vtkInformation *vtkNotUsed(request), //------------------------------------------------------------------------------ void vtkmAverageToPoints::PrintSelf(ostream& os, vtkIndent indent) { - this->Superclass::PrintSelf(os,indent); + this->Superclass::PrintSelf(os, indent); } diff --git a/Accelerators/Vtkm/vtkmAverageToPoints.h b/Accelerators/Vtkm/vtkmAverageToPoints.h index d3bc4facdf..9a5e88cf3a 100644 --- a/Accelerators/Vtkm/vtkmAverageToPoints.h +++ b/Accelerators/Vtkm/vtkmAverageToPoints.h @@ -23,7 +23,7 @@ * values of all cells using a particular point. This filter will also * pass through any existing point and cell arrays. * -*/ + */ #ifndef vtkmAverageToPoints_h #define vtkmAverageToPoints_h @@ -33,7 +33,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmAverageToPoints : public vtkDataSetAlgorithm { public: - vtkTypeMacro(vtkmAverageToPoints,vtkDataSetAlgorithm); + vtkTypeMacro(vtkmAverageToPoints, vtkDataSetAlgorithm); void PrintSelf(ostream& os, vtkIndent indent) override; static vtkmAverageToPoints* New(); @@ -41,9 +41,7 @@ protected: vtkmAverageToPoints(); ~vtkmAverageToPoints(); - virtual int RequestData(vtkInformation *, - vtkInformationVector **, - vtkInformationVector *) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmAverageToPoints(const vtkmAverageToPoints&) = delete; diff --git a/Accelerators/Vtkm/vtkmCleanGrid.cxx b/Accelerators/Vtkm/vtkmCleanGrid.cxx index 1027171aac..5bd85e3ed2 100644 --- a/Accelerators/Vtkm/vtkmCleanGrid.cxx +++ b/Accelerators/Vtkm/vtkmCleanGrid.cxx @@ -32,26 +32,22 @@ #include #include - vtkStandardNewMacro(vtkmCleanGrid); //------------------------------------------------------------------------------ vtkmCleanGrid::vtkmCleanGrid() -: CompactPoints(false) + : CompactPoints(false) { } //------------------------------------------------------------------------------ -vtkmCleanGrid::~vtkmCleanGrid() -{ -} +vtkmCleanGrid::~vtkmCleanGrid() {} //------------------------------------------------------------------------------ void vtkmCleanGrid::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); - os << indent << "CompactPoints: " << (this->CompactPoints ? "On" : "Off") - << "\n"; + os << indent << "CompactPoints: " << (this->CompactPoints ? "On" : "Off") << "\n"; } //------------------------------------------------------------------------------ @@ -63,23 +59,19 @@ int vtkmCleanGrid::FillInputPortInformation(int, vtkInformation* info) //------------------------------------------------------------------------------ int vtkmCleanGrid::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); vtkUnstructuredGrid* output = vtkUnstructuredGrid::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); try { // convert the input dataset to a vtkm::cont::DataSet - auto fieldsFlag = this->CompactPoints ? - tovtkm::FieldsFlag::Points : - tovtkm::FieldsFlag::None; + auto fieldsFlag = this->CompactPoints ? tovtkm::FieldsFlag::Points : tovtkm::FieldsFlag::None; vtkm::cont::DataSet in = tovtkm::Convert(input, fieldsFlag); // apply the filter diff --git a/Accelerators/Vtkm/vtkmCleanGrid.h b/Accelerators/Vtkm/vtkmCleanGrid.h index d03a888829..8e8b6d4818 100644 --- a/Accelerators/Vtkm/vtkmCleanGrid.h +++ b/Accelerators/Vtkm/vtkmCleanGrid.h @@ -21,7 +21,7 @@ * generates vtkUnstructuredGrid as output. vtkmCleanGrid will convert all cells * to an explicit representation, and if enabled, will remove unused points. * -*/ + */ #ifndef vtkmCleanGrid_h #define vtkmCleanGrid_h @@ -55,9 +55,8 @@ protected: vtkmCleanGrid(); ~vtkmCleanGrid(); - int FillInputPortInformation(int, vtkInformation *) override; - int RequestData(vtkInformation *, vtkInformationVector **, - vtkInformationVector *) override; + int FillInputPortInformation(int, vtkInformation*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; bool CompactPoints; diff --git a/Accelerators/Vtkm/vtkmClip.cxx b/Accelerators/Vtkm/vtkmClip.cxx index e0e1ff0a4a..8b5cfa3894 100644 --- a/Accelerators/Vtkm/vtkmClip.cxx +++ b/Accelerators/Vtkm/vtkmClip.cxx @@ -45,11 +45,10 @@ #include - vtkStandardNewMacro(vtkmClip); //------------------------------------------------------------------------------ -void vtkmClip::PrintSelf(std::ostream &os, vtkIndent indent) +void vtkmClip::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); @@ -61,20 +60,18 @@ void vtkmClip::PrintSelf(std::ostream &os, vtkIndent indent) //------------------------------------------------------------------------------ vtkmClip::vtkmClip() - : ClipValue(0.), - ComputeScalars(true), - ClipFunction(nullptr), - ClipFunctionConverter(new tovtkm::ImplicitFunctionConverter) + : ClipValue(0.) + , ComputeScalars(true) + , ClipFunction(nullptr) + , ClipFunctionConverter(new tovtkm::ImplicitFunctionConverter) { // Clip active point scalars by default - this->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, - vtkDataSetAttributes::SCALARS); + this->SetInputArrayToProcess( + 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, vtkDataSetAttributes::SCALARS); } //------------------------------------------------------------------------------ -vtkmClip::~vtkmClip() -{ -} +vtkmClip::~vtkmClip() {} //---------------------------------------------------------------------------- vtkMTimeType vtkmClip::GetMTime() @@ -88,7 +85,7 @@ vtkMTimeType vtkmClip::GetMTime() } //---------------------------------------------------------------------------- -void vtkmClip::SetClipFunction(vtkImplicitFunction *clipFunction) +void vtkmClip::SetClipFunction(vtkImplicitFunction* clipFunction) { if (this->ClipFunction != clipFunction) { @@ -99,29 +96,26 @@ void vtkmClip::SetClipFunction(vtkImplicitFunction *clipFunction) } //------------------------------------------------------------------------------ -int vtkmClip::RequestData(vtkInformation *, - vtkInformationVector **inInfoVec, - vtkInformationVector *outInfoVec) +int vtkmClip::RequestData( + vtkInformation*, vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec) { - vtkm::cont::ScopedRuntimeDeviceTracker tracker(vtkm::cont::DeviceAdapterTagCuda{}, - vtkm::cont::RuntimeDeviceTrackerMode::Disable); + vtkm::cont::ScopedRuntimeDeviceTracker tracker( + vtkm::cont::DeviceAdapterTagCuda{}, vtkm::cont::RuntimeDeviceTrackerMode::Disable); vtkInformation* inInfo = inInfoVec[0]->GetInformationObject(0); vtkInformation* outInfo = outInfoVec->GetInformationObject(0); // Extract data objects from info: - vtkDataSet *input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkUnstructuredGrid *output = + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkUnstructuredGrid* output = vtkUnstructuredGrid::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); // Find the scalar array: int assoc = this->GetInputArrayAssociation(0, inInfoVec); - vtkDataArray *scalars = this->GetInputArrayToProcess(0, inInfoVec); + vtkDataArray* scalars = this->GetInputArrayToProcess(0, inInfoVec); if (!this->ClipFunction && - (assoc != vtkDataObject::FIELD_ASSOCIATION_POINTS || - scalars == nullptr || scalars->GetName() == nullptr || - scalars->GetName()[0] == '\0')) + (assoc != vtkDataObject::FIELD_ASSOCIATION_POINTS || scalars == nullptr || + scalars->GetName() == nullptr || scalars->GetName()[0] == '\0')) { vtkErrorMacro("Invalid scalar array; array missing or not a point array."); return 0; @@ -136,9 +130,8 @@ int vtkmClip::RequestData(vtkInformation *, try { // Convert inputs to vtkm objects: - auto fieldsFlag = this->ComputeScalars ? - tovtkm::FieldsFlag::PointsAndCells : - tovtkm::FieldsFlag::None; + auto fieldsFlag = + this->ComputeScalars ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; auto in = tovtkm::Convert(input, fieldsFlag); // Run filter: @@ -202,7 +195,7 @@ int vtkmClip::RequestData(vtkInformation *, } //------------------------------------------------------------------------------ -int vtkmClip::FillInputPortInformation(int, vtkInformation *info) +int vtkmClip::FillInputPortInformation(int, vtkInformation* info) { // These are the types supported by tovtkm::Convert: info->Set(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkPolyData"); diff --git a/Accelerators/Vtkm/vtkmClip.h b/Accelerators/Vtkm/vtkmClip.h index 8dba66677f..74f8bb169d 100644 --- a/Accelerators/Vtkm/vtkmClip.h +++ b/Accelerators/Vtkm/vtkmClip.h @@ -32,7 +32,8 @@ class vtkImplicitFunction; -namespace tovtkm { +namespace tovtkm +{ class ImplicitFunctionConverter; @@ -43,7 +44,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm public: static vtkmClip* New(); vtkTypeMacro(vtkmClip, vtkUnstructuredGridAlgorithm); - void PrintSelf(ostream &os, vtkIndent indent) override; + void PrintSelf(ostream& os, vtkIndent indent) override; /** * The scalar value to use when clipping the dataset. Values greater than @@ -64,7 +65,7 @@ public: * \c ClipValue is ignored and the clipping is performed using the implicit * function. */ - void SetClipFunction(vtkImplicitFunction *); + void SetClipFunction(vtkImplicitFunction*); vtkGetObjectMacro(ClipFunction, vtkImplicitFunction); vtkMTimeType GetMTime() override; @@ -73,15 +74,14 @@ protected: vtkmClip(); ~vtkmClip(); - int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; int FillInputPortInformation(int port, vtkInformation* info) override; double ClipValue; bool ComputeScalars; - vtkImplicitFunction *ClipFunction; + vtkImplicitFunction* ClipFunction; std::unique_ptr ClipFunctionConverter; private: diff --git a/Accelerators/Vtkm/vtkmContour.cxx b/Accelerators/Vtkm/vtkmContour.cxx index 0645e6b1b6..e8304bf6ae 100644 --- a/Accelerators/Vtkm/vtkmContour.cxx +++ b/Accelerators/Vtkm/vtkmContour.cxx @@ -38,14 +38,10 @@ vtkStandardNewMacro(vtkmContour); //------------------------------------------------------------------------------ -vtkmContour::vtkmContour() -{ -} +vtkmContour::vtkmContour() {} //------------------------------------------------------------------------------ -vtkmContour::~vtkmContour() -{ -} +vtkmContour::~vtkmContour() {} //------------------------------------------------------------------------------ void vtkmContour::PrintSelf(ostream& os, vtkIndent indent) @@ -54,35 +50,30 @@ void vtkmContour::PrintSelf(ostream& os, vtkIndent indent) } //------------------------------------------------------------------------------ -int vtkmContour::RequestData(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmContour::RequestData( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { - vtkm::cont::ScopedRuntimeDeviceTracker tracker(vtkm::cont::DeviceAdapterTagCuda{}, - vtkm::cont::RuntimeDeviceTrackerMode::Disable); - + vtkm::cont::ScopedRuntimeDeviceTracker tracker( + vtkm::cont::DeviceAdapterTagCuda{}, vtkm::cont::RuntimeDeviceTrackerMode::Disable); vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkPolyData* output = - vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkPolyData* output = vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); // Find the scalar array: int association = this->GetInputArrayAssociation(0, inputVector); - vtkDataArray *inputArray = this->GetInputArrayToProcess(0, inputVector); - if (association != vtkDataObject::FIELD_ASSOCIATION_POINTS || - inputArray == nullptr || inputArray->GetName() == nullptr || - inputArray->GetName()[0] == '\0') + vtkDataArray* inputArray = this->GetInputArrayToProcess(0, inputVector); + if (association != vtkDataObject::FIELD_ASSOCIATION_POINTS || inputArray == nullptr || + inputArray->GetName() == nullptr || inputArray->GetName()[0] == '\0') { vtkErrorMacro("Invalid scalar array; array missing or not a point array."); return 0; } const int numContours = this->GetNumberOfContours(); - if(numContours == 0) + if (numContours == 0) { return 1; } @@ -93,7 +84,7 @@ int vtkmContour::RequestData(vtkInformation* request, filter.SetActiveField(inputArray->GetName(), vtkm::cont::Field::Association::POINTS); filter.SetGenerateNormals(this->GetComputeNormals() != 0); filter.SetNumberOfIsoValues(numContours); - for(int i = 0; i < numContours; ++i) + for (int i = 0; i < numContours; ++i) { filter.SetIsoValue(i, this->GetValue(i)); } @@ -111,8 +102,7 @@ int vtkmContour::RequestData(vtkInformation* request, auto inField = tovtkm::Convert(inputArray, association); in.AddField(inField); // don't pass this field - filter.SetFieldsToPass( - vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); + filter.SetFieldsToPass(vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); } vtkm::cont::DataSet result; @@ -135,7 +125,7 @@ int vtkmContour::RequestData(vtkInformation* request, if (this->ComputeNormals) { output->GetPointData()->SetActiveAttribute( - filter.GetNormalArrayName().c_str(), vtkDataSetAttributes::NORMALS); + filter.GetNormalArrayName().c_str(), vtkDataSetAttributes::NORMALS); } } catch (const vtkm::cont::Error& e) diff --git a/Accelerators/Vtkm/vtkmContour.h b/Accelerators/Vtkm/vtkmContour.h index 482d38fec4..8bb1486725 100644 --- a/Accelerators/Vtkm/vtkmContour.h +++ b/Accelerators/Vtkm/vtkmContour.h @@ -28,7 +28,7 @@ * contouring other types of data, use the general vtkContourFilter. If you * want to contour an image (i.e., a volume slice), use vtkMarchingSquares. * -*/ + */ #ifndef vtkmContour_h #define vtkmContour_h @@ -39,7 +39,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmContour : public vtkContourFilter { public: - vtkTypeMacro(vtkmContour,vtkContourFilter); + vtkTypeMacro(vtkmContour, vtkContourFilter); void PrintSelf(ostream& os, vtkIndent indent) override; static vtkmContour* New(); @@ -47,8 +47,7 @@ protected: vtkmContour(); ~vtkmContour(); - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmContour(const vtkmContour&) = delete; diff --git a/Accelerators/Vtkm/vtkmCoordinateSystemTransform.cxx b/Accelerators/Vtkm/vtkmCoordinateSystemTransform.cxx index 8175e64944..154c37e168 100644 --- a/Accelerators/Vtkm/vtkmCoordinateSystemTransform.cxx +++ b/Accelerators/Vtkm/vtkmCoordinateSystemTransform.cxx @@ -44,9 +44,7 @@ vtkmCoordinateSystemTransform::vtkmCoordinateSystemTransform() } //------------------------------------------------------------------------------ -vtkmCoordinateSystemTransform::~vtkmCoordinateSystemTransform() -{ -} +vtkmCoordinateSystemTransform::~vtkmCoordinateSystemTransform() {} //------------------------------------------------------------------------------ void vtkmCoordinateSystemTransform::SetCartesianToCylindrical() @@ -73,8 +71,8 @@ void vtkmCoordinateSystemTransform::SetSphericalToCartesian() } //------------------------------------------------------------------------------ -int vtkmCoordinateSystemTransform::FillInputPortInformation(int vtkNotUsed(port), - vtkInformation* info) +int vtkmCoordinateSystemTransform::FillInputPortInformation( + int vtkNotUsed(port), vtkInformation* info) { info->Remove(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE()); info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkPointSet"); @@ -84,9 +82,8 @@ int vtkmCoordinateSystemTransform::FillInputPortInformation(int vtkNotUsed(port } //------------------------------------------------------------------------------ -int vtkmCoordinateSystemTransform::RequestDataObject(vtkInformation *request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmCoordinateSystemTransform::RequestDataObject( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkImageData* inImage = vtkImageData::GetData(inputVector[0]); vtkRectilinearGrid* inRect = vtkRectilinearGrid::GetData(inputVector[0]); @@ -97,31 +94,27 @@ int vtkmCoordinateSystemTransform::RequestDataObject(vtkInformation *request, if (!output) { vtkNew newOutput; - outputVector->GetInformationObject(0)->Set( - vtkDataObject::DATA_OBJECT(), newOutput); + outputVector->GetInformationObject(0)->Set(vtkDataObject::DATA_OBJECT(), newOutput); } return 1; } else { - return this->Superclass::RequestDataObject(request, - inputVector, - outputVector); + return this->Superclass::RequestDataObject(request, inputVector, outputVector); } } //------------------------------------------------------------------------------ -int vtkmCoordinateSystemTransform::RequestData(vtkInformation*, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmCoordinateSystemTransform::RequestData( + vtkInformation*, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkSmartPointer input = vtkPointSet::GetData(inputVector[0]); - vtkPointSet *output = vtkPointSet::GetData(outputVector); + vtkPointSet* output = vtkPointSet::GetData(outputVector); if (!input) { // Try converting image data. - vtkImageData *inImage = vtkImageData::GetData(inputVector[0]); + vtkImageData* inImage = vtkImageData::GetData(inputVector[0]); if (inImage) { vtkNew image2points; @@ -134,7 +127,7 @@ int vtkmCoordinateSystemTransform::RequestData(vtkInformation*, if (!input) { // Try converting rectilinear grid. - vtkRectilinearGrid *inRect = vtkRectilinearGrid::GetData(inputVector[0]); + vtkRectilinearGrid* inRect = vtkRectilinearGrid::GetData(inputVector[0]); if (inRect) { vtkNew rect2points; @@ -166,29 +159,25 @@ int vtkmCoordinateSystemTransform::RequestData(vtkInformation*, vtkmInputFilterPolicy policy; vtkDataArray* transformResult; if (this->TransformType == TransformTypes::CarToCyl || - this->TransformType == TransformTypes::CylToCar) + this->TransformType == TransformTypes::CylToCar) { // Cylindrical coordinate transform vtkm::filter::CylindricalCoordinateTransform cylindricalCT; cylindricalCT.SetUseCoordinateSystemAsField(true); - (this->TransformType == TransformTypes::CarToCyl) ? - cylindricalCT.SetCartesianToCylindrical() : - cylindricalCT.SetCylindricalToCartesian(); + (this->TransformType == TransformTypes::CarToCyl) ? cylindricalCT.SetCartesianToCylindrical() + : cylindricalCT.SetCylindricalToCartesian(); auto result = cylindricalCT.Execute(in, policy); transformResult = fromvtkm::Convert(result.GetField( - "cylindricalCoordinateSystemTransform", - vtkm::cont::Field::Association::POINTS)); + "cylindricalCoordinateSystemTransform", vtkm::cont::Field::Association::POINTS)); } else { // Spherical coordinate system vtkm::filter::SphericalCoordinateTransform sphericalCT; sphericalCT.SetUseCoordinateSystemAsField(true); - (this->TransformType == TransformTypes::CarToSph) ? - sphericalCT.SetCartesianToSpherical() : - sphericalCT.SetSphericalToCartesian(); + (this->TransformType == TransformTypes::CarToSph) ? sphericalCT.SetCartesianToSpherical() + : sphericalCT.SetSphericalToCartesian(); auto result = sphericalCT.Execute(in, policy); transformResult = fromvtkm::Convert(result.GetField( - "sphericalCoordinateSystemTransform", - vtkm::cont::Field::Association::POINTS)); + "sphericalCoordinateSystemTransform", vtkm::cont::Field::Association::POINTS)); } vtkPoints* newPts = vtkPoints::New(); // Update points @@ -198,7 +187,7 @@ int vtkmCoordinateSystemTransform::RequestData(vtkInformation*, newPts->Delete(); transformResult->FastDelete(); } - catch(const vtkm::cont::Error& e) + catch (const vtkm::cont::Error& e) { vtkErrorMacro(<< "VTK-m error: " << e.GetMessage()); } @@ -213,7 +202,7 @@ int vtkmCoordinateSystemTransform::RequestData(vtkInformation*, } //------------------------------------------------------------------------------ -void vtkmCoordinateSystemTransform::PrintSelf(std::ostream &os, vtkIndent indent) +void vtkmCoordinateSystemTransform::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } diff --git a/Accelerators/Vtkm/vtkmCoordinateSystemTransform.h b/Accelerators/Vtkm/vtkmCoordinateSystemTransform.h index c2f1344b03..1a7d8d28b7 100644 --- a/Accelerators/Vtkm/vtkmCoordinateSystemTransform.h +++ b/Accelerators/Vtkm/vtkmCoordinateSystemTransform.h @@ -20,7 +20,7 @@ * * vtkmCoordinateSystemTransform is a filter that transforms a coordinate system * between Cartesian&Cylindrical and Cartesian&Spherical. -*/ + */ #ifndef vtkmCoordinateSystemTransform_h #define vtkmCoordinateSystemTransform_h @@ -30,7 +30,15 @@ class VTKACCELERATORSVTKM_EXPORT vtkmCoordinateSystemTransform : public vtkPointSetAlgorithm { - enum struct TransformTypes {None, CarToCyl, CylToCar, CarToSph, SphToCar}; + enum struct TransformTypes + { + None, + CarToCyl, + CylToCar, + CarToSph, + SphToCar + }; + public: vtkTypeMacro(vtkmCoordinateSystemTransform, vtkPointSetAlgorithm); void PrintSelf(ostream& os, vtkIndent indent) override; @@ -44,15 +52,14 @@ public: void SetSphericalToCartesian(); int FillInputPortInformation(int port, vtkInformation* info) override; + protected: vtkmCoordinateSystemTransform(); ~vtkmCoordinateSystemTransform(); - int RequestDataObject(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) override; - int RequestData(vtkInformation* , vtkInformationVector**, - vtkInformationVector*) override; + int RequestDataObject(vtkInformation* request, vtkInformationVector** inputVector, + vtkInformationVector* outputVector) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmCoordinateSystemTransform(const vtkmCoordinateSystemTransform&) = delete; diff --git a/Accelerators/Vtkm/vtkmDataArray.h b/Accelerators/Vtkm/vtkmDataArray.h index c3134085c5..eb9377dc6b 100644 --- a/Accelerators/Vtkm/vtkmDataArray.h +++ b/Accelerators/Vtkm/vtkmDataArray.h @@ -27,10 +27,10 @@ #include "vtkGenericDataArray.h" #include "vtkmConfig.h" // For template export -#include // For vtkm::ListTagBase -#include // For vtkm::VecFromPortal -#include // For vtkm::VecTraits -#include // For vtkm::cont::ArrayHandle +#include // For vtkm::ListTagBase +#include // For vtkm::VecFromPortal +#include // For vtkm::VecTraits +#include // For vtkm::cont::ArrayHandle #include // For vtkm::cont::VariantArrayHandle #include // For unique_ptr @@ -56,12 +56,8 @@ public: using typename Superclass::ValueType; - using VtkmTypesList = - vtkm::ListTagBase, - vtkm::Vec, - vtkm::Vec, - vtkm::VecFromPortal::PortalControl>>; + using VtkmTypesList = vtkm::ListTagBase, vtkm::Vec, vtkm::Vec, + vtkm::VecFromPortal::PortalControl> >; static vtkmDataArray* New(); @@ -93,13 +89,13 @@ private: // To access AllocateTuples and ReallocateTuples friend Superclass; - std::unique_ptr> VtkmArray; + std::unique_ptr > VtkmArray; }; //============================================================================= template -inline vtkmDataArray::BaseComponentType>* -make_vtkmDataArray(const vtkm::cont::ArrayHandle& ah) +inline vtkmDataArray::BaseComponentType>* make_vtkmDataArray( + const vtkm::cont::ArrayHandle& ah) { auto ret = vtkmDataArray::BaseComponentType>::New(); ret->SetVtkmArrayHandle(ah); diff --git a/Accelerators/Vtkm/vtkmDataArray.hxx b/Accelerators/Vtkm/vtkmDataArray.hxx index 4debcd29c8..12ceaa3164 100644 --- a/Accelerators/Vtkm/vtkmDataArray.hxx +++ b/Accelerators/Vtkm/vtkmDataArray.hxx @@ -53,7 +53,8 @@ public: }; //----------------------------------------------------------------------------- -template ::HasMultipleComponents> +template ::HasMultipleComponents> struct FlattenVec; template @@ -65,19 +66,21 @@ struct FlattenVec static VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfComponents(const T& vec) { return vtkm::VecTraits::GetNumberOfComponents(vec) * - SubVec::GetNumberOfComponents(vtkm::VecTraits::GetComponent(vec, 0)); + SubVec::GetNumberOfComponents(vtkm::VecTraits::GetComponent(vec, 0)); } static VTKM_EXEC_CONT const ComponentType& GetComponent(const T& vec, vtkm::IdComponent comp) { auto ncomps = SubVec::GetNumberOfComponents(vtkm::VecTraits::GetComponent(vec, 0)); - return SubVec::GetComponent(vtkm::VecTraits::GetComponent(vec, comp / ncomps), comp % ncomps); + return SubVec::GetComponent( + vtkm::VecTraits::GetComponent(vec, comp / ncomps), comp % ncomps); } static VTKM_EXEC_CONT ComponentType& GetComponent(T& vec, vtkm::IdComponent comp) { auto ncomps = SubVec::GetNumberOfComponents(vtkm::VecTraits::GetComponent(vec, 0)); - return SubVec::GetComponent(vtkm::VecTraits::GetComponent(vec, comp / ncomps), comp % ncomps); + return SubVec::GetComponent( + vtkm::VecTraits::GetComponent(vec, comp / ncomps), comp % ncomps); } }; @@ -86,10 +89,7 @@ struct FlattenVec { using ComponentType = typename vtkm::VecTraits::ComponentType; - static constexpr VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfComponents(const T&) - { - return 1; - } + static constexpr VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfComponents(const T&) { return 1; } static VTKM_EXEC_CONT const ComponentType& GetComponent(const T& vec, vtkm::IdComponent) { @@ -104,8 +104,8 @@ struct FlattenVec //----------------------------------------------------------------------------- template -class ArrayHandleWrapper : - public ArrayHandleWrapperBase::ComponentType> +class ArrayHandleWrapper + : public ArrayHandleWrapperBase::ComponentType> { private: using ArrayHandleType = vtkm::cont::ArrayHandle; @@ -117,19 +117,14 @@ public: : Handle(handle) { this->Portal = this->Handle.GetPortalControl(); - this->NumberOfComponents = (this->Portal.GetNumberOfValues() == 0) ? 1 : - FlattenVec::GetNumberOfComponents(this->Portal.Get(0)); + this->NumberOfComponents = (this->Portal.GetNumberOfValues() == 0) + ? 1 + : FlattenVec::GetNumberOfComponents(this->Portal.Get(0)); } - vtkIdType GetNumberOfTuples() const override - { - return this->Portal.GetNumberOfValues(); - } + vtkIdType GetNumberOfTuples() const override { return this->Portal.GetNumberOfValues(); } - int GetNumberOfComponents() const override - { - return this->NumberOfComponents; - } + int GetNumberOfComponents() const override { return this->NumberOfComponents; } void SetTuple(vtkIdType idx, const ComponentType* value) override { @@ -173,19 +168,15 @@ public: { ArrayHandleType newHandle; newHandle.Allocate(numTuples); - vtkm::cont::Algorithm::CopySubRange( - this->Handle, - 0, - std::min(this->Handle.GetNumberOfValues(), newHandle.GetNumberOfValues()), - newHandle, - 0); + vtkm::cont::Algorithm::CopySubRange(this->Handle, 0, + std::min(this->Handle.GetNumberOfValues(), newHandle.GetNumberOfValues()), newHandle, 0); this->Handle = std::move(newHandle); this->Portal = this->Handle.GetPortalControl(); } vtkm::cont::VariantArrayHandle GetVtkmVariantArrayHandle() const override { - return vtkm::cont::VariantArrayHandle{this->Handle}; + return vtkm::cont::VariantArrayHandle{ this->Handle }; } private: @@ -196,8 +187,8 @@ private: //----------------------------------------------------------------------------- template -class ArrayHandleWrapperReadOnly : - public ArrayHandleWrapperBase::ComponentType> +class ArrayHandleWrapperReadOnly + : public ArrayHandleWrapperBase::ComponentType> { private: using ArrayHandleType = vtkm::cont::ArrayHandle; @@ -209,19 +200,14 @@ public: : Handle(handle) { this->Portal = this->Handle.GetPortalConstControl(); - this->NumberOfComponents = (this->Portal.GetNumberOfValues() == 0) ? 1 : - FlattenVec::GetNumberOfComponents(this->Portal.Get(0)); + this->NumberOfComponents = (this->Portal.GetNumberOfValues() == 0) + ? 1 + : FlattenVec::GetNumberOfComponents(this->Portal.Get(0)); } - vtkIdType GetNumberOfTuples() const override - { - return this->Portal.GetNumberOfValues(); - } + vtkIdType GetNumberOfTuples() const override { return this->Portal.GetNumberOfValues(); } - int GetNumberOfComponents() const override - { - return this->NumberOfComponents; - } + int GetNumberOfComponents() const override { return this->NumberOfComponents; } void SetTuple(vtkIdType, const ComponentType*) override { @@ -259,7 +245,7 @@ public: vtkm::cont::VariantArrayHandle GetVtkmVariantArrayHandle() const override { - return vtkm::cont::VariantArrayHandle{this->Handle}; + return vtkm::cont::VariantArrayHandle{ this->Handle }; } private: @@ -275,11 +261,13 @@ class ArrayHandleWrapperFlatSOA : public ArrayHandleWrapperBase private: using ArrayHandleType = vtkm::cont::ArrayHandle; using PortalType = typename ArrayHandleType::PortalControl; - using VtkmArrayType = vtkm::cont::ArrayHandleGroupVecVariable>; + using VtkmArrayType = vtkm::cont::ArrayHandleGroupVecVariable >; public: explicit ArrayHandleWrapperFlatSOA(const ArrayHandleType& handle, int numberOfComponents) - : Handle(handle), NumberOfComponents(numberOfComponents) + : Handle(handle) + , NumberOfComponents(numberOfComponents) { this->Portal = this->Handle.GetPortalControl(); } @@ -289,10 +277,7 @@ public: return this->Portal.GetNumberOfValues() / this->NumberOfComponents; } - int GetNumberOfComponents() const override - { - return this->NumberOfComponents; - } + int GetNumberOfComponents() const override { return this->NumberOfComponents; } void SetTuple(vtkIdType idx, const T* value) override { @@ -334,19 +319,15 @@ public: { ArrayHandleType newHandle; newHandle.Allocate(numTuples * this->NumberOfComponents); - vtkm::cont::Algorithm::CopySubRange( - this->Handle, - 0, - std::min(this->Handle.GetNumberOfValues(), newHandle.GetNumberOfValues()), - newHandle, - 0); + vtkm::cont::Algorithm::CopySubRange(this->Handle, 0, + std::min(this->Handle.GetNumberOfValues(), newHandle.GetNumberOfValues()), newHandle, 0); this->Handle = std::move(newHandle); this->Portal = this->Handle.GetPortalControl(); } vtkm::cont::VariantArrayHandle GetVtkmVariantArrayHandle() const override { - return vtkm::cont::VariantArrayHandle{this->GetVtkmArray()}; + return vtkm::cont::VariantArrayHandle{ this->GetVtkmArray() }; } private: @@ -354,7 +335,7 @@ private: { auto length = this->Handle.GetNumberOfValues() / this->NumberOfComponents; auto offsets = vtkm::cont::ArrayHandleCounting(0, this->NumberOfComponents, length); - return VtkmArrayType{this->Handle, offsets}; + return VtkmArrayType{ this->Handle, offsets }; } ArrayHandleType Handle; @@ -364,28 +345,28 @@ private: //----------------------------------------------------------------------------- template -using IsReadOnly = - std::integral_constant::value>; +using IsReadOnly = std::integral_constant::value>; template -ArrayHandleWrapperBase::ComponentType>* -WrapArrayHandle(const vtkm::cont::ArrayHandle& ah, std::false_type) +ArrayHandleWrapperBase::ComponentType>* WrapArrayHandle( + const vtkm::cont::ArrayHandle& ah, std::false_type) { - return new ArrayHandleWrapper{ah}; + return new ArrayHandleWrapper{ ah }; } template -ArrayHandleWrapperBase::ComponentType>* -WrapArrayHandle(const vtkm::cont::ArrayHandle& ah, std::true_type) +ArrayHandleWrapperBase::ComponentType>* WrapArrayHandle( + const vtkm::cont::ArrayHandle& ah, std::true_type) { - return new ArrayHandleWrapperReadOnly{ah}; + return new ArrayHandleWrapperReadOnly{ ah }; } template -ArrayHandleWrapperBase::ComponentType>* -MakeArrayHandleWrapper(const vtkm::cont::ArrayHandle& ah) +ArrayHandleWrapperBase::ComponentType>* MakeArrayHandleWrapper( + const vtkm::cont::ArrayHandle& ah) { - return WrapArrayHandle(ah, typename IsReadOnly>::type{}); + return WrapArrayHandle(ah, typename IsReadOnly >::type{}); } template @@ -401,19 +382,19 @@ ArrayHandleWrapperBase* MakeArrayHandleWrapper(vtkIdType numberOfTuples, int } case 2: { - vtkm::cont::ArrayHandle> ah; + vtkm::cont::ArrayHandle > ah; ah.Allocate(numberOfTuples); return MakeArrayHandleWrapper(ah); } case 3: { - vtkm::cont::ArrayHandle> ah; + vtkm::cont::ArrayHandle > ah; ah.Allocate(numberOfTuples); return MakeArrayHandleWrapper(ah); } case 4: { - vtkm::cont::ArrayHandle> ah; + vtkm::cont::ArrayHandle > ah; ah.Allocate(numberOfTuples); return MakeArrayHandleWrapper(ah); } @@ -421,7 +402,7 @@ ArrayHandleWrapperBase* MakeArrayHandleWrapper(vtkIdType numberOfTuples, int { vtkm::cont::ArrayHandle ah; ah.Allocate(numberOfTuples * numberOfComponents); - return new ArrayHandleWrapperFlatSOA{ah, numberOfComponents}; + return new ArrayHandleWrapperFlatSOA{ ah, numberOfComponents }; } } } @@ -446,7 +427,7 @@ template void vtkmDataArray::SetVtkmArrayHandle(const vtkm::cont::ArrayHandle& ah) { static_assert(std::is_same::ComponentType>::value, - "Component type of the arrays don't match"); + "Component type of the arrays don't match"); this->VtkmArray.reset(internal::MakeArrayHandleWrapper(ah)); diff --git a/Accelerators/Vtkm/vtkmDataSet.cxx b/Accelerators/Vtkm/vtkmDataSet.cxx index afc3ac3920..458189c95b 100644 --- a/Accelerators/Vtkm/vtkmDataSet.cxx +++ b/Accelerators/Vtkm/vtkmDataSet.cxx @@ -43,8 +43,8 @@ namespace { -using SupportedCellSets = vtkm::ListTagJoin; +using SupportedCellSets = + vtkm::ListTagJoin; template struct VtkmLocator @@ -103,7 +103,7 @@ vtkm::cont::DataSet vtkmDataSet::GetVtkmDataSet() const } //---------------------------------------------------------------------------- -void vtkmDataSet::CopyStructure(vtkDataSet *ds) +void vtkmDataSet::CopyStructure(vtkDataSet* ds) { auto vtkmds = vtkmDataSet::SafeDownCast(ds); if (vtkmds) @@ -121,7 +121,7 @@ vtkIdType vtkmDataSet::GetNumberOfPoints() vtkIdType vtkmDataSet::GetNumberOfCells() { - auto *csBase = this->Internals->CellSet.GetCellSetBase(); + auto* csBase = this->Internals->CellSet.GetCellSetBase(); return csBase ? csBase->GetNumberOfCells() : 0; } @@ -166,11 +166,13 @@ void vtkmDataSet::GetCell(vtkIdType cellId, vtkGenericCell* cell) void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6]) { - if (this->Internals->Coordinates.GetData().IsType() && - this->Internals->CellSet.IsType>()) + if (this->Internals->Coordinates.GetData() + .IsType() && + this->Internals->CellSet.IsType >()) { auto portal = this->Internals->Coordinates.GetData() - .Cast().GetPortalConstControl(); + .Cast() + .GetPortalConstControl(); vtkm::internal::ConnectivityStructuredInternals<3> helper; helper.SetPointDimensions(portal.GetDimensions()); @@ -179,8 +181,8 @@ void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6]) auto max = min + portal.GetSpacing(); for (int i = 0; i < 3; ++i) { - bounds[2*i] = min[i]; - bounds[2*i + 1] = max[i]; + bounds[2 * i] = min[i]; + bounds[2 * i + 1] = max[i]; } } else @@ -191,7 +193,7 @@ void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6]) int vtkmDataSet::GetCellType(vtkIdType cellId) { - auto *csBase = this->Internals->CellSet.GetCellSetBase(); + auto* csBase = this->Internals->CellSet.GetCellSetBase(); if (csBase) { return csBase->GetCellShape(cellId); @@ -199,7 +201,7 @@ int vtkmDataSet::GetCellType(vtkIdType cellId) return VTK_EMPTY_CELL; } -void vtkmDataSet::GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) +void vtkmDataSet::GetCellPoints(vtkIdType cellId, vtkIdList* ptIds) { auto* csBase = this->Internals->CellSet.GetCellSetBase(); if (csBase) @@ -215,7 +217,7 @@ namespace struct WorkletGetPointCells : vtkm::worklet::WorkletVisitPointsWithCells { - using ControlSignature = void (CellSetIn); + using ControlSignature = void(CellSetIn); using ExecutionSignature = void(CellCount, CellIndices, Device); using ScatterType = vtkm::worklet::ScatterPermutation<>; @@ -225,7 +227,9 @@ struct WorkletGetPointCells : vtkm::worklet::WorkletVisitPointsWithCells } template - VTKM_EXEC void operator()(vtkm::Id, IndicesVecType, vtkm::cont::DeviceAdapterTagCuda) const {} + VTKM_EXEC void operator()(vtkm::Id, IndicesVecType, vtkm::cont::DeviceAdapterTagCuda) const + { + } VTKM_SUPPRESS_EXEC_WARNINGS template @@ -243,18 +247,17 @@ struct WorkletGetPointCells : vtkm::worklet::WorkletVisitPointsWithCells } // anonymous namespace -void vtkmDataSet::GetPointCells(vtkIdType ptId, vtkIdList *cellIds) +void vtkmDataSet::GetPointCells(vtkIdType ptId, vtkIdList* cellIds) { auto scatter = WorkletGetPointCells::ScatterType(vtkm::cont::make_ArrayHandle(&ptId, 1)); vtkm::cont::Invoker invoke(vtkm::cont::DeviceAdapterTagSerial{}); - invoke(WorkletGetPointCells{cellIds}, - scatter, - this->Internals->CellSet.ResetCellSetList(SupportedCellSets{})); + invoke(WorkletGetPointCells{ cellIds }, scatter, + this->Internals->CellSet.ResetCellSetList(SupportedCellSets{})); } vtkIdType vtkmDataSet::FindPoint(double x[3]) { - auto &locator = this->Internals->PointLocator; + auto& locator = this->Internals->PointLocator; // critical section { std::lock_guard lock(locator.lock); @@ -277,18 +280,18 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) } // non thread-safe version -vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkIdType, double, int& subId, - double pcoords[3], double *weights) +vtkIdType vtkmDataSet::FindCell( + double x[3], vtkCell*, vtkIdType, double, int& subId, double pcoords[3], double* weights) { // just call the thread-safe version return this->FindCell(x, nullptr, nullptr, -1, 0.0, subId, pcoords, weights); } // thread-safe version -vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkGenericCell*, vtkIdType, - double, int& subId, double pcoords[3], double *weights) +vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkGenericCell*, vtkIdType, double, + int& subId, double pcoords[3], double* weights) { - auto &locator = this->Internals->CellLocator; + auto& locator = this->Internals->CellLocator; // critical section { std::lock_guard lock(locator.lock); @@ -357,7 +360,8 @@ namespace struct MaxCellSize { template - void operator()(const vtkm::cont::CellSetStructured& cellset, vtkm::IdComponent& result) const + void operator()( + const vtkm::cont::CellSetStructured& cellset, vtkm::IdComponent& result) const { result = cellset.GetNumberOfPointsInCell(0); } @@ -369,10 +373,12 @@ struct MaxCellSize } template - void operator()(const vtkm::cont::CellSetExplicit& cellset, vtkm::IdComponent& result) const + void operator()( + const vtkm::cont::CellSetExplicit& cellset, vtkm::IdComponent& result) const { - auto counts = cellset.GetNumIndicesArray(vtkm::TopologyElementTagCell{}, vtkm::TopologyElementTagPoint{}); - result = vtkm::cont::Algorithm::Reduce(counts, vtkm::IdComponent{0}, vtkm::Maximum{}); + auto counts = + cellset.GetNumIndicesArray(vtkm::TopologyElementTagCell{}, vtkm::TopologyElementTagPoint{}); + result = vtkm::cont::Algorithm::Reduce(counts, vtkm::IdComponent{ 0 }, vtkm::Maximum{}); } template @@ -391,7 +397,8 @@ struct MaxCellSize int vtkmDataSet::GetMaxCellSize() { vtkm::IdComponent result = 0; - vtkm::cont::CastAndCall(this->Internals->CellSet.ResetCellSetList(SupportedCellSets{}), MaxCellSize{}, result); + vtkm::cont::CastAndCall( + this->Internals->CellSet.ResetCellSetList(SupportedCellSets{}), MaxCellSize{}, result); return result; } @@ -400,7 +407,7 @@ unsigned long vtkmDataSet::GetActualMemorySize() return this->Superclass::GetActualMemorySize(); } -void vtkmDataSet::ShallowCopy(vtkDataObject *src) +void vtkmDataSet::ShallowCopy(vtkDataObject* src) { auto obj = vtkmDataSet::SafeDownCast(src); if (obj) @@ -410,7 +417,7 @@ void vtkmDataSet::ShallowCopy(vtkDataObject *src) } } -void vtkmDataSet::DeepCopy(vtkDataObject *src) +void vtkmDataSet::DeepCopy(vtkDataObject* src) { auto other = vtkmDataSet::SafeDownCast(src); if (other) diff --git a/Accelerators/Vtkm/vtkmDataSet.h b/Accelerators/Vtkm/vtkmDataSet.h index cc1cc8b8ed..d19e09a174 100644 --- a/Accelerators/Vtkm/vtkmDataSet.h +++ b/Accelerators/Vtkm/vtkmDataSet.h @@ -55,7 +55,7 @@ public: * the invoking object and the object pointed to by the parameter ds must * be of the same type. */ - void CopyStructure(vtkDataSet *ds) override; + void CopyStructure(vtkDataSet* ds) override; /** * Determine the number of points composing the dataset. @@ -70,7 +70,7 @@ public: /** * Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints. */ - double *GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override; + double* GetPoint(vtkIdType ptId) VTK_SIZEHINT(3) override; /** * Copy point coordinates into user provided array x[3] for specified @@ -82,8 +82,8 @@ public: /** * Get cell with cellId such that: 0 <= cellId < NumberOfCells. */ - vtkCell *GetCell(vtkIdType cellId) override; - void GetCell(vtkIdType cellId, vtkGenericCell *cell) override; + vtkCell* GetCell(vtkIdType cellId) override; + void GetCell(vtkIdType cellId, vtkGenericCell* cell) override; /** * Get the bounds of the cell with cellId such that: @@ -99,12 +99,12 @@ public: /** * Topological inquiry to get points defining cell. */ - void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override; + void GetCellPoints(vtkIdType cellId, vtkIdList* ptIds) override; /** * Topological inquiry to get cells using point. */ - void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override; + void GetPointCells(vtkIdType ptId, vtkIdList* cellIds) override; //@{ /** @@ -125,19 +125,16 @@ public: * points in the found cell). Tolerance is used to control how close * the point is to be considered "in" the cell. */ - vtkIdType FindCell(double x[3], vtkCell *cell, vtkIdType cellId, - double tol2, int& subId, double pcoords[3], - double *weights) override; + vtkIdType FindCell(double x[3], vtkCell* cell, vtkIdType cellId, double tol2, int& subId, + double pcoords[3], double* weights) override; /** * This is a version of the above method that can be used with * multithreaded applications. A vtkGenericCell must be passed in * to be used in internal calls that might be made to GetCell() */ - vtkIdType FindCell(double x[3], vtkCell *cell, - vtkGenericCell *gencell, vtkIdType cellId, - double tol2, int& subId, double pcoords[3], - double *weights) override; + vtkIdType FindCell(double x[3], vtkCell* cell, vtkGenericCell* gencell, vtkIdType cellId, + double tol2, int& subId, double pcoords[3], double* weights) override; /** * Reclaim any extra memory used to store data. @@ -179,8 +176,8 @@ public: /** * Shallow and Deep copy. */ - void ShallowCopy(vtkDataObject *src) override; - void DeepCopy(vtkDataObject *src) override; + void ShallowCopy(vtkDataObject* src) override; + void DeepCopy(vtkDataObject* src) override; //@} protected: diff --git a/Accelerators/Vtkm/vtkmExternalFaces.cxx b/Accelerators/Vtkm/vtkmExternalFaces.cxx index b615d77bfd..8450ed5a08 100644 --- a/Accelerators/Vtkm/vtkmExternalFaces.cxx +++ b/Accelerators/Vtkm/vtkmExternalFaces.cxx @@ -46,9 +46,7 @@ vtkmExternalFaces::vtkmExternalFaces() } //------------------------------------------------------------------------------ -vtkmExternalFaces::~vtkmExternalFaces() -{ -} +vtkmExternalFaces::~vtkmExternalFaces() {} //------------------------------------------------------------------------------ void vtkmExternalFaces::PrintSelf(ostream& os, vtkIndent indent) @@ -79,17 +77,15 @@ int vtkmExternalFaces::FillInputPortInformation(int, vtkInformation* info) } //------------------------------------------------------------------------------ -int vtkmExternalFaces::FillOutputPortInformation(int vtkNotUsed(port), - vtkInformation* info) +int vtkmExternalFaces::FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) { info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkUnstructuredGrid"); return 1; } //------------------------------------------------------------------------------ -vtkTypeBool vtkmExternalFaces::ProcessRequest(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +vtkTypeBool vtkmExternalFaces::ProcessRequest( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { // generate the data if (request->Has(vtkDemandDrivenPipeline::REQUEST_DATA())) @@ -102,14 +98,12 @@ vtkTypeBool vtkmExternalFaces::ProcessRequest(vtkInformation* request, //------------------------------------------------------------------------------ int vtkmExternalFaces::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); vtkUnstructuredGrid* output = vtkUnstructuredGrid::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); diff --git a/Accelerators/Vtkm/vtkmExternalFaces.h b/Accelerators/Vtkm/vtkmExternalFaces.h index d8ee2d9f66..5116ce68df 100644 --- a/Accelerators/Vtkm/vtkmExternalFaces.h +++ b/Accelerators/Vtkm/vtkmExternalFaces.h @@ -23,7 +23,7 @@ * @warning * This filter is currently only supports propagation of point properties * -*/ + */ #ifndef vtkmExternalFaces_h #define vtkmExternalFaces_h @@ -43,7 +43,7 @@ public: /** * Set the input DataSet */ - void SetInputData(vtkUnstructuredGrid *ds); + void SetInputData(vtkUnstructuredGrid* ds); /** * Get the resulr DataSet @@ -65,13 +65,12 @@ protected: vtkmExternalFaces(); ~vtkmExternalFaces(); - int FillInputPortInformation(int, vtkInformation *) override; - int FillOutputPortInformation(int, vtkInformation *) override; + int FillInputPortInformation(int, vtkInformation*) override; + int FillOutputPortInformation(int, vtkInformation*) override; - vtkTypeBool ProcessRequest(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; - virtual int RequestData(vtkInformation *, vtkInformationVector **, - vtkInformationVector *); + vtkTypeBool ProcessRequest( + vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*); bool CompactPoints; diff --git a/Accelerators/Vtkm/vtkmExtractVOI.cxx b/Accelerators/Vtkm/vtkmExtractVOI.cxx index ed7e138081..def18b992a 100644 --- a/Accelerators/Vtkm/vtkmExtractVOI.cxx +++ b/Accelerators/Vtkm/vtkmExtractVOI.cxx @@ -29,15 +29,13 @@ #include "vtkm/filter/ExtractStructured.h" #include "vtkm/filter/ExtractStructured.hxx" - -namespace { +namespace +{ struct InputFilterPolicy : public vtkmInputFilterPolicy { - using StructuredCellSetList = - vtkm::ListTagBase, - vtkm::cont::CellSetStructured<2>, - vtkm::cont::CellSetStructured<3>>; + using StructuredCellSetList = vtkm::ListTagBase, + vtkm::cont::CellSetStructured<2>, vtkm::cont::CellSetStructured<3> >; }; } @@ -56,17 +54,13 @@ vtkmExtractVOI::~vtkmExtractVOI() = default; //------------------------------------------------------------------------------ int vtkmExtractVOI::RequestData( - vtkInformation *request, - vtkInformationVector **inputVector, - vtkInformationVector *outputVector) + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkImageData* input = - vtkImageData::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkImageData* output = - vtkImageData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkImageData* input = vtkImageData::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkImageData* output = vtkImageData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); try { @@ -87,7 +81,7 @@ int vtkmExtractVOI::RequestData( vtkm::filter::ExtractStructured filter; filter.SetVOI(voi[0], voi[1], voi[2], voi[3], voi[4], voi[5]); filter.SetSampleRate(this->SampleRate[0], this->SampleRate[1], this->SampleRate[2]); - filter.SetIncludeBoundary( (this->IncludeBoundary != 0 ) ); + filter.SetIncludeBoundary((this->IncludeBoundary != 0)); auto result = filter.Execute(in, policy); // convert back to vtkImageData @@ -101,8 +95,7 @@ int vtkmExtractVOI::RequestData( } catch (const vtkm::cont::Error& e) { - vtkErrorMacro(<< "VTK-m error: " << e.GetMessage() - << "Falling back to vtkExtractVOI"); + vtkErrorMacro(<< "VTK-m error: " << e.GetMessage() << "Falling back to vtkExtractVOI"); return this->Superclass::RequestData(request, inputVector, outputVector); } diff --git a/Accelerators/Vtkm/vtkmExtractVOI.h b/Accelerators/Vtkm/vtkmExtractVOI.h index ea067022d0..e698edd5f4 100644 --- a/Accelerators/Vtkm/vtkmExtractVOI.h +++ b/Accelerators/Vtkm/vtkmExtractVOI.h @@ -31,14 +31,13 @@ * for image processing, subsampling large volumes to reduce data size, or * extracting regions of a volume with interesting data. * -*/ + */ #ifndef vtkmExtractVOI_h #define vtkmExtractVOI_h #include "vtkAcceleratorsVTKmModule.h" // for export macro #include "vtkExtractVOI.h" - class VTKACCELERATORSVTKM_EXPORT vtkmExtractVOI : public vtkExtractVOI { public: @@ -50,8 +49,7 @@ protected: vtkmExtractVOI(); ~vtkmExtractVOI(); - int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmExtractVOI(const vtkmExtractVOI&) = delete; diff --git a/Accelerators/Vtkm/vtkmFilterPolicy.h b/Accelerators/Vtkm/vtkmFilterPolicy.h index de8482689e..cf06ba8e3c 100644 --- a/Accelerators/Vtkm/vtkmFilterPolicy.h +++ b/Accelerators/Vtkm/vtkmFilterPolicy.h @@ -35,59 +35,48 @@ namespace tovtkm //------------------------------------------------------------------------------ // All scalar types in vtkType.h struct VTKScalarTypes - : vtkm::ListTagBase< // - char, // - signed char, // - unsigned char, // - short, // - unsigned short, // - int, // - unsigned int, // - long, // - unsigned long, // - long long, // + : vtkm::ListTagBase< // + char, // + signed char, // + unsigned char, // + short, // + unsigned short, // + int, // + unsigned int, // + long, // + unsigned long, // + long long, // unsigned long long, // - float, // - double // - > + float, // + double // + > { }; struct SpecialGradientOutTypes - : vtkm::ListTagBase< - vtkm::Vec< vtkm::Vec, 3>, - vtkm::Vec< vtkm::Vec, 3> - > + : vtkm::ListTagBase, 3>, + vtkm::Vec, 3> > { }; -struct FieldTypeInVTK - : vtkm::ListTagJoin< - vtkm::TypeListTagVecCommon, - VTKScalarTypes> +struct FieldTypeInVTK : vtkm::ListTagJoin { }; struct FieldTypeOutVTK - : vtkm::ListTagJoin< - vtkm::ListTagJoin< - vtkm::TypeListTagVecCommon, - SpecialGradientOutTypes - >, - VTKScalarTypes - > + : vtkm::ListTagJoin, + VTKScalarTypes> { }; //------------------------------------------------------------------------------ struct CellListStructuredInVTK - : vtkm::ListTagBase, vtkm::cont::CellSetStructured<2>> + : vtkm::ListTagBase, vtkm::cont::CellSetStructured<2> > { }; struct CellListStructuredOutVTK - : vtkm::ListTagBase< - vtkm::cont::CellSetPermutation>, - vtkm::cont::CellSetPermutation> > + : vtkm::ListTagBase >, + vtkm::cont::CellSetPermutation > > { }; @@ -99,70 +88,63 @@ using Int32AsIdAOSHandle = vtkm::cont::ArrayHandleCast using Int32AsIdAOSStorage = typename Int32AsIdAOSHandle::StorageTag; using CellSetExplicit32Bit = vtkm::cont::CellSetExplicit; + Int32AsIdAOSStorage, Int32AsIdAOSStorage>; using CellSetExplicit64Bit = vtkm::cont::CellSetExplicit; + vtkm::cont::StorageTagBasic, vtkm::cont::StorageTagBasic>; using CellSetSingleType32Bit = vtkm::cont::CellSetSingleType; using CellSetSingleType64Bit = vtkm::cont::CellSetSingleType; -#else // VTKM_USE_64BIT_IDS +#else // VTKM_USE_64BIT_IDS using Int64AOSHandle = vtkm::cont::ArrayHandle; using Int64AsIdAOSHandle = vtkm::cont::ArrayHandleCast; using Int64AsIdAOSStorage = typename Int64AsIdAOSHandle::StorageTag; using CellSetExplicit32Bit = vtkm::cont::CellSetExplicit; + vtkm::cont::StorageTagBasic, vtkm::cont::StorageTagBasic>; using CellSetExplicit64Bit = vtkm::cont::CellSetExplicit; + Int64AsIdAOSStorage, Int64AsIdAOSStorage>; using CellSetSingleType32Bit = vtkm::cont::CellSetSingleType; using CellSetSingleType64Bit = vtkm::cont::CellSetSingleType; #endif // VTKM_USE_64BIT_IDS //------------------------------------------------------------------------------ struct CellListUnstructuredInVTK - : vtkm::ListTagBase< // - CellSetExplicit32Bit, // - CellSetExplicit64Bit, // + : vtkm::ListTagBase< // + CellSetExplicit32Bit, // + CellSetExplicit64Bit, // CellSetSingleType32Bit, // - CellSetSingleType64Bit // - > + CellSetSingleType64Bit // + > { }; struct CellListUnstructuredOutVTK - : vtkm::ListTagBase< // - vtkm::cont::CellSetExplicit<>, // - vtkm::cont::CellSetSingleType<>, // - CellSetExplicit32Bit, // - CellSetExplicit64Bit, // - CellSetSingleType32Bit, // - CellSetSingleType64Bit, // - vtkm::cont::CellSetPermutation, // - vtkm::cont::CellSetPermutation, // - vtkm::cont::CellSetPermutation, // - vtkm::cont::CellSetPermutation, // - vtkm::cont::CellSetPermutation >, // + : vtkm::ListTagBase< // + vtkm::cont::CellSetExplicit<>, // + vtkm::cont::CellSetSingleType<>, // + CellSetExplicit32Bit, // + CellSetExplicit64Bit, // + CellSetSingleType32Bit, // + CellSetSingleType64Bit, // + vtkm::cont::CellSetPermutation, // + vtkm::cont::CellSetPermutation, // + vtkm::cont::CellSetPermutation, // + vtkm::cont::CellSetPermutation, // + vtkm::cont::CellSetPermutation >, // vtkm::cont::CellSetPermutation > // - > + > { }; //------------------------------------------------------------------------------ -struct CellListAllInVTK - : vtkm::ListTagJoin +struct CellListAllInVTK : vtkm::ListTagJoin { }; -struct CellListAllOutVTK - : vtkm::ListTagJoin +struct CellListAllOutVTK : vtkm::ListTagJoin { }; } //------------------------------------------------------------------------------ -class vtkmInputFilterPolicy - : public vtkm::filter::PolicyBase +class vtkmInputFilterPolicy : public vtkm::filter::PolicyBase { public: using FieldTypeList = tovtkm::FieldTypeInVTK; @@ -170,12 +152,10 @@ public: using StructuredCellSetList = tovtkm::CellListStructuredInVTK; using UnstructuredCellSetList = tovtkm::CellListUnstructuredInVTK; using AllCellSetList = tovtkm::CellListAllInVTK; - }; //------------------------------------------------------------------------------ -class vtkmOutputFilterPolicy - : public vtkm::filter::PolicyBase +class vtkmOutputFilterPolicy : public vtkm::filter::PolicyBase { public: using FieldTypeList = tovtkm::FieldTypeOutVTK; @@ -183,7 +163,6 @@ public: using StructuredCellSetList = tovtkm::CellListStructuredOutVTK; using UnstructuredCellSetList = tovtkm::CellListUnstructuredOutVTK; using AllCellSetList = tovtkm::CellListAllOutVTK; - }; #endif diff --git a/Accelerators/Vtkm/vtkmGradient.cxx b/Accelerators/Vtkm/vtkmGradient.cxx index f4f138d2ea..2800ba4824 100644 --- a/Accelerators/Vtkm/vtkmGradient.cxx +++ b/Accelerators/Vtkm/vtkmGradient.cxx @@ -38,28 +38,27 @@ vtkStandardNewMacro(vtkmGradient); namespace { struct GradientTypes - : vtkm::ListTagBase< // - vtkm::Float32, // - vtkm::Float64, // - vtkm::Vec, // - vtkm::Vec, // + : vtkm::ListTagBase< // + vtkm::Float32, // + vtkm::Float64, // + vtkm::Vec, // + vtkm::Vec, // vtkm::Vec, 3>, // - vtkm::Vec, 3> // + vtkm::Vec, 3> // > { }; //------------------------------------------------------------------------------ -class vtkmGradientFilterPolicy - : public vtkm::filter::PolicyBase - { - public: - using FieldTypeList = GradientTypes; +class vtkmGradientFilterPolicy : public vtkm::filter::PolicyBase +{ +public: + using FieldTypeList = GradientTypes; - using StructuredCellSetList = tovtkm::CellListStructuredInVTK; - using UnstructuredCellSetList = tovtkm::CellListUnstructuredInVTK; - using AllCellSetList = tovtkm::CellListAllInVTK; - }; + using StructuredCellSetList = tovtkm::CellListStructuredInVTK; + using UnstructuredCellSetList = tovtkm::CellListUnstructuredInVTK; + using AllCellSetList = tovtkm::CellListAllInVTK; +}; inline vtkm::cont::DataSet CopyDataSetStructure(const vtkm::cont::DataSet& ds) { @@ -71,14 +70,10 @@ inline vtkm::cont::DataSet CopyDataSetStructure(const vtkm::cont::DataSet& ds) } // anonymous namespace //------------------------------------------------------------------------------ -vtkmGradient::vtkmGradient() -{ -} +vtkmGradient::vtkmGradient() {} //------------------------------------------------------------------------------ -vtkmGradient::~vtkmGradient() -{ -} +vtkmGradient::~vtkmGradient() {} //------------------------------------------------------------------------------ void vtkmGradient::PrintSelf(ostream& os, vtkIndent indent) @@ -87,17 +82,14 @@ void vtkmGradient::PrintSelf(ostream& os, vtkIndent indent) } //------------------------------------------------------------------------------ -int vtkmGradient::RequestData(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmGradient::RequestData( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkDataSet* output = - vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* output = vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); output->ShallowCopy(input); @@ -105,8 +97,7 @@ int vtkmGradient::RequestData(vtkInformation* request, // the gradient for int association = this->GetInputArrayAssociation(0, inputVector); vtkDataArray* inputArray = this->GetInputArrayToProcess(0, inputVector); - if (inputArray == nullptr || inputArray->GetName() == nullptr || - inputArray->GetName()[0] == '\0') + if (inputArray == nullptr || inputArray->GetName() == nullptr || inputArray->GetName()[0] == '\0') { vtkErrorMacro("Invalid input array."); return 0; @@ -124,11 +115,10 @@ int vtkmGradient::RequestData(vtkInformation* request, const bool fieldIsPoint = field.GetAssociation() == vtkm::cont::Field::Association::POINTS; const bool fieldIsCell = field.GetAssociation() == vtkm::cont::Field::Association::CELL_SET; const bool fieldIsVec = (inputArray->GetNumberOfComponents() == 3); - const bool fieldIsScalar = inputArray->GetDataType() == VTK_FLOAT || - inputArray->GetDataType() == VTK_DOUBLE; - const bool fieldValid = (fieldIsPoint || fieldIsCell) && - fieldIsScalar && - (field.GetName() != std::string()); + const bool fieldIsScalar = + inputArray->GetDataType() == VTK_FLOAT || inputArray->GetDataType() == VTK_DOUBLE; + const bool fieldValid = + (fieldIsPoint || fieldIsCell) && fieldIsScalar && (field.GetName() != std::string()); if (!fieldValid) { @@ -138,14 +128,13 @@ int vtkmGradient::RequestData(vtkInformation* request, } vtkmGradientFilterPolicy policy; - auto passNoFields = - vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE); + auto passNoFields = vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE); vtkm::filter::Gradient filter; filter.SetFieldsToPass(passNoFields); filter.SetColumnMajorOrdering(); if (fieldIsVec) - { //this properties are only valid when processing a vec<3> field + { // this properties are only valid when processing a vec<3> field filter.SetComputeDivergence(this->ComputeDivergence != 0); filter.SetComputeVorticity(this->ComputeVorticity != 0); filter.SetComputeQCriterion(this->ComputeQCriterion != 0); @@ -184,9 +173,9 @@ int vtkmGradient::RequestData(vtkInformation* request, filter.SetActiveField(field.GetName(), vtkm::cont::Field::Association::POINTS); result = filter.Execute(in, policy); - //When we have faster approximation enabled the VTK-m gradient will output - //a cell field not a point field. So at that point we will need to convert - //back to a point field + // When we have faster approximation enabled the VTK-m gradient will output + // a cell field not a point field. So at that point we will need to convert + // back to a point field if (this->FasterApproximation) { vtkm::filter::PointAverage cellToPoint; @@ -211,15 +200,15 @@ int vtkmGradient::RequestData(vtkInformation* request, } if (this->ComputeVorticity && fieldIsVec) { - cellToPoint.SetActiveField(filter.GetVorticityName(), - vtkm::cont::Field::Association::CELL_SET); + cellToPoint.SetActiveField( + filter.GetVorticityName(), vtkm::cont::Field::Association::CELL_SET); auto ds = cellToPoint.Execute(c2pIn, policy); result.AddField(ds.GetField(0)); } if (this->ComputeQCriterion && fieldIsVec) { - cellToPoint.SetActiveField(filter.GetQCriterionName(), - vtkm::cont::Field::Association::CELL_SET); + cellToPoint.SetActiveField( + filter.GetQCriterionName(), vtkm::cont::Field::Association::CELL_SET); auto ds = cellToPoint.Execute(c2pIn, policy); result.AddField(ds.GetField(0)); } @@ -227,7 +216,7 @@ int vtkmGradient::RequestData(vtkInformation* request, } else { - //we need to convert the field to be a point field + // we need to convert the field to be a point field vtkm::filter::PointAverage cellToPoint; cellToPoint.SetFieldsToPass(passNoFields); cellToPoint.SetActiveField(field.GetName(), field.GetAssociation()); @@ -245,7 +234,7 @@ int vtkmGradient::RequestData(vtkInformation* request, { requestedResult = CopyDataSetStructure(result); vtkm::Id numOfFields = static_cast(result.GetNumberOfFields()); - for (vtkm::Id i=0; i < numOfFields; ++i) + for (vtkm::Id i = 0; i < numOfFields; ++i) { if (result.GetField(i).GetName() != filter.GetOutputFieldName()) { diff --git a/Accelerators/Vtkm/vtkmGradient.h b/Accelerators/Vtkm/vtkmGradient.h index 57281fd434..ae02e340c0 100644 --- a/Accelerators/Vtkm/vtkmGradient.h +++ b/Accelerators/Vtkm/vtkmGradient.h @@ -28,7 +28,7 @@ * Also options to additionally compute the divergence, vorticity and * Q criterion of input vector fields. * -*/ + */ #ifndef vtkmGradient_h #define vtkmGradient_h @@ -47,9 +47,7 @@ protected: vtkmGradient(); ~vtkmGradient(); - - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmGradient(const vtkmGradient&) = delete; diff --git a/Accelerators/Vtkm/vtkmHistogram.cxx b/Accelerators/Vtkm/vtkmHistogram.cxx index 4d22d35ad6..80bb82a8fc 100644 --- a/Accelerators/Vtkm/vtkmHistogram.cxx +++ b/Accelerators/Vtkm/vtkmHistogram.cxx @@ -48,9 +48,7 @@ vtkmHistogram::vtkmHistogram() } //------------------------------------------------------------------------------ -vtkmHistogram::~vtkmHistogram() -{ -} +vtkmHistogram::~vtkmHistogram() {} //----------------------------------------------------------------------------- int vtkmHistogram::FillInputPortInformation(int port, vtkInformation* info) @@ -63,12 +61,10 @@ int vtkmHistogram::FillInputPortInformation(int port, vtkInformation* info) //------------------------------------------------------------------------------ int vtkmHistogram::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); vtkTable* output = vtkTable::GetData(outputVector, 0); output->Initialize(); @@ -84,9 +80,8 @@ int vtkmHistogram::RequestData(vtkInformation* vtkNotUsed(request), int association = this->GetInputArrayAssociation(0, inputVector); auto fieldArray = this->GetInputArrayToProcess(0, inputVector); if ((association != vtkDataObject::FIELD_ASSOCIATION_POINTS && - association != vtkDataObject::FIELD_ASSOCIATION_CELLS) || - fieldArray == nullptr || - fieldArray->GetName() == nullptr || fieldArray->GetName()[0] == '\0') + association != vtkDataObject::FIELD_ASSOCIATION_CELLS) || + fieldArray == nullptr || fieldArray->GetName() == nullptr || fieldArray->GetName()[0] == '\0') { vtkErrorMacro(<< "Invalid field: Requires a point or cell field with a valid name."); return 0; @@ -123,12 +118,11 @@ int vtkmHistogram::RequestData(vtkInformation* vtkNotUsed(request), this->ComputedRange[1] = filter.GetComputedRange().Max; // Convert the result back - vtkDataArray* resultingArray = - fromvtkm::Convert(result.GetField("histogram")); + vtkDataArray* resultingArray = fromvtkm::Convert(result.GetField("histogram")); resultingArray->SetName("bin_values"); - if (resultingArray == nullptr) + if (resultingArray == nullptr) { - vtkErrorMacro(<<"Unable to convert result array from VTK-m to VTK"); + vtkErrorMacro(<< "Unable to convert result array from VTK-m to VTK"); return 0; } this->FillBinExtents(binExtents); @@ -146,15 +140,14 @@ int vtkmHistogram::RequestData(vtkInformation* vtkNotUsed(request), } //------------------------------------------------------------------------------ -void vtkmHistogram::PrintSelf(std::ostream &os, vtkIndent indent) +void vtkmHistogram::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); - os << indent << "NumberOfBins: " << NumberOfBins << "\n"; - os << indent << "UseCustomBinRanges: " <SetNumberOfComponents(1); binExtents->SetNumberOfTuples(static_cast(this->NumberOfBins)); - double binDelta = this->CenterBinsAroundMinAndMax ? - ((this->ComputedRange[1] - this->ComputedRange[0]) / (this->NumberOfBins -1)) - : this->BinDelta; + double binDelta = this->CenterBinsAroundMinAndMax + ? ((this->ComputedRange[1] - this->ComputedRange[0]) / (this->NumberOfBins - 1)) + : this->BinDelta; double halfBinDelta = binDelta / 2.0; for (vtkIdType i = 0; i < static_cast(this->NumberOfBins); i++) { - binExtents->SetValue(i, this->ComputedRange[0] + (i*binDelta) + - (this->CenterBinsAroundMinAndMax ? 0.0 : halfBinDelta)); + binExtents->SetValue(i, + this->ComputedRange[0] + (i * binDelta) + + (this->CenterBinsAroundMinAndMax ? 0.0 : halfBinDelta)); } } diff --git a/Accelerators/Vtkm/vtkmHistogram.h b/Accelerators/Vtkm/vtkmHistogram.h index 9ae96397fb..d9813ba696 100644 --- a/Accelerators/Vtkm/vtkmHistogram.h +++ b/Accelerators/Vtkm/vtkmHistogram.h @@ -21,7 +21,7 @@ * The histogram consists of a certain number of bins specified by the user, and * the user can fetch the range and bin delta after completion. * -*/ + */ #ifndef vtkmHistogram_h #define vtkmHistogram_h @@ -42,8 +42,8 @@ public: /** * Specify number of bins. Default is 10. */ - vtkSetMacro(NumberOfBins,size_t); - vtkGetMacro(NumberOfBins,size_t); + vtkSetMacro(NumberOfBins, size_t); + vtkGetMacro(NumberOfBins, size_t); //@} //@{ @@ -51,8 +51,8 @@ public: * Specify the range to use to generate the histogram. They are only used when * UseCustomBinRanges is set to true. */ - vtkSetVector2Macro(CustomBinRange,double); - vtkGetVector2Macro(CustomBinRange,double); + vtkSetVector2Macro(CustomBinRange, double); + vtkGetVector2Macro(CustomBinRange, double); //@} //@{ @@ -80,7 +80,7 @@ public: /** * Return the range used to generate the histogram. */ - vtkGetVectorMacro(ComputedRange,double, 2); + vtkGetVectorMacro(ComputedRange, double, 2); //@} //@{ @@ -94,8 +94,7 @@ protected: vtkmHistogram(); ~vtkmHistogram(); - virtual int RequestData(vtkInformation*, - vtkInformationVector**, vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; int FillInputPortInformation(int port, vtkInformation* info) override; private: diff --git a/Accelerators/Vtkm/vtkmImageConnectivity.cxx b/Accelerators/Vtkm/vtkmImageConnectivity.cxx index 72b92b9777..425d1869b2 100644 --- a/Accelerators/Vtkm/vtkmImageConnectivity.cxx +++ b/Accelerators/Vtkm/vtkmImageConnectivity.cxx @@ -15,11 +15,11 @@ //============================================================================= #include "vtkmImageConnectivity.h" +#include "vtkImageData.h" #include "vtkInformation.h" #include "vtkInformationVector.h" #include "vtkNew.h" #include "vtkObjectFactory.h" -#include "vtkImageData.h" #include "vtkmlib/ArrayConverters.h" #include "vtkmlib/DataSetConverters.h" @@ -32,14 +32,10 @@ vtkStandardNewMacro(vtkmImageConnectivity); //------------------------------------------------------------------------------ -vtkmImageConnectivity::vtkmImageConnectivity() -{ -} +vtkmImageConnectivity::vtkmImageConnectivity() {} //------------------------------------------------------------------------------ -vtkmImageConnectivity::~vtkmImageConnectivity() -{ -} +vtkmImageConnectivity::~vtkmImageConnectivity() {} //------------------------------------------------------------------------------ void vtkmImageConnectivity::PrintSelf(ostream& os, vtkIndent indent) @@ -48,25 +44,20 @@ void vtkmImageConnectivity::PrintSelf(ostream& os, vtkIndent indent) } //------------------------------------------------------------------------------ -int vtkmImageConnectivity::RequestData(vtkInformation *, - vtkInformationVector **inputVector, - vtkInformationVector *outputVector) +int vtkmImageConnectivity::RequestData( + vtkInformation*, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { - vtkInformation *outInfo = outputVector->GetInformationObject(0); - vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); - - vtkImageData* output = static_cast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkImageData* input = static_cast( - inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkInformation* outInfo = outputVector->GetInformationObject(0); + vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); + vtkImageData* output = static_cast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkImageData* input = static_cast(inInfo->Get(vtkDataObject::DATA_OBJECT())); // Find the scalar array: int association = this->GetInputArrayAssociation(0, inputVector); - vtkDataArray *inputArray = this->GetInputArrayToProcess(0, inputVector); - if (association != vtkDataObject::FIELD_ASSOCIATION_POINTS || - inputArray == nullptr || inputArray->GetName() == nullptr || - inputArray->GetName()[0] == '\0') + vtkDataArray* inputArray = this->GetInputArrayToProcess(0, inputVector); + if (association != vtkDataObject::FIELD_ASSOCIATION_POINTS || inputArray == nullptr || + inputArray->GetName() == nullptr || inputArray->GetName()[0] == '\0') { vtkErrorMacro("Invalid scalar array; array missing or not a point array."); return 0; @@ -76,7 +67,7 @@ int vtkmImageConnectivity::RequestData(vtkInformation *, { vtkm::filter::ImageConnectivity filter; filter.SetActiveField(inputArray->GetName(), vtkm::cont::Field::Association::POINTS); - //the field should be named 'RegionId' + // the field should be named 'RegionId' filter.SetOutputFieldName("RegionId"); // explicitly convert just the field we need @@ -85,14 +76,13 @@ int vtkmImageConnectivity::RequestData(vtkInformation *, inData.AddField(inField); // don't pass this field - filter.SetFieldsToPass( - vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); + filter.SetFieldsToPass(vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); vtkm::cont::DataSet result; vtkmInputFilterPolicy policy; result = filter.Execute(inData, policy); - //Make sure the output has all the fields / etc that the input has + // Make sure the output has all the fields / etc that the input has output->ShallowCopy(input); // convert back the regionId field to VTK @@ -109,5 +99,4 @@ int vtkmImageConnectivity::RequestData(vtkInformation *, return 0; } return 1; - } diff --git a/Accelerators/Vtkm/vtkmImageConnectivity.h b/Accelerators/Vtkm/vtkmImageConnectivity.h index 11e3ee2870..9e568ff1fc 100644 --- a/Accelerators/Vtkm/vtkmImageConnectivity.h +++ b/Accelerators/Vtkm/vtkmImageConnectivity.h @@ -30,21 +30,20 @@ * Each entry in the point field will be a number that identifies to which * region it belongs. By default, this output point field is named “component”. * - * @sa + * @sa * vtkConnectivityFilter, vtkImageConnectivityFilter -*/ + */ #ifndef vtkmImageConnectivity_h #define vtkmImageConnectivity_h -#include "vtkImageAlgorithm.h" #include "vtkAcceleratorsVTKmModule.h" //required for correct implementation +#include "vtkImageAlgorithm.h" -class VTKACCELERATORSVTKM_EXPORT vtkmImageConnectivity : - public vtkImageAlgorithm +class VTKACCELERATORSVTKM_EXPORT vtkmImageConnectivity : public vtkImageAlgorithm { public: - vtkTypeMacro(vtkmImageConnectivity,vtkImageAlgorithm); + vtkTypeMacro(vtkmImageConnectivity, vtkImageAlgorithm); void PrintSelf(ostream& os, vtkIndent indent) override; static vtkmImageConnectivity* New(); @@ -52,8 +51,7 @@ protected: vtkmImageConnectivity(); ~vtkmImageConnectivity(); - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmImageConnectivity(const vtkmImageConnectivity&) = delete; diff --git a/Accelerators/Vtkm/vtkmLevelOfDetail.cxx b/Accelerators/Vtkm/vtkmLevelOfDetail.cxx index 5fca5656d2..89f1c7a5ae 100644 --- a/Accelerators/Vtkm/vtkmLevelOfDetail.cxx +++ b/Accelerators/Vtkm/vtkmLevelOfDetail.cxx @@ -35,7 +35,6 @@ // the following #include - vtkStandardNewMacro(vtkmLevelOfDetail); //------------------------------------------------------------------------------ @@ -47,9 +46,7 @@ vtkmLevelOfDetail::vtkmLevelOfDetail() } //------------------------------------------------------------------------------ -vtkmLevelOfDetail::~vtkmLevelOfDetail() -{ -} +vtkmLevelOfDetail::~vtkmLevelOfDetail() {} //------------------------------------------------------------------------------ void vtkmLevelOfDetail::SetNumberOfXDivisions(int num) @@ -115,16 +112,13 @@ void vtkmLevelOfDetail::GetNumberOfDivisions(int div[3]) //------------------------------------------------------------------------------ int vtkmLevelOfDetail::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkPolyData* output = - vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkPolyData* output = vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); if (!input || input->GetNumberOfPoints() == 0) { @@ -136,16 +130,15 @@ int vtkmLevelOfDetail::RequestData(vtkInformation* vtkNotUsed(request), { // convert the input dataset to a vtkm::cont::DataSet auto in = tovtkm::Convert(input, tovtkm::FieldsFlag::PointsAndCells); - if(in.GetNumberOfCells() == 0 || in.GetNumberOfPoints() == 0) + if (in.GetNumberOfCells() == 0 || in.GetNumberOfPoints() == 0) { return 0; } vtkmInputFilterPolicy policy; vtkm::filter::VertexClustering filter; - filter.SetNumberOfDivisions(vtkm::make_Vec(this->NumberOfDivisions[0], - this->NumberOfDivisions[1], - this->NumberOfDivisions[2])); + filter.SetNumberOfDivisions(vtkm::make_Vec( + this->NumberOfDivisions[0], this->NumberOfDivisions[1], this->NumberOfDivisions[2])); auto result = filter.Execute(in, policy); @@ -170,10 +163,7 @@ void vtkmLevelOfDetail::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); - os << indent << "Number of X Divisions: " << this->NumberOfDivisions[0] - << "\n"; - os << indent << "Number of Y Divisions: " << this->NumberOfDivisions[1] - << "\n"; - os << indent << "Number of Z Divisions: " << this->NumberOfDivisions[2] - << "\n"; + os << indent << "Number of X Divisions: " << this->NumberOfDivisions[0] << "\n"; + os << indent << "Number of Y Divisions: " << this->NumberOfDivisions[1] << "\n"; + os << indent << "Number of Z Divisions: " << this->NumberOfDivisions[2] << "\n"; } diff --git a/Accelerators/Vtkm/vtkmLevelOfDetail.h b/Accelerators/Vtkm/vtkmLevelOfDetail.h index ea74d08006..d5b5f84285 100644 --- a/Accelerators/Vtkm/vtkmLevelOfDetail.h +++ b/Accelerators/Vtkm/vtkmLevelOfDetail.h @@ -42,7 +42,7 @@ * doesn't increase the computation or memory of the algorithm and will produce * significantly better results. * -*/ + */ #ifndef vtkmLevelOfDetail_h #define vtkmLevelOfDetail_h @@ -53,7 +53,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmLevelOfDetail : public vtkPolyDataAlgorithm { public: - vtkTypeMacro(vtkmLevelOfDetail,vtkPolyDataAlgorithm); + vtkTypeMacro(vtkmLevelOfDetail, vtkPolyDataAlgorithm); void PrintSelf(ostream& os, vtkIndent indent) override; static vtkmLevelOfDetail* New(); @@ -73,10 +73,7 @@ public: // Set/Get the number of divisions for each axis for the spatial bins. // The number of spatial bins is NumberOfXDivisions*NumberOfYDivisions* // NumberOfZDivisions. - void SetNumberOfDivisions(int div[3]) - { - this->SetNumberOfDivisions(div[0], div[1], div[2]); - } + void SetNumberOfDivisions(int div[3]) { this->SetNumberOfDivisions(div[0], div[1], div[2]); } void SetNumberOfDivisions(int div0, int div1, int div2); const int* GetNumberOfDivisions(); @@ -86,8 +83,7 @@ protected: vtkmLevelOfDetail(); ~vtkmLevelOfDetail(); - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: int NumberOfDivisions[3]; diff --git a/Accelerators/Vtkm/vtkmNDHistogram.cxx b/Accelerators/Vtkm/vtkmNDHistogram.cxx index 02ac1674c6..a6302ee649 100644 --- a/Accelerators/Vtkm/vtkmNDHistogram.cxx +++ b/Accelerators/Vtkm/vtkmNDHistogram.cxx @@ -37,25 +37,29 @@ vtkStandardNewMacro(vtkmNDHistogram); void vtkmNDHistogram::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); - os << indent << "FieldNames: " << "\n"; + os << indent << "FieldNames: " + << "\n"; for (const auto& fieldName : FieldNames) { os << indent << fieldName << " "; } os << indent << "\n"; - os << indent << "NumberOfBins: " << "\n"; + os << indent << "NumberOfBins: " + << "\n"; for (const auto& nob : NumberOfBins) { os << indent << nob << " "; } os << indent << "\n"; - os << indent << "BinDeltas: " << "\n"; + os << indent << "BinDeltas: " + << "\n"; for (const auto& bd : BinDeltas) { os << indent << bd << " "; } os << indent << "\n"; - os << indent << "DataRanges: " << "\n"; + os << indent << "DataRanges: " + << "\n"; for (const auto& dr : DataRanges) { os << indent << dr.first << " " << dr.second << " "; @@ -64,14 +68,10 @@ void vtkmNDHistogram::PrintSelf(std::ostream& os, vtkIndent indent) } //------------------------------------------------------------------------------ -vtkmNDHistogram::vtkmNDHistogram() -{ -} +vtkmNDHistogram::vtkmNDHistogram() {} //------------------------------------------------------------------------------ -vtkmNDHistogram::~vtkmNDHistogram() -{ -} +vtkmNDHistogram::~vtkmNDHistogram() {} //------------------------------------------------------------------------------ void vtkmNDHistogram::AddFieldAndBin(const std::string& fieldName, const vtkIdType& numberOfBins) @@ -79,7 +79,7 @@ void vtkmNDHistogram::AddFieldAndBin(const std::string& fieldName, const vtkIdTy this->FieldNames.push_back(fieldName); this->NumberOfBins.push_back(numberOfBins); this->SetInputArrayToProcess(static_cast(this->FieldNames.size()), 0, 0, - vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName.c_str()); + vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName.c_str()); } //------------------------------------------------------------------------------ @@ -106,20 +106,17 @@ int vtkmNDHistogram::FillInputPortInformation(int port, vtkInformation* info) //------------------------------------------------------------------------------ int vtkmNDHistogram::GetFieldIndexFromFieldName(const std::string& fieldName) { - auto iter = - std::find(this->FieldNames.begin(), this->FieldNames.end(), fieldName); - return (iter == std::end(this->FieldNames)) ? -1 : - static_cast(iter - this->FieldNames.begin()); + auto iter = std::find(this->FieldNames.begin(), this->FieldNames.end(), fieldName); + return (iter == std::end(this->FieldNames)) ? -1 + : static_cast(iter - this->FieldNames.begin()); } //------------------------------------------------------------------------------ int vtkmNDHistogram::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); vtkArrayData* output = vtkArrayData::GetData(outputVector, 0); output->ClearArrays(); @@ -145,44 +142,42 @@ int vtkmNDHistogram::RequestData(vtkInformation* vtkNotUsed(request), // Fetch the field array out of the vtkm filter result size_t index = 0; std::vector fArrays; - for (auto& fn: this->FieldNames) + for (auto& fn : this->FieldNames) { - vtkDataArray* fnArray = fromvtkm::Convert(out.GetField( - fn)); + vtkDataArray* fnArray = fromvtkm::Convert(out.GetField(fn)); fnArray->SetName(fn.c_str()); fArrays.push_back(fnArray); this->BinDeltas.push_back(filter.GetBinDelta(index)); - this->DataRanges.push_back(std::make_pair(filter.GetDataRange(index).Min, - filter.GetDataRange(index).Max)); + this->DataRanges.push_back( + std::make_pair(filter.GetDataRange(index).Min, filter.GetDataRange(index).Max)); index++; } vtkDataArray* frequencyArray = fromvtkm::Convert(out.GetField("Frequency")); frequencyArray->SetName("Frequency"); // Create the sparse array - vtkSparseArray* sparseArray = - vtkSparseArray::New(); - vtkArrayExtents sae; //sparse array extent + vtkSparseArray* sparseArray = vtkSparseArray::New(); + vtkArrayExtents sae; // sparse array extent size_t ndims(fArrays.size()); sae.SetDimensions(static_cast(ndims)); - for (size_t i=0; i < ndims; i++) + for (size_t i = 0; i < ndims; i++) { - sae[static_cast(i)] = vtkArrayRange(0, fArrays[i]->GetNumberOfValues()); + sae[static_cast(i)] = + vtkArrayRange(0, fArrays[i]->GetNumberOfValues()); } sparseArray->Resize(sae); // Set the dimension label - for (size_t i=0; i < ndims; i++) + for (size_t i = 0; i < ndims; i++) { - sparseArray->SetDimensionLabel(static_cast(i), - fArrays[i]->GetName()); + sparseArray->SetDimensionLabel(static_cast(i), fArrays[i]->GetName()); } // Fill in the sparse array - for (vtkIdType i=0; i < frequencyArray->GetNumberOfValues(); i++) + for (vtkIdType i = 0; i < frequencyArray->GetNumberOfValues(); i++) { vtkArrayCoordinates coords; coords.SetDimensions(static_cast(ndims)); - for (size_t j=0; j < ndims; j++) + for (size_t j = 0; j < ndims; j++) { coords[static_cast(j)] = fArrays[j]->GetComponent(i, 0); } @@ -198,9 +193,9 @@ int vtkmNDHistogram::RequestData(vtkInformation* vtkNotUsed(request), frequencyArray->FastDelete(); sparseArray->FastDelete(); } - catch(const vtkm::cont::Error& e) + catch (const vtkm::cont::Error& e) { - vtkErrorMacro(<<"VTK-m error: " << e.GetMessage()); + vtkErrorMacro(<< "VTK-m error: " << e.GetMessage()); return 0; } return 1; diff --git a/Accelerators/Vtkm/vtkmNDHistogram.h b/Accelerators/Vtkm/vtkmNDHistogram.h index b31362d15d..3e37bedb79 100644 --- a/Accelerators/Vtkm/vtkmNDHistogram.h +++ b/Accelerators/Vtkm/vtkmNDHistogram.h @@ -29,7 +29,7 @@ * E.g. (FieldA[i], FieldB[i], FieldC[i], Frequency[i]) is a bin in the histogram. * The first three numbers are binIDs for FieldA, FieldB and FieldC. Frequency[i] stores * the frequency for this bin (FieldA[i], FieldB[i], FieldC[i]). -*/ + */ #ifndef vtkmNDHistogram_h #define vtkmNDHistogram_h @@ -64,16 +64,16 @@ protected: vtkmNDHistogram(); ~vtkmNDHistogram(); - int RequestData(vtkInformation* , vtkInformationVector** , - vtkInformationVector* )override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; int FillInputPortInformation(int port, vtkInformation* info) override; + private: vtkmNDHistogram(const vtkmNDHistogram&) = delete; void operator=(const vtkmNDHistogram&) = delete; std::vector FieldNames; std::vector NumberOfBins; std::vector BinDeltas; - std::vector> DataRanges; + std::vector > DataRanges; }; #endif // vtkmNDHistogram_h diff --git a/Accelerators/Vtkm/vtkmPointElevation.cxx b/Accelerators/Vtkm/vtkmPointElevation.cxx index e3d1f35a1d..b176acc442 100644 --- a/Accelerators/Vtkm/vtkmPointElevation.cxx +++ b/Accelerators/Vtkm/vtkmPointElevation.cxx @@ -33,33 +33,26 @@ vtkStandardNewMacro(vtkmPointElevation); //------------------------------------------------------------------------------ -vtkmPointElevation::vtkmPointElevation() -{ -} +vtkmPointElevation::vtkmPointElevation() {} //------------------------------------------------------------------------------ -vtkmPointElevation::~vtkmPointElevation() -{ -} +vtkmPointElevation::~vtkmPointElevation() {} //------------------------------------------------------------------------------ -int vtkmPointElevation::RequestData(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmPointElevation::RequestData( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { // Get the input and output data objects. vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkDataSet* output = vtkDataSet::SafeDownCast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* output = vtkDataSet::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); output->ShallowCopy(input); // Check the size of the input. vtkIdType numPts = input->GetNumberOfPoints(); - if(numPts < 1) + if (numPts < 1) { vtkDebugMacro("No input!"); return 1; @@ -67,44 +60,40 @@ int vtkmPointElevation::RequestData(vtkInformation* request, try { - // Convert the input dataset to a vtkm::cont::DataSet - auto in = tovtkm::Convert(input, tovtkm::FieldsFlag::Points); + // Convert the input dataset to a vtkm::cont::DataSet + auto in = tovtkm::Convert(input, tovtkm::FieldsFlag::Points); - vtkmInputFilterPolicy policy; - // Setup input - vtkm::filter::PointElevation filter; - filter.SetLowPoint(this->LowPoint[0],this->LowPoint[1], - this->LowPoint[2]); - filter.SetHighPoint(this->HighPoint[0],this->HighPoint[1], - this->HighPoint[2]); - filter.SetRange(this->ScalarRange[0], this->ScalarRange[1]); - filter.SetOutputFieldName("elevation"); - filter.SetUseCoordinateSystemAsField(true); - auto result = filter.Execute(in, policy); + vtkmInputFilterPolicy policy; + // Setup input + vtkm::filter::PointElevation filter; + filter.SetLowPoint(this->LowPoint[0], this->LowPoint[1], this->LowPoint[2]); + filter.SetHighPoint(this->HighPoint[0], this->HighPoint[1], this->HighPoint[2]); + filter.SetRange(this->ScalarRange[0], this->ScalarRange[1]); + filter.SetOutputFieldName("elevation"); + filter.SetUseCoordinateSystemAsField(true); + auto result = filter.Execute(in, policy); - // Convert the result back - vtkDataArray* resultingArray = - fromvtkm::Convert(result.GetField("elevation")); - if (resultingArray == nullptr) - { - vtkErrorMacro(<< "Unable to convert result array from VTK-m to VTK"); - return 0; - } - output->GetPointData()->AddArray(resultingArray); - output->GetPointData()->SetActiveScalars("elevation"); - resultingArray->FastDelete(); + // Convert the result back + vtkDataArray* resultingArray = fromvtkm::Convert(result.GetField("elevation")); + if (resultingArray == nullptr) + { + vtkErrorMacro(<< "Unable to convert result array from VTK-m to VTK"); + return 0; + } + output->GetPointData()->AddArray(resultingArray); + output->GetPointData()->SetActiveScalars("elevation"); + resultingArray->FastDelete(); } catch (const vtkm::cont::Error& e) { - vtkErrorMacro(<< "VTK-m error: " << e.GetMessage() - << "Falling back to serial implementation"); + vtkErrorMacro(<< "VTK-m error: " << e.GetMessage() << "Falling back to serial implementation"); return this->Superclass::RequestData(request, inputVector, outputVector); } return 1; } //------------------------------------------------------------------------------ -void vtkmPointElevation::PrintSelf(std::ostream &os, vtkIndent indent) +void vtkmPointElevation::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } diff --git a/Accelerators/Vtkm/vtkmPointElevation.h b/Accelerators/Vtkm/vtkmPointElevation.h index 4f25ce0a96..a592d205cb 100644 --- a/Accelerators/Vtkm/vtkmPointElevation.h +++ b/Accelerators/Vtkm/vtkmPointElevation.h @@ -23,7 +23,7 @@ * can be oriented arbitrarily. A typical example is to generate scalars based * on elevation or height above a plane. * -*/ + */ #ifndef vtkmPointElevation_h #define vtkmPointElevation_h @@ -43,13 +43,11 @@ protected: vtkmPointElevation(); ~vtkmPointElevation(); - virtual int RequestData(vtkInformation* , vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmPointElevation(const vtkmPointElevation&) = delete; void operator=(const vtkmPointElevation&) = delete; - }; #endif // vtkmPointElevation_h diff --git a/Accelerators/Vtkm/vtkmPointTransform.cxx b/Accelerators/Vtkm/vtkmPointTransform.cxx index e2ed08ece1..b13026c996 100644 --- a/Accelerators/Vtkm/vtkmPointTransform.cxx +++ b/Accelerators/Vtkm/vtkmPointTransform.cxx @@ -28,7 +28,6 @@ #include "vtkSmartPointer.h" #include "vtkStructuredGrid.h" - #include "vtkmlib/ArrayConverters.h" #include "vtkmlib/DataSetConverters.h" @@ -39,7 +38,7 @@ #include "vtkmFilterPolicy.h" vtkStandardNewMacro(vtkmPointTransform); -vtkCxxSetObjectMacro(vtkmPointTransform,Transform,vtkHomogeneousTransform); +vtkCxxSetObjectMacro(vtkmPointTransform, Transform, vtkHomogeneousTransform); //------------------------------------------------------------------------------ vtkmPointTransform::vtkmPointTransform() @@ -54,8 +53,7 @@ vtkmPointTransform::~vtkmPointTransform() } //------------------------------------------------------------------------------ -int vtkmPointTransform::FillInputPortInformation(int vtkNotUsed(port), - vtkInformation* info) +int vtkmPointTransform::FillInputPortInformation(int vtkNotUsed(port), vtkInformation* info) { info->Remove(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE()); info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkPointSet"); @@ -65,9 +63,8 @@ int vtkmPointTransform::FillInputPortInformation(int vtkNotUsed(port), } //------------------------------------------------------------------------------ -int vtkmPointTransform::RequestDataObject(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmPointTransform::RequestDataObject( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkImageData* inImage = vtkImageData::GetData(inputVector[0]); vtkRectilinearGrid* inRect = vtkRectilinearGrid::GetData(inputVector[0]); @@ -78,21 +75,19 @@ int vtkmPointTransform::RequestDataObject(vtkInformation* request, if (!output) { vtkNew newOutput; - outputVector->GetInformationObject(0)->Set( - vtkDataObject::DATA_OBJECT(), newOutput); + outputVector->GetInformationObject(0)->Set(vtkDataObject::DATA_OBJECT(), newOutput); } return 1; } else { - return this->Superclass::RequestDataObject(request, inputVector, outputVector); + return this->Superclass::RequestDataObject(request, inputVector, outputVector); } } //------------------------------------------------------------------------------ int vtkmPointTransform::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector **inputVector, - vtkInformationVector *outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkSmartPointer input = vtkPointSet::GetData(inputVector[0]); vtkSmartPointer output = vtkPointSet::GetData(outputVector); @@ -132,7 +127,7 @@ int vtkmPointTransform::RequestData(vtkInformation* vtkNotUsed(request), vtkm::Matrix vtkmMatrix; for (int i = 0; i < 4; i++) { - for(int j = 0;j < 4; j++) + for (int j = 0; j < 4; j++) { vtkmMatrix[i][j] = static_cast(matrix->GetElement(i, j)); } @@ -144,8 +139,8 @@ int vtkmPointTransform::RequestData(vtkInformation* vtkNotUsed(request), vtkmInputFilterPolicy policy; auto result = pointTransform.Execute(in, policy); - vtkDataArray* pointTransformResult = fromvtkm::Convert(result.GetField("transform", - vtkm::cont::Field::Association::POINTS)); + vtkDataArray* pointTransformResult = + fromvtkm::Convert(result.GetField("transform", vtkm::cont::Field::Association::POINTS)); vtkPoints* newPts = vtkPoints::New(); // Update points newPts->SetNumberOfPoints(pointTransformResult->GetNumberOfTuples()); @@ -154,7 +149,7 @@ int vtkmPointTransform::RequestData(vtkInformation* vtkNotUsed(request), newPts->FastDelete(); pointTransformResult->FastDelete(); } - catch(const vtkm::cont::Error& e) + catch (const vtkm::cont::Error& e) { vtkErrorMacro(<< "VTK-m error: " << e.GetMessage()); } diff --git a/Accelerators/Vtkm/vtkmPointTransform.h b/Accelerators/Vtkm/vtkmPointTransform.h index b38b03bd59..ccdb0cba75 100644 --- a/Accelerators/Vtkm/vtkmPointTransform.h +++ b/Accelerators/Vtkm/vtkmPointTransform.h @@ -13,12 +13,12 @@ =========================================================================*/ /** - * @class vtkmPointTransform - * @brief transform points via vtkm PointTransform filter - * - * vtkmPointTransform is a filter to transform point coordinates. For now it - * does not support transforming associated point normals and vectors, as well - * as cell normals and vectors with the point coordinates. + * @class vtkmPointTransform + * @brief transform points via vtkm PointTransform filter + * + * vtkmPointTransform is a filter to transform point coordinates. For now it + * does not support transforming associated point normals and vectors, as well + * as cell normals and vectors with the point coordinates. */ #ifndef vtkmPointTransform_h @@ -29,33 +29,32 @@ class vtkHomogeneousTransform; -class VTKACCELERATORSVTKM_EXPORT vtkmPointTransform : public vtkPointSetAlgorithm +class VTKACCELERATORSVTKM_EXPORT vtkmPointTransform : public vtkPointSetAlgorithm { public: vtkTypeMacro(vtkmPointTransform, vtkPointSetAlgorithm); void PrintSelf(ostream& os, vtkIndent indent) override; - static vtkmPointTransform *New(); + static vtkmPointTransform* New(); //@{ /** * Specify the transform object used to transform the points */ void SetTransform(vtkHomogeneousTransform* tf); - vtkGetObjectMacro(Transform,vtkHomogeneousTransform); + vtkGetObjectMacro(Transform, vtkHomogeneousTransform); //@} - int FillInputPortInformation(int port, vtkInformation *info) override; + int FillInputPortInformation(int port, vtkInformation* info) override; + protected: vtkmPointTransform(); ~vtkmPointTransform() override; - int RequestDataObject(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) override; - int RequestData(vtkInformation*, - vtkInformationVector**, - vtkInformationVector*) override; + int RequestDataObject(vtkInformation* request, vtkInformationVector** inputVector, + vtkInformationVector* outputVector) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; vtkHomogeneousTransform* Transform; + private: vtkmPointTransform(const vtkmPointTransform&) = delete; void operator=(const vtkmPointTransform&) = delete; diff --git a/Accelerators/Vtkm/vtkmPolyDataNormals.cxx b/Accelerators/Vtkm/vtkmPolyDataNormals.cxx index 07b641cb0f..dabbd90e57 100644 --- a/Accelerators/Vtkm/vtkmPolyDataNormals.cxx +++ b/Accelerators/Vtkm/vtkmPolyDataNormals.cxx @@ -28,7 +28,6 @@ #include "vtkm/filter/SurfaceNormals.h" - vtkStandardNewMacro(vtkmPolyDataNormals); //------------------------------------------------------------------------------ @@ -54,19 +53,15 @@ vtkmPolyDataNormals::~vtkmPolyDataNormals() = default; //------------------------------------------------------------------------------ int vtkmPolyDataNormals::RequestData( - vtkInformation *request, - vtkInformationVector **inputVector, - vtkInformationVector *outputVector) + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { // get the info objects - vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); - vtkInformation *outInfo = outputVector->GetInformationObject(0); + vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); + vtkInformation* outInfo = outputVector->GetInformationObject(0); // get the input and output - vtkPolyData *input = vtkPolyData::SafeDownCast( - inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkPolyData *output = vtkPolyData::SafeDownCast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkPolyData* input = vtkPolyData::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkPolyData* output = vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); try { @@ -105,8 +100,7 @@ int vtkmPolyDataNormals::RequestData( } catch (const vtkm::cont::Error& e) { - vtkWarningMacro(<< "VTK-m error: " << e.GetMessage() - << "Falling back to vtkPolyDataNormals"); + vtkWarningMacro(<< "VTK-m error: " << e.GetMessage() << "Falling back to vtkPolyDataNormals"); return this->Superclass::RequestData(request, inputVector, outputVector); } diff --git a/Accelerators/Vtkm/vtkmPolyDataNormals.h b/Accelerators/Vtkm/vtkmPolyDataNormals.h index 26d1cc8974..7b35bf1c3c 100644 --- a/Accelerators/Vtkm/vtkmPolyDataNormals.h +++ b/Accelerators/Vtkm/vtkmPolyDataNormals.h @@ -37,7 +37,7 @@ * if you know that you have a triangle mesh which does not require splitting * nor consistency check on the cell orientations. * -*/ + */ #ifndef vtkmPolyDataNormals_h #define vtkmPolyDataNormals_h @@ -56,8 +56,7 @@ protected: vtkmPolyDataNormals(); ~vtkmPolyDataNormals(); - int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmPolyDataNormals(const vtkmPolyDataNormals&) = delete; diff --git a/Accelerators/Vtkm/vtkmProbe.cxx b/Accelerators/Vtkm/vtkmProbe.cxx index 62e42c0541..355cfbbe36 100644 --- a/Accelerators/Vtkm/vtkmProbe.cxx +++ b/Accelerators/Vtkm/vtkmProbe.cxx @@ -56,34 +56,30 @@ vtkDataObject* vtkmProbe::GetSource() { if (this->GetNumberOfInputConnections(1) < 1) { - return nullptr; + return nullptr; } return this->GetExecutive()->GetInputData(1, 0); } //------------------------------------------------------------------------------ -void vtkmProbe::SetSourceConnection(vtkAlgorithmOutput *algOutput) +void vtkmProbe::SetSourceConnection(vtkAlgorithmOutput* algOutput) { this->SetInputConnection(1, algOutput); } //------------------------------------------------------------------------------ -int vtkmProbe::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmProbe::RequestData(vtkInformation* vtkNotUsed(request), vtkInformationVector** inputVector, + vtkInformationVector* outputVector) { // Get the info objects - vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); - vtkInformation *sourceInfo = inputVector[1]->GetInformationObject(0); - vtkInformation *outInfo = outputVector->GetInformationObject(0); + vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); + vtkInformation* sourceInfo = inputVector[1]->GetInformationObject(0); + vtkInformation* outInfo = outputVector->GetInformationObject(0); // Get the input and output - vtkDataSet* input = vtkDataSet::SafeDownCast( - inInfo->Get(vtkDataSet::DATA_OBJECT())); - vtkDataSet* source = vtkDataSet::SafeDownCast( - sourceInfo->Get(vtkDataSet::DATA_OBJECT())); - vtkDataSet* output = vtkDataSet::SafeDownCast( - outInfo->Get(vtkDataSet::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataSet::DATA_OBJECT())); + vtkDataSet* source = vtkDataSet::SafeDownCast(sourceInfo->Get(vtkDataSet::DATA_OBJECT())); + vtkDataSet* output = vtkDataSet::SafeDownCast(outInfo->Get(vtkDataSet::DATA_OBJECT())); // Copy the input to the output as a starting point output->CopyStructure(input); @@ -108,7 +104,7 @@ int vtkmProbe::RequestData(vtkInformation* vtkNotUsed(request), probe.SetGeometry(in); auto result = probe.Execute(so, policy); - for (vtkm::Id i=0; i < result.GetNumberOfFields(); i++) + for (vtkm::Id i = 0; i < result.GetNumberOfFields(); i++) { const vtkm::cont::Field& field = result.GetField(i); vtkDataArray* fieldArray = fromvtkm::Convert(field); @@ -137,15 +133,14 @@ int vtkmProbe::RequestData(vtkInformation* vtkNotUsed(request), return 0; } - this->PassAttributeData( input, source, output); + this->PassAttributeData(input, source, output); return 1; } //------------------------------------------------------------------------------ int vtkmProbe::RequestInformation(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { // Update the whole extent in the output vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); @@ -154,26 +149,22 @@ int vtkmProbe::RequestInformation(vtkInformation* vtkNotUsed(request), int wholeExtent[6]; if (inInfo && outInfo) { - outInfo->CopyEntry(sourceInfo, - vtkStreamingDemandDrivenPipeline::TIME_STEPS()); - outInfo->CopyEntry(sourceInfo, - vtkStreamingDemandDrivenPipeline::TIME_RANGE()); + outInfo->CopyEntry(sourceInfo, vtkStreamingDemandDrivenPipeline::TIME_STEPS()); + outInfo->CopyEntry(sourceInfo, vtkStreamingDemandDrivenPipeline::TIME_RANGE()); inInfo->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), wholeExtent); outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), wholeExtent, 6); - // Make sure that the scalar type and number of components - // are propagated from the source not the input. - if (vtkImageData::HasScalarType(sourceInfo)) - { - vtkImageData::SetScalarType(vtkImageData::GetScalarType(sourceInfo), - outInfo); - } - if (vtkImageData::HasNumberOfScalarComponents(sourceInfo)) - { - vtkImageData::SetNumberOfScalarComponents( - vtkImageData::GetNumberOfScalarComponents(sourceInfo), - outInfo); - } + // Make sure that the scalar type and number of components + // are propagated from the source not the input. + if (vtkImageData::HasScalarType(sourceInfo)) + { + vtkImageData::SetScalarType(vtkImageData::GetScalarType(sourceInfo), outInfo); + } + if (vtkImageData::HasNumberOfScalarComponents(sourceInfo)) + { + vtkImageData::SetNumberOfScalarComponents( + vtkImageData::GetNumberOfScalarComponents(sourceInfo), outInfo); + } return 1; } vtkErrorMacro("Missing input or output info!"); @@ -182,8 +173,7 @@ int vtkmProbe::RequestInformation(vtkInformation* vtkNotUsed(request), //------------------------------------------------------------------------------ int vtkmProbe::RequestUpdateExtent(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* sourceInfo = inputVector[1]->GetInformationObject(0); @@ -202,18 +192,16 @@ int vtkmProbe::RequestUpdateExtent(vtkInformation* vtkNotUsed(request), } vtkErrorMacro("Missing input or output info!"); return 0; - } //------------------------------------------------------------------------------ -void vtkmProbe::PassAttributeData(vtkDataSet* input, - vtkDataObject* vtkNotUsed(source), - vtkDataSet* output) +void vtkmProbe::PassAttributeData( + vtkDataSet* input, vtkDataObject* vtkNotUsed(source), vtkDataSet* output) { if (this->PassPointArrays) { // Copy point data arrays int numPtArrays = input->GetPointData()->GetNumberOfArrays(); - for (int i=0; i < numPtArrays; i++) + for (int i = 0; i < numPtArrays; i++) { vtkDataArray* da = input->GetPointData()->GetArray(i); if (da && !output->GetPointData()->HasArray(da->GetName())) @@ -237,9 +225,9 @@ void vtkmProbe::PassAttributeData(vtkDataSet* input, if (this->PassCellArrays) { int numCellArrays = input->GetCellData()->GetNumberOfArrays(); - for (int i=0; iGetCellData()->GetArray(i); + vtkDataArray* da = input->GetCellData()->GetArray(i); if (!output->GetCellData()->HasArray(da->GetName())) { output->GetCellData()->AddArray(da); diff --git a/Accelerators/Vtkm/vtkmProbe.h b/Accelerators/Vtkm/vtkmProbe.h index b2914fd85b..22029a2911 100644 --- a/Accelerators/Vtkm/vtkmProbe.h +++ b/Accelerators/Vtkm/vtkmProbe.h @@ -39,7 +39,7 @@ * rendering techniques can be used to visualize the results. Another example: * a line or curve can be used to probe data to produce x-y plots along * that line or curve. -*/ + */ #ifndef vtkmProbe_h #define vtkmProbe_h @@ -63,8 +63,8 @@ public: * while the Source is probed (interpolated) to generate the scalars, * vectors, etc. for the output points based on the point locations. */ - void SetSourceData(vtkDataObject *source); - vtkDataObject *GetSource(); + void SetSourceData(vtkDataObject* source); + vtkDataObject* GetSource(); //@} //@} @@ -128,7 +128,7 @@ public: protected: vtkmProbe(); - ~vtkmProbe()=default; + ~vtkmProbe() = default; vtkTypeBool PassCellArrays; vtkTypeBool PassPointArrays; @@ -136,28 +136,24 @@ protected: std::string ValidPointMaskArrayName; std::string ValidCellMaskArrayName; - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; - virtual int RequestUpdateExtent(vtkInformation*, - vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestUpdateExtent( + vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; - virtual int RequestInformation(vtkInformation*, - vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestInformation( + vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; /** - * Call at the end of RequestData() to pass attribute dat a respecting the - * PassCellArrays, PassPointArrays and PassFieldArrays flag - */ - void PassAttributeData(vtkDataSet* input, vtkDataObject* source, - vtkDataSet* output); + * Call at the end of RequestData() to pass attribute dat a respecting the + * PassCellArrays, PassPointArrays and PassFieldArrays flag + */ + void PassAttributeData(vtkDataSet* input, vtkDataObject* source, vtkDataSet* output); private: vtkmProbe(const vtkmProbe&) = delete; void operator=(const vtkmProbe&) = delete; }; -#endif //vtkmProbe_h +#endif // vtkmProbe_h // VTK-HeaderTest-Exclude: vtkmProbe.h diff --git a/Accelerators/Vtkm/vtkmThreshold.cxx b/Accelerators/Vtkm/vtkmThreshold.cxx index 2958642fe8..8efcc5b4c0 100644 --- a/Accelerators/Vtkm/vtkmThreshold.cxx +++ b/Accelerators/Vtkm/vtkmThreshold.cxx @@ -36,31 +36,24 @@ vtkStandardNewMacro(vtkmThreshold); //------------------------------------------------------------------------------ -vtkmThreshold::vtkmThreshold() -{ -} +vtkmThreshold::vtkmThreshold() {} //------------------------------------------------------------------------------ -vtkmThreshold::~vtkmThreshold() -{ -} +vtkmThreshold::~vtkmThreshold() {} //------------------------------------------------------------------------------ -int vtkmThreshold::RequestData(vtkInformation* request, - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) +int vtkmThreshold::RequestData( + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); vtkInformation* outInfo = outputVector->GetInformationObject(0); - vtkDataSet* input = - vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkDataSet* input = vtkDataSet::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkUnstructuredGrid* output = vtkUnstructuredGrid::SafeDownCast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkUnstructuredGrid* output = + vtkUnstructuredGrid::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); vtkDataArray* inputArray = this->GetInputArrayToProcess(0, inputVector); - if (inputArray == nullptr || inputArray->GetName() == nullptr || - inputArray->GetName()[0] == '\0') + if (inputArray == nullptr || inputArray->GetName() == nullptr || inputArray->GetName()[0] == '\0') { vtkErrorMacro("Invalid input array."); return 0; diff --git a/Accelerators/Vtkm/vtkmThreshold.h b/Accelerators/Vtkm/vtkmThreshold.h index fb0f19fc1e..a5715e6e4e 100644 --- a/Accelerators/Vtkm/vtkmThreshold.h +++ b/Accelerators/Vtkm/vtkmThreshold.h @@ -27,7 +27,7 @@ * data. By default, point data is used to obtain scalars, but you can * control this behavior. See the AttributeMode ivar below. * -*/ + */ #ifndef vtkmThreshold_h #define vtkmThreshold_h @@ -37,7 +37,7 @@ class VTKACCELERATORSVTKM_EXPORT vtkmThreshold : public vtkThreshold { public: - vtkTypeMacro(vtkmThreshold,vtkThreshold); + vtkTypeMacro(vtkmThreshold, vtkThreshold); void PrintSelf(ostream& os, vtkIndent indent) override; static vtkmThreshold* New(); @@ -46,8 +46,7 @@ protected: vtkmThreshold(); ~vtkmThreshold(); - virtual int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmThreshold(const vtkmThreshold&) = delete; diff --git a/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.cxx b/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.cxx index 86fc4706c4..3de8aac67c 100644 --- a/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.cxx +++ b/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.cxx @@ -29,14 +29,13 @@ #include "vtkm/filter/SurfaceNormals.h" - -namespace { +namespace +{ struct InputFilterPolicy : public vtkmInputFilterPolicy { using UnstructuredCellSetList = - vtkm::ListTagBase; + vtkm::ListTagBase; }; } @@ -55,25 +54,20 @@ vtkmTriangleMeshPointNormals::~vtkmTriangleMeshPointNormals() = default; //------------------------------------------------------------------------------ int vtkmTriangleMeshPointNormals::RequestData( - vtkInformation *request, - vtkInformationVector **inputVector, - vtkInformationVector *outputVector) + vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) { // get the info objects - vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); - vtkInformation *outInfo = outputVector->GetInformationObject(0); + vtkInformation* inInfo = inputVector[0]->GetInformationObject(0); + vtkInformation* outInfo = outputVector->GetInformationObject(0); // get the input and output - vtkPolyData *input = vtkPolyData::SafeDownCast( - inInfo->Get(vtkDataObject::DATA_OBJECT())); - vtkPolyData *output = vtkPolyData::SafeDownCast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkPolyData* input = vtkPolyData::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkPolyData* output = vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT())); // check if polydata is in supported format - if (input->GetVerts()->GetNumberOfCells() != 0 || - input->GetLines()->GetNumberOfCells() != 0 || - input->GetStrips()->GetNumberOfCells() != 0 || - (input->GetPolys()->GetNumberOfConnectivityIds() % 3) != 0) + if (input->GetVerts()->GetNumberOfCells() != 0 || input->GetLines()->GetNumberOfCells() != 0 || + input->GetStrips()->GetNumberOfCells() != 0 || + (input->GetPolys()->GetNumberOfConnectivityIds() % 3) != 0) { vtkErrorMacro(<< "This filter only works with polydata containing just triangles."); return 0; diff --git a/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h b/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h index 4083aff8e3..ad7256c523 100644 --- a/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h +++ b/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h @@ -42,7 +42,7 @@ * are therefore weighted by the triangle area. This is not more nor less * correct than normalizing them before adding them, but it is much faster. * -*/ + */ #ifndef vtkmTriangleMeshPointNormals_h #define vtkmTriangleMeshPointNormals_h @@ -50,8 +50,7 @@ #include "vtkAcceleratorsVTKmModule.h" // for export macro #include "vtkTriangleMeshPointNormals.h" -class VTKACCELERATORSVTKM_EXPORT vtkmTriangleMeshPointNormals - : public vtkTriangleMeshPointNormals +class VTKACCELERATORSVTKM_EXPORT vtkmTriangleMeshPointNormals : public vtkTriangleMeshPointNormals { public: vtkTypeMacro(vtkmTriangleMeshPointNormals, vtkTriangleMeshPointNormals); @@ -62,8 +61,7 @@ protected: vtkmTriangleMeshPointNormals(); ~vtkmTriangleMeshPointNormals(); - int RequestData(vtkInformation*, vtkInformationVector**, - vtkInformationVector*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmTriangleMeshPointNormals(const vtkmTriangleMeshPointNormals&) = delete; diff --git a/Accelerators/Vtkm/vtkmWarpScalar.cxx b/Accelerators/Vtkm/vtkmWarpScalar.cxx index 3982832282..31ad0b26e3 100644 --- a/Accelerators/Vtkm/vtkmWarpScalar.cxx +++ b/Accelerators/Vtkm/vtkmWarpScalar.cxx @@ -38,19 +38,17 @@ vtkStandardNewMacro(vtkmWarpScalar); //------------------------------------------------------------------------------ -vtkmWarpScalar::vtkmWarpScalar() : vtkWarpScalar() +vtkmWarpScalar::vtkmWarpScalar() + : vtkWarpScalar() { } //------------------------------------------------------------------------------ -vtkmWarpScalar::~vtkmWarpScalar() -{ -} +vtkmWarpScalar::~vtkmWarpScalar() {} //------------------------------------------------------------------------------ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkSmartPointer input = vtkPointSet::GetData(inputVector[0]); vtkSmartPointer output = vtkPointSet::GetData(outputVector); @@ -58,7 +56,7 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), if (!input) { // Try converting image data. - vtkImageData *inImage = vtkImageData::GetData(inputVector[0]); + vtkImageData* inImage = vtkImageData::GetData(inputVector[0]); if (inImage) { vtkNew image2points; @@ -71,7 +69,7 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), if (!input) { // Try converting rectilinear grid. - vtkRectilinearGrid *inRect = vtkRectilinearGrid::GetData(inputVector[0]); + vtkRectilinearGrid* inRect = vtkRectilinearGrid::GetData(inputVector[0]); if (inRect) { vtkNew rect2points; @@ -98,7 +96,7 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), // InScalars is not used when XYPlane is on if (!inPts || (!inScalars && !this->XYPlane)) { - vtkDebugMacro( << "No data to warp"); + vtkDebugMacro(<< "No data to warp"); return 1; } @@ -119,8 +117,7 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), // Get/generate the normal field if (inNormals && !this->UseNormal) { // DataNormal - auto inNormalsField = tovtkm::Convert(inNormals, - vtkDataObject::FIELD_ASSOCIATION_POINTS); + auto inNormalsField = tovtkm::Convert(inNormals, vtkDataObject::FIELD_ASSOCIATION_POINTS); in.AddField(inNormalsField); warpScalar.SetNormalField(inNormals->GetName()); } @@ -129,19 +126,17 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), using vecType = vtkm::Vec; vecType normal = vtkm::make_Vec(0.0, 0.0, 1.0); vtkm::cont::ArrayHandleConstant vectorAH = - vtkm::cont::make_ArrayHandleConstant(normal, - numberOfPoints); + vtkm::cont::make_ArrayHandleConstant(normal, numberOfPoints); vtkm::cont::DataSetFieldAdd::AddPointField(in, "zNormal", vectorAH); warpScalar.SetNormalField("zNormal"); } else { using vecType = vtkm::Vec; - vecType normal = vtkm::make_Vec(this->Normal[0], - this->Normal[1], this->Normal[2]); + vecType normal = + vtkm::make_Vec(this->Normal[0], this->Normal[1], this->Normal[2]); vtkm::cont::ArrayHandleConstant vectorAH = - vtkm::cont::make_ArrayHandleConstant(normal, - numberOfPoints); + vtkm::cont::make_ArrayHandleConstant(normal, numberOfPoints); vtkm::cont::DataSetFieldAdd::AddPointField(in, "instanceNormal", vectorAH); warpScalar.SetNormalField("instanceNormal"); } @@ -164,8 +159,8 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), vtkmInputFilterPolicy policy; auto result = warpScalar.Execute(in, policy); - vtkDataArray* warpScalarResult = fromvtkm::Convert(result.GetField("warpscalar", - vtkm::cont::Field::Association::POINTS)); + vtkDataArray* warpScalarResult = + fromvtkm::Convert(result.GetField("warpscalar", vtkm::cont::Field::Association::POINTS)); vtkPoints* newPts = vtkPoints::New(); // Update points newPts->SetNumberOfPoints(warpScalarResult->GetNumberOfTuples()); @@ -189,9 +184,8 @@ int vtkmWarpScalar::RequestData(vtkInformation* vtkNotUsed(request), return 1; } - //------------------------------------------------------------------------------ -void vtkmWarpScalar::PrintSelf(std::ostream &os, vtkIndent indent) +void vtkmWarpScalar::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } diff --git a/Accelerators/Vtkm/vtkmWarpScalar.h b/Accelerators/Vtkm/vtkmWarpScalar.h index 0982643ea5..cb4fecb13d 100644 --- a/Accelerators/Vtkm/vtkmWarpScalar.h +++ b/Accelerators/Vtkm/vtkmWarpScalar.h @@ -35,7 +35,7 @@ * Note that the filter passes both its point data and cell data to * its output, except for normals, since these are distorted by the * warping. -*/ + */ #ifndef vtkmWarpScalar_h #define vtkmWarpScalar_h @@ -55,8 +55,7 @@ protected: vtkmWarpScalar(); ~vtkmWarpScalar(); - int RequestData(vtkInformation* , vtkInformationVector**, - vtkInformationVector*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmWarpScalar(const vtkmWarpScalar&) = delete; diff --git a/Accelerators/Vtkm/vtkmWarpVector.cxx b/Accelerators/Vtkm/vtkmWarpVector.cxx index 8d1ccefe92..a3b8360da3 100644 --- a/Accelerators/Vtkm/vtkmWarpVector.cxx +++ b/Accelerators/Vtkm/vtkmWarpVector.cxx @@ -38,19 +38,17 @@ vtkStandardNewMacro(vtkmWarpVector); //------------------------------------------------------------------------------ -vtkmWarpVector::vtkmWarpVector() : vtkWarpVector() +vtkmWarpVector::vtkmWarpVector() + : vtkWarpVector() { } //------------------------------------------------------------------------------ -vtkmWarpVector::~vtkmWarpVector() -{ -} +vtkmWarpVector::~vtkmWarpVector() {} //------------------------------------------------------------------------------ int vtkmWarpVector::RequestData(vtkInformation* vtkNotUsed(request), - vtkInformationVector** inputVector, - vtkInformationVector* outputVector) + vtkInformationVector** inputVector, vtkInformationVector* outputVector) { vtkSmartPointer input = vtkPointSet::GetData(inputVector[0]); vtkSmartPointer output = vtkPointSet::GetData(outputVector); @@ -58,7 +56,7 @@ int vtkmWarpVector::RequestData(vtkInformation* vtkNotUsed(request), if (!input) { // Try converting image data. - vtkImageData *inImage = vtkImageData::GetData(inputVector[0]); + vtkImageData* inImage = vtkImageData::GetData(inputVector[0]); if (inImage) { vtkNew image2points; @@ -71,7 +69,7 @@ int vtkmWarpVector::RequestData(vtkInformation* vtkNotUsed(request), if (!input) { // Try converting rectilinear grid. - vtkRectilinearGrid *inRect = vtkRectilinearGrid::GetData(inputVector[0]); + vtkRectilinearGrid* inRect = vtkRectilinearGrid::GetData(inputVector[0]); if (inRect) { vtkNew rect2points; @@ -92,33 +90,32 @@ int vtkmWarpVector::RequestData(vtkInformation* vtkNotUsed(request), if (!vectors || !numPts) { - vtkDebugMacro(<< "no input data"); - return 1; + vtkDebugMacro(<< "no input data"); + return 1; } output->CopyStructure(input); try { - vtkm::cont::DataSet in = tovtkm::Convert(input, tovtkm::FieldsFlag::PointsAndCells); - vtkm::cont::Field vectorField = tovtkm::Convert(vectors, - vectorsAssociation); - in.AddField(vectorField); - - vtkmInputFilterPolicy policy; - vtkm::filter::WarpVector warpVector(this->ScaleFactor); - warpVector.SetUseCoordinateSystemAsField("true"); - warpVector.SetVectorField(vectorField.GetName(), vectorField.GetAssociation()); - auto result = warpVector.Execute(in, policy); - - vtkDataArray* warpVectorResult = fromvtkm::Convert( - result.GetField("warpvector",vtkm::cont::Field::Association::POINTS)); - vtkNew newPts; - - newPts->SetNumberOfPoints(warpVectorResult->GetNumberOfTuples()); - newPts->SetData(warpVectorResult); - output->SetPoints(newPts); - warpVectorResult->FastDelete(); + vtkm::cont::DataSet in = tovtkm::Convert(input, tovtkm::FieldsFlag::PointsAndCells); + vtkm::cont::Field vectorField = tovtkm::Convert(vectors, vectorsAssociation); + in.AddField(vectorField); + + vtkmInputFilterPolicy policy; + vtkm::filter::WarpVector warpVector(this->ScaleFactor); + warpVector.SetUseCoordinateSystemAsField("true"); + warpVector.SetVectorField(vectorField.GetName(), vectorField.GetAssociation()); + auto result = warpVector.Execute(in, policy); + + vtkDataArray* warpVectorResult = + fromvtkm::Convert(result.GetField("warpvector", vtkm::cont::Field::Association::POINTS)); + vtkNew newPts; + + newPts->SetNumberOfPoints(warpVectorResult->GetNumberOfTuples()); + newPts->SetData(warpVectorResult); + output->SetPoints(newPts); + warpVectorResult->FastDelete(); } catch (const vtkm::cont::Error& e) { @@ -134,9 +131,8 @@ int vtkmWarpVector::RequestData(vtkInformation* vtkNotUsed(request), return 1; } - //------------------------------------------------------------------------------ -void vtkmWarpVector::PrintSelf(std::ostream &os, vtkIndent indent) +void vtkmWarpVector::PrintSelf(std::ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); } diff --git a/Accelerators/Vtkm/vtkmWarpVector.h b/Accelerators/Vtkm/vtkmWarpVector.h index c31f54aefe..57aeaafed4 100644 --- a/Accelerators/Vtkm/vtkmWarpVector.h +++ b/Accelerators/Vtkm/vtkmWarpVector.h @@ -22,7 +22,7 @@ * profiles or mechanical deformation. * * The filter passes both its point data and cell data to its output. -*/ + */ #ifndef vtkmWarpVector_h #define vtkmWarpVector_h @@ -42,8 +42,7 @@ protected: vtkmWarpVector(); ~vtkmWarpVector(); - int RequestData(vtkInformation* , vtkInformationVector**, - vtkInformationVector*) override; + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; private: vtkmWarpVector(const vtkmWarpVector&) = delete; diff --git a/Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx b/Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx index b94234597e..92982e24d3 100644 --- a/Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx +++ b/Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx @@ -31,10 +31,10 @@ #include "vtkPointData.h" #include "vtkPoints.h" -namespace tovtkm { +namespace tovtkm +{ -void ProcessFields(vtkDataSet *input, vtkm::cont::DataSet &dataset, - tovtkm::FieldsFlag fields) +void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::FieldsFlag fields) { if ((fields & tovtkm::FieldsFlag::Points) != tovtkm::FieldsFlag::None) { @@ -47,8 +47,7 @@ void ProcessFields(vtkDataSet *input, vtkm::cont::DataSet &dataset, continue; } - vtkm::cont::Field pfield = - tovtkm::Convert(array, vtkDataObject::FIELD_ASSOCIATION_POINTS); + vtkm::cont::Field pfield = tovtkm::Convert(array, vtkDataObject::FIELD_ASSOCIATION_POINTS); dataset.AddField(pfield); } } @@ -64,8 +63,7 @@ void ProcessFields(vtkDataSet *input, vtkm::cont::DataSet &dataset, continue; } - vtkm::cont::Field cfield = - tovtkm::Convert(array, vtkDataObject::FIELD_ASSOCIATION_CELLS); + vtkm::cont::Field cfield = tovtkm::Convert(array, vtkDataObject::FIELD_ASSOCIATION_CELLS); dataset.AddField(cfield); } } @@ -79,13 +77,11 @@ vtkm::cont::Field Convert(vtkmDataArray* input, int association) // on if they are a cell or point field. if (association == vtkDataObject::FIELD_ASSOCIATION_POINTS) { - return vtkm::cont::make_FieldPoint(input->GetName(), - input->GetVtkmVariantArrayHandle()); + return vtkm::cont::make_FieldPoint(input->GetName(), input->GetVtkmVariantArrayHandle()); } else if (association == vtkDataObject::FIELD_ASSOCIATION_CELLS) { - return vtkm::cont::make_FieldCell(input->GetName(), - input->GetVtkmVariantArrayHandle()); + return vtkm::cont::make_FieldCell(input->GetName(), input->GetVtkmVariantArrayHandle()); } return vtkm::cont::Field(); @@ -109,19 +105,24 @@ vtkm::cont::Field Convert(vtkDataArray* input, int association) switch (input->GetDataType()) { vtkTemplateMacro( - vtkAOSDataArrayTemplate* typedIn1 = - vtkAOSDataArrayTemplate::FastDownCast(input); - if (typedIn1) { field = Convert(typedIn1, association); } - else { - vtkSOADataArrayTemplate* typedIn2 = - vtkSOADataArrayTemplate::FastDownCast(input); - if (typedIn2) { field = Convert(typedIn2, association); } - else { - vtkmDataArray* typedIn3 = - vtkmDataArray::SafeDownCast(input); - if (typedIn3) { field = Convert(typedIn3, association); } + vtkAOSDataArrayTemplate* typedIn1 = + vtkAOSDataArrayTemplate::FastDownCast(input); + if (typedIn1) { field = Convert(typedIn1, association); } else { + vtkSOADataArrayTemplate* typedIn2 = + vtkSOADataArrayTemplate::FastDownCast(input); + if (typedIn2) + { + field = Convert(typedIn2, association); + } + else + { + vtkmDataArray* typedIn3 = vtkmDataArray::SafeDownCast(input); + if (typedIn3) + { + field = Convert(typedIn3, association); } - }); + } + }); // end vtkTemplateMacro } return field; @@ -129,16 +130,21 @@ vtkm::cont::Field Convert(vtkDataArray* input, int association) } // namespace tovtkm -namespace fromvtkm { +namespace fromvtkm +{ -namespace { +namespace +{ struct ArrayConverter { public: mutable vtkDataArray* Data; - ArrayConverter() : Data(nullptr) {} + ArrayConverter() + : Data(nullptr) + { + } // CastAndCall always passes a const array handle. Just shallow copy to a // local array handle by taking by value. @@ -153,9 +159,9 @@ public: void operator()(vtkm::cont::ArrayHandle handle) const { using BasicHandle = vtkm::cont::ArrayHandle; - if(vtkm::cont::IsType(handle)) + if (vtkm::cont::IsType(handle)) { - this->operator()( vtkm::cont::Cast(handle) ); + this->operator()(vtkm::cont::Cast(handle)); } else { @@ -164,17 +170,18 @@ public: } template - void operator()(vtkm::cont::ArrayHandle, vtkm::cont::StorageTagVirtual> handle) const + void operator()( + vtkm::cont::ArrayHandle, vtkm::cont::StorageTagVirtual> handle) const { - using SOAHandle = vtkm::cont::ArrayHandle, vtkm::cont::StorageTagSOA>; - using BasicHandle = vtkm::cont::ArrayHandle, vtkm::cont::StorageTagBasic>; - if(vtkm::cont::IsType(handle)) + using SOAHandle = vtkm::cont::ArrayHandle, vtkm::cont::StorageTagSOA>; + using BasicHandle = vtkm::cont::ArrayHandle, vtkm::cont::StorageTagBasic>; + if (vtkm::cont::IsType(handle)) { - this->operator()( vtkm::cont::Cast(handle) ); + this->operator()(vtkm::cont::Cast(handle)); } - else if(vtkm::cont::IsType(handle)) + else if (vtkm::cont::IsType(handle)) { - this->operator()( vtkm::cont::Cast(handle) ); + this->operator()(vtkm::cont::Cast(handle)); } else { @@ -182,13 +189,11 @@ public: } } - template - void operator()( - vtkm::cont::ArrayHandle handle) const + void operator()(vtkm::cont::ArrayHandle handle) const { // we can steal this array! - using Traits = tovtkm::vtkPortalTraits; //Handles Vec properly + using Traits = tovtkm::vtkPortalTraits; // Handles Vec properly using ValueType = typename Traits::ComponentType; using VTKArrayType = vtkAOSDataArrayTemplate; @@ -198,23 +203,21 @@ public: handle.SyncControlArray(); const vtkm::Id size = handle.GetNumberOfValues() * Traits::NUM_COMPONENTS; - //VTK-m allocations are aligned or done with cuda uvm memory so we need to propagate - //the proper free function to VTK + // VTK-m allocations are aligned or done with cuda uvm memory so we need to propagate + // the proper free function to VTK auto stolenState = handle.GetStorage().StealArray(); auto stolenMemory = reinterpret_cast(stolenState.first); - array->SetVoidArray( - stolenMemory, size, 0, vtkAbstractArray::VTK_DATA_ARRAY_USER_DEFINED); + array->SetVoidArray(stolenMemory, size, 0, vtkAbstractArray::VTK_DATA_ARRAY_USER_DEFINED); array->SetArrayFreeFunction(stolenState.second); this->Data = array; } template - void operator()( - vtkm::cont::ArrayHandle handle) const + void operator()(vtkm::cont::ArrayHandle handle) const { // we can steal this array! - using Traits = tovtkm::vtkPortalTraits; //Handles Vec properly + using Traits = tovtkm::vtkPortalTraits; // Handles Vec properly using ValueType = typename Traits::ComponentType; using VTKArrayType = vtkSOADataArrayTemplate; @@ -224,13 +227,13 @@ public: handle.SyncControlArray(); auto storage = handle.GetStorage(); const vtkm::Id size = handle.GetNumberOfValues() * Traits::NUM_COMPONENTS; - for(vtkm::IdComponent i=0; i < Traits::NUM_COMPONENTS; ++i) + for (vtkm::IdComponent i = 0; i < Traits::NUM_COMPONENTS; ++i) { - //steal each component array. + // steal each component array. auto stolenState = storage.GetArray(i).GetStorage().StealArray(); auto stolenMemory = reinterpret_cast(stolenState.first); array->SetArray( - i, stolenMemory, size, true, 0, vtkAbstractArray::VTK_DATA_ARRAY_USER_DEFINED); + i, stolenMemory, size, true, 0, vtkAbstractArray::VTK_DATA_ARRAY_USER_DEFINED); array->SetArrayFreeFunction(i, stolenState.second); } } @@ -253,8 +256,7 @@ vtkDataArray* Convert(const vtkm::cont::Field& input) try { - vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicyFieldNotActive(input, policy), - aConverter); + vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicyFieldNotActive(input, policy), aConverter); data = aConverter.Data; if (data) { @@ -279,10 +281,11 @@ vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input) points->SetData(pdata); pdata->FastDelete(); } - catch (vtkm::cont::Error &e) + catch (vtkm::cont::Error& e) { vtkGenericWarningMacro("Converting vtkm::cont::CoordinateSystem to " - "vtkPoints failed: " << e.what()); + "vtkPoints failed: " + << e.what()); } return points; } @@ -302,12 +305,12 @@ bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output) pd->AddArray(vfield); vfield->FastDelete(); } - else if (vfield && f.GetAssociation() == vtkm::cont::Field::Association::CELL_SET) + else if (vfield && f.GetAssociation() == vtkm::cont::Field::Association::CELL_SET) { cd->AddArray(vfield); vfield->FastDelete(); } - else if(vfield) + else if (vfield) { vfield->Delete(); } diff --git a/Accelerators/Vtkm/vtkmlib/ArrayConverters.h b/Accelerators/Vtkm/vtkmlib/ArrayConverters.h index 42587681ad..0130a3e5da 100644 --- a/Accelerators/Vtkm/vtkmlib/ArrayConverters.h +++ b/Accelerators/Vtkm/vtkmlib/ArrayConverters.h @@ -32,54 +32,52 @@ class vtkDataArray; class vtkDataSet; class vtkPoints; -namespace vtkm { -namespace cont { +namespace vtkm +{ +namespace cont +{ class DataSet; class CoordinateSystem; } } -namespace tovtkm { +namespace tovtkm +{ template struct DataArrayToArrayHandle; template -struct DataArrayToArrayHandle, NumComponents> { +struct DataArrayToArrayHandle, NumComponents> +{ using ValueType = - typename std::conditional>::type; - using StorageType = - vtkm::cont::internal::Storage; - using ArrayHandleType = - vtkm::cont::ArrayHandle; - - static ArrayHandleType Wrap(vtkAOSDataArrayTemplate *input) + typename std::conditional >::type; + using StorageType = vtkm::cont::internal::Storage; + using ArrayHandleType = vtkm::cont::ArrayHandle; + + static ArrayHandleType Wrap(vtkAOSDataArrayTemplate* input) { return vtkm::cont::make_ArrayHandle( - reinterpret_cast(input->GetPointer(0)), - input->GetNumberOfTuples()); + reinterpret_cast(input->GetPointer(0)), input->GetNumberOfTuples()); } }; template -struct DataArrayToArrayHandle, NumComponents> { +struct DataArrayToArrayHandle, NumComponents> +{ using ValueType = vtkm::Vec; - using StorageType = - vtkm::cont::internal::Storage; - using ArrayHandleType = - vtkm::cont::ArrayHandle; + using StorageType = vtkm::cont::internal::Storage; + using ArrayHandleType = vtkm::cont::ArrayHandle; - static ArrayHandleType Wrap(vtkSOADataArrayTemplate *input) + static ArrayHandleType Wrap(vtkSOADataArrayTemplate* input) { vtkm::Id numValues = input->GetNumberOfTuples(); vtkm::cont::internal::Storage storage; - for(vtkm::IdComponent i=0; i < NumComponents; ++i) + for (vtkm::IdComponent i = 0; i < NumComponents; ++i) { - storage.SetArray( - i, vtkm::cont::make_ArrayHandle( - reinterpret_cast(input->GetComponentArrayPointer(i)), - numValues)); + storage.SetArray(i, + vtkm::cont::make_ArrayHandle( + reinterpret_cast(input->GetComponentArrayPointer(i)), numValues)); } return vtkm::cont::ArrayHandleSOA(storage); @@ -87,38 +85,37 @@ struct DataArrayToArrayHandle, NumComponents> { }; template -struct DataArrayToArrayHandle, 1> { - using StorageType = - vtkm::cont::internal::Storage; - using ArrayHandleType = - vtkm::cont::ArrayHandle; +struct DataArrayToArrayHandle, 1> +{ + using StorageType = vtkm::cont::internal::Storage; + using ArrayHandleType = vtkm::cont::ArrayHandle; - static ArrayHandleType Wrap(vtkSOADataArrayTemplate *input) + static ArrayHandleType Wrap(vtkSOADataArrayTemplate* input) { - return vtkm::cont::make_ArrayHandle(input->GetComponentArrayPointer(0), - input->GetNumberOfTuples()); + return vtkm::cont::make_ArrayHandle( + input->GetComponentArrayPointer(0), input->GetNumberOfTuples()); } }; enum class FieldsFlag { - None = 0x0, + None = 0x0, Points = 0x1, - Cells = 0x2, + Cells = 0x2, PointsAndCells = Points | Cells }; VTKACCELERATORSVTKM_EXPORT -void ProcessFields(vtkDataSet *input, vtkm::cont::DataSet &dataset, - tovtkm::FieldsFlag fields); +void ProcessFields(vtkDataSet* input, vtkm::cont::DataSet& dataset, tovtkm::FieldsFlag fields); // determine the type and call the proper Convert routine VTKACCELERATORSVTKM_EXPORT vtkm::cont::Field Convert(vtkDataArray* input, int association); } -namespace fromvtkm { +namespace fromvtkm +{ VTKACCELERATORSVTKM_EXPORT vtkDataArray* Convert(const vtkm::cont::Field& input); @@ -130,15 +127,13 @@ VTKACCELERATORSVTKM_EXPORT bool ConvertArrays(const vtkm::cont::DataSet& input, vtkDataSet* output); } -inline tovtkm::FieldsFlag operator&(const tovtkm::FieldsFlag &a, - const tovtkm::FieldsFlag &b) +inline tovtkm::FieldsFlag operator&(const tovtkm::FieldsFlag& a, const tovtkm::FieldsFlag& b) { using T = std::underlying_type::type; return static_cast(static_cast(a) & static_cast(b)); } -inline tovtkm::FieldsFlag operator|(const tovtkm::FieldsFlag &a, - const tovtkm::FieldsFlag &b) +inline tovtkm::FieldsFlag operator|(const tovtkm::FieldsFlag& a, const tovtkm::FieldsFlag& b) { using T = std::underlying_type::type; return static_cast(static_cast(a) | static_cast(b)); diff --git a/Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx b/Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx index d470af7331..fc1708984d 100644 --- a/Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx +++ b/Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx @@ -30,24 +30,24 @@ vtkm::cont::VariantArrayHandle vtkDataArrayToVariantArrayHandle(DataArrayType* i int numComps = input->GetNumberOfComponents(); switch (numComps) { - case 1: - return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); - case 2: - return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); - case 3: - return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); - case 4: - return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); - case 6: - return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); - case 9: - return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); - default: + case 1: + return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); + case 2: + return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); + case 3: + return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); + case 4: + return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); + case 6: + return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); + case 9: + return vtkm::cont::VariantArrayHandle(DataArrayToArrayHandle::Wrap(input)); + default: { vtkm::Id numTuples = input->GetNumberOfTuples(); auto subHandle = DataArrayToArrayHandle::Wrap(input); auto offsets = vtkm::cont::ArrayHandleCounting(0, numComps, numTuples); - auto handle = vtkm::cont::make_ArrayHandleGroupVecVariable(subHandle, offsets); + auto handle = vtkm::cont::make_ArrayHandleGroupVecVariable(subHandle, offsets); return vtkm::cont::VariantArrayHandle(handle); } } @@ -86,36 +86,38 @@ vtkm::cont::Field Convert(DataArrayType* input, int association) } #if !defined(vtkmlib_ArrayConverterExport_cxx) -#define VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, ValueType) \ - extern template vtkm::cont::Field Convert>(ArrayType* input, int association); +#define VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, ValueType) \ + extern template vtkm::cont::Field Convert >( \ + ArrayType * input, int association); #else -#define VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, ValueType) \ - template vtkm::cont::Field Convert>(ArrayType* input, int association); +#define VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, ValueType) \ + template vtkm::cont::Field Convert >( \ + ArrayType * input, int association); #endif -#define VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, char) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, int) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, long) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, long long) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, short) \ +#define VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, char) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, int) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, long) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, long long) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, short) \ VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, signed char) -#define VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned char) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned int) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned long) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned long long) \ +#define VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned char) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned int) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned long) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned long long) \ VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, unsigned short) -#define VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ - VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, double) \ +#define VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ + VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, double) \ VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM_DETAIL(ArrayType, float) #if !defined(vtkmlib_ArrayConverterExport_cxx) -#define VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ - VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ - VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ +#define VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ + VTK_EXPORT_SIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ + VTK_EXPORT_UNSIGNED_ARRAY_CONVERSION_TO_VTKM(ArrayType) \ VTK_EXPORT_REAL_ARRAY_CONVERSION_TO_VTKM(ArrayType) VTK_EXPORT_ARRAY_CONVERSION_TO_VTKM(vtkAOSDataArrayTemplate) diff --git a/Accelerators/Vtkm/vtkmlib/CellSetConverters.cxx b/Accelerators/Vtkm/vtkmlib/CellSetConverters.cxx index 4c575c3058..7d9f06e03b 100644 --- a/Accelerators/Vtkm/vtkmlib/CellSetConverters.cxx +++ b/Accelerators/Vtkm/vtkmlib/CellSetConverters.cxx @@ -36,21 +36,25 @@ #include "vtkNew.h" #include "vtkUnsignedCharArray.h" -namespace tovtkm { +namespace tovtkm +{ -namespace { +namespace +{ template struct ReorderHex : public vtkm::exec::FunctorBase { - ReorderHex(PortalT portal): Portal{portal} {} + ReorderHex(PortalT portal) + : Portal{ portal } + { + } void operator()(vtkm::Id index) const { const vtkm::Id offset = index * 8; - auto doSwap = [&](vtkm::Id id1, vtkm::Id id2) - { + auto doSwap = [&](vtkm::Id id1, vtkm::Id id2) { id1 += offset; id2 += offset; @@ -63,14 +67,17 @@ struct ReorderHex : public vtkm::exec::FunctorBase doSwap(6, 7); } - PortalT Portal; + PortalT Portal; }; struct RunReorder { - RunReorder(vtkm::cont::ArrayHandle &handle) : Handle{handle} {} + RunReorder(vtkm::cont::ArrayHandle& handle) + : Handle{ handle } + { + } - template + template bool operator()(Device) const { using Algo = typename vtkm::cont::DeviceAdapterAlgorithm; @@ -78,7 +85,7 @@ struct RunReorder auto portal = this->Handle.PrepareForInPlace(Device{}); using Functor = ReorderHex; - Functor reorder{portal}; + Functor reorder{ portal }; Algo::Schedule(reorder, portal.GetNumberOfValues() / 8); return true; @@ -90,10 +97,8 @@ struct RunReorder struct BuildSingleTypeCellSetVisitor { template - vtkm::cont::DynamicCellSet operator()(CellStateT &state, - vtkm::UInt8 cellType, - vtkm::IdComponent cellSize, - vtkIdType numPoints) + vtkm::cont::DynamicCellSet operator()( + CellStateT& state, vtkm::UInt8 cellType, vtkm::IdComponent cellSize, vtkIdType numPoints) { using VTKIdT = typename CellStateT::ValueType; // might not be vtkIdType... using VTKArrayT = vtkAOSDataArrayTemplate; @@ -112,10 +117,7 @@ struct BuildSingleTypeCellSetVisitor using CellSetType = vtkm::cont::CellSetSingleType; CellSetType cellSet; - cellSet.Fill(static_cast(numPoints), - cellType, - cellSize, - connHandle); + cellSet.Fill(static_cast(numPoints), cellType, cellSize, connHandle); return cellSet; } }; @@ -123,21 +125,18 @@ struct BuildSingleTypeCellSetVisitor struct BuildSingleTypeVoxelCellSetVisitor { template - vtkm::cont::DynamicCellSet operator()(CellStateT &state, - vtkIdType numPoints) + vtkm::cont::DynamicCellSet operator()(CellStateT& state, vtkIdType numPoints) { vtkm::cont::ArrayHandle connHandle; { - auto *conn = state.GetConnectivity(); - const auto *origData = conn->GetPointer(0); + auto* conn = state.GetConnectivity(); + const auto* origData = conn->GetPointer(0); const vtkm::Id numIds = conn->GetNumberOfValues(); - vtkm::cont::ArrayCopy(vtkm::cont::make_ArrayHandle(origData, - numIds, - vtkm::CopyFlag::Off), - connHandle); + vtkm::cont::ArrayCopy( + vtkm::cont::make_ArrayHandle(origData, numIds, vtkm::CopyFlag::Off), connHandle); // reorder cells from voxel->hex: - RunReorder reorder{connHandle}; + RunReorder reorder{ connHandle }; vtkm::cont::TryExecute(reorder); } @@ -152,80 +151,63 @@ struct BuildSingleTypeVoxelCellSetVisitor } // end anon namespace // convert a cell array of a single type to a vtkm CellSetSingleType -vtkm::cont::DynamicCellSet ConvertSingleType(vtkCellArray* cells, int cellType, - vtkIdType numberOfPoints) +vtkm::cont::DynamicCellSet ConvertSingleType( + vtkCellArray* cells, int cellType, vtkIdType numberOfPoints) { switch (cellType) { - case VTK_LINE: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_LINE, - 2, - numberOfPoints); - - case VTK_HEXAHEDRON: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_HEXAHEDRON, - 8, - numberOfPoints); - - case VTK_VOXEL: - // Note that this is a special case that reorders ids voxel to hex: - return cells->Visit(BuildSingleTypeVoxelCellSetVisitor{}, - numberOfPoints); - - case VTK_QUAD: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_QUAD, - 4, - numberOfPoints); - - case VTK_TETRA: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_TETRA, - 4, - numberOfPoints); - - case VTK_TRIANGLE: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_TRIANGLE, - 3, - numberOfPoints); - - case VTK_VERTEX: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_VERTEX, - 1, - numberOfPoints); - - case VTK_WEDGE: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_WEDGE, - 6, - numberOfPoints); - - case VTK_PYRAMID: - return cells->Visit(BuildSingleTypeCellSetVisitor{}, - vtkm::CELL_SHAPE_PYRAMID, - 5, - numberOfPoints); - - default: - break; + case VTK_LINE: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_LINE, 2, numberOfPoints); + + case VTK_HEXAHEDRON: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_HEXAHEDRON, 8, numberOfPoints); + + case VTK_VOXEL: + // Note that this is a special case that reorders ids voxel to hex: + return cells->Visit(BuildSingleTypeVoxelCellSetVisitor{}, numberOfPoints); + + case VTK_QUAD: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_QUAD, 4, numberOfPoints); + + case VTK_TETRA: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_TETRA, 4, numberOfPoints); + + case VTK_TRIANGLE: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_TRIANGLE, 3, numberOfPoints); + + case VTK_VERTEX: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_VERTEX, 1, numberOfPoints); + + case VTK_WEDGE: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_WEDGE, 6, numberOfPoints); + + case VTK_PYRAMID: + return cells->Visit( + BuildSingleTypeCellSetVisitor{}, vtkm::CELL_SHAPE_PYRAMID, 5, numberOfPoints); + + default: + break; } throw vtkm::cont::ErrorBadType("Unsupported VTK cell type in " "CellSetSingleType converter."); } -namespace { +namespace +{ struct BuildExplicitCellSetVisitor { template - vtkm::cont::DynamicCellSet operator()(CellStateT &state, - const vtkm::cont::ArrayHandle& shapes, - vtkm::Id numPoints) const + vtkm::cont::DynamicCellSet operator()(CellStateT& state, + const vtkm::cont::ArrayHandle& shapes, vtkm::Id numPoints) const { using VTKIdT = typename CellStateT::ValueType; // might not be vtkIdType... using VTKArrayT = vtkAOSDataArrayTemplate; @@ -239,15 +221,15 @@ struct BuildExplicitCellSetVisitor // Cast if necessary: auto connHandle = IsVtkmIdType ? connHandleDirect : vtkm::cont::make_ArrayHandleCast(connHandleDirect); - auto offsetsHandle = IsVtkmIdType ? offsetsHandleDirect - : vtkm::cont::make_ArrayHandleCast(offsetsHandleDirect); + auto offsetsHandle = IsVtkmIdType + ? offsetsHandleDirect + : vtkm::cont::make_ArrayHandleCast(offsetsHandleDirect); using ShapesStorageTag = typename std::decay::type::StorageTag; using ConnStorageTag = typename decltype(connHandle)::StorageTag; using OffsetsStorageTag = typename decltype(offsetsHandle)::StorageTag; - using CellSetType = vtkm::cont::CellSetExplicit; + using CellSetType = + vtkm::cont::CellSetExplicit; CellSetType cellSet; cellSet.Fill(numPoints, shapes, connHandle, offsetsHandle); @@ -258,23 +240,21 @@ struct BuildExplicitCellSetVisitor } // end anon namespace // convert a cell array of mixed types to a vtkm CellSetExplicit -vtkm::cont::DynamicCellSet Convert(vtkUnsignedCharArray* types, - vtkCellArray* cells, - vtkIdType numberOfPoints) +vtkm::cont::DynamicCellSet Convert( + vtkUnsignedCharArray* types, vtkCellArray* cells, vtkIdType numberOfPoints) { using ShapeArrayType = vtkAOSDataArrayTemplate; using ShapeConverter = tovtkm::DataArrayToArrayHandle; - return cells->Visit(BuildExplicitCellSetVisitor{}, - ShapeConverter::Wrap(types), - numberOfPoints); + return cells->Visit(BuildExplicitCellSetVisitor{}, ShapeConverter::Wrap(types), numberOfPoints); } } // namespace tovtkm -namespace fromvtkm { +namespace fromvtkm +{ bool Convert(const vtkm::cont::DynamicCellSet& toConvert, vtkCellArray* cells, - vtkUnsignedCharArray* typesArray) + vtkUnsignedCharArray* typesArray) { const auto* cellset = toConvert.GetCellSetBase(); @@ -296,8 +276,8 @@ bool Convert(const vtkm::cont::DynamicCellSet& toConvert, vtkCellArray* cells, typesArray->SetNumberOfTuples(static_cast(numCells)); } - vtkIdType *connIter = connArray->GetPointer(0); - const vtkIdType *connBegin = connIter; + vtkIdType* connIter = connArray->GetPointer(0); + const vtkIdType* connBegin = connIter; for (vtkm::Id cellId = 0; cellId < numCells; ++cellId) { diff --git a/Accelerators/Vtkm/vtkmlib/CellSetConverters.h b/Accelerators/Vtkm/vtkmlib/CellSetConverters.h index 0ce8e45b2c..7973422eb7 100644 --- a/Accelerators/Vtkm/vtkmlib/CellSetConverters.h +++ b/Accelerators/Vtkm/vtkmlib/CellSetConverters.h @@ -27,23 +27,23 @@ class vtkCellArray; class vtkUnsignedCharArray; class vtkIdTypeArray; -namespace tovtkm { +namespace tovtkm +{ VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DynamicCellSet ConvertSingleType(vtkCellArray* cells, int cellType, - vtkIdType numberOfPoints); +vtkm::cont::DynamicCellSet ConvertSingleType( + vtkCellArray* cells, int cellType, vtkIdType numberOfPoints); VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DynamicCellSet Convert(vtkUnsignedCharArray* types, - vtkCellArray* cells, - vtkIdType numberOfPoints); +vtkm::cont::DynamicCellSet Convert( + vtkUnsignedCharArray* types, vtkCellArray* cells, vtkIdType numberOfPoints); } -namespace fromvtkm { +namespace fromvtkm +{ VTKACCELERATORSVTKM_EXPORT -bool Convert(const vtkm::cont::DynamicCellSet& toConvert, - vtkCellArray* cells, - vtkUnsignedCharArray* types = nullptr); +bool Convert(const vtkm::cont::DynamicCellSet& toConvert, vtkCellArray* cells, + vtkUnsignedCharArray* types = nullptr); } #endif // vtkmlib_CellSetConverters_h diff --git a/Accelerators/Vtkm/vtkmlib/DataSetConverters.cxx b/Accelerators/Vtkm/vtkmlib/DataSetConverters.cxx index 452957b747..fe473338d5 100644 --- a/Accelerators/Vtkm/vtkmlib/DataSetConverters.cxx +++ b/Accelerators/Vtkm/vtkmlib/DataSetConverters.cxx @@ -40,46 +40,46 @@ #include #include -namespace tovtkm { +namespace tovtkm +{ -namespace { +namespace +{ template -vtkm::cont::CoordinateSystem deduce_container(vtkPoints *points) +vtkm::cont::CoordinateSystem deduce_container(vtkPoints* points) { typedef vtkm::Vec Vec3; - vtkAOSDataArrayTemplate *typedIn = - vtkAOSDataArrayTemplate::FastDownCast(points->GetData()); + vtkAOSDataArrayTemplate* typedIn = vtkAOSDataArrayTemplate::FastDownCast(points->GetData()); if (typedIn) { auto p = DataArrayToArrayHandle, 3>::Wrap(typedIn); return vtkm::cont::CoordinateSystem("coords", p); } - vtkSOADataArrayTemplate *typedIn2 = - vtkSOADataArrayTemplate::FastDownCast(points->GetData()); + vtkSOADataArrayTemplate* typedIn2 = + vtkSOADataArrayTemplate::FastDownCast(points->GetData()); if (typedIn2) { auto p = DataArrayToArrayHandle, 3>::Wrap(typedIn2); return vtkm::cont::CoordinateSystem("coords", p); } - vtkmDataArray *typedIn3 = - vtkmDataArray::SafeDownCast(points->GetData()); + vtkmDataArray* typedIn3 = vtkmDataArray::SafeDownCast(points->GetData()); if (typedIn3) { return vtkm::cont::CoordinateSystem("coords", typedIn3->GetVtkmVariantArrayHandle()); } typedef vtkm::Vec Vec3; - Vec3 *xyz = nullptr; + Vec3* xyz = nullptr; return vtkm::cont::make_CoordinateSystem("coords", xyz, 0); } } //------------------------------------------------------------------------------ // convert a vtkPoints array into a coordinate system -vtkm::cont::CoordinateSystem Convert(vtkPoints *points) +vtkm::cont::CoordinateSystem Convert(vtkPoints* points) { if (points) { @@ -95,16 +95,17 @@ vtkm::cont::CoordinateSystem Convert(vtkPoints *points) // unsupported/null point set typedef vtkm::Vec Vec3; - Vec3 *xyz = nullptr; + Vec3* xyz = nullptr; return vtkm::cont::make_CoordinateSystem("coords", xyz, 0); } //------------------------------------------------------------------------------ // convert an structured grid type -vtkm::cont::DataSet Convert(vtkStructuredGrid *input, FieldsFlag fields) +vtkm::cont::DataSet Convert(vtkStructuredGrid* input, FieldsFlag fields) { const int dimensionality = input->GetDataDimension(); - int dims[3]; input->GetDimensions(dims); + int dims[3]; + input->GetDimensions(dims); vtkm::cont::DataSet dataset; @@ -113,22 +114,22 @@ vtkm::cont::DataSet Convert(vtkStructuredGrid *input, FieldsFlag fields) dataset.AddCoordinateSystem(coords); // second step is to create structured cellset that represe - if(dimensionality == 1) + if (dimensionality == 1) { vtkm::cont::CellSetStructured<1> cells; cells.SetPointDimensions(dims[0]); dataset.SetCellSet(cells); } - else if(dimensionality == 2) + else if (dimensionality == 2) { vtkm::cont::CellSetStructured<2> cells; - cells.SetPointDimensions(vtkm::make_Vec(dims[0],dims[1])); + cells.SetPointDimensions(vtkm::make_Vec(dims[0], dims[1])); dataset.SetCellSet(cells); } else - { //going to presume 3d for everything else + { // going to presume 3d for everything else vtkm::cont::CellSetStructured<3> cells; - cells.SetPointDimensions(vtkm::make_Vec(dims[0],dims[1],dims[2])); + cells.SetPointDimensions(vtkm::make_Vec(dims[0], dims[1], dims[2])); dataset.SetCellSet(cells); } @@ -139,25 +140,25 @@ vtkm::cont::DataSet Convert(vtkStructuredGrid *input, FieldsFlag fields) //------------------------------------------------------------------------------ // determine the type and call the proper Convert routine -vtkm::cont::DataSet Convert(vtkDataSet *input, FieldsFlag fields) +vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields) { switch (input->GetDataObjectType()) { - case VTK_UNSTRUCTURED_GRID: - return Convert(vtkUnstructuredGrid::SafeDownCast(input), fields); - case VTK_STRUCTURED_GRID: - return Convert(vtkStructuredGrid::SafeDownCast(input), fields); - case VTK_UNIFORM_GRID: - case VTK_IMAGE_DATA: - return Convert(vtkImageData::SafeDownCast(input), fields); - case VTK_POLY_DATA: - return Convert(vtkPolyData::SafeDownCast(input), fields); - - case VTK_UNSTRUCTURED_GRID_BASE: - case VTK_RECTILINEAR_GRID: - case VTK_STRUCTURED_POINTS: - default: - return vtkm::cont::DataSet(); + case VTK_UNSTRUCTURED_GRID: + return Convert(vtkUnstructuredGrid::SafeDownCast(input), fields); + case VTK_STRUCTURED_GRID: + return Convert(vtkStructuredGrid::SafeDownCast(input), fields); + case VTK_UNIFORM_GRID: + case VTK_IMAGE_DATA: + return Convert(vtkImageData::SafeDownCast(input), fields); + case VTK_POLY_DATA: + return Convert(vtkPolyData::SafeDownCast(input), fields); + + case VTK_UNSTRUCTURED_GRID_BASE: + case VTK_RECTILINEAR_GRID: + case VTK_STRUCTURED_POINTS: + default: + return vtkm::cont::DataSet(); } } diff --git a/Accelerators/Vtkm/vtkmlib/DataSetConverters.h b/Accelerators/Vtkm/vtkmlib/DataSetConverters.h index 02915e2df2..6192b1624e 100644 --- a/Accelerators/Vtkm/vtkmlib/DataSetConverters.h +++ b/Accelerators/Vtkm/vtkmlib/DataSetConverters.h @@ -30,7 +30,8 @@ class vtkStructuredGrid; class vtkPoints; class vtkDataSet; -namespace tovtkm { +namespace tovtkm +{ // convert a vtkPoints array into a coordinate system VTKACCELERATORSVTKM_EXPORT @@ -38,14 +39,11 @@ vtkm::cont::CoordinateSystem Convert(vtkPoints* points); // convert an structured grid type VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DataSet Convert(vtkStructuredGrid* input, - FieldsFlag fields = FieldsFlag::None); - +vtkm::cont::DataSet Convert(vtkStructuredGrid* input, FieldsFlag fields = FieldsFlag::None); // determine the type and call the proper Convert routine VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DataSet Convert(vtkDataSet* input, - FieldsFlag fields = FieldsFlag::None); +vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields = FieldsFlag::None); } #endif // vtkmlib_DataSetConverters_h diff --git a/Accelerators/Vtkm/vtkmlib/ImageDataConverter.cxx b/Accelerators/Vtkm/vtkmlib/ImageDataConverter.cxx index 3046ab358f..6fbcc9428b 100644 --- a/Accelerators/Vtkm/vtkmlib/ImageDataConverter.cxx +++ b/Accelerators/Vtkm/vtkmlib/ImageDataConverter.cxx @@ -24,12 +24,12 @@ #include "vtkImageData.h" #include "vtkPointData.h" - -namespace tovtkm { +namespace tovtkm +{ //------------------------------------------------------------------------------ // convert an image data type -vtkm::cont::DataSet Convert(vtkImageData *input, FieldsFlag fields) +vtkm::cont::DataSet Convert(vtkImageData* input, FieldsFlag fields) { int extent[6]; input->GetExtent(extent); @@ -44,14 +44,11 @@ vtkm::cont::DataSet Convert(vtkImageData *input, FieldsFlag fields) static_cast((static_cast(extent[0]) * vspacing[0]) + vorigin[0]), static_cast((static_cast(extent[2]) * vspacing[1]) + vorigin[1]), static_cast((static_cast(extent[4]) * vspacing[2]) + vorigin[2])); - vtkm::Vec spacing( - static_cast(vspacing[0]), - static_cast(vspacing[1]), - static_cast(vspacing[2])); + vtkm::Vec spacing(static_cast(vspacing[0]), + static_cast(vspacing[1]), static_cast(vspacing[2])); vtkm::Id3 dims(vdims[0], vdims[1], vdims[2]); - vtkm::cont::DataSet dataset = - vtkm::cont::DataSetBuilderUniform::Create(dims, origin, spacing); + vtkm::cont::DataSet dataset = vtkm::cont::DataSetBuilderUniform::Create(dims, origin, spacing); ProcessFields(input, dataset, fields); @@ -60,10 +57,11 @@ vtkm::cont::DataSet Convert(vtkImageData *input, FieldsFlag fields) } // tovtkm -namespace fromvtkm { +namespace fromvtkm +{ -bool Convert(const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, - vtkDataSet* input) +bool Convert( + const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, vtkDataSet* input) { vtkm::cont::CoordinateSystem cs = voutput.GetCoordinateSystem(); if (!cs.GetData().IsType()) @@ -77,9 +75,8 @@ bool Convert(const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* o auto origin = portal.GetOrigin(); auto spacing = portal.GetSpacing(); auto dim = portal.GetDimensions(); - VTKM_ASSERT((extents[1] - extents[0] + 1) == dim[0] && - (extents[3] - extents[2] + 1) == dim[1] && - (extents[5] - extents[4] + 1) == dim[2]); + VTKM_ASSERT((extents[1] - extents[0] + 1) == dim[0] && (extents[3] - extents[2] + 1) == dim[1] && + (extents[5] - extents[4] + 1) == dim[2]); origin[0] -= static_cast(extents[0]) * spacing[0]; origin[1] -= static_cast(extents[2]) * spacing[1]; @@ -93,24 +90,20 @@ bool Convert(const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* o bool arraysConverted = fromvtkm::ConvertArrays(voutput, output); // Pass information about attributes. - for (int attributeType = 0; - attributeType < vtkDataSetAttributes::NUM_ATTRIBUTES; attributeType++) + for (int attributeType = 0; attributeType < vtkDataSetAttributes::NUM_ATTRIBUTES; attributeType++) { - vtkDataArray* attribute = - input->GetPointData()->GetAttribute(attributeType); + vtkDataArray* attribute = input->GetPointData()->GetAttribute(attributeType); if (attribute == nullptr) { continue; } - output->GetPointData()->SetActiveAttribute(attribute->GetName(), - attributeType); + output->GetPointData()->SetActiveAttribute(attribute->GetName(), attributeType); } return arraysConverted; } -bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, - vtkDataSet* input) +bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSet* input) { vtkm::cont::CoordinateSystem cs = voutput.GetCoordinateSystem(); if (!cs.GetData().IsType()) @@ -122,9 +115,8 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, auto portal = points.GetPortalConstControl(); auto dim = portal.GetDimensions(); - int extents[6] = {0, static_cast(dim[0] - 1), - 0, static_cast(dim[1] - 1), - 0, static_cast(dim[2] - 1)}; + int extents[6] = { 0, static_cast(dim[0] - 1), 0, static_cast(dim[1] - 1), 0, + static_cast(dim[2] - 1) }; return Convert(voutput, extents, output, input); } diff --git a/Accelerators/Vtkm/vtkmlib/ImageDataConverter.h b/Accelerators/Vtkm/vtkmlib/ImageDataConverter.h index bdfc6010f2..e174a2c32b 100644 --- a/Accelerators/Vtkm/vtkmlib/ImageDataConverter.h +++ b/Accelerators/Vtkm/vtkmlib/ImageDataConverter.h @@ -26,22 +26,23 @@ class vtkImageData; class vtkDataSet; -namespace tovtkm { +namespace tovtkm +{ VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DataSet Convert(vtkImageData* input, - FieldsFlag fields = FieldsFlag::None); +vtkm::cont::DataSet Convert(vtkImageData* input, FieldsFlag fields = FieldsFlag::None); } -namespace fromvtkm { +namespace fromvtkm +{ VTKACCELERATORSVTKM_EXPORT bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSet* input); VTKACCELERATORSVTKM_EXPORT -bool Convert(const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, - vtkDataSet* input); +bool Convert( + const vtkm::cont::DataSet& voutput, int extents[6], vtkImageData* output, vtkDataSet* input); } #endif // vtkmlib_ImageDataConverter_h diff --git a/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.cxx index 777887c21f..6be1b5573e 100644 --- a/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.cxx +++ b/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.cxx @@ -24,27 +24,28 @@ #include - -namespace tovtkm { +namespace tovtkm +{ inline vtkm::Vec MakeFVec3(const double x[3]) { return vtkm::Vec(static_cast(x[0]), - static_cast(x[1]), - static_cast(x[2])); + static_cast(x[1]), static_cast(x[2])); } ImplicitFunctionConverter::ImplicitFunctionConverter() - : InFunction(nullptr), OutFunction(), MTime(0) + : InFunction(nullptr) + , OutFunction() + , MTime(0) { } -void ImplicitFunctionConverter::Set(vtkImplicitFunction *function) +void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) { - vtkBox *box = nullptr; - vtkCylinder *cylinder = nullptr; - vtkPlane *plane = nullptr; - vtkSphere *sphere = nullptr; + vtkBox* box = nullptr; + vtkCylinder* cylinder = nullptr; + vtkPlane* plane = nullptr; + vtkSphere* sphere = nullptr; if ((box = vtkBox::SafeDownCast(function))) { @@ -81,8 +82,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction *function) sphere->GetCenter(center); radius = sphere->GetRadius(); - auto s = new vtkm::Sphere( - MakeFVec3(center), static_cast(radius)); + auto s = new vtkm::Sphere(MakeFVec3(center), static_cast(radius)); this->OutFunction.Reset(s, true); } else @@ -100,10 +100,10 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const { if (this->InFunction && (this->MTime < this->InFunction->GetMTime())) { - vtkBox *box = nullptr; - vtkCylinder *cylinder = nullptr; - vtkPlane *plane = nullptr; - vtkSphere *sphere = nullptr; + vtkBox* box = nullptr; + vtkCylinder* cylinder = nullptr; + vtkPlane* plane = nullptr; + vtkSphere* sphere = nullptr; if ((box = vtkBox::SafeDownCast(this->InFunction))) { diff --git a/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.h b/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.h index 120c343683..c17f02dbf6 100644 --- a/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.h +++ b/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.h @@ -17,25 +17,26 @@ #define vtkmlib_ImplicitFunctionConverter_h #include "vtkAcceleratorsVTKmModule.h" -#include "vtkType.h" // For vtkMTimeType +#include "vtkType.h" // For vtkMTimeType #include "vtkmConfig.h" //required for general vtkm setup #include "vtkm/cont/ImplicitFunctionHandle.h" class vtkImplicitFunction; -namespace tovtkm { +namespace tovtkm +{ class VTKACCELERATORSVTKM_EXPORT ImplicitFunctionConverter { public: ImplicitFunctionConverter(); - void Set(vtkImplicitFunction *); + void Set(vtkImplicitFunction*); const vtkm::cont::ImplicitFunctionHandle& Get() const; private: - vtkImplicitFunction *InFunction; + vtkImplicitFunction* InFunction; vtkm::cont::ImplicitFunctionHandle OutFunction; mutable vtkMTimeType MTime; }; diff --git a/Accelerators/Vtkm/vtkmlib/PolyDataConverter.cxx b/Accelerators/Vtkm/vtkmlib/PolyDataConverter.cxx index af7449c2a4..4d91bebde7 100644 --- a/Accelerators/Vtkm/vtkmlib/PolyDataConverter.cxx +++ b/Accelerators/Vtkm/vtkmlib/PolyDataConverter.cxx @@ -37,7 +37,8 @@ #include #include -namespace tovtkm { +namespace tovtkm +{ //------------------------------------------------------------------------------ // convert an polydata type @@ -55,12 +56,9 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) // first check if we only have polys/lines/verts bool filled = false; - const bool onlyPolys = - (input->GetNumberOfCells() == input->GetNumberOfPolys()); - const bool onlyLines = - (input->GetNumberOfCells() == input->GetNumberOfLines()); - const bool onlyVerts = - (input->GetNumberOfCells() == input->GetNumberOfVerts()); + const bool onlyPolys = (input->GetNumberOfCells() == input->GetNumberOfPolys()); + const bool onlyLines = (input->GetNumberOfCells() == input->GetNumberOfLines()); + const bool onlyVerts = (input->GetNumberOfCells() == input->GetNumberOfVerts()); const vtkIdType numPoints = input->GetNumberOfPoints(); if (onlyPolys) @@ -70,8 +68,7 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) if (homoSize == 3) { // We are all triangles - vtkm::cont::DynamicCellSet dcells = - ConvertSingleType(cells, VTK_TRIANGLE, numPoints); + vtkm::cont::DynamicCellSet dcells = ConvertSingleType(cells, VTK_TRIANGLE, numPoints); dataset.SetCellSet(dcells); filled = true; } @@ -86,8 +83,9 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) { // we have mixture of polygins/quads/triangles, we don't support that // currently - vtkErrorWithObjectMacro(input, "VTK-m currently only handles vtkPolyData " - "with only triangles or only quads."); + vtkErrorWithObjectMacro(input, + "VTK-m currently only handles vtkPolyData " + "with only triangles or only quads."); } } else if (onlyLines) @@ -103,8 +101,9 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) } else { - vtkErrorWithObjectMacro(input, "VTK-m does not currently support " - "PolyLine cells."); + vtkErrorWithObjectMacro(input, + "VTK-m does not currently support " + "PolyLine cells."); } } else if (onlyVerts) @@ -120,20 +119,22 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) } else { - vtkErrorWithObjectMacro(input, "VTK-m does not currently support " - "PolyVertex cells."); + vtkErrorWithObjectMacro(input, + "VTK-m does not currently support " + "PolyVertex cells."); } } else { - vtkErrorWithObjectMacro(input, "VTK-m does not currently support mixed " - "cell types or triangle strips in " - "vtkPolyData."); + vtkErrorWithObjectMacro(input, + "VTK-m does not currently support mixed " + "cell types or triangle strips in " + "vtkPolyData."); } if (!filled) { - //todo: we need to convert a mixed type which + // todo: we need to convert a mixed type which } ProcessFields(input, dataset, fields); @@ -143,11 +144,11 @@ vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields) } // namespace tovtkm -namespace fromvtkm { +namespace fromvtkm +{ //------------------------------------------------------------------------------ -bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, - vtkDataSet* input) +bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet* input) { vtkPoints* points = fromvtkm::Convert(voutput.GetCoordinateSystem()); output->SetPoints(points); @@ -170,17 +171,14 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, bool arraysConverted = ConvertArrays(voutput, output); // Pass information about attributes. - for (int attributeType = 0; - attributeType < vtkDataSetAttributes::NUM_ATTRIBUTES; attributeType++) + for (int attributeType = 0; attributeType < vtkDataSetAttributes::NUM_ATTRIBUTES; attributeType++) { - vtkDataArray* attribute = - input->GetPointData()->GetAttribute(attributeType); + vtkDataArray* attribute = input->GetPointData()->GetAttribute(attributeType); if (attribute == nullptr) { continue; } - output->GetPointData()->SetActiveAttribute(attribute->GetName(), - attributeType); + output->GetPointData()->SetActiveAttribute(attribute->GetName(), attributeType); } return arraysConverted; diff --git a/Accelerators/Vtkm/vtkmlib/PolyDataConverter.h b/Accelerators/Vtkm/vtkmlib/PolyDataConverter.h index dfc7b784b2..0d70629295 100644 --- a/Accelerators/Vtkm/vtkmlib/PolyDataConverter.h +++ b/Accelerators/Vtkm/vtkmlib/PolyDataConverter.h @@ -28,16 +28,16 @@ class vtkPolyData; class vtkDataSet; -namespace tovtkm { +namespace tovtkm +{ // convert an polydata type VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DataSet Convert(vtkPolyData* input, - FieldsFlag fields = FieldsFlag::None); +vtkm::cont::DataSet Convert(vtkPolyData* input, FieldsFlag fields = FieldsFlag::None); } -namespace fromvtkm { +namespace fromvtkm +{ VTKACCELERATORSVTKM_EXPORT -bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, - vtkDataSet* input); +bool Convert(const vtkm::cont::DataSet& voutput, vtkPolyData* output, vtkDataSet* input); } #endif // vtkmlib_PolyDataConverter_h diff --git a/Accelerators/Vtkm/vtkmlib/PortalTraits.h b/Accelerators/Vtkm/vtkmlib/PortalTraits.h index cb7e0343d8..5ad6df7f78 100644 --- a/Accelerators/Vtkm/vtkmlib/PortalTraits.h +++ b/Accelerators/Vtkm/vtkmlib/PortalTraits.h @@ -24,138 +24,124 @@ #include -namespace tovtkm { +namespace tovtkm +{ struct vtkPortalOfVecOfVecValues; struct vtkPortalOfVecOfValues; struct vtkPortalOfScalarValues; -template +template struct vtkPortalTraits { using TagType = vtkPortalOfScalarValues; using ComponentType = typename std::remove_const::type; using Type = ComponentType; - static constexpr vtkm::IdComponent NUM_COMPONENTS = 1; + static constexpr vtkm::IdComponent NUM_COMPONENTS = 1; - static inline - void SetComponent(Type& t, vtkm::IdComponent, const ComponentType& v) - { t = v; } + static inline void SetComponent(Type& t, vtkm::IdComponent, const ComponentType& v) { t = v; } - static inline - ComponentType GetComponent(const Type& t, vtkm::IdComponent) - { - return t; - } + static inline ComponentType GetComponent(const Type& t, vtkm::IdComponent) { return t; } }; -template -struct vtkPortalTraits< vtkm::Vec > +template +struct vtkPortalTraits > { using TagType = vtkPortalOfVecOfValues; using ComponentType = typename std::remove_const::type; - using Type = vtkm::Vec; - static constexpr vtkm::IdComponent NUM_COMPONENTS = N; + using Type = vtkm::Vec; + static constexpr vtkm::IdComponent NUM_COMPONENTS = N; - static inline - void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) - { + static inline void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) + { VTKM_ASSUME((i >= 0 && i < N)); t[i] = v; - } + } - static inline - ComponentType GetComponent(const Type& t, vtkm::IdComponent i) - { + static inline ComponentType GetComponent(const Type& t, vtkm::IdComponent i) + { VTKM_ASSUME((i >= 0 && i < N)); return t[i]; - } + } }; -template -struct vtkPortalTraits< const vtkm::Vec > +template +struct vtkPortalTraits > { using TagType = vtkPortalOfVecOfValues; using ComponentType = typename std::remove_const::type; - using Type = vtkm::Vec; - static constexpr vtkm::IdComponent NUM_COMPONENTS = N; + using Type = vtkm::Vec; + static constexpr vtkm::IdComponent NUM_COMPONENTS = N; - static inline - void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) - { + static inline void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) + { VTKM_ASSUME((i >= 0 && i < N)); t[i] = v; - } + } - static inline - ComponentType GetComponent(const Type& t, vtkm::IdComponent i) - { + static inline ComponentType GetComponent(const Type& t, vtkm::IdComponent i) + { VTKM_ASSUME((i >= 0 && i < N)); return t[i]; - } + } }; -template -struct vtkPortalTraits, M> > +template +struct vtkPortalTraits, M> > { using TagType = vtkPortalOfVecOfVecValues; using ComponentType = typename std::remove_const::type; - using Type = vtkm::Vec< vtkm::Vec, M>; - static constexpr vtkm::IdComponent NUM_COMPONENTS = N*M; + using Type = vtkm::Vec, M>; + static constexpr vtkm::IdComponent NUM_COMPONENTS = N * M; - static constexpr vtkm::IdComponent NUM_COMPONENTS_OUTER = M; - static constexpr vtkm::IdComponent NUM_COMPONENTS_INNER = N; + static constexpr vtkm::IdComponent NUM_COMPONENTS_OUTER = M; + static constexpr vtkm::IdComponent NUM_COMPONENTS_INNER = N; - static inline - void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) - { + static inline void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) + { VTKM_ASSUME((i >= 0 && i < NUM_COMPONENTS)); - //We need to convert i back to a 2d index - const vtkm::IdComponent j = i%N; - t[i/N][j] = v; - } - - static inline - ComponentType GetComponent(const Type& t, vtkm::IdComponent i) - { + // We need to convert i back to a 2d index + const vtkm::IdComponent j = i % N; + t[i / N][j] = v; + } + + static inline ComponentType GetComponent(const Type& t, vtkm::IdComponent i) + { VTKM_ASSUME((i >= 0 && i < NUM_COMPONENTS)); - //We need to convert i back to a 2d index - const vtkm::IdComponent j = i%N; - return t[i/N][j]; - } + // We need to convert i back to a 2d index + const vtkm::IdComponent j = i % N; + return t[i / N][j]; + } }; -template -struct vtkPortalTraits< const vtkm::Vec< vtkm::Vec, M> > +template +struct vtkPortalTraits, M> > { using TagType = vtkPortalOfVecOfVecValues; using ComponentType = typename std::remove_const::type; - using Type = vtkm::Vec< vtkm::Vec, M>; - static constexpr vtkm::IdComponent NUM_COMPONENTS = N*M; + using Type = vtkm::Vec, M>; + static constexpr vtkm::IdComponent NUM_COMPONENTS = N * M; - static constexpr vtkm::IdComponent NUM_COMPONENTS_OUTER = M; - static constexpr vtkm::IdComponent NUM_COMPONENTS_INNER = N; + static constexpr vtkm::IdComponent NUM_COMPONENTS_OUTER = M; + static constexpr vtkm::IdComponent NUM_COMPONENTS_INNER = N; - - static inline - void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) - { + static inline void SetComponent(Type& t, vtkm::IdComponent i, const ComponentType& v) + { VTKM_ASSUME((i >= 0 && i < NUM_COMPONENTS)); - //We need to convert i back to a 2d index - const vtkm::IdComponent j = i%N; - t[i/N][j] = v; - } - - static inline - ComponentType GetComponent(const Type& t, vtkm::IdComponent i) - { + // We need to convert i back to a 2d index + const vtkm::IdComponent j = i % N; + t[i / N][j] = v; + } + + static inline ComponentType GetComponent(const Type& t, vtkm::IdComponent i) + { VTKM_ASSUME((i >= 0 && i < NUM_COMPONENTS)); - //We need to convert i back to a 2d index - const vtkm::IdComponent j = i%N; - return t[i/N][j]; - } + // We need to convert i back to a 2d index + const vtkm::IdComponent j = i % N; + return t[i / N][j]; + } }; -} //namespace vtkmlib +} // namespace vtkmlib #endif // vtkmlib_PortalsTraits_h diff --git a/Accelerators/Vtkm/vtkmlib/Portals.cxx b/Accelerators/Vtkm/vtkmlib/Portals.cxx index b1479a42c5..9d1803802e 100644 --- a/Accelerators/Vtkm/vtkmlib/Portals.cxx +++ b/Accelerators/Vtkm/vtkmlib/Portals.cxx @@ -22,12 +22,8 @@ namespace tovtkm { // T extern template instantiations -template class VTKACCELERATORSVTKM_EXPORT - vtkPointsPortal const>; -template class VTKACCELERATORSVTKM_EXPORT - vtkPointsPortal const>; -template class VTKACCELERATORSVTKM_EXPORT - vtkPointsPortal>; -template class VTKACCELERATORSVTKM_EXPORT - vtkPointsPortal>; +template class VTKACCELERATORSVTKM_EXPORT vtkPointsPortal const>; +template class VTKACCELERATORSVTKM_EXPORT vtkPointsPortal const>; +template class VTKACCELERATORSVTKM_EXPORT vtkPointsPortal >; +template class VTKACCELERATORSVTKM_EXPORT vtkPointsPortal >; } diff --git a/Accelerators/Vtkm/vtkmlib/Portals.h b/Accelerators/Vtkm/vtkmlib/Portals.h index ddb7c63405..d1c9ec7cbc 100644 --- a/Accelerators/Vtkm/vtkmlib/Portals.h +++ b/Accelerators/Vtkm/vtkmlib/Portals.h @@ -26,7 +26,8 @@ class vtkPoints; #include -namespace tovtkm { +namespace tovtkm +{ template class VTKM_ALWAYS_EXPORT vtkArrayPortal @@ -46,10 +47,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS VTKM_EXEC_CONT - vtkm::Id GetNumberOfValues() const - { - return this->Size; - } + vtkm::Id GetNumberOfValues() const { return this->Size; } VTKM_SUPPRESS_EXEC_WARNINGS VTKM_EXEC_CONT @@ -59,33 +57,24 @@ public: VTKM_EXEC_CONT inline void Set(vtkm::Id index, const ValueType& value) const; - typedef vtkm::cont::internal::IteratorFromArrayPortal - IteratorType; + typedef vtkm::cont::internal::IteratorFromArrayPortal IteratorType; VTKM_CONT - IteratorType GetIteratorBegin() const - { - return IteratorType(*this, 0); - } + IteratorType GetIteratorBegin() const { return IteratorType(*this, 0); } VTKM_CONT - IteratorType GetIteratorEnd() const - { - return IteratorType(*this, this->Size); - } + IteratorType GetIteratorEnd() const { return IteratorType(*this, this->Size); } VTKM_CONT - VTKDataArrayType* GetVtkData() const - { - return this->VTKData; - } + VTKDataArrayType* GetVtkData() const { return this->VTKData; } private: VTKDataArrayType* VTKData; vtkm::Id Size; }; -template class VTKM_ALWAYS_EXPORT vtkPointsPortal +template +class VTKM_ALWAYS_EXPORT vtkPointsPortal { static const int NUM_COMPONENTS = vtkm::VecTraits::NUM_COMPONENTS; @@ -101,10 +90,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS VTKM_EXEC_CONT - vtkm::Id GetNumberOfValues() const - { - return this->Size; - } + vtkm::Id GetNumberOfValues() const { return this->Size; } VTKM_SUPPRESS_EXEC_WARNINGS VTKM_EXEC_CONT @@ -114,26 +100,16 @@ public: VTKM_EXEC_CONT inline void Set(vtkm::Id index, const ValueType& value) const; - typedef vtkm::cont::internal::IteratorFromArrayPortal - IteratorType; + typedef vtkm::cont::internal::IteratorFromArrayPortal IteratorType; VTKM_CONT - IteratorType GetIteratorBegin() const - { - return IteratorType(*this, 0); - } + IteratorType GetIteratorBegin() const { return IteratorType(*this, 0); } VTKM_CONT - IteratorType GetIteratorEnd() const - { - return IteratorType(*this, this->Size); - } + IteratorType GetIteratorEnd() const { return IteratorType(*this, this->Size); } VTKM_CONT - vtkPoints* GetVtkData() const - { - return Points; - } + vtkPoints* GetVtkData() const { return Points; } private: vtkPoints* Points; @@ -144,16 +120,17 @@ private: #ifndef vtkmlib_Portals_cxx #include -namespace tovtkm { +namespace tovtkm +{ // T extern template instantiations extern template class VTKACCELERATORSVTKM_TEMPLATE_EXPORT - vtkPointsPortal const>; + vtkPointsPortal const>; extern template class VTKACCELERATORSVTKM_TEMPLATE_EXPORT - vtkPointsPortal const>; + vtkPointsPortal const>; extern template class VTKACCELERATORSVTKM_TEMPLATE_EXPORT - vtkPointsPortal>; + vtkPointsPortal >; extern template class VTKACCELERATORSVTKM_TEMPLATE_EXPORT - vtkPointsPortal>; + vtkPointsPortal >; } #endif // defined vtkmlib_Portals_cxx diff --git a/Accelerators/Vtkm/vtkmlib/Portals.hxx b/Accelerators/Vtkm/vtkmlib/Portals.hxx index e00a9ccc8d..b017019be7 100644 --- a/Accelerators/Vtkm/vtkmlib/Portals.hxx +++ b/Accelerators/Vtkm/vtkmlib/Portals.hxx @@ -25,54 +25,55 @@ #include #include -namespace { +namespace +{ -template struct fillComponents +template +struct fillComponents { template - VTKM_EXEC - void operator()(T* t, const Tuple& tuple) const + VTKM_EXEC void operator()(T* t, const Tuple& tuple) const { fillComponents()(t, tuple); t[N - 1] = vtkm::VecTraits::GetComponent(tuple, N - 1); } }; -template <> struct fillComponents<1> +template <> +struct fillComponents<1> { template - VTKM_EXEC - void operator()(T* t, const Tuple& tuple) const + VTKM_EXEC void operator()(T* t, const Tuple& tuple) const { t[0] = vtkm::VecTraits::GetComponent(tuple, 0); } }; } -namespace tovtkm { +namespace tovtkm +{ //------------------------------------------------------------------------------ template -VTKM_EXEC_CONT -vtkArrayPortal::vtkArrayPortal() - : VTKData(nullptr), Size(0) +VTKM_EXEC_CONT vtkArrayPortal::vtkArrayPortal() + : VTKData(nullptr) + , Size(0) { } //------------------------------------------------------------------------------ template -VTKM_CONT -vtkArrayPortal::vtkArrayPortal(VTKDataArrayType* array, - vtkm::Id size) - : VTKData(array), Size(size) +VTKM_CONT vtkArrayPortal::vtkArrayPortal( + VTKDataArrayType* array, vtkm::Id size) + : VTKData(array) + , Size(size) { VTKM_ASSERT(this->GetNumberOfValues() >= 0); } //------------------------------------------------------------------------------ template -typename vtkArrayPortal::ValueType -VTKM_EXEC +typename vtkArrayPortal::ValueType VTKM_EXEC vtkArrayPortal::Get(vtkm::Id index) const { VTKM_ASSUME(this->VTKData->GetNumberOfComponents() == NUM_COMPONENTS); @@ -88,9 +89,8 @@ vtkArrayPortal::Get(vtkm::Id index) const //------------------------------------------------------------------------------ template -VTKM_EXEC -void vtkArrayPortal::Set(vtkm::Id index, - const ValueType& value) const +VTKM_EXEC void vtkArrayPortal::Set( + vtkm::Id index, const ValueType& value) const { VTKM_ASSUME((this->VTKData->GetNumberOfComponents() == NUM_COMPONENTS)); @@ -103,27 +103,26 @@ void vtkArrayPortal::Set(vtkm::Id index, //------------------------------------------------------------------------------ template -VTKM_EXEC_CONT -vtkPointsPortal::vtkPointsPortal() : Points(nullptr), Array(nullptr), Size(0) +VTKM_EXEC_CONT vtkPointsPortal::vtkPointsPortal() + : Points(nullptr) + , Array(nullptr) + , Size(0) { } //------------------------------------------------------------------------------ template -VTKM_CONT -vtkPointsPortal::vtkPointsPortal(vtkPoints* points, vtkm::Id size) - : Points(points), - Array(static_cast(points->GetVoidPointer(0))), - Size(size) +VTKM_CONT vtkPointsPortal::vtkPointsPortal(vtkPoints* points, vtkm::Id size) + : Points(points) + , Array(static_cast(points->GetVoidPointer(0))) + , Size(size) { VTKM_ASSERT(this->GetNumberOfValues() >= 0); } //------------------------------------------------------------------------------ template -typename vtkPointsPortal::ValueType -VTKM_EXEC -vtkPointsPortal::Get(vtkm::Id index) const +typename vtkPointsPortal::ValueType VTKM_EXEC vtkPointsPortal::Get(vtkm::Id index) const { const ComponentType* const raw = this->Array + (index * NUM_COMPONENTS); return ValueType(raw[0], raw[1], raw[2]); @@ -131,8 +130,7 @@ vtkPointsPortal::Get(vtkm::Id index) const //------------------------------------------------------------------------------ template -VTKM_EXEC -void vtkPointsPortal::Set(vtkm::Id index, const ValueType& value) const +VTKM_EXEC void vtkPointsPortal::Set(vtkm::Id index, const ValueType& value) const { ComponentType* rawArray = this->Array + (index * NUM_COMPONENTS); // use template magic to auto unroll insertion diff --git a/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.cxx b/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.cxx index a9479c197c..48324110b9 100644 --- a/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.cxx +++ b/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.cxx @@ -38,7 +38,8 @@ #include #include -namespace tovtkm { +namespace tovtkm +{ //------------------------------------------------------------------------------ // convert an unstructured grid type @@ -58,16 +59,13 @@ vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields) if (input->IsHomogeneous()) { int cellType = input->GetCellType(0); // get the celltype - vtkm::cont::DynamicCellSet cells = - ConvertSingleType(input->GetCells(), cellType, numPoints); + vtkm::cont::DynamicCellSet cells = ConvertSingleType(input->GetCells(), cellType, numPoints); dataset.SetCellSet(cells); } else { vtkm::cont::DynamicCellSet cells = - Convert(input->GetCellTypesArray(), - input->GetCells(), - numPoints); + Convert(input->GetCellTypesArray(), input->GetCells(), numPoints); dataset.SetCellSet(cells); } @@ -78,11 +76,11 @@ vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields) } // namespace tovtkm -namespace fromvtkm { +namespace fromvtkm +{ //------------------------------------------------------------------------------ -bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, - vtkDataSet* input) +bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkDataSet* input) { vtkPoints* points = fromvtkm::Convert(voutput.GetCoordinateSystem()); // If this fails, it's likely a missing entry in tovtkm::PointListOutVTK: @@ -99,9 +97,7 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkNew types; vtkm::cont::DynamicCellSet outCells = voutput.GetCellSet(); - const bool cellsConverted = fromvtkm::Convert(outCells, - cells.GetPointer(), - types.GetPointer()); + const bool cellsConverted = fromvtkm::Convert(outCells, cells.GetPointer(), types.GetPointer()); if (!cellsConverted) { @@ -116,17 +112,14 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, const bool arraysConverted = fromvtkm::ConvertArrays(voutput, output); // Pass information about attributes. - for (int attributeType = 0; - attributeType < vtkDataSetAttributes::NUM_ATTRIBUTES; attributeType++) + for (int attributeType = 0; attributeType < vtkDataSetAttributes::NUM_ATTRIBUTES; attributeType++) { - vtkDataArray* attribute = - input->GetPointData()->GetAttribute(attributeType); + vtkDataArray* attribute = input->GetPointData()->GetAttribute(attributeType); if (attribute == nullptr) { continue; } - output->GetPointData()->SetActiveAttribute(attribute->GetName(), - attributeType); + output->GetPointData()->SetActiveAttribute(attribute->GetName(), attributeType); } return arraysConverted; diff --git a/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.h b/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.h index 2f536102c7..dbd82de749 100644 --- a/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.h +++ b/Accelerators/Vtkm/vtkmlib/UnstructuredGridConverter.h @@ -28,17 +28,17 @@ class vtkUnstructuredGrid; class vtkDataSet; -namespace tovtkm { +namespace tovtkm +{ // convert an unstructured grid type VTKACCELERATORSVTKM_EXPORT -vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, - FieldsFlag fields = FieldsFlag::None); +vtkm::cont::DataSet Convert(vtkUnstructuredGrid* input, FieldsFlag fields = FieldsFlag::None); } -namespace fromvtkm { +namespace fromvtkm +{ VTKACCELERATORSVTKM_EXPORT -bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, - vtkDataSet* input); +bool Convert(const vtkm::cont::DataSet& voutput, vtkUnstructuredGrid* output, vtkDataSet* input); } #endif // vtkmlib_UnstructuredGridConverter_h diff --git a/CMake/TestNO_ICC_IDYNAMIC_NEEDED.cxx b/CMake/TestNO_ICC_IDYNAMIC_NEEDED.cxx index ddfa6d2580..a326f98d2f 100644 --- a/CMake/TestNO_ICC_IDYNAMIC_NEEDED.cxx +++ b/CMake/TestNO_ICC_IDYNAMIC_NEEDED.cxx @@ -1,9 +1,15 @@ #ifdef __INTEL_COMPILER - //If -i_dynamic is required (i.e. icc v7.1 on Redhat 9 or similar glibc version), - //this simple program will fail to compile. - #include - int main(int argc, char * argv[]) { return 1; } -#else //__INTEL_COMPILER - // If not the INTEL compiler, just fall though to simplest program - int main(int argc, char * argv[]) { return 1; } +// If -i_dynamic is required (i.e. icc v7.1 on Redhat 9 or similar glibc version), +// this simple program will fail to compile. +#include +int main(int argc, char* argv[]) +{ + return 1; +} +#else //__INTEL_COMPILER + // If not the INTEL compiler, just fall though to simplest program +int main(int argc, char* argv[]) +{ + return 1; +} #endif //__INTEL_COMPILER diff --git a/CMake/patches/3.16/FindMPI/libver_mpi.c b/CMake/patches/3.16/FindMPI/libver_mpi.c index d89328a01e..849cd11f79 100644 --- a/CMake/patches/3.16/FindMPI/libver_mpi.c +++ b/CMake/patches/3.16/FindMPI/libver_mpi.c @@ -1,9 +1,9 @@ #include #ifdef __cplusplus -# include +#include #else -# include +#include #endif int main(int argc, char* argv[]) diff --git a/CMake/patches/3.16/FindMPI/test_mpi.c b/CMake/patches/3.16/FindMPI/test_mpi.c index 7c96d54a8f..bc7d2ae4f5 100644 --- a/CMake/patches/3.16/FindMPI/test_mpi.c +++ b/CMake/patches/3.16/FindMPI/test_mpi.c @@ -1,31 +1,24 @@ #include #ifdef __cplusplus -# include +#include #else -# include +#include #endif #if defined(MPI_VERSION) && defined(MPI_SUBVERSION) -const char mpiver_str[] = { 'I', 'N', - 'F', 'O', - ':', 'M', - 'P', 'I', - '-', 'V', - 'E', 'R', - '[', ('0' + MPI_VERSION), - '.', ('0' + MPI_SUBVERSION), - ']', '\0' }; +const char mpiver_str[] = { 'I', 'N', 'F', 'O', ':', 'M', 'P', 'I', '-', 'V', 'E', 'R', '[', + ('0' + MPI_VERSION), '.', ('0' + MPI_SUBVERSION), ']', '\0' }; #endif int main(int argc, char* argv[]) { #if defined(MPI_VERSION) && defined(MPI_SUBVERSION) -# ifdef __cplusplus +#ifdef __cplusplus std::puts(mpiver_str); -# else +#else puts(mpiver_str); -# endif +#endif #endif #ifdef TEST_MPI_MPICXX MPI::MPI_Init(&argc, &argv); diff --git a/CMake/vtkRequireLargeFilesSupport.cxx b/CMake/vtkRequireLargeFilesSupport.cxx index 9a32c9e917..941dc9c686 100644 --- a/CMake/vtkRequireLargeFilesSupport.cxx +++ b/CMake/vtkRequireLargeFilesSupport.cxx @@ -6,22 +6,22 @@ #include #include -int main( int, char **argv ) +int main(int, char** argv) { // check that off_t can hold 2^63 - 1 and perform basic operations... -#define OFF_T_64 (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define OFF_T_64 (((off_t)1 << 62) - 1 + ((off_t)1 << 62)) if (OFF_T_64 % 2147483647 != 1) return 1; // stat breaks on SCO OpenServer struct stat buf; - stat( argv[0], &buf ); + stat(argv[0], &buf); if (!S_ISREG(buf.st_mode)) return 2; - FILE *file = fopen( argv[0], "r" ); - off_t offset = ftello( file ); - fseek( file, offset, SEEK_CUR ); - fclose( file ); + FILE* file = fopen(argv[0], "r"); + off_t offset = ftello(file); + fseek(file, offset, SEEK_CUR); + fclose(file); return 0; } diff --git a/CMake/vtkTestvfw32Capture.cxx b/CMake/vtkTestvfw32Capture.cxx index 82fff81eeb..0355dfd885 100644 --- a/CMake/vtkTestvfw32Capture.cxx +++ b/CMake/vtkTestvfw32Capture.cxx @@ -22,13 +22,13 @@ int main() { vtkWin32VideoSourceInternal internal; - internal.CapWnd = capCreateCaptureWindow( - "Capture", WS_CHILD|WS_VISIBLE, 0, 0, 100, 100, NULL, 1); + internal.CapWnd = + capCreateCaptureWindow("Capture", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, NULL, 1); -// capDriverConnect -// capDriverGetCaps -// capCaptureGetSetup -// capCaptureSetSetup + // capDriverConnect + // capDriverGetCaps + // capCaptureGetSetup + // capCaptureSetSetup // test if constants used in vtkWin32VideoSource exist. int controlcallback_preroll = CONTROLCALLBACK_PREROLL; int controlcallback_capturing = CONTROLCALLBACK_CAPTURING; @@ -38,15 +38,15 @@ int main() capSetUserData(internal.CapWnd, &internal); -// capSetCallbackOnCapControl -// capSetCallbackOnFrame -// capSetCallbackOnVideoStream -// capSetCallbackOnStatus -// capSetCallbackOnError + // capSetCallbackOnCapControl + // capSetCallbackOnFrame + // capSetCallbackOnVideoStream + // capSetCallbackOnStatus + // capSetCallbackOnError - (void) capOverlay(internal.CapWnd, TRUE); + (void)capOverlay(internal.CapWnd, TRUE); - (void) capGetUserData(internal.CapWnd); + (void)capGetUserData(internal.CapWnd); return 0; } diff --git a/Charts/Core/Testing/Cxx/TestAdjustLowerBoundForLogPlot.cxx b/Charts/Core/Testing/Cxx/TestAdjustLowerBoundForLogPlot.cxx index 243ecae1ba..e20f8566c5 100644 --- a/Charts/Core/Testing/Cxx/TestAdjustLowerBoundForLogPlot.cxx +++ b/Charts/Core/Testing/Cxx/TestAdjustLowerBoundForLogPlot.cxx @@ -52,9 +52,9 @@ int TestAdjustLowerBoundForLogPlot(int vtkNotUsed(argc), char* vtkNotUsed(argv)[ table->SetNumberOfRows(numRows); for (int i = 0; i < numRows; ++i) { - float x = 0.1*((-0.5*(numRows-1)) + i); + float x = 0.1 * ((-0.5 * (numRows - 1)) + i); table->SetValue(i, 0, x); - float y = std::abs(x*x - 10.0); + float y = std::abs(x * x - 10.0); table->SetValue(i, 1, y); } @@ -65,8 +65,8 @@ int TestAdjustLowerBoundForLogPlot(int vtkNotUsed(argc), char* vtkNotUsed(argv)[ axis->LogScaleOn(); // This sequence is necessary to invoke the logic when AdjustLowerBoundForLogPlot is enabled. - view->GetRenderWindow()->Render(); - chart->RecalculateBounds(); + view->GetRenderWindow()->Render(); + chart->RecalculateBounds(); // Finally render the scene and compare the image to a reference image view->GetInteractor()->Initialize(); diff --git a/Charts/Core/Testing/Cxx/TestAreaPlot.cxx b/Charts/Core/Testing/Cxx/TestAreaPlot.cxx index 031d399e38..2d99074ee5 100644 --- a/Charts/Core/Testing/Cxx/TestAreaPlot.cxx +++ b/Charts/Core/Testing/Cxx/TestAreaPlot.cxx @@ -30,7 +30,7 @@ #include //---------------------------------------------------------------------------- -int TestAreaPlot( int, char * [] ) +int TestAreaPlot(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -65,7 +65,7 @@ int TestAreaPlot( int, char * [] ) // Test charting with a few more points... int numPoints = 69; - float inc = 7.5 / (numPoints-1); + float inc = 7.5 / (numPoints - 1); table->SetNumberOfRows(numPoints); for (int i = 0; i < numPoints; ++i) { diff --git a/Charts/Core/Testing/Cxx/TestAxes.cxx b/Charts/Core/Testing/Cxx/TestAxes.cxx index 419f80c988..b9552f2e28 100644 --- a/Charts/Core/Testing/Cxx/TestAxes.cxx +++ b/Charts/Core/Testing/Cxx/TestAxes.cxx @@ -27,7 +27,7 @@ #include //---------------------------------------------------------------------------- -int TestAxes(int , char * []) +int TestAxes(int, char*[]) { int status = EXIT_SUCCESS; @@ -52,7 +52,7 @@ int TestAxes(int , char * []) for (size_t i = 0; i < axesVertical.size(); ++i) { axesVertical[i] = vtkSmartPointer::New(); - vtkAxis *axis = axesVertical[i]; + vtkAxis* axis = axesVertical[i]; axis->SetPoint1(vtkVector2f(i * 69 + 30, 10)); axis->SetPoint2(vtkVector2f(i * 69 + 30, 290)); axis->SetPosition((i % 2) ? vtkAxis::LEFT : vtkAxis::RIGHT); @@ -78,8 +78,7 @@ int TestAxes(int , char * []) axesVertical[2]->SetRangeLabelFormat("%3.1f"); axesVertical[3]->SetTitle("Custom vertical labels"); - axesVertical[3]->SetCustomTickPositions(positions, - labels); + axesVertical[3]->SetCustomTickPositions(positions, labels); axesVertical[3]->SetPoint1(vtkVector2f(3 * 69 + 80, 10)); axesVertical[3]->SetPoint2(vtkVector2f(3 * 69 + 80, 290)); axesVertical[3]->AutoScale(); @@ -95,7 +94,7 @@ int TestAxes(int , char * []) for (size_t i = 0; i < axesHorizontal.size(); ++i) { axesHorizontal[i] = vtkSmartPointer::New(); - vtkAxis *axis = axesHorizontal[i]; + vtkAxis* axis = axesHorizontal[i]; axis->SetPoint1(vtkVector2f(310, i * 50 + 30)); axis->SetPoint2(vtkVector2f(490, i * 50 + 30)); axis->SetPosition((i % 2) ? vtkAxis::TOP : vtkAxis::BOTTOM); @@ -106,12 +105,12 @@ int TestAxes(int , char * []) } // Now to test some of the API in the horizontal axes. - axesHorizontal[0]->LogScaleOn(); // LogScaleActive=false because min*max<0 - axesHorizontal[0]->SetUnscaledRange(1,100); // LogScaleActive becomes true + axesHorizontal[0]->LogScaleOn(); // LogScaleActive=false because min*max<0 + axesHorizontal[0]->SetUnscaledRange(1, 100); // LogScaleActive becomes true double range[2]; axesHorizontal[0]->GetRange(range); - if (!axesHorizontal[0]->GetLogScaleActive() || - fabs(range[0]) > 1e-8 || fabs(range[1] - 2.) > 1e-8) + if (!axesHorizontal[0]->GetLogScaleActive() || fabs(range[0]) > 1e-8 || + fabs(range[1] - 2.) > 1e-8) { cerr << "ERROR: did not transition to log scaling when range changed.\n"; status = EXIT_FAILURE; @@ -120,18 +119,15 @@ int TestAxes(int , char * []) axesHorizontal[0]->SetMinimumLimit(-1.); axesHorizontal[0]->SetMaximumLimit(3.); // ... and verify that the unscaled limits have changed: - if ( - fabs(axesHorizontal[0]->GetUnscaledMinimumLimit()-0.1) > 1e-8 || - fabs(axesHorizontal[0]->GetUnscaledMaximumLimit()-1000.0) > 1e-8) + if (fabs(axesHorizontal[0]->GetUnscaledMinimumLimit() - 0.1) > 1e-8 || + fabs(axesHorizontal[0]->GetUnscaledMaximumLimit() - 1000.0) > 1e-8) { - cerr - << "ERROR: did not update unscaled limits when scaled limits changed.\n"; + cerr << "ERROR: did not update unscaled limits when scaled limits changed.\n"; status = EXIT_FAILURE; } axesHorizontal[0]->LogScaleOff(); if (axesHorizontal[0]->GetLogScaleActive() || - -axesHorizontal[0]->GetMinimumLimit() == - axesHorizontal[0]->GetMaximumLimit()) + -axesHorizontal[0]->GetMinimumLimit() == axesHorizontal[0]->GetMaximumLimit()) { cerr << "ERROR: did not transition from log scaling or reset limits.\n"; status = EXIT_FAILURE; @@ -153,8 +149,7 @@ int TestAxes(int , char * []) axesHorizontal[4]->SetNumberOfTicks(5); axesHorizontal[5]->SetTitle("Custom horizontal labels"); - axesHorizontal[5]->SetCustomTickPositions(positions, - labels); + axesHorizontal[5]->SetCustomTickPositions(positions, labels); axesHorizontal[5]->SetPosition(vtkAxis::BOTTOM); for (size_t i = 0; i < axesHorizontal.size(); ++i) @@ -164,7 +159,7 @@ int TestAxes(int , char * []) // Test LogScale and UnscaledRange methods vtkNew logAxis; - double plainRange[2] = {0.1, 1000.0}; + double plainRange[2] = { 0.1, 1000.0 }; double logRange[2]; logAxis->SetScene(view->GetScene()); logAxis->SetUnscaledRange(plainRange); @@ -173,27 +168,21 @@ int TestAxes(int , char * []) logAxis->GetUnscaledRange(logRange); if ((logRange[0] != plainRange[0]) || (logRange[1] != plainRange[1])) { - vtkGenericWarningMacro( - << "Error: expected unscaled range to be unchanged but got [" - << logRange[0] << ", " << logRange[1] << "]."); + vtkGenericWarningMacro(<< "Error: expected unscaled range to be unchanged but got [" + << logRange[0] << ", " << logRange[1] << "]."); } logAxis->GetRange(logRange); - if ( - (fabs((pow(10., logRange[0]) - plainRange[0])) > 1e-6) || + if ((fabs((pow(10., logRange[0]) - plainRange[0])) > 1e-6) || (fabs((pow(10., logRange[1]) - plainRange[1])) > 1e-6)) { - vtkGenericWarningMacro( - << "Error: expected scaled range to be [-1, 3] but got [" - << logRange[0] << ", " << logRange[1] << "]."); + vtkGenericWarningMacro(<< "Error: expected scaled range to be [-1, 3] but got [" << logRange[0] + << ", " << logRange[1] << "]."); } - if ( - (logAxis->GetMinimum() != logRange[0]) || - (logAxis->GetMaximum() != logRange[1]) || + if ((logAxis->GetMinimum() != logRange[0]) || (logAxis->GetMaximum() != logRange[1]) || (logAxis->GetUnscaledMinimum() != plainRange[0]) || (logAxis->GetUnscaledMaximum() != plainRange[1])) { - vtkGenericWarningMacro( - "Error: returned ranges do not match returned min/max."); + vtkGenericWarningMacro("Error: returned ranges do not match returned min/max."); } logAxis->SetMinimum(logRange[0]); logAxis->SetMaximum(logRange[1]); diff --git a/Charts/Core/Testing/Cxx/TestAxes2.cxx b/Charts/Core/Testing/Cxx/TestAxes2.cxx index 8c0b1a841c..104f692ff5 100644 --- a/Charts/Core/Testing/Cxx/TestAxes2.cxx +++ b/Charts/Core/Testing/Cxx/TestAxes2.cxx @@ -22,7 +22,7 @@ #include "vtkTextProperty.h" //---------------------------------------------------------------------------- -int TestAxes2(int , char * []) +int TestAxes2(int, char*[]) { int status = EXIT_SUCCESS; diff --git a/Charts/Core/Testing/Cxx/TestBagPlot.cxx b/Charts/Core/Testing/Cxx/TestBagPlot.cxx index 28cfffc313..a45cc0cc15 100644 --- a/Charts/Core/Testing/Cxx/TestBagPlot.cxx +++ b/Charts/Core/Testing/Cxx/TestBagPlot.cxx @@ -50,7 +50,7 @@ const double densities[] = { // clang-format on //---------------------------------------------------------------------------- -int TestBagPlot(int, char * []) +int TestBagPlot(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -86,8 +86,8 @@ int TestBagPlot(int, char * []) { for (int i = 0; i < numDataI; ++i) { - table->SetValue(i + j * numDataI, 0, i); //X - table->SetValue(i + j * numDataI, 1, j); //Y + table->SetValue(i + j * numDataI, 0, i); // X + table->SetValue(i + j * numDataI, 1, j); // Y double d = densities[i + j * numDataI]; table->SetValue(i + j * numDataI, 2, d); // Density } @@ -96,8 +96,7 @@ int TestBagPlot(int, char * []) vtkNew bagPlot; chart->AddPlot(bagPlot); - bagPlot->SetInputData(table, arrX->GetName(), - arrY->GetName(), arrDensity->GetName()); + bagPlot->SetInputData(table, arrX->GetName(), arrY->GetName(), arrDensity->GetName()); bagPlot->SetColor(255, 0, 0, 255); bagPlot->SetMarkerSize(4); diff --git a/Charts/Core/Testing/Cxx/TestBarGraph.cxx b/Charts/Core/Testing/Cxx/TestBarGraph.cxx index 742a29bbf6..6803a7445b 100644 --- a/Charts/Core/Testing/Cxx/TestBarGraph.cxx +++ b/Charts/Core/Testing/Cxx/TestBarGraph.cxx @@ -27,15 +27,15 @@ #include "vtkTable.h" // Monthly circulation data -static int data_2008[] = {10822, 10941, 9979, 10370, 9460, 11228, - 15093, 12231, 10160, 9816, 9384, 7892}; -static int data_2009[] = {9058, 9474, 9979, 9408, 8900, 11569, - 14688, 12231, 10294, 9585, 8957, 8590}; -static int data_2010[] = {9058, 10941, 9979, 10270, 8900, 11228, - 14688, 12231, 10160, 9585, 9384, 8590}; +static int data_2008[] = { 10822, 10941, 9979, 10370, 9460, 11228, 15093, 12231, 10160, 9816, 9384, + 7892 }; +static int data_2009[] = { 9058, 9474, 9979, 9408, 8900, 11569, 14688, 12231, 10294, 9585, 8957, + 8590 }; +static int data_2010[] = { 9058, 10941, 9979, 10270, 8900, 11228, 14688, 12231, 10160, 9585, 9384, + 8590 }; //---------------------------------------------------------------------------- -int TestBarGraph(int , char * []) +int TestBarGraph(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -66,14 +66,14 @@ int TestBarGraph(int , char * []) table->SetNumberOfRows(12); for (int i = 0; i < 12; i++) { - table->SetValue(i,0,i+1); - table->SetValue(i,1,data_2008[i]); - table->SetValue(i,2,data_2009[i]); - table->SetValue(i,3,data_2010[i]); + table->SetValue(i, 0, i + 1); + table->SetValue(i, 1, data_2008[i]); + table->SetValue(i, 2, data_2009[i]); + table->SetValue(i, 3, data_2010[i]); } // Add multiple bar plots, setting the colors etc - vtkPlot *plot = nullptr; + vtkPlot* plot = nullptr; plot = chart->AddPlot(vtkChart::BAR); plot->SetInputData(table, 0, 1); @@ -87,7 +87,7 @@ int TestBarGraph(int , char * []) plot->SetInputData(table, 0, 3); plot->SetColor(0, 0, 255, 255); - //Finally render the scene and compare the image to a reference image + // Finally render the scene and compare the image to a reference image view->GetRenderWindow()->SetMultiSamples(0); view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); diff --git a/Charts/Core/Testing/Cxx/TestBarGraphHorizontal.cxx b/Charts/Core/Testing/Cxx/TestBarGraphHorizontal.cxx index 2d84ee1a32..28fe56e3e5 100644 --- a/Charts/Core/Testing/Cxx/TestBarGraphHorizontal.cxx +++ b/Charts/Core/Testing/Cxx/TestBarGraphHorizontal.cxx @@ -26,15 +26,15 @@ #include "vtkTable.h" // Monthly circulation data -static int data_2008[] = {10822, 10941, 9979, 10370, 9460, 11228, - 15093, 12231, 10160, 9816, 9384, 7892}; -static int data_2009[] = {9058, 9474, 9979, 9408, 8900, 11569, - 14688, 12231, 10294, 9585, 8957, 8590}; -static int data_2010[] = {9058, 10941, 9979, 10270, 8900, 11228, - 14688, 12231, 10160, 9585, 9384, 8590}; +static int data_2008[] = { 10822, 10941, 9979, 10370, 9460, 11228, 15093, 12231, 10160, 9816, 9384, + 7892 }; +static int data_2009[] = { 9058, 9474, 9979, 9408, 8900, 11569, 14688, 12231, 10294, 9585, 8957, + 8590 }; +static int data_2010[] = { 9058, 10941, 9979, 10270, 8900, 11228, 14688, 12231, 10160, 9585, 9384, + 8590 }; //---------------------------------------------------------------------------- -int TestBarGraphHorizontal(int , char * []) +int TestBarGraphHorizontal(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -65,14 +65,14 @@ int TestBarGraphHorizontal(int , char * []) table->SetNumberOfRows(12); for (int i = 0; i < 12; i++) { - table->SetValue(i,0,i+1); - table->SetValue(i,1,data_2008[i]); - table->SetValue(i,2,data_2009[i]); - table->SetValue(i,3,data_2010[i]); + table->SetValue(i, 0, i + 1); + table->SetValue(i, 1, data_2008[i]); + table->SetValue(i, 2, data_2009[i]); + table->SetValue(i, 3, data_2010[i]); } // Add multiple bar plots, setting the colors etc - vtkPlot *plot = nullptr; + vtkPlot* plot = nullptr; vtkPlotBar* barPlot = nullptr; plot = chart->AddPlot(vtkChart::BAR); diff --git a/Charts/Core/Testing/Cxx/TestBarGraphSelection.cxx b/Charts/Core/Testing/Cxx/TestBarGraphSelection.cxx index d28139bbd4..c6d05e41a4 100644 --- a/Charts/Core/Testing/Cxx/TestBarGraphSelection.cxx +++ b/Charts/Core/Testing/Cxx/TestBarGraphSelection.cxx @@ -28,15 +28,15 @@ #include "vtkTable.h" // Monthly circulation data -static int data_2008[] = {10822, 10941, 9979, 10370, 9460, 11228, - 15093, 12231, 10160, 9816, 9384, 7892}; -static int data_2009[] = {9058, 9474, 9979, 9408, 8900, 11569, - 14688, 12231, 10294, 9585, 8957, 8590}; -static int data_2010[] = {9058, 10941, 9979, 10270, 8900, 11228, - 14688, 12231, 10160, 9585, 9384, 8590}; +static int data_2008[] = { 10822, 10941, 9979, 10370, 9460, 11228, 15093, 12231, 10160, 9816, 9384, + 7892 }; +static int data_2009[] = { 9058, 9474, 9979, 9408, 8900, 11569, 14688, 12231, 10294, 9585, 8957, + 8590 }; +static int data_2010[] = { 9058, 10941, 9979, 10270, 8900, 11228, 14688, 12231, 10160, 9585, 9384, + 8590 }; //---------------------------------------------------------------------------- -int TestBarGraphSelection(int , char * []) +int TestBarGraphSelection(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -67,10 +67,10 @@ int TestBarGraphSelection(int , char * []) table->SetNumberOfRows(12); for (int i = 0; i < 12; i++) { - table->SetValue(i,0,i+1); - table->SetValue(i,1,data_2008[i]); - table->SetValue(i,2,data_2009[i]); - table->SetValue(i,3,data_2010[i]); + table->SetValue(i, 0, i + 1); + table->SetValue(i, 1, data_2008[i]); + table->SetValue(i, 2, data_2009[i]); + table->SetValue(i, 3, data_2010[i]); } // Build a selection object. @@ -80,7 +80,7 @@ int TestBarGraphSelection(int , char * []) selection->InsertNextValue(5); // Add multiple bar plots, setting the colors etc - vtkPlot *plot = nullptr; + vtkPlot* plot = nullptr; plot = chart->AddPlot(vtkChart::BAR); plot->SetInputData(table, 0, 1); @@ -98,7 +98,7 @@ int TestBarGraphSelection(int , char * []) plot->SetSelection(selection); - //Finally render the scene and compare the image to a reference image + // Finally render the scene and compare the image to a reference image view->GetRenderWindow()->SetMultiSamples(0); view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); diff --git a/Charts/Core/Testing/Cxx/TestBoxPlot.cxx b/Charts/Core/Testing/Cxx/TestBoxPlot.cxx index e4521bcb5d..ed65434eaf 100644 --- a/Charts/Core/Testing/Cxx/TestBoxPlot.cxx +++ b/Charts/Core/Testing/Cxx/TestBoxPlot.cxx @@ -29,7 +29,7 @@ #include "vtkTable.h" //---------------------------------------------------------------------------- -int TestBoxPlot(int , char* []) +int TestBoxPlot(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -59,11 +59,11 @@ int TestBoxPlot(int , char* []) const double scale = 1e02; for (int i = 0; i < numParam; i++) { - inputBoxPlotTable->SetValue(0, i, (i/2) * scale); //Q0 - inputBoxPlotTable->SetValue(1, i, (2*i + 2 - i) * scale); //Q1 - inputBoxPlotTable->SetValue(2, i, (2*i + 4) * scale); //Q2 - inputBoxPlotTable->SetValue(3, i, (2*i + 7) * scale); //Q3 - inputBoxPlotTable->SetValue(4, i, (2*i + 8) * scale); //Q4 + inputBoxPlotTable->SetValue(0, i, (i / 2) * scale); // Q0 + inputBoxPlotTable->SetValue(1, i, (2 * i + 2 - i) * scale); // Q1 + inputBoxPlotTable->SetValue(2, i, (2 * i + 4) * scale); // Q2 + inputBoxPlotTable->SetValue(3, i, (2 * i + 7) * scale); // Q3 + inputBoxPlotTable->SetValue(4, i, (2 * i + 8) * scale); // Q4 } vtkNew lookup; diff --git a/Charts/Core/Testing/Cxx/TestBoxPlot2.cxx b/Charts/Core/Testing/Cxx/TestBoxPlot2.cxx index b780e85356..ffc804aa7a 100644 --- a/Charts/Core/Testing/Cxx/TestBoxPlot2.cxx +++ b/Charts/Core/Testing/Cxx/TestBoxPlot2.cxx @@ -35,32 +35,28 @@ #include "vtkTestErrorObserver.h" //---------------------------------------------------------------------------- -int TestBoxPlot2(int , char* []) +int TestBoxPlot2(int, char*[]) { // Set up a 2D scene, add an XY chart to it - vtkSmartPointer view = - vtkSmartPointer::New(); + vtkSmartPointer view = vtkSmartPointer::New(); view->GetRenderWindow()->SetSize(400, 400); view->GetRenderWindow()->SetMultiSamples(0); - vtkSmartPointer chart = - vtkSmartPointer::New(); + vtkSmartPointer chart = vtkSmartPointer::New(); view->GetScene()->AddItem(chart); // Creates a vtkPlotBox input table int numberOfColumns = 5; - vtkSmartPointer inputBoxPlotTable = - vtkSmartPointer::New(); + vtkSmartPointer inputBoxPlotTable = vtkSmartPointer::New(); for (int i = 0; i < numberOfColumns; ++i) - { + { char num[10]; snprintf(num, sizeof(num), "Run %d", i + 1); - vtkSmartPointer arrIndex = - vtkSmartPointer::New(); + vtkSmartPointer arrIndex = vtkSmartPointer::New(); arrIndex->SetName(num); inputBoxPlotTable->AddColumn(arrIndex); - } + } // Data from the Michelson Morley experiment inputBoxPlotTable->SetNumberOfRows(20); @@ -87,20 +83,18 @@ int TestBoxPlot2(int , char* []) { 960, 800, 840, 780, 870 }, }; for (int j = 0; j < 20; ++j) - { + { for (int i = 0; i < 5; ++i) - { + { inputBoxPlotTable->SetValue(j, i, values[j][i]); - } } + } // Compute the min, q1, median, q3 qnd max. - vtkSmartPointer quartiles = - vtkSmartPointer::New(); + vtkSmartPointer quartiles = vtkSmartPointer::New(); quartiles->SetInputData(vtkStatisticsAlgorithm::INPUT_DATA, inputBoxPlotTable); quartiles->Update(); - vtkSmartPointer lookup = - vtkSmartPointer::New(); + vtkSmartPointer lookup = vtkSmartPointer::New(); lookup->SetNumberOfColors(5); lookup->SetRange(0, 4); lookup->Build(); @@ -115,12 +109,10 @@ int TestBoxPlot2(int , char* []) chart->GetYAxis()->SetTitle("Speed of Light (km/s - 299000)"); vtkSmartPointer errorObserver = vtkSmartPointer::New(); - chart->GetPlot(0)->AddObserver(vtkCommand::ErrorEvent,errorObserver); - + chart->GetPlot(0)->AddObserver(vtkCommand::ErrorEvent, errorObserver); // Set the labels - vtkSmartPointer labels = - vtkSmartPointer::New(); + vtkSmartPointer labels = vtkSmartPointer::New(); labels->SetNumberOfValues(5); labels->SetValue(0, "Run 1"); labels->SetValue(1, "Run 2"); @@ -139,7 +131,7 @@ int TestBoxPlot2(int , char* []) int status = errorObserver->CheckErrorMessage("Input table must contain 5 rows per column"); // Now render a valid plot - vtkTable *outTable = quartiles->GetOutput(); + vtkTable* outTable = quartiles->GetOutput(); chart->GetPlot(0)->SetInputData(outTable); view->Render(); diff --git a/Charts/Core/Testing/Cxx/TestCategoryLegend.cxx b/Charts/Core/Testing/Cxx/TestCategoryLegend.cxx index 5ec59a19c8..f333357c08 100644 --- a/Charts/Core/Testing/Cxx/TestCategoryLegend.cxx +++ b/Charts/Core/Testing/Cxx/TestCategoryLegend.cxx @@ -60,7 +60,7 @@ int TestCategoryLegend(int argc, char* argv[]) vtkNew contextView; contextView->GetScene()->AddItem(trans); contextView->GetRenderer()->SetBackground(1.0, 1.0, 1.0); - contextView->GetRenderWindow()->SetSize(300,200); + contextView->GetRenderWindow()->SetSize(300, 200); contextView->GetRenderWindow()->SetMultiSamples(0); contextView->GetRenderWindow()->Render(); diff --git a/Charts/Core/Testing/Cxx/TestChartBadPoints.cxx b/Charts/Core/Testing/Cxx/TestChartBadPoints.cxx index 13d88b6208..c361598349 100644 --- a/Charts/Core/Testing/Cxx/TestChartBadPoints.cxx +++ b/Charts/Core/Testing/Cxx/TestChartBadPoints.cxx @@ -25,7 +25,7 @@ #include "vtkTable.h" //---------------------------------------------------------------------------- -int TestChartBadPoints(int, char* []) +int TestChartBadPoints(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; diff --git a/Charts/Core/Testing/Cxx/TestChartDouble.cxx b/Charts/Core/Testing/Cxx/TestChartDouble.cxx index 60d7cf88e3..87422d7868 100644 --- a/Charts/Core/Testing/Cxx/TestChartDouble.cxx +++ b/Charts/Core/Testing/Cxx/TestChartDouble.cxx @@ -28,7 +28,7 @@ #include "vtkAxis.h" //---------------------------------------------------------------------------- -int TestChartDouble(int, char *[]) +int TestChartDouble(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -64,7 +64,7 @@ int TestChartDouble(int, char *[]) } // Add multiple line plots, setting the colors etc - vtkPlot *line = chart->AddPlot(vtkChart::POINTS); + vtkPlot* line = chart->AddPlot(vtkChart::POINTS); line->SetInputData(table, 0, 1); line = chart->AddPlot(vtkChart::LINE); line->SetInputData(table, 0, 2); diff --git a/Charts/Core/Testing/Cxx/TestChartDoubleColors.cxx b/Charts/Core/Testing/Cxx/TestChartDoubleColors.cxx index a9e0b9145d..57cffb208f 100644 --- a/Charts/Core/Testing/Cxx/TestChartDoubleColors.cxx +++ b/Charts/Core/Testing/Cxx/TestChartDoubleColors.cxx @@ -30,7 +30,7 @@ #include "vtkTable.h" //---------------------------------------------------------------------------- -int TestChartDoubleColors(int, char *[]) +int TestChartDoubleColors(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; diff --git a/Charts/Core/Testing/Cxx/TestChartDoubleColorsOpaque.cxx b/Charts/Core/Testing/Cxx/TestChartDoubleColorsOpaque.cxx index a242323af6..0a3bfcc13f 100644 --- a/Charts/Core/Testing/Cxx/TestChartDoubleColorsOpaque.cxx +++ b/Charts/Core/Testing/Cxx/TestChartDoubleColorsOpaque.cxx @@ -30,7 +30,7 @@ #include "vtkTable.h" //---------------------------------------------------------------------------- -int TestChartDoubleColorsOpaque(int, char *[]) +int TestChartDoubleColorsOpaque(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; diff --git a/Charts/Core/Testing/Cxx/TestChartMatrix.cxx b/Charts/Core/Testing/Cxx/TestChartMatrix.cxx index 2f2f001981..44c70db2ef 100644 --- a/Charts/Core/Testing/Cxx/TestChartMatrix.cxx +++ b/Charts/Core/Testing/Cxx/TestChartMatrix.cxx @@ -25,7 +25,7 @@ #include "vtkTable.h" //---------------------------------------------------------------------------- -int TestChartMatrix( int, char * [] ) +int TestChartMatrix(int, char*[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -35,7 +35,7 @@ int TestChartMatrix( int, char * [] ) matrix->SetSize(vtkVector2i(2, 2)); matrix->SetGutter(vtkVector2f(30.0, 30.0)); - vtkChart *chart = matrix->GetChart(vtkVector2i(0, 0)); + vtkChart* chart = matrix->GetChart(vtkVector2i(0, 0)); // Create a table with some points in it... vtkNew table; @@ -56,7 +56,7 @@ int TestChartMatrix( int, char * [] ) table->AddColumn(tangent); // Test charting with a few more points... int numPoints = 42; - float inc = 7.5 / (numPoints-1); + float inc = 7.5 / (numPoints - 1); table->SetNumberOfRows(numPoints); for (int i = 0; i < numPoints; ++i) { @@ -68,7 +68,7 @@ int TestChartMatrix( int, char * [] ) } // Add multiple line plots, setting the colors etc - vtkPlot *line = chart->AddPlot(vtkChart::POINTS); + vtkPlot* line = chart->AddPlot(vtkChart::POINTS); line->SetInputData(table, 0, 1); line->SetColor(0, 255, 0, 255); @@ -86,7 +86,7 @@ int TestChartMatrix( int, char * [] ) line = chart->AddPlot(vtkChart::BAR); line->SetInputData(table, 0, 4); - //Finally render the scene and compare the image to a reference image + // Finally render the scene and compare the image to a reference image view->GetRenderWindow()->SetMultiSamples(0); view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); diff --git a/Charts/Core/Testing/Cxx/TestChartTileScaling.cxx b/Charts/Core/Testing/Cxx/TestChartTileScaling.cxx index ec27f367d2..4e7580d43d 100644 --- a/Charts/Core/Testing/Cxx/TestChartTileScaling.cxx +++ b/Charts/Core/Testing/Cxx/TestChartTileScaling.cxx @@ -35,7 +35,7 @@ // not rendering properly at the tile 'seams', as can be seen in the 'valid' // baseline. Just noting that this is expected for now. // -int TestChartTileScaling( int, char *[]) +int TestChartTileScaling(int, char*[]) { vtkNew view; view->GetRenderWindow()->SetMultiSamples(0); @@ -62,7 +62,7 @@ int TestChartTileScaling( int, char *[]) // Test charting with a few more points... int numPoints = 69; - float inc = 7.5 / (numPoints-1); + float inc = 7.5 / (numPoints - 1); table->SetNumberOfRows(numPoints); for (int i = 0; i < numPoints; ++i) { @@ -72,7 +72,7 @@ int TestChartTileScaling( int, char *[]) } // Add multiple line plots, setting the colors etc - vtkPlot *line = chart->AddPlot(vtkChart::LINE); + vtkPlot* line = chart->AddPlot(vtkChart::LINE); line->SetInputData(table, 0, 1); line->SetColor(0, 255, 0, 255); line->SetWidth(1.0); diff --git a/Charts/Core/Testing/Cxx/TestChartUnicode.cxx b/Charts/Core/Testing/Cxx/TestChartUnicode.cxx index d33a797578..fbb686ed77 100644 --- a/Charts/Core/Testing/Cxx/TestChartUnicode.cxx +++ b/Charts/Core/Testing/Cxx/TestChartUnicode.cxx @@ -30,7 +30,7 @@ #include //---------------------------------------------------------------------------- -int TestChartUnicode(int argc, char *argv[]) +int TestChartUnicode(int argc, char* argv[]) { if (argc < 2) { @@ -51,12 +51,12 @@ int TestChartUnicode(int argc, char *argv[]) chart->GetTitleProperties()->SetFontFile(fontFile.c_str()); chart->SetTitle("\xcf\x85\xcf\x84\xce\xba"); - vtkAxis *axis1 = chart->GetAxis(0); + vtkAxis* axis1 = chart->GetAxis(0); axis1->GetTitleProperties()->SetFontFamily(VTK_FONT_FILE); axis1->GetTitleProperties()->SetFontFile(fontFile.c_str()); axis1->SetTitle("\xcf\x87(m)"); - vtkAxis *axis2 = chart->GetAxis(1); + vtkAxis* axis2 = chart->GetAxis(1); axis2->GetTitleProperties()->SetFontFamily(VTK_FONT_FILE); axis2->GetTitleProperties()->SetFontFile(fontFile.c_str()); axis2->SetTitle("\xcf\x80\xcf\x86"); @@ -79,7 +79,7 @@ int TestChartUnicode(int argc, char *argv[]) } // Add multiple line plots, setting the colors etc - vtkPlot *line = chart->AddPlot(vtkChart::LINE); + vtkPlot* line = chart->AddPlot(vtkChart::LINE); line->SetInputData(table, 0, 1); line->SetColor(42, 55, 69, 255); diff --git a/Charts/Core/Testing/Cxx/TestChartXYInvertedAxis.cxx b/Charts/Core/Testing/Cxx/TestChartXYInvertedAxis.cxx index fc5d815db6..b09d3e3280 100644 --- a/Charts/Core/Testing/Cxx/TestChartXYInvertedAxis.cxx +++ b/Charts/Core/Testing/Cxx/TestChartXYInvertedAxis.cxx @@ -26,1483 +26,1481 @@ #include "vtkTable.h" #include "vtkTesting.h" -static const char *TestChartXYInvertedAxisLog = -"# StreamVersion 1\n" -"RenderEvent 0 0 0 0 0 0 0\n" -"TimerEvent 0 0 0 0 0 0 0\n" -"EnterEvent 397 52 0 0 0 0 0\n" -"MouseMoveEvent 397 52 0 0 0 0 0\n" -"MouseMoveEvent 388 52 0 0 0 0 0\n" -"MouseMoveEvent 384 52 0 0 0 0 0\n" -"MouseMoveEvent 380 52 0 0 0 0 0\n" -"MouseMoveEvent 379 52 0 0 0 0 0\n" -"MouseMoveEvent 378 52 0 0 0 0 0\n" -"MouseMoveEvent 377 52 0 0 0 0 0\n" -"MouseMoveEvent 375 52 0 0 0 0 0\n" -"MouseMoveEvent 372 52 0 0 0 0 0\n" -"MouseMoveEvent 369 51 0 0 0 0 0\n" -"TimerEvent 369 51 0 0 0 0 0\n" -"MouseMoveEvent 365 50 0 0 0 0 0\n" -"MouseMoveEvent 360 48 0 0 0 0 0\n" -"MouseMoveEvent 353 47 0 0 0 0 0\n" -"MouseMoveEvent 346 43 0 0 0 0 0\n" -"MouseMoveEvent 340 41 0 0 0 0 0\n" -"MouseMoveEvent 335 39 0 0 0 0 0\n" -"TimerEvent 335 39 0 0 0 0 0\n" -"MouseMoveEvent 329 39 0 0 0 0 0\n" -"MouseMoveEvent 326 39 0 0 0 0 0\n" -"MouseMoveEvent 323 39 0 0 0 0 0\n" -"MouseMoveEvent 319 41 0 0 0 0 0\n" -"MouseMoveEvent 315 41 0 0 0 0 0\n" -"MouseMoveEvent 311 41 0 0 0 0 0\n" -"TimerEvent 311 41 0 0 0 0 0\n" -"MouseMoveEvent 310 41 0 0 0 0 0\n" -"MouseMoveEvent 309 41 0 0 0 0 0\n" -"MouseMoveEvent 308 42 0 0 0 0 0\n" -"MouseMoveEvent 305 45 0 0 0 0 0\n" -"MouseMoveEvent 301 48 0 0 0 0 0\n" -"MouseMoveEvent 297 55 0 0 0 0 0\n" -"TimerEvent 297 55 0 0 0 0 0\n" -"MouseMoveEvent 289 64 0 0 0 0 0\n" -"MouseMoveEvent 283 74 0 0 0 0 0\n" -"MouseMoveEvent 276 82 0 0 0 0 0\n" -"MouseMoveEvent 268 90 0 0 0 0 0\n" -"MouseMoveEvent 262 95 0 0 0 0 0\n" -"MouseMoveEvent 256 99 0 0 0 0 0\n" -"TimerEvent 256 99 0 0 0 0 0\n" -"MouseMoveEvent 254 101 0 0 0 0 0\n" -"MouseMoveEvent 253 102 0 0 0 0 0\n" -"MouseMoveEvent 252 102 0 0 0 0 0\n" -"TimerEvent 252 102 0 0 0 0 0\n" -"MouseMoveEvent 251 103 0 0 0 0 0\n" -"MouseMoveEvent 249 105 0 0 0 0 0\n" -"MouseMoveEvent 247 107 0 0 0 0 0\n" -"MouseMoveEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelForwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" -"TimerEvent 246 108 0 0 0 0 0\n" -"MouseMoveEvent 245 109 0 0 0 0 0\n" -"MouseMoveEvent 245 113 0 0 0 0 0\n" -"MouseMoveEvent 244 118 0 0 0 0 0\n" -"MouseMoveEvent 242 122 0 0 0 0 0\n" -"MouseMoveEvent 242 125 0 0 0 0 0\n" -"MouseMoveEvent 240 133 0 0 0 0 0\n" -"TimerEvent 240 133 0 0 0 0 0\n" -"MouseMoveEvent 236 142 0 0 0 0 0\n" -"MouseMoveEvent 234 151 0 0 0 0 0\n" -"MouseMoveEvent 232 159 0 0 0 0 0\n" -"MouseMoveEvent 230 166 0 0 0 0 0\n" -"MouseMoveEvent 228 174 0 0 0 0 0\n" -"MouseMoveEvent 227 180 0 0 0 0 0\n" -"TimerEvent 227 180 0 0 0 0 0\n" -"MouseMoveEvent 225 184 0 0 0 0 0\n" -"MouseMoveEvent 225 188 0 0 0 0 0\n" -"MouseMoveEvent 223 192 0 0 0 0 0\n" -"MouseMoveEvent 223 193 0 0 0 0 0\n" -"MouseMoveEvent 222 195 0 0 0 0 0\n" -"MouseMoveEvent 222 198 0 0 0 0 0\n" -"TimerEvent 222 198 0 0 0 0 0\n" -"MouseMoveEvent 220 202 0 0 0 0 0\n" -"MouseMoveEvent 220 203 0 0 0 0 0\n" -"MouseMoveEvent 219 205 0 0 0 0 0\n" -"TimerEvent 219 205 0 0 0 0 0\n" -"MouseMoveEvent 218 207 0 0 0 0 0\n" -"TimerEvent 218 207 0 0 0 0 0\n" -"MouseMoveEvent 217 208 0 0 0 0 0\n" -"MouseMoveEvent 216 208 0 0 0 0 0\n" -"MouseMoveEvent 214 208 0 0 0 0 0\n" -"MouseMoveEvent 212 208 0 0 0 0 0\n" -"MouseMoveEvent 210 207 0 0 0 0 0\n" -"MouseMoveEvent 209 206 0 0 0 0 0\n" -"TimerEvent 209 206 0 0 0 0 0\n" -"MouseMoveEvent 207 205 0 0 0 0 0\n" -"MouseMoveEvent 205 203 0 0 0 0 0\n" -"MouseMoveEvent 203 201 0 0 0 0 0\n" -"MouseMoveEvent 201 199 0 0 0 0 0\n" -"MouseMoveEvent 200 198 0 0 0 0 0\n" -"MouseMoveEvent 198 196 0 0 0 0 0\n" -"TimerEvent 198 196 0 0 0 0 0\n" -"MouseMoveEvent 197 195 0 0 0 0 0\n" -"MouseMoveEvent 196 194 0 0 0 0 0\n" -"TimerEvent 196 194 0 0 0 0 0\n" -"MouseMoveEvent 195 193 0 0 0 0 0\n" -"MouseMoveEvent 195 192 0 0 0 0 0\n" -"MouseMoveEvent 194 190 0 0 0 0 0\n" -"MouseMoveEvent 193 189 0 0 0 0 0\n" -"MouseMoveEvent 192 187 0 0 0 0 0\n" -"MouseMoveEvent 192 186 0 0 0 0 0\n" -"TimerEvent 192 186 0 0 0 0 0\n" -"MouseMoveEvent 191 185 0 0 0 0 0\n" -"MouseMoveEvent 189 182 0 0 0 0 0\n" -"MouseMoveEvent 188 181 0 0 0 0 0\n" -"MouseMoveEvent 187 179 0 0 0 0 0\n" -"MouseMoveEvent 186 178 0 0 0 0 0\n" -"MouseMoveEvent 185 175 0 0 0 0 0\n" -"TimerEvent 185 175 0 0 0 0 0\n" -"MouseMoveEvent 184 172 0 0 0 0 0\n" -"MouseMoveEvent 182 168 0 0 0 0 0\n" -"MouseMoveEvent 181 166 0 0 0 0 0\n" -"MouseMoveEvent 180 162 0 0 0 0 0\n" -"MouseMoveEvent 178 159 0 0 0 0 0\n" -"MouseMoveEvent 176 156 0 0 0 0 0\n" -"TimerEvent 176 156 0 0 0 0 0\n" -"MouseMoveEvent 174 153 0 0 0 0 0\n" -"MouseMoveEvent 173 150 0 0 0 0 0\n" -"MouseMoveEvent 172 148 0 0 0 0 0\n" -"MouseMoveEvent 171 147 0 0 0 0 0\n" -"MouseMoveEvent 170 145 0 0 0 0 0\n" -"MouseMoveEvent 169 143 0 0 0 0 0\n" -"TimerEvent 169 143 0 0 0 0 0\n" -"MouseMoveEvent 169 142 0 0 0 0 0\n" -"MouseMoveEvent 168 139 0 0 0 0 0\n" -"MouseMoveEvent 167 138 0 0 0 0 0\n" -"MouseMoveEvent 167 137 0 0 0 0 0\n" -"TimerEvent 167 137 0 0 0 0 0\n" -"MouseMoveEvent 167 136 0 0 0 0 0\n" -"MouseMoveEvent 166 135 0 0 0 0 0\n" -"MouseMoveEvent 166 134 0 0 0 0 0\n" -"MouseMoveEvent 165 132 0 0 0 0 0\n" -"TimerEvent 165 132 0 0 0 0 0\n" -"MouseMoveEvent 165 131 0 0 0 0 0\n" -"MouseMoveEvent 164 129 0 0 0 0 0\n" -"MouseMoveEvent 164 127 0 0 0 0 0\n" -"MouseMoveEvent 163 125 0 0 0 0 0\n" -"MouseMoveEvent 162 123 0 0 0 0 0\n" -"MouseMoveEvent 161 122 0 0 0 0 0\n" -"TimerEvent 161 122 0 0 0 0 0\n" -"MouseMoveEvent 160 120 0 0 0 0 0\n" -"MouseMoveEvent 160 119 0 0 0 0 0\n" -"MouseMoveEvent 158 116 0 0 0 0 0\n" -"MouseMoveEvent 157 114 0 0 0 0 0\n" -"MouseMoveEvent 156 112 0 0 0 0 0\n" -"MouseMoveEvent 154 109 0 0 0 0 0\n" -"TimerEvent 154 109 0 0 0 0 0\n" -"MouseMoveEvent 153 107 0 0 0 0 0\n" -"MouseMoveEvent 152 105 0 0 0 0 0\n" -"MouseMoveEvent 151 103 0 0 0 0 0\n" -"MouseMoveEvent 151 102 0 0 0 0 0\n" -"MouseMoveEvent 150 101 0 0 0 0 0\n" -"TimerEvent 150 101 0 0 0 0 0\n" -"MouseMoveEvent 150 100 0 0 0 0 0\n" -"MouseMoveEvent 149 98 0 0 0 0 0\n" -"MouseMoveEvent 149 97 0 0 0 0 0\n" -"TimerEvent 149 97 0 0 0 0 0\n" -"MouseMoveEvent 148 96 0 0 0 0 0\n" -"MouseMoveEvent 147 94 0 0 0 0 0\n" -"TimerEvent 147 94 0 0 0 0 0\n" -"MouseMoveEvent 146 93 0 0 0 0 0\n" -"MouseMoveEvent 145 92 0 0 0 0 0\n" -"TimerEvent 145 92 0 0 0 0 0\n" -"MouseMoveEvent 144 91 0 0 0 0 0\n" -"MouseMoveEvent 143 90 0 0 0 0 0\n" -"MouseMoveEvent 142 90 0 0 0 0 0\n" -"MouseMoveEvent 141 90 0 0 0 0 0\n" -"TimerEvent 141 90 0 0 0 0 0\n" -"MouseMoveEvent 140 90 0 0 0 0 0\n" -"MouseMoveEvent 139 91 0 0 0 0 0\n" -"MouseMoveEvent 137 92 0 0 0 0 0\n" -"MouseMoveEvent 136 92 0 0 0 0 0\n" -"MouseMoveEvent 135 93 0 0 0 0 0\n" -"MouseMoveEvent 132 94 0 0 0 0 0\n" -"TimerEvent 132 94 0 0 0 0 0\n" -"MouseMoveEvent 131 95 0 0 0 0 0\n" -"MouseMoveEvent 130 96 0 0 0 0 0\n" -"MouseMoveEvent 128 98 0 0 0 0 0\n" -"MouseMoveEvent 128 100 0 0 0 0 0\n" -"MouseMoveEvent 127 102 0 0 0 0 0\n" -"TimerEvent 127 102 0 0 0 0 0\n" -"MouseMoveEvent 127 103 0 0 0 0 0\n" -"MouseMoveEvent 127 104 0 0 0 0 0\n" -"MouseMoveEvent 127 106 0 0 0 0 0\n" -"MouseMoveEvent 127 107 0 0 0 0 0\n" -"MouseMoveEvent 127 108 0 0 0 0 0\n" -"MouseMoveEvent 127 109 0 0 0 0 0\n" -"TimerEvent 127 109 0 0 0 0 0\n" -"MouseMoveEvent 127 110 0 0 0 0 0\n" -"MouseMoveEvent 127 111 0 0 0 0 0\n" -"MouseMoveEvent 127 112 0 0 0 0 0\n" -"MouseMoveEvent 127 114 0 0 0 0 0\n" -"MouseMoveEvent 127 115 0 0 0 0 0\n" -"TimerEvent 127 115 0 0 0 0 0\n" -"MouseMoveEvent 127 116 0 0 0 0 0\n" -"MouseMoveEvent 127 118 0 0 0 0 0\n" -"MouseMoveEvent 128 119 0 0 0 0 0\n" -"TimerEvent 128 119 0 0 0 0 0\n" -"MouseMoveEvent 128 120 0 0 0 0 0\n" -"MouseMoveEvent 129 121 0 0 0 0 0\n" -"TimerEvent 129 121 0 0 0 0 0\n" -"MouseMoveEvent 129 122 0 0 0 0 0\n" -"MouseMoveEvent 129 123 0 0 0 0 0\n" -"MouseMoveEvent 129 125 0 0 0 0 0\n" -"MouseMoveEvent 129 126 0 0 0 0 0\n" -"MouseMoveEvent 129 128 0 0 0 0 0\n" -"MouseMoveEvent 129 130 0 0 0 0 0\n" -"TimerEvent 129 130 0 0 0 0 0\n" -"MouseMoveEvent 130 132 0 0 0 0 0\n" -"MouseMoveEvent 130 134 0 0 0 0 0\n" -"MouseMoveEvent 131 136 0 0 0 0 0\n" -"MouseMoveEvent 131 139 0 0 0 0 0\n" -"MouseMoveEvent 132 142 0 0 0 0 0\n" -"MouseMoveEvent 132 144 0 0 0 0 0\n" -"TimerEvent 132 144 0 0 0 0 0\n" -"MouseMoveEvent 132 146 0 0 0 0 0\n" -"MouseMoveEvent 133 148 0 0 0 0 0\n" -"MouseMoveEvent 133 149 0 0 0 0 0\n" -"MouseMoveEvent 133 151 0 0 0 0 0\n" -"MouseMoveEvent 133 153 0 0 0 0 0\n" -"MouseMoveEvent 133 154 0 0 0 0 0\n" -"TimerEvent 133 154 0 0 0 0 0\n" -"MouseMoveEvent 133 156 0 0 0 0 0\n" -"MouseMoveEvent 133 159 0 0 0 0 0\n" -"MouseMoveEvent 133 161 0 0 0 0 0\n" -"MouseMoveEvent 134 163 0 0 0 0 0\n" -"MouseMoveEvent 134 164 0 0 0 0 0\n" -"MouseMoveEvent 135 166 0 0 0 0 0\n" -"TimerEvent 135 166 0 0 0 0 0\n" -"MouseMoveEvent 135 167 0 0 0 0 0\n" -"MouseMoveEvent 135 168 0 0 0 0 0\n" -"MouseMoveEvent 136 169 0 0 0 0 0\n" -"MouseMoveEvent 136 170 0 0 0 0 0\n" -"TimerEvent 136 170 0 0 0 0 0\n" -"MouseMoveEvent 136 171 0 0 0 0 0\n" -"MouseMoveEvent 137 172 0 0 0 0 0\n" -"MouseMoveEvent 138 173 0 0 0 0 0\n" -"MouseMoveEvent 139 175 0 0 0 0 0\n" -"TimerEvent 139 175 0 0 0 0 0\n" -"MouseMoveEvent 140 176 0 0 0 0 0\n" -"MouseMoveEvent 141 177 0 0 0 0 0\n" -"MouseMoveEvent 142 179 0 0 0 0 0\n" -"TimerEvent 142 179 0 0 0 0 0\n" -"MouseMoveEvent 144 181 0 0 0 0 0\n" -"MouseMoveEvent 145 183 0 0 0 0 0\n" -"MouseMoveEvent 147 185 0 0 0 0 0\n" -"MouseMoveEvent 148 186 0 0 0 0 0\n" -"MouseMoveEvent 149 187 0 0 0 0 0\n" -"MouseMoveEvent 150 189 0 0 0 0 0\n" -"TimerEvent 150 189 0 0 0 0 0\n" -"MouseMoveEvent 151 190 0 0 0 0 0\n" -"MouseMoveEvent 152 192 0 0 0 0 0\n" -"MouseMoveEvent 153 193 0 0 0 0 0\n" -"MouseMoveEvent 154 195 0 0 0 0 0\n" -"TimerEvent 154 195 0 0 0 0 0\n" -"MouseMoveEvent 154 196 0 0 0 0 0\n" -"MouseMoveEvent 155 197 0 0 0 0 0\n" -"MouseMoveEvent 157 200 0 0 0 0 0\n" -"MouseMoveEvent 157 202 0 0 0 0 0\n" -"MouseMoveEvent 158 203 0 0 0 0 0\n" -"MouseMoveEvent 159 204 0 0 0 0 0\n" -"TimerEvent 159 204 0 0 0 0 0\n" -"MouseMoveEvent 159 205 0 0 0 0 0\n" -"MouseMoveEvent 159 206 0 0 0 0 0\n" -"MouseMoveEvent 160 207 0 0 0 0 0\n" -"MouseMoveEvent 161 210 0 0 0 0 0\n" -"MouseMoveEvent 162 211 0 0 0 0 0\n" -"TimerEvent 162 211 0 0 0 0 0\n" -"MouseMoveEvent 163 213 0 0 0 0 0\n" -"MouseMoveEvent 164 214 0 0 0 0 0\n" -"MouseMoveEvent 166 216 0 0 0 0 0\n" -"MouseMoveEvent 167 218 0 0 0 0 0\n" -"TimerEvent 167 218 0 0 0 0 0\n" -"MouseMoveEvent 168 219 0 0 0 0 0\n" -"MouseMoveEvent 169 220 0 0 0 0 0\n" -"MouseMoveEvent 170 222 0 0 0 0 0\n" -"MouseMoveEvent 172 224 0 0 0 0 0\n" -"MouseMoveEvent 173 225 0 0 0 0 0\n" -"MouseMoveEvent 174 226 0 0 0 0 0\n" -"TimerEvent 174 226 0 0 0 0 0\n" -"MouseMoveEvent 175 227 0 0 0 0 0\n" -"MouseMoveEvent 176 228 0 0 0 0 0\n" -"TimerEvent 176 228 0 0 0 0 0\n" -"MouseMoveEvent 176 229 0 0 0 0 0\n" -"MouseMoveEvent 176 230 0 0 0 0 0\n" -"MouseMoveEvent 177 231 0 0 0 0 0\n" -"MouseMoveEvent 177 232 0 0 0 0 0\n" -"TimerEvent 177 232 0 0 0 0 0\n" -"MouseMoveEvent 178 233 0 0 0 0 0\n" -"MouseMoveEvent 179 234 0 0 0 0 0\n" -"TimerEvent 179 234 0 0 0 0 0\n" -"MouseMoveEvent 180 235 0 0 0 0 0\n" -"MouseMoveEvent 181 236 0 0 0 0 0\n" -"TimerEvent 181 236 0 0 0 0 0\n" -"MouseMoveEvent 182 237 0 0 0 0 0\n" -"TimerEvent 182 237 0 0 0 0 0\n" -"MouseMoveEvent 183 238 0 0 0 0 0\n" -"TimerEvent 183 238 0 0 0 0 0\n" -"MouseMoveEvent 185 238 0 0 0 0 0\n" -"MouseMoveEvent 186 238 0 0 0 0 0\n" -"TimerEvent 186 238 0 0 0 0 0\n" -"MouseMoveEvent 187 237 0 0 0 0 0\n" -"MouseMoveEvent 187 236 0 0 0 0 0\n" -"MouseMoveEvent 187 235 0 0 0 0 0\n" -"MouseMoveEvent 186 234 0 0 0 0 0\n" -"TimerEvent 186 234 0 0 0 0 0\n" -"MouseMoveEvent 185 232 0 0 0 0 0\n" -"MouseMoveEvent 185 231 0 0 0 0 0\n" -"MouseMoveEvent 185 230 0 0 0 0 0\n" -"MouseMoveEvent 185 229 0 0 0 0 0\n" -"TimerEvent 185 229 0 0 0 0 0\n" -"MouseMoveEvent 185 228 0 0 0 0 0\n" -"MouseMoveEvent 185 227 0 0 0 0 0\n" -"MouseMoveEvent 185 225 0 0 0 0 0\n" -"MouseMoveEvent 185 224 0 0 0 0 0\n" -"TimerEvent 185 224 0 0 0 0 0\n" -"MouseMoveEvent 185 223 0 0 0 0 0\n" -"MouseMoveEvent 185 222 0 0 0 0 0\n" -"MouseMoveEvent 185 220 0 0 0 0 0\n" -"MouseMoveEvent 185 219 0 0 0 0 0\n" -"MouseMoveEvent 186 217 0 0 0 0 0\n" -"MouseMoveEvent 188 214 0 0 0 0 0\n" -"TimerEvent 188 214 0 0 0 0 0\n" -"MouseMoveEvent 190 211 0 0 0 0 0\n" -"MouseMoveEvent 192 208 0 0 0 0 0\n" -"MouseMoveEvent 194 206 0 0 0 0 0\n" -"MouseMoveEvent 197 203 0 0 0 0 0\n" -"MouseMoveEvent 201 200 0 0 0 0 0\n" -"MouseMoveEvent 204 196 0 0 0 0 0\n" -"TimerEvent 204 196 0 0 0 0 0\n" -"MouseMoveEvent 208 192 0 0 0 0 0\n" -"MouseMoveEvent 214 188 0 0 0 0 0\n" -"MouseMoveEvent 219 184 0 0 0 0 0\n" -"MouseMoveEvent 225 180 0 0 0 0 0\n" -"MouseMoveEvent 230 176 0 0 0 0 0\n" -"MouseMoveEvent 232 175 0 0 0 0 0\n" -"TimerEvent 232 175 0 0 0 0 0\n" -"MouseMoveEvent 233 174 0 0 0 0 0\n" -"MouseMoveEvent 235 172 0 0 0 0 0\n" -"MouseMoveEvent 237 170 0 0 0 0 0\n" -"MouseMoveEvent 239 169 0 0 0 0 0\n" -"MouseMoveEvent 241 167 0 0 0 0 0\n" -"MouseMoveEvent 243 165 0 0 0 0 0\n" -"TimerEvent 243 165 0 0 0 0 0\n" -"MouseMoveEvent 246 163 0 0 0 0 0\n" -"MouseMoveEvent 249 161 0 0 0 0 0\n" -"MouseMoveEvent 252 158 0 0 0 0 0\n" -"MouseMoveEvent 254 156 0 0 0 0 0\n" -"MouseMoveEvent 257 154 0 0 0 0 0\n" -"MouseMoveEvent 259 152 0 0 0 0 0\n" -"TimerEvent 259 152 0 0 0 0 0\n" -"MouseMoveEvent 261 150 0 0 0 0 0\n" -"MouseMoveEvent 263 148 0 0 0 0 0\n" -"MouseMoveEvent 267 145 0 0 0 0 0\n" -"MouseMoveEvent 270 143 0 0 0 0 0\n" -"MouseMoveEvent 273 140 0 0 0 0 0\n" -"MouseMoveEvent 278 136 0 0 0 0 0\n" -"TimerEvent 278 136 0 0 0 0 0\n" -"MouseMoveEvent 279 135 0 0 0 0 0\n" -"TimerEvent 279 135 0 0 0 0 0\n" -"LeftButtonPressEvent 279 135 0 0 0 0 0\n" -"MouseMoveEvent 278 135 0 0 0 0 0\n" -"MouseMoveEvent 277 135 0 0 0 0 0\n" -"MouseMoveEvent 275 135 0 0 0 0 0\n" -"MouseMoveEvent 272 136 0 0 0 0 0\n" -"MouseMoveEvent 269 137 0 0 0 0 0\n" -"MouseMoveEvent 265 139 0 0 0 0 0\n" -"TimerEvent 265 139 0 0 0 0 0\n" -"MouseMoveEvent 261 139 0 0 0 0 0\n" -"MouseMoveEvent 257 141 0 0 0 0 0\n" -"MouseMoveEvent 253 142 0 0 0 0 0\n" -"MouseMoveEvent 247 143 0 0 0 0 0\n" -"MouseMoveEvent 242 145 0 0 0 0 0\n" -"MouseMoveEvent 237 145 0 0 0 0 0\n" -"TimerEvent 237 145 0 0 0 0 0\n" -"MouseMoveEvent 235 146 0 0 0 0 0\n" -"MouseMoveEvent 232 147 0 0 0 0 0\n" -"MouseMoveEvent 230 148 0 0 0 0 0\n" -"MouseMoveEvent 227 148 0 0 0 0 0\n" -"MouseMoveEvent 224 149 0 0 0 0 0\n" -"TimerEvent 224 149 0 0 0 0 0\n" -"MouseMoveEvent 221 151 0 0 0 0 0\n" -"MouseMoveEvent 217 152 0 0 0 0 0\n" -"MouseMoveEvent 213 154 0 0 0 0 0\n" -"MouseMoveEvent 210 156 0 0 0 0 0\n" -"MouseMoveEvent 208 157 0 0 0 0 0\n" -"MouseMoveEvent 205 158 0 0 0 0 0\n" -"TimerEvent 205 158 0 0 0 0 0\n" -"MouseMoveEvent 203 159 0 0 0 0 0\n" -"MouseMoveEvent 202 159 0 0 0 0 0\n" -"MouseMoveEvent 200 160 0 0 0 0 0\n" -"MouseMoveEvent 199 160 0 0 0 0 0\n" -"MouseMoveEvent 198 161 0 0 0 0 0\n" -"MouseMoveEvent 196 161 0 0 0 0 0\n" -"TimerEvent 196 161 0 0 0 0 0\n" -"MouseMoveEvent 195 161 0 0 0 0 0\n" -"MouseMoveEvent 194 162 0 0 0 0 0\n" -"MouseMoveEvent 192 162 0 0 0 0 0\n" -"MouseMoveEvent 191 163 0 0 0 0 0\n" -"TimerEvent 191 163 0 0 0 0 0\n" -"MouseMoveEvent 190 163 0 0 0 0 0\n" -"MouseMoveEvent 189 163 0 0 0 0 0\n" -"MouseMoveEvent 188 163 0 0 0 0 0\n" -"MouseMoveEvent 187 163 0 0 0 0 0\n" -"TimerEvent 187 163 0 0 0 0 0\n" -"MouseMoveEvent 186 163 0 0 0 0 0\n" -"MouseMoveEvent 185 163 0 0 0 0 0\n" -"MouseMoveEvent 184 163 0 0 0 0 0\n" -"TimerEvent 184 163 0 0 0 0 0\n" -"LeftButtonReleaseEvent 184 163 0 0 0 0 0\n" -"MouseMoveEvent 183 164 0 0 0 0 0\n" -"MouseMoveEvent 185 166 0 0 0 0 0\n" -"MouseMoveEvent 185 167 0 0 0 0 0\n" -"MouseMoveEvent 186 169 0 0 0 0 0\n" -"TimerEvent 186 169 0 0 0 0 0\n" -"MouseMoveEvent 187 171 0 0 0 0 0\n" -"TimerEvent 187 171 0 0 0 0 0\n" -"MouseWheelBackwardEvent 187 171 0 0 0 0 0\n" -"TimerEvent 187 171 0 0 0 0 0\n" -"MouseWheelBackwardEvent 187 171 0 0 0 1 0\n" -"TimerEvent 187 171 0 0 0 0 0\n" -"MouseWheelBackwardEvent 187 171 0 0 0 0 0\n" -"TimerEvent 187 171 0 0 0 0 0\n" -"MouseMoveEvent 187 172 0 0 0 0 0\n" -"MouseMoveEvent 187 173 0 0 0 0 0\n" -"MouseMoveEvent 187 174 0 0 0 0 0\n" -"MouseMoveEvent 187 175 0 0 0 0 0\n" -"MouseMoveEvent 188 177 0 0 0 0 0\n" -"TimerEvent 188 177 0 0 0 0 0\n" -"MouseMoveEvent 188 178 0 0 0 0 0\n" -"MouseMoveEvent 189 179 0 0 0 0 0\n" -"MouseMoveEvent 189 180 0 0 0 0 0\n" -"MouseMoveEvent 190 181 0 0 0 0 0\n" -"TimerEvent 190 181 0 0 0 0 0\n" -"MouseMoveEvent 190 182 0 0 0 0 0\n" -"MouseMoveEvent 191 183 0 0 0 0 0\n" -"MouseMoveEvent 191 184 0 0 0 0 0\n" -"TimerEvent 191 184 0 0 0 0 0\n" -"MouseMoveEvent 192 186 0 0 0 0 0\n" -"MouseMoveEvent 192 187 0 0 0 0 0\n" -"MouseMoveEvent 192 188 0 0 0 0 0\n" -"TimerEvent 192 188 0 0 0 0 0\n" -"MouseMoveEvent 192 189 0 0 0 0 0\n" -"MouseMoveEvent 192 190 0 0 0 0 0\n" -"MouseMoveEvent 192 191 0 0 0 0 0\n" -"TimerEvent 192 191 0 0 0 0 0\n" -"MouseMoveEvent 192 192 0 0 0 0 0\n" -"TimerEvent 192 192 0 0 0 0 0\n" -"MouseMoveEvent 193 193 0 0 0 0 0\n" -"MouseMoveEvent 193 192 0 0 0 0 0\n" -"TimerEvent 193 192 0 0 0 0 0\n" -"MouseMoveEvent 194 191 0 0 0 0 0\n" -"MouseMoveEvent 194 189 0 0 0 0 0\n" -"MouseMoveEvent 194 188 0 0 0 0 0\n" -"MouseMoveEvent 194 186 0 0 0 0 0\n" -"MouseMoveEvent 194 185 0 0 0 0 0\n" -"MouseMoveEvent 194 184 0 0 0 0 0\n" -"TimerEvent 194 184 0 0 0 0 0\n" -"MouseMoveEvent 194 183 0 0 0 0 0\n" -"MouseMoveEvent 194 182 0 0 0 0 0\n" -"MouseMoveEvent 194 181 0 0 0 0 0\n" -"MouseMoveEvent 194 180 0 0 0 0 0\n" -"TimerEvent 194 180 0 0 0 0 0\n" -"MouseMoveEvent 194 179 0 0 0 0 0\n" -"MouseMoveEvent 194 178 0 0 0 0 0\n" -"TimerEvent 194 178 0 0 0 0 0\n" -"MouseMoveEvent 194 177 0 0 0 0 0\n" -"TimerEvent 194 177 0 0 0 0 0\n" -"MouseMoveEvent 195 176 0 0 0 0 0\n" -"MouseMoveEvent 196 176 0 0 0 0 0\n" -"TimerEvent 196 176 0 0 0 0 0\n" -"MouseMoveEvent 198 174 0 0 0 0 0\n" -"MouseMoveEvent 198 173 0 0 0 0 0\n" -"MouseMoveEvent 199 172 0 0 0 0 0\n" -"MouseMoveEvent 199 171 0 0 0 0 0\n" -"MouseMoveEvent 200 170 0 0 0 0 0\n" -"TimerEvent 200 170 0 0 0 0 0\n" -"MouseMoveEvent 200 169 0 0 0 0 0\n" -"MouseMoveEvent 201 168 0 0 0 0 0\n" -"MouseMoveEvent 201 167 0 0 0 0 0\n" -"TimerEvent 201 167 0 0 0 0 0\n" -"MouseMoveEvent 202 166 0 0 0 0 0\n" -"MouseMoveEvent 203 166 0 0 0 0 0\n" -"MouseMoveEvent 206 166 0 0 0 0 0\n" -"MouseMoveEvent 209 166 0 0 0 0 0\n" -"MouseMoveEvent 211 167 0 0 0 0 0\n" -"MouseMoveEvent 213 168 0 0 0 0 0\n" -"TimerEvent 213 168 0 0 0 0 0\n" -"MouseMoveEvent 216 168 0 0 0 0 0\n" -"MouseMoveEvent 218 169 0 0 0 0 0\n" -"MouseMoveEvent 221 171 0 0 0 0 0\n" -"MouseMoveEvent 225 173 0 0 0 0 0\n" -"MouseMoveEvent 228 175 0 0 0 0 0\n" -"MouseMoveEvent 230 176 0 0 0 0 0\n" -"TimerEvent 230 176 0 0 0 0 0\n" -"MouseMoveEvent 233 178 0 0 0 0 0\n" -"MouseMoveEvent 234 179 0 0 0 0 0\n" -"MouseMoveEvent 235 180 0 0 0 0 0\n" -"MouseMoveEvent 237 181 0 0 0 0 0\n" -"TimerEvent 237 181 0 0 0 0 0\n" -"MouseMoveEvent 238 181 0 0 0 0 0\n" -"MouseMoveEvent 239 182 0 0 0 0 0\n" -"MouseMoveEvent 240 183 0 0 0 0 0\n" -"MouseMoveEvent 240 185 0 0 0 0 0\n" -"TimerEvent 240 185 0 0 0 0 0\n" -"MouseMoveEvent 240 187 0 0 0 0 0\n" -"MouseMoveEvent 240 188 0 0 0 0 0\n" -"MouseMoveEvent 240 189 0 0 0 0 0\n" -"MouseMoveEvent 240 190 0 0 0 0 0\n" -"TimerEvent 240 190 0 0 0 0 0\n" -"MouseMoveEvent 239 192 0 0 0 0 0\n" -"MouseMoveEvent 238 193 0 0 0 0 0\n" -"MouseMoveEvent 237 194 0 0 0 0 0\n" -"MouseMoveEvent 235 196 0 0 0 0 0\n" -"MouseMoveEvent 235 197 0 0 0 0 0\n" -"TimerEvent 235 197 0 0 0 0 0\n" -"MouseMoveEvent 234 199 0 0 0 0 0\n" -"MouseMoveEvent 233 201 0 0 0 0 0\n" -"MouseMoveEvent 232 203 0 0 0 0 0\n" -"MouseMoveEvent 232 204 0 0 0 0 0\n" -"MouseMoveEvent 231 207 0 0 0 0 0\n" -"MouseMoveEvent 231 208 0 0 0 0 0\n" -"TimerEvent 231 208 0 0 0 0 0\n" -"MouseMoveEvent 230 210 0 0 0 0 0\n" -"MouseMoveEvent 229 213 0 0 0 0 0\n" -"MouseMoveEvent 229 215 0 0 0 0 0\n" -"MouseMoveEvent 228 217 0 0 0 0 0\n" -"MouseMoveEvent 228 218 0 0 0 0 0\n" -"MouseMoveEvent 228 219 0 0 0 0 0\n" -"TimerEvent 228 219 0 0 0 0 0\n" -"MouseMoveEvent 227 220 0 0 0 0 0\n" -"TimerEvent 227 220 0 0 0 0 0\n" -"MouseMoveEvent 229 219 0 0 0 0 0\n" -"MouseMoveEvent 230 219 0 0 0 0 0\n" -"TimerEvent 230 219 0 0 0 0 0\n" -"MouseMoveEvent 232 218 0 0 0 0 0\n" -"MouseMoveEvent 233 217 0 0 0 0 0\n" -"MouseMoveEvent 235 216 0 0 0 0 0\n" -"MouseMoveEvent 236 215 0 0 0 0 0\n" -"MouseMoveEvent 239 214 0 0 0 0 0\n" -"TimerEvent 239 214 0 0 0 0 0\n" -"MouseMoveEvent 241 212 0 0 0 0 0\n" -"MouseMoveEvent 244 210 0 0 0 0 0\n" -"MouseMoveEvent 248 207 0 0 0 0 0\n" -"MouseMoveEvent 254 203 0 0 0 0 0\n" -"MouseMoveEvent 261 199 0 0 0 0 0\n" -"MouseMoveEvent 267 195 0 0 0 0 0\n" -"TimerEvent 267 195 0 0 0 0 0\n" -"MouseMoveEvent 270 193 0 0 0 0 0\n" -"MouseMoveEvent 271 192 0 0 0 0 0\n" -"TimerEvent 271 192 0 0 0 0 0\n" -"MouseMoveEvent 273 190 0 0 0 0 0\n" -"MouseMoveEvent 275 188 0 0 0 0 0\n" -"MouseMoveEvent 277 186 0 0 0 0 0\n" -"MouseMoveEvent 280 184 0 0 0 0 0\n" -"MouseMoveEvent 284 180 0 0 0 0 0\n" -"MouseMoveEvent 285 179 0 0 0 0 0\n" -"TimerEvent 285 179 0 0 0 0 0\n" -"MouseMoveEvent 286 178 0 0 0 0 0\n" -"TimerEvent 286 178 0 0 0 0 0\n" -"LeftButtonPressEvent 286 178 0 0 0 0 0\n" -"MouseMoveEvent 285 178 0 0 0 0 0\n" -"MouseMoveEvent 283 178 0 0 0 0 0\n" -"MouseMoveEvent 282 178 0 0 0 0 0\n" -"MouseMoveEvent 281 178 0 0 0 0 0\n" -"MouseMoveEvent 279 178 0 0 0 0 0\n" -"TimerEvent 279 178 0 0 0 0 0\n" -"MouseMoveEvent 278 178 0 0 0 0 0\n" -"MouseMoveEvent 276 178 0 0 0 0 0\n" -"MouseMoveEvent 274 178 0 0 0 0 0\n" -"MouseMoveEvent 272 178 0 0 0 0 0\n" -"MouseMoveEvent 270 178 0 0 0 0 0\n" -"MouseMoveEvent 269 178 0 0 0 0 0\n" -"TimerEvent 269 178 0 0 0 0 0\n" -"MouseMoveEvent 268 178 0 0 0 0 0\n" -"MouseMoveEvent 267 178 0 0 0 0 0\n" -"MouseMoveEvent 265 178 0 0 0 0 0\n" -"MouseMoveEvent 264 178 0 0 0 0 0\n" -"MouseMoveEvent 263 178 0 0 0 0 0\n" -"MouseMoveEvent 260 178 0 0 0 0 0\n" -"TimerEvent 260 178 0 0 0 0 0\n" -"MouseMoveEvent 257 178 0 0 0 0 0\n" -"MouseMoveEvent 254 178 0 0 0 0 0\n" -"MouseMoveEvent 251 178 0 0 0 0 0\n" -"MouseMoveEvent 248 178 0 0 0 0 0\n" -"MouseMoveEvent 246 178 0 0 0 0 0\n" -"MouseMoveEvent 244 178 0 0 0 0 0\n" -"TimerEvent 244 178 0 0 0 0 0\n" -"MouseMoveEvent 243 178 0 0 0 0 0\n" -"MouseMoveEvent 242 178 0 0 0 0 0\n" -"MouseMoveEvent 240 178 0 0 0 0 0\n" -"TimerEvent 240 178 0 0 0 0 0\n" -"MouseMoveEvent 239 178 0 0 0 0 0\n" -"MouseMoveEvent 236 177 0 0 0 0 0\n" -"MouseMoveEvent 233 177 0 0 0 0 0\n" -"MouseMoveEvent 229 177 0 0 0 0 0\n" -"MouseMoveEvent 224 177 0 0 0 0 0\n" -"MouseMoveEvent 217 177 0 0 0 0 0\n" -"TimerEvent 217 177 0 0 0 0 0\n" -"MouseMoveEvent 212 176 0 0 0 0 0\n" -"MouseMoveEvent 209 176 0 0 0 0 0\n" -"MouseMoveEvent 207 176 0 0 0 0 0\n" -"MouseMoveEvent 205 176 0 0 0 0 0\n" -"MouseMoveEvent 204 176 0 0 0 0 0\n" -"TimerEvent 204 176 0 0 0 0 0\n" -"MouseMoveEvent 203 176 0 0 0 0 0\n" -"MouseMoveEvent 202 176 0 0 0 0 0\n" -"MouseMoveEvent 201 176 0 0 0 0 0\n" -"TimerEvent 201 176 0 0 0 0 0\n" -"MouseMoveEvent 200 176 0 0 0 0 0\n" -"MouseMoveEvent 199 176 0 0 0 0 0\n" -"MouseMoveEvent 198 176 0 0 0 0 0\n" -"MouseMoveEvent 197 176 0 0 0 0 0\n" -"MouseMoveEvent 195 177 0 0 0 0 0\n" -"TimerEvent 195 177 0 0 0 0 0\n" -"MouseMoveEvent 194 177 0 0 0 0 0\n" -"TimerEvent 194 177 0 0 0 0 0\n" -"LeftButtonReleaseEvent 194 177 0 0 0 0 0\n" -"MouseMoveEvent 193 178 0 0 0 0 0\n" -"MouseMoveEvent 194 180 0 0 0 0 0\n" -"MouseMoveEvent 195 181 0 0 0 0 0\n" -"MouseMoveEvent 196 183 0 0 0 0 0\n" -"TimerEvent 196 183 0 0 0 0 0\n" -"MouseMoveEvent 197 184 0 0 0 0 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelBackwardEvent 197 184 0 0 0 0 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelBackwardEvent 197 184 0 0 0 1 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelForwardEvent 197 184 0 0 0 0 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelForwardEvent 197 184 0 0 0 1 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelForwardEvent 197 184 0 0 0 0 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelForwardEvent 197 184 0 0 0 1 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelForwardEvent 197 184 0 0 0 0 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseWheelForwardEvent 197 184 0 0 0 1 0\n" -"TimerEvent 197 184 0 0 0 0 0\n" -"MouseMoveEvent 198 184 0 0 0 0 0\n" -"MouseMoveEvent 199 184 0 0 0 0 0\n" -"MouseMoveEvent 203 184 0 0 0 0 0\n" -"MouseMoveEvent 205 184 0 0 0 0 0\n" -"MouseMoveEvent 208 186 0 0 0 0 0\n" -"MouseMoveEvent 210 186 0 0 0 0 0\n" -"TimerEvent 210 186 0 0 0 0 0\n" -"MouseMoveEvent 213 187 0 0 0 0 0\n" -"MouseMoveEvent 219 188 0 0 0 0 0\n" -"MouseMoveEvent 232 191 0 0 0 0 0\n" -"MouseMoveEvent 248 193 0 0 0 0 0\n" -"MouseMoveEvent 261 195 0 0 0 0 0\n" -"MouseMoveEvent 271 196 0 0 0 0 0\n" -"TimerEvent 271 196 0 0 0 0 0\n" -"MouseMoveEvent 275 196 0 0 0 0 0\n" -"MouseMoveEvent 276 197 0 0 0 0 0\n" -"MouseMoveEvent 279 198 0 0 0 0 0\n" -"MouseMoveEvent 280 199 0 0 0 0 0\n" -"TimerEvent 280 199 0 0 0 0 0\n" -"MouseMoveEvent 281 200 0 0 0 0 0\n" -"MouseMoveEvent 281 201 0 0 0 0 0\n" -"MouseMoveEvent 281 202 0 0 0 0 0\n" -"MouseMoveEvent 280 204 0 0 0 0 0\n" -"TimerEvent 280 204 0 0 0 0 0\n" -"MouseMoveEvent 279 205 0 0 0 0 0\n" -"MouseMoveEvent 276 206 0 0 0 0 0\n" -"MouseMoveEvent 274 206 0 0 0 0 0\n" -"MouseMoveEvent 271 208 0 0 0 0 0\n" -"MouseMoveEvent 269 209 0 0 0 0 0\n" -"MouseMoveEvent 266 210 0 0 0 0 0\n" -"TimerEvent 266 210 0 0 0 0 0\n" -"MouseMoveEvent 263 212 0 0 0 0 0\n" -"MouseMoveEvent 262 213 0 0 0 0 0\n" -"MouseMoveEvent 261 214 0 0 0 0 0\n" -"MouseMoveEvent 260 215 0 0 0 0 0\n" -"MouseMoveEvent 259 216 0 0 0 0 0\n" -"MouseMoveEvent 257 218 0 0 0 0 0\n" -"TimerEvent 257 218 0 0 0 0 0\n" -"MouseMoveEvent 256 219 0 0 0 0 0\n" -"MouseMoveEvent 256 220 0 0 0 0 0\n" -"MouseMoveEvent 255 221 0 0 0 0 0\n" -"TimerEvent 255 221 0 0 0 0 0\n" -"LeftButtonPressEvent 255 221 0 0 0 0 0\n" -"MouseMoveEvent 254 222 0 0 0 0 0\n" -"MouseMoveEvent 254 220 0 0 0 0 0\n" -"MouseMoveEvent 254 215 0 0 0 0 0\n" -"MouseMoveEvent 254 207 0 0 0 0 0\n" -"MouseMoveEvent 254 195 0 0 0 0 0\n" -"MouseMoveEvent 254 183 0 0 0 0 0\n" -"TimerEvent 254 183 0 0 0 0 0\n" -"MouseMoveEvent 254 172 0 0 0 0 0\n" -"MouseMoveEvent 254 162 0 0 0 0 0\n" -"MouseMoveEvent 254 151 0 0 0 0 0\n" -"MouseMoveEvent 254 140 0 0 0 0 0\n" -"MouseMoveEvent 254 130 0 0 0 0 0\n" -"MouseMoveEvent 254 117 0 0 0 0 0\n" -"TimerEvent 254 117 0 0 0 0 0\n" -"MouseMoveEvent 254 104 0 0 0 0 0\n" -"MouseMoveEvent 254 92 0 0 0 0 0\n" -"MouseMoveEvent 254 79 0 0 0 0 0\n" -"MouseMoveEvent 254 68 0 0 0 0 0\n" -"MouseMoveEvent 254 57 0 0 0 0 0\n" -"MouseMoveEvent 254 51 0 0 0 0 0\n" -"TimerEvent 254 51 0 0 0 0 0\n" -"MouseMoveEvent 254 46 0 0 0 0 0\n" -"MouseMoveEvent 254 43 0 0 0 0 0\n" -"MouseMoveEvent 254 41 0 0 0 0 0\n" -"MouseMoveEvent 254 40 0 0 0 0 0\n" -"MouseMoveEvent 254 39 0 0 0 0 0\n" -"MouseMoveEvent 254 38 0 0 0 0 0\n" -"TimerEvent 254 38 0 0 0 0 0\n" -"MouseMoveEvent 254 37 0 0 0 0 0\n" -"MouseMoveEvent 254 36 0 0 0 0 0\n" -"MouseMoveEvent 254 35 0 0 0 0 0\n" -"MouseMoveEvent 254 34 0 0 0 0 0\n" -"TimerEvent 254 34 0 0 0 0 0\n" -"MouseMoveEvent 254 33 0 0 0 0 0\n" -"MouseMoveEvent 254 32 0 0 0 0 0\n" -"TimerEvent 254 32 0 0 0 0 0\n" -"MouseMoveEvent 254 34 0 0 0 0 0\n" -"MouseMoveEvent 254 37 0 0 0 0 0\n" -"MouseMoveEvent 254 40 0 0 0 0 0\n" -"MouseMoveEvent 254 44 0 0 0 0 0\n" -"MouseMoveEvent 254 50 0 0 0 0 0\n" -"MouseMoveEvent 254 52 0 0 0 0 0\n" -"TimerEvent 254 52 0 0 0 0 0\n" -"MouseMoveEvent 254 55 0 0 0 0 0\n" -"MouseMoveEvent 254 59 0 0 0 0 0\n" -"MouseMoveEvent 254 64 0 0 0 0 0\n" -"MouseMoveEvent 254 69 0 0 0 0 0\n" -"MouseMoveEvent 254 74 0 0 0 0 0\n" -"MouseMoveEvent 254 80 0 0 0 0 0\n" -"TimerEvent 254 80 0 0 0 0 0\n" -"MouseMoveEvent 254 85 0 0 0 0 0\n" -"MouseMoveEvent 254 90 0 0 0 0 0\n" -"MouseMoveEvent 254 96 0 0 0 0 0\n" -"MouseMoveEvent 254 101 0 0 0 0 0\n" -"MouseMoveEvent 253 107 0 0 0 0 0\n" -"MouseMoveEvent 251 112 0 0 0 0 0\n" -"TimerEvent 251 112 0 0 0 0 0\n" -"MouseMoveEvent 250 117 0 0 0 0 0\n" -"MouseMoveEvent 248 121 0 0 0 0 0\n" -"MouseMoveEvent 248 122 0 0 0 0 0\n" -"MouseMoveEvent 247 125 0 0 0 0 0\n" -"MouseMoveEvent 247 126 0 0 0 0 0\n" -"TimerEvent 247 126 0 0 0 0 0\n" -"MouseMoveEvent 247 127 0 0 0 0 0\n" -"MouseMoveEvent 247 128 0 0 0 0 0\n" -"MouseMoveEvent 247 130 0 0 0 0 0\n" -"MouseMoveEvent 247 131 0 0 0 0 0\n" -"MouseMoveEvent 247 133 0 0 0 0 0\n" -"MouseMoveEvent 247 135 0 0 0 0 0\n" -"TimerEvent 247 135 0 0 0 0 0\n" -"MouseMoveEvent 247 138 0 0 0 0 0\n" -"MouseMoveEvent 247 141 0 0 0 0 0\n" -"MouseMoveEvent 247 145 0 0 0 0 0\n" -"MouseMoveEvent 247 148 0 0 0 0 0\n" -"MouseMoveEvent 247 151 0 0 0 0 0\n" -"MouseMoveEvent 247 155 0 0 0 0 0\n" -"TimerEvent 247 155 0 0 0 0 0\n" -"MouseMoveEvent 247 159 0 0 0 0 0\n" -"MouseMoveEvent 247 161 0 0 0 0 0\n" -"MouseMoveEvent 247 163 0 0 0 0 0\n" -"MouseMoveEvent 246 166 0 0 0 0 0\n" -"MouseMoveEvent 246 168 0 0 0 0 0\n" -"MouseMoveEvent 246 170 0 0 0 0 0\n" -"TimerEvent 246 170 0 0 0 0 0\n" -"MouseMoveEvent 246 172 0 0 0 0 0\n" -"MouseMoveEvent 246 175 0 0 0 0 0\n" -"MouseMoveEvent 246 177 0 0 0 0 0\n" -"MouseMoveEvent 246 180 0 0 0 0 0\n" -"MouseMoveEvent 246 183 0 0 0 0 0\n" -"MouseMoveEvent 246 185 0 0 0 0 0\n" -"TimerEvent 246 185 0 0 0 0 0\n" -"MouseMoveEvent 246 187 0 0 0 0 0\n" -"MouseMoveEvent 246 189 0 0 0 0 0\n" -"MouseMoveEvent 246 192 0 0 0 0 0\n" -"MouseMoveEvent 246 194 0 0 0 0 0\n" -"MouseMoveEvent 246 196 0 0 0 0 0\n" -"MouseMoveEvent 246 198 0 0 0 0 0\n" -"TimerEvent 246 198 0 0 0 0 0\n" -"MouseMoveEvent 246 201 0 0 0 0 0\n" -"MouseMoveEvent 246 202 0 0 0 0 0\n" -"MouseMoveEvent 246 205 0 0 0 0 0\n" -"MouseMoveEvent 246 207 0 0 0 0 0\n" -"MouseMoveEvent 246 209 0 0 0 0 0\n" -"MouseMoveEvent 246 211 0 0 0 0 0\n" -"TimerEvent 246 211 0 0 0 0 0\n" -"MouseMoveEvent 246 214 0 0 0 0 0\n" -"MouseMoveEvent 246 217 0 0 0 0 0\n" -"MouseMoveEvent 246 220 0 0 0 0 0\n" -"MouseMoveEvent 246 222 0 0 0 0 0\n" -"MouseMoveEvent 245 225 0 0 0 0 0\n" -"MouseMoveEvent 245 227 0 0 0 0 0\n" -"TimerEvent 245 227 0 0 0 0 0\n" -"MouseMoveEvent 244 229 0 0 0 0 0\n" -"MouseMoveEvent 244 230 0 0 0 0 0\n" -"MouseMoveEvent 243 233 0 0 0 0 0\n" -"MouseMoveEvent 243 235 0 0 0 0 0\n" -"MouseMoveEvent 242 237 0 0 0 0 0\n" -"MouseMoveEvent 240 240 0 0 0 0 0\n" -"TimerEvent 240 240 0 0 0 0 0\n" -"MouseMoveEvent 240 242 0 0 0 0 0\n" -"MouseMoveEvent 239 244 0 0 0 0 0\n" -"MouseMoveEvent 238 245 0 0 0 0 0\n" -"MouseMoveEvent 237 247 0 0 0 0 0\n" -"MouseMoveEvent 236 248 0 0 0 0 0\n" -"MouseMoveEvent 235 250 0 0 0 0 0\n" -"TimerEvent 235 250 0 0 0 0 0\n" -"MouseMoveEvent 234 251 0 0 0 0 0\n" -"MouseMoveEvent 233 252 0 0 0 0 0\n" -"MouseMoveEvent 232 253 0 0 0 0 0\n" -"MouseMoveEvent 231 255 0 0 0 0 0\n" -"MouseMoveEvent 230 256 0 0 0 0 0\n" -"TimerEvent 230 256 0 0 0 0 0\n" -"MouseMoveEvent 229 257 0 0 0 0 0\n" -"MouseMoveEvent 228 258 0 0 0 0 0\n" -"MouseMoveEvent 227 260 0 0 0 0 0\n" -"MouseMoveEvent 226 261 0 0 0 0 0\n" -"TimerEvent 226 261 0 0 0 0 0\n" -"MouseMoveEvent 225 262 0 0 0 0 0\n" -"MouseMoveEvent 223 262 0 0 0 0 0\n" -"MouseMoveEvent 219 262 0 0 0 0 0\n" -"MouseMoveEvent 215 261 0 0 0 0 0\n" -"MouseMoveEvent 208 259 0 0 0 0 0\n" -"MouseMoveEvent 204 257 0 0 0 0 0\n" -"TimerEvent 204 257 0 0 0 0 0\n" -"MouseMoveEvent 203 256 0 0 0 0 0\n" -"TimerEvent 203 256 0 0 0 0 0\n" -"MouseMoveEvent 202 256 0 0 0 0 0\n" -"MouseMoveEvent 201 256 0 0 0 0 0\n" -"MouseMoveEvent 200 255 0 0 0 0 0\n" -"MouseMoveEvent 199 254 0 0 0 0 0\n" -"MouseMoveEvent 198 251 0 0 0 0 0\n" -"TimerEvent 198 251 0 0 0 0 0\n" -"MouseMoveEvent 196 248 0 0 0 0 0\n" -"MouseMoveEvent 193 245 0 0 0 0 0\n" -"MouseMoveEvent 189 240 0 0 0 0 0\n" -"MouseMoveEvent 185 235 0 0 0 0 0\n" -"MouseMoveEvent 178 228 0 0 0 0 0\n" -"MouseMoveEvent 170 222 0 0 0 0 0\n" -"TimerEvent 170 222 0 0 0 0 0\n" -"MouseMoveEvent 164 216 0 0 0 0 0\n" -"MouseMoveEvent 159 211 0 0 0 0 0\n" -"MouseMoveEvent 154 205 0 0 0 0 0\n" -"MouseMoveEvent 150 201 0 0 0 0 0\n" -"MouseMoveEvent 146 198 0 0 0 0 0\n" -"MouseMoveEvent 142 194 0 0 0 0 0\n" -"TimerEvent 142 194 0 0 0 0 0\n" -"MouseMoveEvent 138 189 0 0 0 0 0\n" -"MouseMoveEvent 133 185 0 0 0 0 0\n" -"MouseMoveEvent 129 177 0 0 0 0 0\n" -"MouseMoveEvent 125 173 0 0 0 0 0\n" -"MouseMoveEvent 123 169 0 0 0 0 0\n" -"MouseMoveEvent 122 165 0 0 0 0 0\n" -"TimerEvent 122 165 0 0 0 0 0\n" -"MouseMoveEvent 120 161 0 0 0 0 0\n" -"MouseMoveEvent 118 157 0 0 0 0 0\n" -"MouseMoveEvent 116 153 0 0 0 0 0\n" -"MouseMoveEvent 113 149 0 0 0 0 0\n" -"MouseMoveEvent 111 145 0 0 0 0 0\n" -"MouseMoveEvent 109 141 0 0 0 0 0\n" -"TimerEvent 109 141 0 0 0 0 0\n" -"MouseMoveEvent 102 137 0 0 0 0 0\n" -"MouseMoveEvent 98 133 0 0 0 0 0\n" -"MouseMoveEvent 94 132 0 0 0 0 0\n" -"MouseMoveEvent 93 131 0 0 0 0 0\n" -"MouseMoveEvent 90 129 0 0 0 0 0\n" -"TimerEvent 90 129 0 0 0 0 0\n" -"MouseMoveEvent 89 129 0 0 0 0 0\n" -"TimerEvent 89 129 0 0 0 0 0\n" -"MouseMoveEvent 89 133 0 0 0 0 0\n" -"MouseMoveEvent 89 137 0 0 0 0 0\n" -"MouseMoveEvent 87 141 0 0 0 0 0\n" -"MouseMoveEvent 85 144 0 0 0 0 0\n" -"TimerEvent 85 144 0 0 0 0 0\n" -"MouseMoveEvent 85 145 0 0 0 0 0\n" -"MouseMoveEvent 84 146 0 0 0 0 0\n" -"MouseMoveEvent 83 147 0 0 0 0 0\n" -"MouseMoveEvent 82 148 0 0 0 0 0\n" -"MouseMoveEvent 81 149 0 0 0 0 0\n" -"MouseMoveEvent 80 150 0 0 0 0 0\n" -"TimerEvent 80 150 0 0 0 0 0\n" -"MouseMoveEvent 79 150 0 0 0 0 0\n" -"MouseMoveEvent 78 150 0 0 0 0 0\n" -"MouseMoveEvent 76 151 0 0 0 0 0\n" -"MouseMoveEvent 74 152 0 0 0 0 0\n" -"MouseMoveEvent 73 152 0 0 0 0 0\n" -"TimerEvent 73 152 0 0 0 0 0\n" -"MouseMoveEvent 71 153 0 0 0 0 0\n" -"MouseMoveEvent 69 154 0 0 0 0 0\n" -"MouseMoveEvent 67 155 0 0 0 0 0\n" -"MouseMoveEvent 66 156 0 0 0 0 0\n" -"MouseMoveEvent 63 157 0 0 0 0 0\n" -"MouseMoveEvent 62 158 0 0 0 0 0\n" -"TimerEvent 62 158 0 0 0 0 0\n" -"MouseMoveEvent 60 159 0 0 0 0 0\n" -"MouseMoveEvent 58 160 0 0 0 0 0\n" -"MouseMoveEvent 56 162 0 0 0 0 0\n" -"MouseMoveEvent 55 163 0 0 0 0 0\n" -"MouseMoveEvent 54 164 0 0 0 0 0\n" -"MouseMoveEvent 52 166 0 0 0 0 0\n" -"TimerEvent 52 166 0 0 0 0 0\n" -"MouseMoveEvent 51 167 0 0 0 0 0\n" -"MouseMoveEvent 50 169 0 0 0 0 0\n" -"MouseMoveEvent 49 170 0 0 0 0 0\n" -"MouseMoveEvent 48 172 0 0 0 0 0\n" -"MouseMoveEvent 48 174 0 0 0 0 0\n" -"MouseMoveEvent 47 176 0 0 0 0 0\n" -"TimerEvent 47 176 0 0 0 0 0\n" -"MouseMoveEvent 47 178 0 0 0 0 0\n" -"MouseMoveEvent 47 179 0 0 0 0 0\n" -"MouseMoveEvent 47 181 0 0 0 0 0\n" -"MouseMoveEvent 47 183 0 0 0 0 0\n" -"MouseMoveEvent 47 184 0 0 0 0 0\n" -"MouseMoveEvent 47 186 0 0 0 0 0\n" -"TimerEvent 47 186 0 0 0 0 0\n" -"MouseMoveEvent 46 188 0 0 0 0 0\n" -"MouseMoveEvent 46 190 0 0 0 0 0\n" -"MouseMoveEvent 45 191 0 0 0 0 0\n" -"MouseMoveEvent 45 193 0 0 0 0 0\n" -"MouseMoveEvent 45 194 0 0 0 0 0\n" -"MouseMoveEvent 45 196 0 0 0 0 0\n" -"TimerEvent 45 196 0 0 0 0 0\n" -"MouseMoveEvent 45 197 0 0 0 0 0\n" -"MouseMoveEvent 45 198 0 0 0 0 0\n" -"MouseMoveEvent 45 199 0 0 0 0 0\n" -"MouseMoveEvent 45 200 0 0 0 0 0\n" -"TimerEvent 45 200 0 0 0 0 0\n" -"MouseMoveEvent 45 201 0 0 0 0 0\n" -"MouseMoveEvent 45 202 0 0 0 0 0\n" -"MouseMoveEvent 45 204 0 0 0 0 0\n" -"MouseMoveEvent 45 205 0 0 0 0 0\n" -"MouseMoveEvent 45 206 0 0 0 0 0\n" -"MouseMoveEvent 45 208 0 0 0 0 0\n" -"TimerEvent 45 208 0 0 0 0 0\n" -"MouseMoveEvent 45 210 0 0 0 0 0\n" -"MouseMoveEvent 45 211 0 0 0 0 0\n" -"MouseMoveEvent 45 213 0 0 0 0 0\n" -"MouseMoveEvent 45 215 0 0 0 0 0\n" -"MouseMoveEvent 46 217 0 0 0 0 0\n" -"MouseMoveEvent 47 219 0 0 0 0 0\n" -"TimerEvent 47 219 0 0 0 0 0\n" -"MouseMoveEvent 47 221 0 0 0 0 0\n" -"MouseMoveEvent 48 223 0 0 0 0 0\n" -"MouseMoveEvent 48 225 0 0 0 0 0\n" -"MouseMoveEvent 48 227 0 0 0 0 0\n" -"MouseMoveEvent 49 228 0 0 0 0 0\n" -"MouseMoveEvent 49 229 0 0 0 0 0\n" -"TimerEvent 49 229 0 0 0 0 0\n" -"MouseMoveEvent 49 230 0 0 0 0 0\n" -"MouseMoveEvent 49 231 0 0 0 0 0\n" -"MouseMoveEvent 49 232 0 0 0 0 0\n" -"MouseMoveEvent 49 234 0 0 0 0 0\n" -"MouseMoveEvent 49 235 0 0 0 0 0\n" -"MouseMoveEvent 50 236 0 0 0 0 0\n" -"TimerEvent 50 236 0 0 0 0 0\n" -"MouseMoveEvent 51 237 0 0 0 0 0\n" -"MouseMoveEvent 52 238 0 0 0 0 0\n" -"MouseMoveEvent 53 239 0 0 0 0 0\n" -"MouseMoveEvent 54 240 0 0 0 0 0\n" -"MouseMoveEvent 55 242 0 0 0 0 0\n" -"MouseMoveEvent 56 243 0 0 0 0 0\n" -"TimerEvent 56 243 0 0 0 0 0\n" -"MouseMoveEvent 57 244 0 0 0 0 0\n" -"MouseMoveEvent 59 246 0 0 0 0 0\n" -"MouseMoveEvent 60 247 0 0 0 0 0\n" -"MouseMoveEvent 62 249 0 0 0 0 0\n" -"MouseMoveEvent 63 250 0 0 0 0 0\n" -"TimerEvent 63 250 0 0 0 0 0\n" -"MouseMoveEvent 64 251 0 0 0 0 0\n" -"MouseMoveEvent 65 252 0 0 0 0 0\n" -"MouseMoveEvent 66 252 0 0 0 0 0\n" -"MouseMoveEvent 67 253 0 0 0 0 0\n" -"MouseMoveEvent 69 253 0 0 0 0 0\n" -"MouseMoveEvent 70 253 0 0 0 0 0\n" -"TimerEvent 70 253 0 0 0 0 0\n" -"MouseMoveEvent 71 254 0 0 0 0 0\n" -"MouseMoveEvent 73 254 0 0 0 0 0\n" -"MouseMoveEvent 75 254 0 0 0 0 0\n" -"MouseMoveEvent 76 255 0 0 0 0 0\n" -"MouseMoveEvent 78 255 0 0 0 0 0\n" -"MouseMoveEvent 79 255 0 0 0 0 0\n" -"TimerEvent 79 255 0 0 0 0 0\n" -"MouseMoveEvent 81 255 0 0 0 0 0\n" -"MouseMoveEvent 83 255 0 0 0 0 0\n" -"MouseMoveEvent 86 256 0 0 0 0 0\n" -"MouseMoveEvent 89 256 0 0 0 0 0\n" -"MouseMoveEvent 94 256 0 0 0 0 0\n" -"MouseMoveEvent 102 257 0 0 0 0 0\n" -"TimerEvent 102 257 0 0 0 0 0\n" -"MouseMoveEvent 110 257 0 0 0 0 0\n" -"MouseMoveEvent 119 260 0 0 0 0 0\n" -"MouseMoveEvent 127 260 0 0 0 0 0\n" -"MouseMoveEvent 134 260 0 0 0 0 0\n" -"MouseMoveEvent 141 261 0 0 0 0 0\n" -"MouseMoveEvent 148 263 0 0 0 0 0\n" -"TimerEvent 148 263 0 0 0 0 0\n" -"MouseMoveEvent 155 263 0 0 0 0 0\n" -"MouseMoveEvent 160 263 0 0 0 0 0\n" -"MouseMoveEvent 166 264 0 0 0 0 0\n" -"MouseMoveEvent 168 264 0 0 0 0 0\n" -"MouseMoveEvent 170 265 0 0 0 0 0\n" -"MouseMoveEvent 171 265 0 0 0 0 0\n" -"TimerEvent 171 265 0 0 0 0 0\n" -"MouseMoveEvent 173 265 0 0 0 0 0\n" -"MouseMoveEvent 175 265 0 0 0 0 0\n" -"MouseMoveEvent 179 265 0 0 0 0 0\n" -"MouseMoveEvent 183 265 0 0 0 0 0\n" -"MouseMoveEvent 188 265 0 0 0 0 0\n" -"MouseMoveEvent 195 265 0 0 0 0 0\n" -"TimerEvent 195 265 0 0 0 0 0\n" -"MouseMoveEvent 202 265 0 0 0 0 0\n" -"MouseMoveEvent 209 265 0 0 0 0 0\n" -"MouseMoveEvent 216 265 0 0 0 0 0\n" -"MouseMoveEvent 223 265 0 0 0 0 0\n" -"MouseMoveEvent 228 265 0 0 0 0 0\n" -"MouseMoveEvent 233 265 0 0 0 0 0\n" -"TimerEvent 233 265 0 0 0 0 0\n" -"MouseMoveEvent 234 265 0 0 0 0 0\n" -"MouseMoveEvent 235 265 0 0 0 0 0\n" -"MouseMoveEvent 236 265 0 0 0 0 0\n" -"TimerEvent 236 265 0 0 0 0 0\n" -"MouseMoveEvent 238 265 0 0 0 0 0\n" -"MouseMoveEvent 240 265 0 0 0 0 0\n" -"MouseMoveEvent 242 265 0 0 0 0 0\n" -"MouseMoveEvent 243 265 0 0 0 0 0\n" -"MouseMoveEvent 245 265 0 0 0 0 0\n" -"MouseMoveEvent 246 265 0 0 0 0 0\n" -"TimerEvent 246 265 0 0 0 0 0\n" -"MouseMoveEvent 249 264 0 0 0 0 0\n" -"MouseMoveEvent 251 263 0 0 0 0 0\n" -"MouseMoveEvent 254 262 0 0 0 0 0\n" -"MouseMoveEvent 257 261 0 0 0 0 0\n" -"MouseMoveEvent 261 260 0 0 0 0 0\n" -"MouseMoveEvent 263 259 0 0 0 0 0\n" -"TimerEvent 263 259 0 0 0 0 0\n" -"MouseMoveEvent 266 259 0 0 0 0 0\n" -"MouseMoveEvent 268 258 0 0 0 0 0\n" -"MouseMoveEvent 269 257 0 0 0 0 0\n" -"MouseMoveEvent 271 256 0 0 0 0 0\n" -"MouseMoveEvent 274 255 0 0 0 0 0\n" -"TimerEvent 274 255 0 0 0 0 0\n" -"MouseMoveEvent 277 253 0 0 0 0 0\n" -"MouseMoveEvent 278 252 0 0 0 0 0\n" -"MouseMoveEvent 279 251 0 0 0 0 0\n" -"MouseMoveEvent 280 250 0 0 0 0 0\n" -"TimerEvent 280 250 0 0 0 0 0\n" -"MouseMoveEvent 281 249 0 0 0 0 0\n" -"MouseMoveEvent 282 248 0 0 0 0 0\n" -"MouseMoveEvent 282 247 0 0 0 0 0\n" -"MouseMoveEvent 282 246 0 0 0 0 0\n" -"MouseMoveEvent 282 243 0 0 0 0 0\n" -"MouseMoveEvent 283 241 0 0 0 0 0\n" -"TimerEvent 283 241 0 0 0 0 0\n" -"MouseMoveEvent 284 239 0 0 0 0 0\n" -"MouseMoveEvent 284 237 0 0 0 0 0\n" -"MouseMoveEvent 284 236 0 0 0 0 0\n" -"MouseMoveEvent 284 234 0 0 0 0 0\n" -"MouseMoveEvent 284 232 0 0 0 0 0\n" -"MouseMoveEvent 285 229 0 0 0 0 0\n" -"TimerEvent 285 229 0 0 0 0 0\n" -"MouseMoveEvent 286 226 0 0 0 0 0\n" -"MouseMoveEvent 286 225 0 0 0 0 0\n" -"MouseMoveEvent 286 223 0 0 0 0 0\n" -"MouseMoveEvent 287 221 0 0 0 0 0\n" -"MouseMoveEvent 287 220 0 0 0 0 0\n" -"MouseMoveEvent 287 218 0 0 0 0 0\n" -"TimerEvent 287 218 0 0 0 0 0\n" -"MouseMoveEvent 287 216 0 0 0 0 0\n" -"MouseMoveEvent 288 214 0 0 0 0 0\n" -"MouseMoveEvent 288 212 0 0 0 0 0\n" -"MouseMoveEvent 288 211 0 0 0 0 0\n" -"MouseMoveEvent 288 209 0 0 0 0 0\n" -"MouseMoveEvent 289 207 0 0 0 0 0\n" -"TimerEvent 289 207 0 0 0 0 0\n" -"MouseMoveEvent 290 205 0 0 0 0 0\n" -"MouseMoveEvent 290 204 0 0 0 0 0\n" -"MouseMoveEvent 291 203 0 0 0 0 0\n" -"MouseMoveEvent 291 202 0 0 0 0 0\n" -"MouseMoveEvent 292 201 0 0 0 0 0\n" -"TimerEvent 292 201 0 0 0 0 0\n" -"MouseMoveEvent 292 200 0 0 0 0 0\n" -"MouseMoveEvent 293 199 0 0 0 0 0\n" -"MouseMoveEvent 294 197 0 0 0 0 0\n" -"MouseMoveEvent 294 195 0 0 0 0 0\n" -"MouseMoveEvent 295 192 0 0 0 0 0\n" -"MouseMoveEvent 296 190 0 0 0 0 0\n" -"TimerEvent 296 190 0 0 0 0 0\n" -"MouseMoveEvent 297 187 0 0 0 0 0\n" -"TimerEvent 297 187 0 0 0 0 0\n" -"LeftButtonReleaseEvent 297 187 0 0 0 0 0\n" -"MouseMoveEvent 296 186 0 0 0 0 0\n" -"MouseMoveEvent 292 186 0 0 0 0 0\n" -"MouseMoveEvent 289 186 0 0 0 0 0\n" -"MouseMoveEvent 283 186 0 0 0 0 0\n" -"MouseMoveEvent 278 185 0 0 0 0 0\n" -"MouseMoveEvent 275 185 0 0 0 0 0\n" -"TimerEvent 275 185 0 0 0 0 0\n" -"MouseMoveEvent 273 184 0 0 0 0 0\n" -"MouseMoveEvent 272 184 0 0 0 0 0\n" -"MouseMoveEvent 268 184 0 0 0 0 0\n" -"MouseMoveEvent 263 184 0 0 0 0 0\n" -"MouseMoveEvent 255 184 0 0 0 0 0\n" -"MouseMoveEvent 244 184 0 0 0 0 0\n" -"TimerEvent 244 184 0 0 0 0 0\n" -"MouseMoveEvent 230 184 0 0 0 0 0\n" -"MouseMoveEvent 216 184 0 0 0 0 0\n" -"MouseMoveEvent 202 187 0 0 0 0 0\n" -"MouseMoveEvent 188 189 0 0 0 0 0\n" -"MouseMoveEvent 177 191 0 0 0 0 0\n" -"MouseMoveEvent 167 193 0 0 0 0 0\n" -"TimerEvent 167 193 0 0 0 0 0\n" -"MouseMoveEvent 159 196 0 0 0 0 0\n" -"MouseMoveEvent 151 199 0 0 0 0 0\n" -"MouseMoveEvent 140 202 0 0 0 0 0\n" -"MouseMoveEvent 132 206 0 0 0 0 0\n" -"MouseMoveEvent 125 208 0 0 0 0 0\n" -"MouseMoveEvent 120 211 0 0 0 0 0\n" -"TimerEvent 120 211 0 0 0 0 0\n" -"MouseMoveEvent 116 214 0 0 0 0 0\n" -"MouseMoveEvent 114 216 0 0 0 0 0\n" -"MouseMoveEvent 113 218 0 0 0 0 0\n" -"MouseMoveEvent 112 222 0 0 0 0 0\n" -"MouseMoveEvent 109 228 0 0 0 0 0\n" -"MouseMoveEvent 109 233 0 0 0 0 0\n" -"TimerEvent 109 233 0 0 0 0 0\n" -"MouseMoveEvent 109 239 0 0 0 0 0\n" -"MouseMoveEvent 109 242 0 0 0 0 0\n" -"MouseMoveEvent 109 245 0 0 0 0 0\n" -"MouseMoveEvent 109 247 0 0 0 0 0\n" -"MouseMoveEvent 109 250 0 0 0 0 0\n" -"MouseMoveEvent 110 252 0 0 0 0 0\n" -"TimerEvent 110 252 0 0 0 0 0\n" -"MouseMoveEvent 111 254 0 0 0 0 0\n" -"MouseMoveEvent 111 255 0 0 0 0 0\n" -"MouseMoveEvent 111 256 0 0 0 0 0\n" -"MouseMoveEvent 111 257 0 0 0 0 0\n" -"MouseMoveEvent 111 258 0 0 0 0 0\n" -"MouseMoveEvent 111 259 0 0 0 0 0\n" -"TimerEvent 111 259 0 0 0 0 0\n" -"MouseMoveEvent 112 260 0 0 0 0 0\n" -"MouseMoveEvent 113 261 0 0 0 0 0\n" -"TimerEvent 113 261 0 0 0 0 0\n" -"MouseMoveEvent 114 261 0 0 0 0 0\n" -"MouseMoveEvent 115 261 0 0 0 0 0\n" -"MouseMoveEvent 117 260 0 0 0 0 0\n" -"MouseMoveEvent 119 258 0 0 0 0 0\n" -"MouseMoveEvent 121 256 0 0 0 0 0\n" -"TimerEvent 121 256 0 0 0 0 0\n" -"MouseMoveEvent 122 255 0 0 0 0 0\n" -"MouseMoveEvent 125 253 0 0 0 0 0\n" -"MouseMoveEvent 128 251 0 0 0 0 0\n" -"MouseMoveEvent 131 249 0 0 0 0 0\n" -"MouseMoveEvent 133 248 0 0 0 0 0\n" -"MouseMoveEvent 134 248 0 0 0 0 0\n" -"TimerEvent 134 248 0 0 0 0 0\n" -"MouseMoveEvent 135 247 0 0 0 0 0\n" -"MouseMoveEvent 136 247 0 0 0 0 0\n" -"MouseMoveEvent 137 247 0 0 0 0 0\n" -"MouseMoveEvent 138 247 0 0 0 0 0\n" -"MouseMoveEvent 139 247 0 0 0 0 0\n" -"TimerEvent 139 247 0 0 0 0 0\n" -"MouseMoveEvent 140 247 0 0 0 0 0\n" -"MouseMoveEvent 141 247 0 0 0 0 0\n" -"MouseMoveEvent 142 247 0 0 0 0 0\n" -"MouseMoveEvent 144 247 0 0 0 0 0\n" -"MouseMoveEvent 145 247 0 0 0 0 0\n" -"TimerEvent 145 247 0 0 0 0 0\n" -"MouseMoveEvent 146 247 0 0 0 0 0\n" -"MouseMoveEvent 147 247 0 0 0 0 0\n" -"MouseMoveEvent 148 248 0 0 0 0 0\n" -"MouseMoveEvent 149 249 0 0 0 0 0\n" -"TimerEvent 149 249 0 0 0 0 0\n" -"MouseMoveEvent 150 250 0 0 0 0 0\n" -"MouseMoveEvent 151 251 0 0 0 0 0\n" -"MouseMoveEvent 152 252 0 0 0 0 0\n" -"MouseMoveEvent 153 253 0 0 0 0 0\n" -"MouseMoveEvent 153 254 0 0 0 0 0\n" -"MouseMoveEvent 154 255 0 0 0 0 0\n" -"TimerEvent 154 255 0 0 0 0 0\n" -"MouseMoveEvent 155 256 0 0 0 0 0\n" -"MouseMoveEvent 156 257 0 0 0 0 0\n" -"TimerEvent 156 257 0 0 0 0 0\n" -"MouseMoveEvent 157 258 0 0 0 0 0\n" -"MouseMoveEvent 157 259 0 0 0 0 0\n" -"TimerEvent 157 259 0 0 0 0 0\n" -"MouseMoveEvent 158 261 0 0 0 0 0\n" -"MouseMoveEvent 159 262 0 0 0 0 0\n" -"MouseMoveEvent 160 263 0 0 0 0 0\n" -"MouseMoveEvent 160 264 0 0 0 0 0\n" -"TimerEvent 160 264 0 0 0 0 0\n" -"MouseMoveEvent 161 265 0 0 0 0 0\n" -"MouseMoveEvent 162 266 0 0 0 0 0\n" -"RightButtonPressEvent 162 266 0 0 0 0 0\n" -"TimerEvent 162 266 0 0 0 0 0\n" -"MouseMoveEvent 162 264 0 0 0 0 0\n" -"MouseMoveEvent 163 260 0 0 0 0 0\n" -"MouseMoveEvent 165 254 0 0 0 0 0\n" -"MouseMoveEvent 165 247 0 0 0 0 0\n" -"MouseMoveEvent 167 239 0 0 0 0 0\n" -"MouseMoveEvent 168 230 0 0 0 0 0\n" -"TimerEvent 168 230 0 0 0 0 0\n" -"MouseMoveEvent 170 220 0 0 0 0 0\n" -"MouseMoveEvent 170 210 0 0 0 0 0\n" -"MouseMoveEvent 172 200 0 0 0 0 0\n" -"MouseMoveEvent 174 190 0 0 0 0 0\n" -"MouseMoveEvent 174 180 0 0 0 0 0\n" -"MouseMoveEvent 175 170 0 0 0 0 0\n" -"TimerEvent 175 170 0 0 0 0 0\n" -"MouseMoveEvent 175 160 0 0 0 0 0\n" -"MouseMoveEvent 175 150 0 0 0 0 0\n" -"MouseMoveEvent 175 140 0 0 0 0 0\n" -"MouseMoveEvent 175 130 0 0 0 0 0\n" -"MouseMoveEvent 175 122 0 0 0 0 0\n" -"MouseMoveEvent 175 113 0 0 0 0 0\n" -"TimerEvent 175 113 0 0 0 0 0\n" -"MouseMoveEvent 175 107 0 0 0 0 0\n" -"MouseMoveEvent 175 103 0 0 0 0 0\n" -"MouseMoveEvent 175 100 0 0 0 0 0\n" -"MouseMoveEvent 176 99 0 0 0 0 0\n" -"MouseMoveEvent 176 98 0 0 0 0 0\n" -"MouseMoveEvent 176 97 0 0 0 0 0\n" -"TimerEvent 176 97 0 0 0 0 0\n" -"MouseMoveEvent 176 96 0 0 0 0 0\n" -"MouseMoveEvent 176 95 0 0 0 0 0\n" -"MouseMoveEvent 176 94 0 0 0 0 0\n" -"MouseMoveEvent 177 92 0 0 0 0 0\n" -"TimerEvent 177 92 0 0 0 0 0\n" -"MouseMoveEvent 178 91 0 0 0 0 0\n" -"MouseMoveEvent 179 90 0 0 0 0 0\n" -"MouseMoveEvent 181 86 0 0 0 0 0\n" -"MouseMoveEvent 183 84 0 0 0 0 0\n" -"MouseMoveEvent 185 82 0 0 0 0 0\n" -"MouseMoveEvent 188 80 0 0 0 0 0\n" -"TimerEvent 188 80 0 0 0 0 0\n" -"MouseMoveEvent 190 79 0 0 0 0 0\n" -"MouseMoveEvent 194 77 0 0 0 0 0\n" -"MouseMoveEvent 197 76 0 0 0 0 0\n" -"MouseMoveEvent 201 75 0 0 0 0 0\n" -"MouseMoveEvent 205 75 0 0 0 0 0\n" -"MouseMoveEvent 210 74 0 0 0 0 0\n" -"TimerEvent 210 74 0 0 0 0 0\n" -"MouseMoveEvent 215 74 0 0 0 0 0\n" -"MouseMoveEvent 221 74 0 0 0 0 0\n" -"MouseMoveEvent 225 74 0 0 0 0 0\n" -"MouseMoveEvent 227 74 0 0 0 0 0\n" -"MouseMoveEvent 230 74 0 0 0 0 0\n" -"MouseMoveEvent 234 74 0 0 0 0 0\n" -"TimerEvent 234 74 0 0 0 0 0\n" -"MouseMoveEvent 237 74 0 0 0 0 0\n" -"MouseMoveEvent 239 74 0 0 0 0 0\n" -"MouseMoveEvent 241 74 0 0 0 0 0\n" -"MouseMoveEvent 243 75 0 0 0 0 0\n" -"MouseMoveEvent 245 75 0 0 0 0 0\n" -"MouseMoveEvent 247 76 0 0 0 0 0\n" -"TimerEvent 247 76 0 0 0 0 0\n" -"MouseMoveEvent 248 76 0 0 0 0 0\n" -"TimerEvent 248 76 0 0 0 0 0\n" -"MouseMoveEvent 250 77 0 0 0 0 0\n" -"MouseMoveEvent 252 77 0 0 0 0 0\n" -"MouseMoveEvent 254 77 0 0 0 0 0\n" -"MouseMoveEvent 255 77 0 0 0 0 0\n" -"MouseMoveEvent 257 78 0 0 0 0 0\n" -"MouseMoveEvent 259 78 0 0 0 0 0\n" -"TimerEvent 259 78 0 0 0 0 0\n" -"MouseMoveEvent 262 78 0 0 0 0 0\n" -"MouseMoveEvent 264 78 0 0 0 0 0\n" -"MouseMoveEvent 265 78 0 0 0 0 0\n" -"MouseMoveEvent 267 79 0 0 0 0 0\n" -"TimerEvent 267 79 0 0 0 0 0\n" -"MouseMoveEvent 269 80 0 0 0 0 0\n" -"TimerEvent 269 80 0 0 0 0 0\n" -"RightButtonReleaseEvent 269 80 0 0 0 0 0\n" -"TimerEvent 269 80 0 0 0 0 0\n" -"MouseMoveEvent 270 81 0 0 0 0 0\n" -"MouseMoveEvent 271 82 0 0 0 0 0\n" -"MouseMoveEvent 273 84 0 0 0 0 0\n" -"MouseMoveEvent 276 87 0 0 0 0 0\n" -"MouseMoveEvent 278 89 0 0 0 0 0\n" -"MouseMoveEvent 280 91 0 0 0 0 0\n" -"TimerEvent 280 91 0 0 0 0 0\n" -"MouseMoveEvent 281 92 0 0 0 0 0\n" -"MouseMoveEvent 284 94 0 0 0 0 0\n" -"MouseMoveEvent 285 95 0 0 0 0 0\n" -"MouseMoveEvent 287 96 0 0 0 0 0\n" -"MouseMoveEvent 289 97 0 0 0 0 0\n" -"MouseMoveEvent 291 98 0 0 0 0 0\n" -"TimerEvent 291 98 0 0 0 0 0\n" -"MouseMoveEvent 292 99 0 0 0 0 0\n" -"MouseMoveEvent 293 100 0 0 0 0 0\n" -"MouseMoveEvent 294 101 0 0 0 0 0\n" -"MouseMoveEvent 295 101 0 0 0 0 0\n" -"TimerEvent 295 101 0 0 0 0 0\n" -"LeftButtonPressEvent 295 101 0 0 0 0 0\n" -"MouseMoveEvent 296 102 0 0 0 0 0\n" -"MouseMoveEvent 294 103 0 0 0 0 0\n" -"MouseMoveEvent 291 104 0 0 0 0 0\n" -"MouseMoveEvent 286 106 0 0 0 0 0\n" -"MouseMoveEvent 282 108 0 0 0 0 0\n" -"MouseMoveEvent 276 109 0 0 0 0 0\n" -"TimerEvent 276 109 0 0 0 0 0\n" -"MouseMoveEvent 271 111 0 0 0 0 0\n" -"MouseMoveEvent 264 112 0 0 0 0 0\n" -"MouseMoveEvent 256 115 0 0 0 0 0\n" -"MouseMoveEvent 249 117 0 0 0 0 0\n" -"MouseMoveEvent 243 119 0 0 0 0 0\n" -"MouseMoveEvent 239 121 0 0 0 0 0\n" -"TimerEvent 239 121 0 0 0 0 0\n" -"MouseMoveEvent 235 123 0 0 0 0 0\n" -"MouseMoveEvent 234 123 0 0 0 0 0\n" -"MouseMoveEvent 233 124 0 0 0 0 0\n" -"MouseMoveEvent 232 124 0 0 0 0 0\n" -"MouseMoveEvent 231 125 0 0 0 0 0\n" -"TimerEvent 231 125 0 0 0 0 0\n" -"MouseMoveEvent 230 125 0 0 0 0 0\n" -"MouseMoveEvent 229 125 0 0 0 0 0\n" -"MouseMoveEvent 228 125 0 0 0 0 0\n" -"MouseMoveEvent 227 126 0 0 0 0 0\n" -"TimerEvent 227 126 0 0 0 0 0\n" -"MouseMoveEvent 225 126 0 0 0 0 0\n" -"MouseMoveEvent 223 127 0 0 0 0 0\n" -"MouseMoveEvent 222 127 0 0 0 0 0\n" -"MouseMoveEvent 220 128 0 0 0 0 0\n" -"MouseMoveEvent 219 128 0 0 0 0 0\n" -"MouseMoveEvent 217 129 0 0 0 0 0\n" -"TimerEvent 217 129 0 0 0 0 0\n" -"MouseMoveEvent 216 129 0 0 0 0 0\n" -"MouseMoveEvent 214 130 0 0 0 0 0\n" -"MouseMoveEvent 212 131 0 0 0 0 0\n" -"TimerEvent 212 131 0 0 0 0 0\n" -"MouseMoveEvent 211 131 0 0 0 0 0\n" -"MouseMoveEvent 210 132 0 0 0 0 0\n" -"MouseMoveEvent 209 133 0 0 0 0 0\n" -"TimerEvent 209 133 0 0 0 0 0\n" -"MouseMoveEvent 208 134 0 0 0 0 0\n" -"MouseMoveEvent 206 135 0 0 0 0 0\n" -"TimerEvent 206 135 0 0 0 0 0\n" -"MouseMoveEvent 205 136 0 0 0 0 0\n" -"MouseMoveEvent 204 137 0 0 0 0 0\n" -"MouseMoveEvent 203 138 0 0 0 0 0\n" -"TimerEvent 203 138 0 0 0 0 0\n" -"MouseMoveEvent 201 139 0 0 0 0 0\n" -"LeftButtonReleaseEvent 201 139 0 0 0 0 0\n" -"MouseMoveEvent 200 139 0 0 0 0 0\n" -"MouseMoveEvent 198 139 0 0 0 0 0\n" -"MouseMoveEvent 195 140 0 0 0 0 0\n" -"MouseMoveEvent 189 141 0 0 0 0 0\n" -"MouseMoveEvent 180 143 0 0 0 0 0\n" -"TimerEvent 180 143 0 0 0 0 0\n" -"MouseMoveEvent 166 144 0 0 0 0 0\n" -"MouseMoveEvent 152 146 0 0 0 0 0\n" -"MouseMoveEvent 138 148 0 0 0 0 0\n" -"MouseMoveEvent 126 150 0 0 0 0 0\n" -"MouseMoveEvent 118 152 0 0 0 0 0\n" -"MouseMoveEvent 111 152 0 0 0 0 0\n" -"TimerEvent 111 152 0 0 0 0 0\n" -"MouseMoveEvent 110 153 0 0 0 0 0\n" -"MouseMoveEvent 109 154 0 0 0 0 0\n" -"MouseMoveEvent 108 155 0 0 0 0 0\n" -"TimerEvent 108 155 0 0 0 0 0\n" -"MouseMoveEvent 108 156 0 0 0 0 0\n" -"MouseMoveEvent 108 157 0 0 0 0 0\n" -"MouseMoveEvent 108 158 0 0 0 0 0\n" -"MouseMoveEvent 108 159 0 0 0 0 0\n" -"MouseMoveEvent 108 160 0 0 0 0 0\n" -"MouseMoveEvent 108 161 0 0 0 0 0\n" -"TimerEvent 108 161 0 0 0 0 0\n" -"MouseMoveEvent 108 162 0 0 0 0 0\n" -"MouseMoveEvent 108 163 0 0 0 0 0\n" -"MouseMoveEvent 108 164 0 0 0 0 0\n" -"MouseMoveEvent 108 165 0 0 0 0 0\n" -"MouseMoveEvent 108 166 0 0 0 0 0\n" -"MouseMoveEvent 108 167 0 0 0 0 0\n" -"TimerEvent 108 167 0 0 0 0 0\n" -"MouseMoveEvent 108 168 0 0 0 0 0\n" -"MouseMoveEvent 108 169 0 0 0 0 0\n" -"MouseMoveEvent 109 170 0 0 0 0 0\n" -"MouseMoveEvent 110 171 0 0 0 0 0\n" -"TimerEvent 110 171 0 0 0 0 0\n" -"MouseMoveEvent 111 172 0 0 0 0 0\n" -"MouseMoveEvent 112 173 0 0 0 0 0\n" -"MouseMoveEvent 113 174 0 0 0 0 0\n" -"MouseMoveEvent 114 174 0 0 0 0 0\n" -"TimerEvent 114 174 0 0 0 0 0\n" -"MouseMoveEvent 115 174 0 0 0 0 0\n" -"MouseMoveEvent 116 175 0 0 0 0 0\n" -"TimerEvent 116 175 0 0 0 0 0\n" -"MouseMoveEvent 116 176 0 0 0 0 0\n" -"MouseMoveEvent 117 177 0 0 0 0 0\n" -"MouseMoveEvent 117 178 0 0 0 0 0\n" -"MouseMoveEvent 117 179 0 0 0 0 0\n" -"MouseMoveEvent 117 181 0 0 0 0 0\n" -"TimerEvent 117 181 0 0 0 0 0\n" -"MouseMoveEvent 117 182 0 0 0 0 0\n" -"MouseMoveEvent 117 183 0 0 0 0 0\n" -"MouseMoveEvent 117 184 0 0 0 0 0\n" -"MouseMoveEvent 117 185 0 0 0 0 0\n" -"MouseMoveEvent 117 187 0 0 0 0 0\n" -"MouseMoveEvent 117 188 0 0 0 0 0\n" -"TimerEvent 117 188 0 0 0 0 0\n" -"MouseMoveEvent 117 189 0 0 0 0 0\n" -"MouseMoveEvent 117 190 0 0 0 0 0\n" -"MouseMoveEvent 117 192 0 0 0 0 0\n" -"MouseMoveEvent 117 193 0 0 0 0 0\n" -"TimerEvent 117 193 0 0 0 0 0\n" -"MouseMoveEvent 117 194 0 0 0 0 0\n" -"MouseMoveEvent 117 195 0 0 0 0 0\n" -"MouseMoveEvent 117 196 0 0 0 0 0\n" -"TimerEvent 117 196 0 0 0 0 0\n" -"MouseMoveEvent 117 197 0 0 0 0 0\n" -"MouseMoveEvent 118 198 0 0 0 0 0\n" -"TimerEvent 118 198 0 0 0 0 0\n" -"MouseMoveEvent 118 197 0 0 0 0 0\n" -"MouseMoveEvent 118 196 0 0 0 0 0\n" -"TimerEvent 118 196 0 0 0 0 0\n" -"MouseMoveEvent 119 195 0 0 0 0 0\n" -"TimerEvent 119 195 0 0 0 0 0\n" -"MouseMoveEvent 120 194 0 0 0 0 0\n" -"MouseMoveEvent 121 195 0 0 0 0 0\n" -"TimerEvent 121 195 0 0 0 0 0\n" -; +static const char* TestChartXYInvertedAxisLog = "# StreamVersion 1\n" + "RenderEvent 0 0 0 0 0 0 0\n" + "TimerEvent 0 0 0 0 0 0 0\n" + "EnterEvent 397 52 0 0 0 0 0\n" + "MouseMoveEvent 397 52 0 0 0 0 0\n" + "MouseMoveEvent 388 52 0 0 0 0 0\n" + "MouseMoveEvent 384 52 0 0 0 0 0\n" + "MouseMoveEvent 380 52 0 0 0 0 0\n" + "MouseMoveEvent 379 52 0 0 0 0 0\n" + "MouseMoveEvent 378 52 0 0 0 0 0\n" + "MouseMoveEvent 377 52 0 0 0 0 0\n" + "MouseMoveEvent 375 52 0 0 0 0 0\n" + "MouseMoveEvent 372 52 0 0 0 0 0\n" + "MouseMoveEvent 369 51 0 0 0 0 0\n" + "TimerEvent 369 51 0 0 0 0 0\n" + "MouseMoveEvent 365 50 0 0 0 0 0\n" + "MouseMoveEvent 360 48 0 0 0 0 0\n" + "MouseMoveEvent 353 47 0 0 0 0 0\n" + "MouseMoveEvent 346 43 0 0 0 0 0\n" + "MouseMoveEvent 340 41 0 0 0 0 0\n" + "MouseMoveEvent 335 39 0 0 0 0 0\n" + "TimerEvent 335 39 0 0 0 0 0\n" + "MouseMoveEvent 329 39 0 0 0 0 0\n" + "MouseMoveEvent 326 39 0 0 0 0 0\n" + "MouseMoveEvent 323 39 0 0 0 0 0\n" + "MouseMoveEvent 319 41 0 0 0 0 0\n" + "MouseMoveEvent 315 41 0 0 0 0 0\n" + "MouseMoveEvent 311 41 0 0 0 0 0\n" + "TimerEvent 311 41 0 0 0 0 0\n" + "MouseMoveEvent 310 41 0 0 0 0 0\n" + "MouseMoveEvent 309 41 0 0 0 0 0\n" + "MouseMoveEvent 308 42 0 0 0 0 0\n" + "MouseMoveEvent 305 45 0 0 0 0 0\n" + "MouseMoveEvent 301 48 0 0 0 0 0\n" + "MouseMoveEvent 297 55 0 0 0 0 0\n" + "TimerEvent 297 55 0 0 0 0 0\n" + "MouseMoveEvent 289 64 0 0 0 0 0\n" + "MouseMoveEvent 283 74 0 0 0 0 0\n" + "MouseMoveEvent 276 82 0 0 0 0 0\n" + "MouseMoveEvent 268 90 0 0 0 0 0\n" + "MouseMoveEvent 262 95 0 0 0 0 0\n" + "MouseMoveEvent 256 99 0 0 0 0 0\n" + "TimerEvent 256 99 0 0 0 0 0\n" + "MouseMoveEvent 254 101 0 0 0 0 0\n" + "MouseMoveEvent 253 102 0 0 0 0 0\n" + "MouseMoveEvent 252 102 0 0 0 0 0\n" + "TimerEvent 252 102 0 0 0 0 0\n" + "MouseMoveEvent 251 103 0 0 0 0 0\n" + "MouseMoveEvent 249 105 0 0 0 0 0\n" + "MouseMoveEvent 247 107 0 0 0 0 0\n" + "MouseMoveEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelForwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 1 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseWheelBackwardEvent 246 108 0 0 0 0 0\n" + "TimerEvent 246 108 0 0 0 0 0\n" + "MouseMoveEvent 245 109 0 0 0 0 0\n" + "MouseMoveEvent 245 113 0 0 0 0 0\n" + "MouseMoveEvent 244 118 0 0 0 0 0\n" + "MouseMoveEvent 242 122 0 0 0 0 0\n" + "MouseMoveEvent 242 125 0 0 0 0 0\n" + "MouseMoveEvent 240 133 0 0 0 0 0\n" + "TimerEvent 240 133 0 0 0 0 0\n" + "MouseMoveEvent 236 142 0 0 0 0 0\n" + "MouseMoveEvent 234 151 0 0 0 0 0\n" + "MouseMoveEvent 232 159 0 0 0 0 0\n" + "MouseMoveEvent 230 166 0 0 0 0 0\n" + "MouseMoveEvent 228 174 0 0 0 0 0\n" + "MouseMoveEvent 227 180 0 0 0 0 0\n" + "TimerEvent 227 180 0 0 0 0 0\n" + "MouseMoveEvent 225 184 0 0 0 0 0\n" + "MouseMoveEvent 225 188 0 0 0 0 0\n" + "MouseMoveEvent 223 192 0 0 0 0 0\n" + "MouseMoveEvent 223 193 0 0 0 0 0\n" + "MouseMoveEvent 222 195 0 0 0 0 0\n" + "MouseMoveEvent 222 198 0 0 0 0 0\n" + "TimerEvent 222 198 0 0 0 0 0\n" + "MouseMoveEvent 220 202 0 0 0 0 0\n" + "MouseMoveEvent 220 203 0 0 0 0 0\n" + "MouseMoveEvent 219 205 0 0 0 0 0\n" + "TimerEvent 219 205 0 0 0 0 0\n" + "MouseMoveEvent 218 207 0 0 0 0 0\n" + "TimerEvent 218 207 0 0 0 0 0\n" + "MouseMoveEvent 217 208 0 0 0 0 0\n" + "MouseMoveEvent 216 208 0 0 0 0 0\n" + "MouseMoveEvent 214 208 0 0 0 0 0\n" + "MouseMoveEvent 212 208 0 0 0 0 0\n" + "MouseMoveEvent 210 207 0 0 0 0 0\n" + "MouseMoveEvent 209 206 0 0 0 0 0\n" + "TimerEvent 209 206 0 0 0 0 0\n" + "MouseMoveEvent 207 205 0 0 0 0 0\n" + "MouseMoveEvent 205 203 0 0 0 0 0\n" + "MouseMoveEvent 203 201 0 0 0 0 0\n" + "MouseMoveEvent 201 199 0 0 0 0 0\n" + "MouseMoveEvent 200 198 0 0 0 0 0\n" + "MouseMoveEvent 198 196 0 0 0 0 0\n" + "TimerEvent 198 196 0 0 0 0 0\n" + "MouseMoveEvent 197 195 0 0 0 0 0\n" + "MouseMoveEvent 196 194 0 0 0 0 0\n" + "TimerEvent 196 194 0 0 0 0 0\n" + "MouseMoveEvent 195 193 0 0 0 0 0\n" + "MouseMoveEvent 195 192 0 0 0 0 0\n" + "MouseMoveEvent 194 190 0 0 0 0 0\n" + "MouseMoveEvent 193 189 0 0 0 0 0\n" + "MouseMoveEvent 192 187 0 0 0 0 0\n" + "MouseMoveEvent 192 186 0 0 0 0 0\n" + "TimerEvent 192 186 0 0 0 0 0\n" + "MouseMoveEvent 191 185 0 0 0 0 0\n" + "MouseMoveEvent 189 182 0 0 0 0 0\n" + "MouseMoveEvent 188 181 0 0 0 0 0\n" + "MouseMoveEvent 187 179 0 0 0 0 0\n" + "MouseMoveEvent 186 178 0 0 0 0 0\n" + "MouseMoveEvent 185 175 0 0 0 0 0\n" + "TimerEvent 185 175 0 0 0 0 0\n" + "MouseMoveEvent 184 172 0 0 0 0 0\n" + "MouseMoveEvent 182 168 0 0 0 0 0\n" + "MouseMoveEvent 181 166 0 0 0 0 0\n" + "MouseMoveEvent 180 162 0 0 0 0 0\n" + "MouseMoveEvent 178 159 0 0 0 0 0\n" + "MouseMoveEvent 176 156 0 0 0 0 0\n" + "TimerEvent 176 156 0 0 0 0 0\n" + "MouseMoveEvent 174 153 0 0 0 0 0\n" + "MouseMoveEvent 173 150 0 0 0 0 0\n" + "MouseMoveEvent 172 148 0 0 0 0 0\n" + "MouseMoveEvent 171 147 0 0 0 0 0\n" + "MouseMoveEvent 170 145 0 0 0 0 0\n" + "MouseMoveEvent 169 143 0 0 0 0 0\n" + "TimerEvent 169 143 0 0 0 0 0\n" + "MouseMoveEvent 169 142 0 0 0 0 0\n" + "MouseMoveEvent 168 139 0 0 0 0 0\n" + "MouseMoveEvent 167 138 0 0 0 0 0\n" + "MouseMoveEvent 167 137 0 0 0 0 0\n" + "TimerEvent 167 137 0 0 0 0 0\n" + "MouseMoveEvent 167 136 0 0 0 0 0\n" + "MouseMoveEvent 166 135 0 0 0 0 0\n" + "MouseMoveEvent 166 134 0 0 0 0 0\n" + "MouseMoveEvent 165 132 0 0 0 0 0\n" + "TimerEvent 165 132 0 0 0 0 0\n" + "MouseMoveEvent 165 131 0 0 0 0 0\n" + "MouseMoveEvent 164 129 0 0 0 0 0\n" + "MouseMoveEvent 164 127 0 0 0 0 0\n" + "MouseMoveEvent 163 125 0 0 0 0 0\n" + "MouseMoveEvent 162 123 0 0 0 0 0\n" + "MouseMoveEvent 161 122 0 0 0 0 0\n" + "TimerEvent 161 122 0 0 0 0 0\n" + "MouseMoveEvent 160 120 0 0 0 0 0\n" + "MouseMoveEvent 160 119 0 0 0 0 0\n" + "MouseMoveEvent 158 116 0 0 0 0 0\n" + "MouseMoveEvent 157 114 0 0 0 0 0\n" + "MouseMoveEvent 156 112 0 0 0 0 0\n" + "MouseMoveEvent 154 109 0 0 0 0 0\n" + "TimerEvent 154 109 0 0 0 0 0\n" + "MouseMoveEvent 153 107 0 0 0 0 0\n" + "MouseMoveEvent 152 105 0 0 0 0 0\n" + "MouseMoveEvent 151 103 0 0 0 0 0\n" + "MouseMoveEvent 151 102 0 0 0 0 0\n" + "MouseMoveEvent 150 101 0 0 0 0 0\n" + "TimerEvent 150 101 0 0 0 0 0\n" + "MouseMoveEvent 150 100 0 0 0 0 0\n" + "MouseMoveEvent 149 98 0 0 0 0 0\n" + "MouseMoveEvent 149 97 0 0 0 0 0\n" + "TimerEvent 149 97 0 0 0 0 0\n" + "MouseMoveEvent 148 96 0 0 0 0 0\n" + "MouseMoveEvent 147 94 0 0 0 0 0\n" + "TimerEvent 147 94 0 0 0 0 0\n" + "MouseMoveEvent 146 93 0 0 0 0 0\n" + "MouseMoveEvent 145 92 0 0 0 0 0\n" + "TimerEvent 145 92 0 0 0 0 0\n" + "MouseMoveEvent 144 91 0 0 0 0 0\n" + "MouseMoveEvent 143 90 0 0 0 0 0\n" + "MouseMoveEvent 142 90 0 0 0 0 0\n" + "MouseMoveEvent 141 90 0 0 0 0 0\n" + "TimerEvent 141 90 0 0 0 0 0\n" + "MouseMoveEvent 140 90 0 0 0 0 0\n" + "MouseMoveEvent 139 91 0 0 0 0 0\n" + "MouseMoveEvent 137 92 0 0 0 0 0\n" + "MouseMoveEvent 136 92 0 0 0 0 0\n" + "MouseMoveEvent 135 93 0 0 0 0 0\n" + "MouseMoveEvent 132 94 0 0 0 0 0\n" + "TimerEvent 132 94 0 0 0 0 0\n" + "MouseMoveEvent 131 95 0 0 0 0 0\n" + "MouseMoveEvent 130 96 0 0 0 0 0\n" + "MouseMoveEvent 128 98 0 0 0 0 0\n" + "MouseMoveEvent 128 100 0 0 0 0 0\n" + "MouseMoveEvent 127 102 0 0 0 0 0\n" + "TimerEvent 127 102 0 0 0 0 0\n" + "MouseMoveEvent 127 103 0 0 0 0 0\n" + "MouseMoveEvent 127 104 0 0 0 0 0\n" + "MouseMoveEvent 127 106 0 0 0 0 0\n" + "MouseMoveEvent 127 107 0 0 0 0 0\n" + "MouseMoveEvent 127 108 0 0 0 0 0\n" + "MouseMoveEvent 127 109 0 0 0 0 0\n" + "TimerEvent 127 109 0 0 0 0 0\n" + "MouseMoveEvent 127 110 0 0 0 0 0\n" + "MouseMoveEvent 127 111 0 0 0 0 0\n" + "MouseMoveEvent 127 112 0 0 0 0 0\n" + "MouseMoveEvent 127 114 0 0 0 0 0\n" + "MouseMoveEvent 127 115 0 0 0 0 0\n" + "TimerEvent 127 115 0 0 0 0 0\n" + "MouseMoveEvent 127 116 0 0 0 0 0\n" + "MouseMoveEvent 127 118 0 0 0 0 0\n" + "MouseMoveEvent 128 119 0 0 0 0 0\n" + "TimerEvent 128 119 0 0 0 0 0\n" + "MouseMoveEvent 128 120 0 0 0 0 0\n" + "MouseMoveEvent 129 121 0 0 0 0 0\n" + "TimerEvent 129 121 0 0 0 0 0\n" + "MouseMoveEvent 129 122 0 0 0 0 0\n" + "MouseMoveEvent 129 123 0 0 0 0 0\n" + "MouseMoveEvent 129 125 0 0 0 0 0\n" + "MouseMoveEvent 129 126 0 0 0 0 0\n" + "MouseMoveEvent 129 128 0 0 0 0 0\n" + "MouseMoveEvent 129 130 0 0 0 0 0\n" + "TimerEvent 129 130 0 0 0 0 0\n" + "MouseMoveEvent 130 132 0 0 0 0 0\n" + "MouseMoveEvent 130 134 0 0 0 0 0\n" + "MouseMoveEvent 131 136 0 0 0 0 0\n" + "MouseMoveEvent 131 139 0 0 0 0 0\n" + "MouseMoveEvent 132 142 0 0 0 0 0\n" + "MouseMoveEvent 132 144 0 0 0 0 0\n" + "TimerEvent 132 144 0 0 0 0 0\n" + "MouseMoveEvent 132 146 0 0 0 0 0\n" + "MouseMoveEvent 133 148 0 0 0 0 0\n" + "MouseMoveEvent 133 149 0 0 0 0 0\n" + "MouseMoveEvent 133 151 0 0 0 0 0\n" + "MouseMoveEvent 133 153 0 0 0 0 0\n" + "MouseMoveEvent 133 154 0 0 0 0 0\n" + "TimerEvent 133 154 0 0 0 0 0\n" + "MouseMoveEvent 133 156 0 0 0 0 0\n" + "MouseMoveEvent 133 159 0 0 0 0 0\n" + "MouseMoveEvent 133 161 0 0 0 0 0\n" + "MouseMoveEvent 134 163 0 0 0 0 0\n" + "MouseMoveEvent 134 164 0 0 0 0 0\n" + "MouseMoveEvent 135 166 0 0 0 0 0\n" + "TimerEvent 135 166 0 0 0 0 0\n" + "MouseMoveEvent 135 167 0 0 0 0 0\n" + "MouseMoveEvent 135 168 0 0 0 0 0\n" + "MouseMoveEvent 136 169 0 0 0 0 0\n" + "MouseMoveEvent 136 170 0 0 0 0 0\n" + "TimerEvent 136 170 0 0 0 0 0\n" + "MouseMoveEvent 136 171 0 0 0 0 0\n" + "MouseMoveEvent 137 172 0 0 0 0 0\n" + "MouseMoveEvent 138 173 0 0 0 0 0\n" + "MouseMoveEvent 139 175 0 0 0 0 0\n" + "TimerEvent 139 175 0 0 0 0 0\n" + "MouseMoveEvent 140 176 0 0 0 0 0\n" + "MouseMoveEvent 141 177 0 0 0 0 0\n" + "MouseMoveEvent 142 179 0 0 0 0 0\n" + "TimerEvent 142 179 0 0 0 0 0\n" + "MouseMoveEvent 144 181 0 0 0 0 0\n" + "MouseMoveEvent 145 183 0 0 0 0 0\n" + "MouseMoveEvent 147 185 0 0 0 0 0\n" + "MouseMoveEvent 148 186 0 0 0 0 0\n" + "MouseMoveEvent 149 187 0 0 0 0 0\n" + "MouseMoveEvent 150 189 0 0 0 0 0\n" + "TimerEvent 150 189 0 0 0 0 0\n" + "MouseMoveEvent 151 190 0 0 0 0 0\n" + "MouseMoveEvent 152 192 0 0 0 0 0\n" + "MouseMoveEvent 153 193 0 0 0 0 0\n" + "MouseMoveEvent 154 195 0 0 0 0 0\n" + "TimerEvent 154 195 0 0 0 0 0\n" + "MouseMoveEvent 154 196 0 0 0 0 0\n" + "MouseMoveEvent 155 197 0 0 0 0 0\n" + "MouseMoveEvent 157 200 0 0 0 0 0\n" + "MouseMoveEvent 157 202 0 0 0 0 0\n" + "MouseMoveEvent 158 203 0 0 0 0 0\n" + "MouseMoveEvent 159 204 0 0 0 0 0\n" + "TimerEvent 159 204 0 0 0 0 0\n" + "MouseMoveEvent 159 205 0 0 0 0 0\n" + "MouseMoveEvent 159 206 0 0 0 0 0\n" + "MouseMoveEvent 160 207 0 0 0 0 0\n" + "MouseMoveEvent 161 210 0 0 0 0 0\n" + "MouseMoveEvent 162 211 0 0 0 0 0\n" + "TimerEvent 162 211 0 0 0 0 0\n" + "MouseMoveEvent 163 213 0 0 0 0 0\n" + "MouseMoveEvent 164 214 0 0 0 0 0\n" + "MouseMoveEvent 166 216 0 0 0 0 0\n" + "MouseMoveEvent 167 218 0 0 0 0 0\n" + "TimerEvent 167 218 0 0 0 0 0\n" + "MouseMoveEvent 168 219 0 0 0 0 0\n" + "MouseMoveEvent 169 220 0 0 0 0 0\n" + "MouseMoveEvent 170 222 0 0 0 0 0\n" + "MouseMoveEvent 172 224 0 0 0 0 0\n" + "MouseMoveEvent 173 225 0 0 0 0 0\n" + "MouseMoveEvent 174 226 0 0 0 0 0\n" + "TimerEvent 174 226 0 0 0 0 0\n" + "MouseMoveEvent 175 227 0 0 0 0 0\n" + "MouseMoveEvent 176 228 0 0 0 0 0\n" + "TimerEvent 176 228 0 0 0 0 0\n" + "MouseMoveEvent 176 229 0 0 0 0 0\n" + "MouseMoveEvent 176 230 0 0 0 0 0\n" + "MouseMoveEvent 177 231 0 0 0 0 0\n" + "MouseMoveEvent 177 232 0 0 0 0 0\n" + "TimerEvent 177 232 0 0 0 0 0\n" + "MouseMoveEvent 178 233 0 0 0 0 0\n" + "MouseMoveEvent 179 234 0 0 0 0 0\n" + "TimerEvent 179 234 0 0 0 0 0\n" + "MouseMoveEvent 180 235 0 0 0 0 0\n" + "MouseMoveEvent 181 236 0 0 0 0 0\n" + "TimerEvent 181 236 0 0 0 0 0\n" + "MouseMoveEvent 182 237 0 0 0 0 0\n" + "TimerEvent 182 237 0 0 0 0 0\n" + "MouseMoveEvent 183 238 0 0 0 0 0\n" + "TimerEvent 183 238 0 0 0 0 0\n" + "MouseMoveEvent 185 238 0 0 0 0 0\n" + "MouseMoveEvent 186 238 0 0 0 0 0\n" + "TimerEvent 186 238 0 0 0 0 0\n" + "MouseMoveEvent 187 237 0 0 0 0 0\n" + "MouseMoveEvent 187 236 0 0 0 0 0\n" + "MouseMoveEvent 187 235 0 0 0 0 0\n" + "MouseMoveEvent 186 234 0 0 0 0 0\n" + "TimerEvent 186 234 0 0 0 0 0\n" + "MouseMoveEvent 185 232 0 0 0 0 0\n" + "MouseMoveEvent 185 231 0 0 0 0 0\n" + "MouseMoveEvent 185 230 0 0 0 0 0\n" + "MouseMoveEvent 185 229 0 0 0 0 0\n" + "TimerEvent 185 229 0 0 0 0 0\n" + "MouseMoveEvent 185 228 0 0 0 0 0\n" + "MouseMoveEvent 185 227 0 0 0 0 0\n" + "MouseMoveEvent 185 225 0 0 0 0 0\n" + "MouseMoveEvent 185 224 0 0 0 0 0\n" + "TimerEvent 185 224 0 0 0 0 0\n" + "MouseMoveEvent 185 223 0 0 0 0 0\n" + "MouseMoveEvent 185 222 0 0 0 0 0\n" + "MouseMoveEvent 185 220 0 0 0 0 0\n" + "MouseMoveEvent 185 219 0 0 0 0 0\n" + "MouseMoveEvent 186 217 0 0 0 0 0\n" + "MouseMoveEvent 188 214 0 0 0 0 0\n" + "TimerEvent 188 214 0 0 0 0 0\n" + "MouseMoveEvent 190 211 0 0 0 0 0\n" + "MouseMoveEvent 192 208 0 0 0 0 0\n" + "MouseMoveEvent 194 206 0 0 0 0 0\n" + "MouseMoveEvent 197 203 0 0 0 0 0\n" + "MouseMoveEvent 201 200 0 0 0 0 0\n" + "MouseMoveEvent 204 196 0 0 0 0 0\n" + "TimerEvent 204 196 0 0 0 0 0\n" + "MouseMoveEvent 208 192 0 0 0 0 0\n" + "MouseMoveEvent 214 188 0 0 0 0 0\n" + "MouseMoveEvent 219 184 0 0 0 0 0\n" + "MouseMoveEvent 225 180 0 0 0 0 0\n" + "MouseMoveEvent 230 176 0 0 0 0 0\n" + "MouseMoveEvent 232 175 0 0 0 0 0\n" + "TimerEvent 232 175 0 0 0 0 0\n" + "MouseMoveEvent 233 174 0 0 0 0 0\n" + "MouseMoveEvent 235 172 0 0 0 0 0\n" + "MouseMoveEvent 237 170 0 0 0 0 0\n" + "MouseMoveEvent 239 169 0 0 0 0 0\n" + "MouseMoveEvent 241 167 0 0 0 0 0\n" + "MouseMoveEvent 243 165 0 0 0 0 0\n" + "TimerEvent 243 165 0 0 0 0 0\n" + "MouseMoveEvent 246 163 0 0 0 0 0\n" + "MouseMoveEvent 249 161 0 0 0 0 0\n" + "MouseMoveEvent 252 158 0 0 0 0 0\n" + "MouseMoveEvent 254 156 0 0 0 0 0\n" + "MouseMoveEvent 257 154 0 0 0 0 0\n" + "MouseMoveEvent 259 152 0 0 0 0 0\n" + "TimerEvent 259 152 0 0 0 0 0\n" + "MouseMoveEvent 261 150 0 0 0 0 0\n" + "MouseMoveEvent 263 148 0 0 0 0 0\n" + "MouseMoveEvent 267 145 0 0 0 0 0\n" + "MouseMoveEvent 270 143 0 0 0 0 0\n" + "MouseMoveEvent 273 140 0 0 0 0 0\n" + "MouseMoveEvent 278 136 0 0 0 0 0\n" + "TimerEvent 278 136 0 0 0 0 0\n" + "MouseMoveEvent 279 135 0 0 0 0 0\n" + "TimerEvent 279 135 0 0 0 0 0\n" + "LeftButtonPressEvent 279 135 0 0 0 0 0\n" + "MouseMoveEvent 278 135 0 0 0 0 0\n" + "MouseMoveEvent 277 135 0 0 0 0 0\n" + "MouseMoveEvent 275 135 0 0 0 0 0\n" + "MouseMoveEvent 272 136 0 0 0 0 0\n" + "MouseMoveEvent 269 137 0 0 0 0 0\n" + "MouseMoveEvent 265 139 0 0 0 0 0\n" + "TimerEvent 265 139 0 0 0 0 0\n" + "MouseMoveEvent 261 139 0 0 0 0 0\n" + "MouseMoveEvent 257 141 0 0 0 0 0\n" + "MouseMoveEvent 253 142 0 0 0 0 0\n" + "MouseMoveEvent 247 143 0 0 0 0 0\n" + "MouseMoveEvent 242 145 0 0 0 0 0\n" + "MouseMoveEvent 237 145 0 0 0 0 0\n" + "TimerEvent 237 145 0 0 0 0 0\n" + "MouseMoveEvent 235 146 0 0 0 0 0\n" + "MouseMoveEvent 232 147 0 0 0 0 0\n" + "MouseMoveEvent 230 148 0 0 0 0 0\n" + "MouseMoveEvent 227 148 0 0 0 0 0\n" + "MouseMoveEvent 224 149 0 0 0 0 0\n" + "TimerEvent 224 149 0 0 0 0 0\n" + "MouseMoveEvent 221 151 0 0 0 0 0\n" + "MouseMoveEvent 217 152 0 0 0 0 0\n" + "MouseMoveEvent 213 154 0 0 0 0 0\n" + "MouseMoveEvent 210 156 0 0 0 0 0\n" + "MouseMoveEvent 208 157 0 0 0 0 0\n" + "MouseMoveEvent 205 158 0 0 0 0 0\n" + "TimerEvent 205 158 0 0 0 0 0\n" + "MouseMoveEvent 203 159 0 0 0 0 0\n" + "MouseMoveEvent 202 159 0 0 0 0 0\n" + "MouseMoveEvent 200 160 0 0 0 0 0\n" + "MouseMoveEvent 199 160 0 0 0 0 0\n" + "MouseMoveEvent 198 161 0 0 0 0 0\n" + "MouseMoveEvent 196 161 0 0 0 0 0\n" + "TimerEvent 196 161 0 0 0 0 0\n" + "MouseMoveEvent 195 161 0 0 0 0 0\n" + "MouseMoveEvent 194 162 0 0 0 0 0\n" + "MouseMoveEvent 192 162 0 0 0 0 0\n" + "MouseMoveEvent 191 163 0 0 0 0 0\n" + "TimerEvent 191 163 0 0 0 0 0\n" + "MouseMoveEvent 190 163 0 0 0 0 0\n" + "MouseMoveEvent 189 163 0 0 0 0 0\n" + "MouseMoveEvent 188 163 0 0 0 0 0\n" + "MouseMoveEvent 187 163 0 0 0 0 0\n" + "TimerEvent 187 163 0 0 0 0 0\n" + "MouseMoveEvent 186 163 0 0 0 0 0\n" + "MouseMoveEvent 185 163 0 0 0 0 0\n" + "MouseMoveEvent 184 163 0 0 0 0 0\n" + "TimerEvent 184 163 0 0 0 0 0\n" + "LeftButtonReleaseEvent 184 163 0 0 0 0 0\n" + "MouseMoveEvent 183 164 0 0 0 0 0\n" + "MouseMoveEvent 185 166 0 0 0 0 0\n" + "MouseMoveEvent 185 167 0 0 0 0 0\n" + "MouseMoveEvent 186 169 0 0 0 0 0\n" + "TimerEvent 186 169 0 0 0 0 0\n" + "MouseMoveEvent 187 171 0 0 0 0 0\n" + "TimerEvent 187 171 0 0 0 0 0\n" + "MouseWheelBackwardEvent 187 171 0 0 0 0 0\n" + "TimerEvent 187 171 0 0 0 0 0\n" + "MouseWheelBackwardEvent 187 171 0 0 0 1 0\n" + "TimerEvent 187 171 0 0 0 0 0\n" + "MouseWheelBackwardEvent 187 171 0 0 0 0 0\n" + "TimerEvent 187 171 0 0 0 0 0\n" + "MouseMoveEvent 187 172 0 0 0 0 0\n" + "MouseMoveEvent 187 173 0 0 0 0 0\n" + "MouseMoveEvent 187 174 0 0 0 0 0\n" + "MouseMoveEvent 187 175 0 0 0 0 0\n" + "MouseMoveEvent 188 177 0 0 0 0 0\n" + "TimerEvent 188 177 0 0 0 0 0\n" + "MouseMoveEvent 188 178 0 0 0 0 0\n" + "MouseMoveEvent 189 179 0 0 0 0 0\n" + "MouseMoveEvent 189 180 0 0 0 0 0\n" + "MouseMoveEvent 190 181 0 0 0 0 0\n" + "TimerEvent 190 181 0 0 0 0 0\n" + "MouseMoveEvent 190 182 0 0 0 0 0\n" + "MouseMoveEvent 191 183 0 0 0 0 0\n" + "MouseMoveEvent 191 184 0 0 0 0 0\n" + "TimerEvent 191 184 0 0 0 0 0\n" + "MouseMoveEvent 192 186 0 0 0 0 0\n" + "MouseMoveEvent 192 187 0 0 0 0 0\n" + "MouseMoveEvent 192 188 0 0 0 0 0\n" + "TimerEvent 192 188 0 0 0 0 0\n" + "MouseMoveEvent 192 189 0 0 0 0 0\n" + "MouseMoveEvent 192 190 0 0 0 0 0\n" + "MouseMoveEvent 192 191 0 0 0 0 0\n" + "TimerEvent 192 191 0 0 0 0 0\n" + "MouseMoveEvent 192 192 0 0 0 0 0\n" + "TimerEvent 192 192 0 0 0 0 0\n" + "MouseMoveEvent 193 193 0 0 0 0 0\n" + "MouseMoveEvent 193 192 0 0 0 0 0\n" + "TimerEvent 193 192 0 0 0 0 0\n" + "MouseMoveEvent 194 191 0 0 0 0 0\n" + "MouseMoveEvent 194 189 0 0 0 0 0\n" + "MouseMoveEvent 194 188 0 0 0 0 0\n" + "MouseMoveEvent 194 186 0 0 0 0 0\n" + "MouseMoveEvent 194 185 0 0 0 0 0\n" + "MouseMoveEvent 194 184 0 0 0 0 0\n" + "TimerEvent 194 184 0 0 0 0 0\n" + "MouseMoveEvent 194 183 0 0 0 0 0\n" + "MouseMoveEvent 194 182 0 0 0 0 0\n" + "MouseMoveEvent 194 181 0 0 0 0 0\n" + "MouseMoveEvent 194 180 0 0 0 0 0\n" + "TimerEvent 194 180 0 0 0 0 0\n" + "MouseMoveEvent 194 179 0 0 0 0 0\n" + "MouseMoveEvent 194 178 0 0 0 0 0\n" + "TimerEvent 194 178 0 0 0 0 0\n" + "MouseMoveEvent 194 177 0 0 0 0 0\n" + "TimerEvent 194 177 0 0 0 0 0\n" + "MouseMoveEvent 195 176 0 0 0 0 0\n" + "MouseMoveEvent 196 176 0 0 0 0 0\n" + "TimerEvent 196 176 0 0 0 0 0\n" + "MouseMoveEvent 198 174 0 0 0 0 0\n" + "MouseMoveEvent 198 173 0 0 0 0 0\n" + "MouseMoveEvent 199 172 0 0 0 0 0\n" + "MouseMoveEvent 199 171 0 0 0 0 0\n" + "MouseMoveEvent 200 170 0 0 0 0 0\n" + "TimerEvent 200 170 0 0 0 0 0\n" + "MouseMoveEvent 200 169 0 0 0 0 0\n" + "MouseMoveEvent 201 168 0 0 0 0 0\n" + "MouseMoveEvent 201 167 0 0 0 0 0\n" + "TimerEvent 201 167 0 0 0 0 0\n" + "MouseMoveEvent 202 166 0 0 0 0 0\n" + "MouseMoveEvent 203 166 0 0 0 0 0\n" + "MouseMoveEvent 206 166 0 0 0 0 0\n" + "MouseMoveEvent 209 166 0 0 0 0 0\n" + "MouseMoveEvent 211 167 0 0 0 0 0\n" + "MouseMoveEvent 213 168 0 0 0 0 0\n" + "TimerEvent 213 168 0 0 0 0 0\n" + "MouseMoveEvent 216 168 0 0 0 0 0\n" + "MouseMoveEvent 218 169 0 0 0 0 0\n" + "MouseMoveEvent 221 171 0 0 0 0 0\n" + "MouseMoveEvent 225 173 0 0 0 0 0\n" + "MouseMoveEvent 228 175 0 0 0 0 0\n" + "MouseMoveEvent 230 176 0 0 0 0 0\n" + "TimerEvent 230 176 0 0 0 0 0\n" + "MouseMoveEvent 233 178 0 0 0 0 0\n" + "MouseMoveEvent 234 179 0 0 0 0 0\n" + "MouseMoveEvent 235 180 0 0 0 0 0\n" + "MouseMoveEvent 237 181 0 0 0 0 0\n" + "TimerEvent 237 181 0 0 0 0 0\n" + "MouseMoveEvent 238 181 0 0 0 0 0\n" + "MouseMoveEvent 239 182 0 0 0 0 0\n" + "MouseMoveEvent 240 183 0 0 0 0 0\n" + "MouseMoveEvent 240 185 0 0 0 0 0\n" + "TimerEvent 240 185 0 0 0 0 0\n" + "MouseMoveEvent 240 187 0 0 0 0 0\n" + "MouseMoveEvent 240 188 0 0 0 0 0\n" + "MouseMoveEvent 240 189 0 0 0 0 0\n" + "MouseMoveEvent 240 190 0 0 0 0 0\n" + "TimerEvent 240 190 0 0 0 0 0\n" + "MouseMoveEvent 239 192 0 0 0 0 0\n" + "MouseMoveEvent 238 193 0 0 0 0 0\n" + "MouseMoveEvent 237 194 0 0 0 0 0\n" + "MouseMoveEvent 235 196 0 0 0 0 0\n" + "MouseMoveEvent 235 197 0 0 0 0 0\n" + "TimerEvent 235 197 0 0 0 0 0\n" + "MouseMoveEvent 234 199 0 0 0 0 0\n" + "MouseMoveEvent 233 201 0 0 0 0 0\n" + "MouseMoveEvent 232 203 0 0 0 0 0\n" + "MouseMoveEvent 232 204 0 0 0 0 0\n" + "MouseMoveEvent 231 207 0 0 0 0 0\n" + "MouseMoveEvent 231 208 0 0 0 0 0\n" + "TimerEvent 231 208 0 0 0 0 0\n" + "MouseMoveEvent 230 210 0 0 0 0 0\n" + "MouseMoveEvent 229 213 0 0 0 0 0\n" + "MouseMoveEvent 229 215 0 0 0 0 0\n" + "MouseMoveEvent 228 217 0 0 0 0 0\n" + "MouseMoveEvent 228 218 0 0 0 0 0\n" + "MouseMoveEvent 228 219 0 0 0 0 0\n" + "TimerEvent 228 219 0 0 0 0 0\n" + "MouseMoveEvent 227 220 0 0 0 0 0\n" + "TimerEvent 227 220 0 0 0 0 0\n" + "MouseMoveEvent 229 219 0 0 0 0 0\n" + "MouseMoveEvent 230 219 0 0 0 0 0\n" + "TimerEvent 230 219 0 0 0 0 0\n" + "MouseMoveEvent 232 218 0 0 0 0 0\n" + "MouseMoveEvent 233 217 0 0 0 0 0\n" + "MouseMoveEvent 235 216 0 0 0 0 0\n" + "MouseMoveEvent 236 215 0 0 0 0 0\n" + "MouseMoveEvent 239 214 0 0 0 0 0\n" + "TimerEvent 239 214 0 0 0 0 0\n" + "MouseMoveEvent 241 212 0 0 0 0 0\n" + "MouseMoveEvent 244 210 0 0 0 0 0\n" + "MouseMoveEvent 248 207 0 0 0 0 0\n" + "MouseMoveEvent 254 203 0 0 0 0 0\n" + "MouseMoveEvent 261 199 0 0 0 0 0\n" + "MouseMoveEvent 267 195 0 0 0 0 0\n" + "TimerEvent 267 195 0 0 0 0 0\n" + "MouseMoveEvent 270 193 0 0 0 0 0\n" + "MouseMoveEvent 271 192 0 0 0 0 0\n" + "TimerEvent 271 192 0 0 0 0 0\n" + "MouseMoveEvent 273 190 0 0 0 0 0\n" + "MouseMoveEvent 275 188 0 0 0 0 0\n" + "MouseMoveEvent 277 186 0 0 0 0 0\n" + "MouseMoveEvent 280 184 0 0 0 0 0\n" + "MouseMoveEvent 284 180 0 0 0 0 0\n" + "MouseMoveEvent 285 179 0 0 0 0 0\n" + "TimerEvent 285 179 0 0 0 0 0\n" + "MouseMoveEvent 286 178 0 0 0 0 0\n" + "TimerEvent 286 178 0 0 0 0 0\n" + "LeftButtonPressEvent 286 178 0 0 0 0 0\n" + "MouseMoveEvent 285 178 0 0 0 0 0\n" + "MouseMoveEvent 283 178 0 0 0 0 0\n" + "MouseMoveEvent 282 178 0 0 0 0 0\n" + "MouseMoveEvent 281 178 0 0 0 0 0\n" + "MouseMoveEvent 279 178 0 0 0 0 0\n" + "TimerEvent 279 178 0 0 0 0 0\n" + "MouseMoveEvent 278 178 0 0 0 0 0\n" + "MouseMoveEvent 276 178 0 0 0 0 0\n" + "MouseMoveEvent 274 178 0 0 0 0 0\n" + "MouseMoveEvent 272 178 0 0 0 0 0\n" + "MouseMoveEvent 270 178 0 0 0 0 0\n" + "MouseMoveEvent 269 178 0 0 0 0 0\n" + "TimerEvent 269 178 0 0 0 0 0\n" + "MouseMoveEvent 268 178 0 0 0 0 0\n" + "MouseMoveEvent 267 178 0 0 0 0 0\n" + "MouseMoveEvent 265 178 0 0 0 0 0\n" + "MouseMoveEvent 264 178 0 0 0 0 0\n" + "MouseMoveEvent 263 178 0 0 0 0 0\n" + "MouseMoveEvent 260 178 0 0 0 0 0\n" + "TimerEvent 260 178 0 0 0 0 0\n" + "MouseMoveEvent 257 178 0 0 0 0 0\n" + "MouseMoveEvent 254 178 0 0 0 0 0\n" + "MouseMoveEvent 251 178 0 0 0 0 0\n" + "MouseMoveEvent 248 178 0 0 0 0 0\n" + "MouseMoveEvent 246 178 0 0 0 0 0\n" + "MouseMoveEvent 244 178 0 0 0 0 0\n" + "TimerEvent 244 178 0 0 0 0 0\n" + "MouseMoveEvent 243 178 0 0 0 0 0\n" + "MouseMoveEvent 242 178 0 0 0 0 0\n" + "MouseMoveEvent 240 178 0 0 0 0 0\n" + "TimerEvent 240 178 0 0 0 0 0\n" + "MouseMoveEvent 239 178 0 0 0 0 0\n" + "MouseMoveEvent 236 177 0 0 0 0 0\n" + "MouseMoveEvent 233 177 0 0 0 0 0\n" + "MouseMoveEvent 229 177 0 0 0 0 0\n" + "MouseMoveEvent 224 177 0 0 0 0 0\n" + "MouseMoveEvent 217 177 0 0 0 0 0\n" + "TimerEvent 217 177 0 0 0 0 0\n" + "MouseMoveEvent 212 176 0 0 0 0 0\n" + "MouseMoveEvent 209 176 0 0 0 0 0\n" + "MouseMoveEvent 207 176 0 0 0 0 0\n" + "MouseMoveEvent 205 176 0 0 0 0 0\n" + "MouseMoveEvent 204 176 0 0 0 0 0\n" + "TimerEvent 204 176 0 0 0 0 0\n" + "MouseMoveEvent 203 176 0 0 0 0 0\n" + "MouseMoveEvent 202 176 0 0 0 0 0\n" + "MouseMoveEvent 201 176 0 0 0 0 0\n" + "TimerEvent 201 176 0 0 0 0 0\n" + "MouseMoveEvent 200 176 0 0 0 0 0\n" + "MouseMoveEvent 199 176 0 0 0 0 0\n" + "MouseMoveEvent 198 176 0 0 0 0 0\n" + "MouseMoveEvent 197 176 0 0 0 0 0\n" + "MouseMoveEvent 195 177 0 0 0 0 0\n" + "TimerEvent 195 177 0 0 0 0 0\n" + "MouseMoveEvent 194 177 0 0 0 0 0\n" + "TimerEvent 194 177 0 0 0 0 0\n" + "LeftButtonReleaseEvent 194 177 0 0 0 0 0\n" + "MouseMoveEvent 193 178 0 0 0 0 0\n" + "MouseMoveEvent 194 180 0 0 0 0 0\n" + "MouseMoveEvent 195 181 0 0 0 0 0\n" + "MouseMoveEvent 196 183 0 0 0 0 0\n" + "TimerEvent 196 183 0 0 0 0 0\n" + "MouseMoveEvent 197 184 0 0 0 0 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelBackwardEvent 197 184 0 0 0 0 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelBackwardEvent 197 184 0 0 0 1 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelForwardEvent 197 184 0 0 0 0 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelForwardEvent 197 184 0 0 0 1 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelForwardEvent 197 184 0 0 0 0 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelForwardEvent 197 184 0 0 0 1 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelForwardEvent 197 184 0 0 0 0 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseWheelForwardEvent 197 184 0 0 0 1 0\n" + "TimerEvent 197 184 0 0 0 0 0\n" + "MouseMoveEvent 198 184 0 0 0 0 0\n" + "MouseMoveEvent 199 184 0 0 0 0 0\n" + "MouseMoveEvent 203 184 0 0 0 0 0\n" + "MouseMoveEvent 205 184 0 0 0 0 0\n" + "MouseMoveEvent 208 186 0 0 0 0 0\n" + "MouseMoveEvent 210 186 0 0 0 0 0\n" + "TimerEvent 210 186 0 0 0 0 0\n" + "MouseMoveEvent 213 187 0 0 0 0 0\n" + "MouseMoveEvent 219 188 0 0 0 0 0\n" + "MouseMoveEvent 232 191 0 0 0 0 0\n" + "MouseMoveEvent 248 193 0 0 0 0 0\n" + "MouseMoveEvent 261 195 0 0 0 0 0\n" + "MouseMoveEvent 271 196 0 0 0 0 0\n" + "TimerEvent 271 196 0 0 0 0 0\n" + "MouseMoveEvent 275 196 0 0 0 0 0\n" + "MouseMoveEvent 276 197 0 0 0 0 0\n" + "MouseMoveEvent 279 198 0 0 0 0 0\n" + "MouseMoveEvent 280 199 0 0 0 0 0\n" + "TimerEvent 280 199 0 0 0 0 0\n" + "MouseMoveEvent 281 200 0 0 0 0 0\n" + "MouseMoveEvent 281 201 0 0 0 0 0\n" + "MouseMoveEvent 281 202 0 0 0 0 0\n" + "MouseMoveEvent 280 204 0 0 0 0 0\n" + "TimerEvent 280 204 0 0 0 0 0\n" + "MouseMoveEvent 279 205 0 0 0 0 0\n" + "MouseMoveEvent 276 206 0 0 0 0 0\n" + "MouseMoveEvent 274 206 0 0 0 0 0\n" + "MouseMoveEvent 271 208 0 0 0 0 0\n" + "MouseMoveEvent 269 209 0 0 0 0 0\n" + "MouseMoveEvent 266 210 0 0 0 0 0\n" + "TimerEvent 266 210 0 0 0 0 0\n" + "MouseMoveEvent 263 212 0 0 0 0 0\n" + "MouseMoveEvent 262 213 0 0 0 0 0\n" + "MouseMoveEvent 261 214 0 0 0 0 0\n" + "MouseMoveEvent 260 215 0 0 0 0 0\n" + "MouseMoveEvent 259 216 0 0 0 0 0\n" + "MouseMoveEvent 257 218 0 0 0 0 0\n" + "TimerEvent 257 218 0 0 0 0 0\n" + "MouseMoveEvent 256 219 0 0 0 0 0\n" + "MouseMoveEvent 256 220 0 0 0 0 0\n" + "MouseMoveEvent 255 221 0 0 0 0 0\n" + "TimerEvent 255 221 0 0 0 0 0\n" + "LeftButtonPressEvent 255 221 0 0 0 0 0\n" + "MouseMoveEvent 254 222 0 0 0 0 0\n" + "MouseMoveEvent 254 220 0 0 0 0 0\n" + "MouseMoveEvent 254 215 0 0 0 0 0\n" + "MouseMoveEvent 254 207 0 0 0 0 0\n" + "MouseMoveEvent 254 195 0 0 0 0 0\n" + "MouseMoveEvent 254 183 0 0 0 0 0\n" + "TimerEvent 254 183 0 0 0 0 0\n" + "MouseMoveEvent 254 172 0 0 0 0 0\n" + "MouseMoveEvent 254 162 0 0 0 0 0\n" + "MouseMoveEvent 254 151 0 0 0 0 0\n" + "MouseMoveEvent 254 140 0 0 0 0 0\n" + "MouseMoveEvent 254 130 0 0 0 0 0\n" + "MouseMoveEvent 254 117 0 0 0 0 0\n" + "TimerEvent 254 117 0 0 0 0 0\n" + "MouseMoveEvent 254 104 0 0 0 0 0\n" + "MouseMoveEvent 254 92 0 0 0 0 0\n" + "MouseMoveEvent 254 79 0 0 0 0 0\n" + "MouseMoveEvent 254 68 0 0 0 0 0\n" + "MouseMoveEvent 254 57 0 0 0 0 0\n" + "MouseMoveEvent 254 51 0 0 0 0 0\n" + "TimerEvent 254 51 0 0 0 0 0\n" + "MouseMoveEvent 254 46 0 0 0 0 0\n" + "MouseMoveEvent 254 43 0 0 0 0 0\n" + "MouseMoveEvent 254 41 0 0 0 0 0\n" + "MouseMoveEvent 254 40 0 0 0 0 0\n" + "MouseMoveEvent 254 39 0 0 0 0 0\n" + "MouseMoveEvent 254 38 0 0 0 0 0\n" + "TimerEvent 254 38 0 0 0 0 0\n" + "MouseMoveEvent 254 37 0 0 0 0 0\n" + "MouseMoveEvent 254 36 0 0 0 0 0\n" + "MouseMoveEvent 254 35 0 0 0 0 0\n" + "MouseMoveEvent 254 34 0 0 0 0 0\n" + "TimerEvent 254 34 0 0 0 0 0\n" + "MouseMoveEvent 254 33 0 0 0 0 0\n" + "MouseMoveEvent 254 32 0 0 0 0 0\n" + "TimerEvent 254 32 0 0 0 0 0\n" + "MouseMoveEvent 254 34 0 0 0 0 0\n" + "MouseMoveEvent 254 37 0 0 0 0 0\n" + "MouseMoveEvent 254 40 0 0 0 0 0\n" + "MouseMoveEvent 254 44 0 0 0 0 0\n" + "MouseMoveEvent 254 50 0 0 0 0 0\n" + "MouseMoveEvent 254 52 0 0 0 0 0\n" + "TimerEvent 254 52 0 0 0 0 0\n" + "MouseMoveEvent 254 55 0 0 0 0 0\n" + "MouseMoveEvent 254 59 0 0 0 0 0\n" + "MouseMoveEvent 254 64 0 0 0 0 0\n" + "MouseMoveEvent 254 69 0 0 0 0 0\n" + "MouseMoveEvent 254 74 0 0 0 0 0\n" + "MouseMoveEvent 254 80 0 0 0 0 0\n" + "TimerEvent 254 80 0 0 0 0 0\n" + "MouseMoveEvent 254 85 0 0 0 0 0\n" + "MouseMoveEvent 254 90 0 0 0 0 0\n" + "MouseMoveEvent 254 96 0 0 0 0 0\n" + "MouseMoveEvent 254 101 0 0 0 0 0\n" + "MouseMoveEvent 253 107 0 0 0 0 0\n" + "MouseMoveEvent 251 112 0 0 0 0 0\n" + "TimerEvent 251 112 0 0 0 0 0\n" + "MouseMoveEvent 250 117 0 0 0 0 0\n" + "MouseMoveEvent 248 121 0 0 0 0 0\n" + "MouseMoveEvent 248 122 0 0 0 0 0\n" + "MouseMoveEvent 247 125 0 0 0 0 0\n" + "MouseMoveEvent 247 126 0 0 0 0 0\n" + "TimerEvent 247 126 0 0 0 0 0\n" + "MouseMoveEvent 247 127 0 0 0 0 0\n" + "MouseMoveEvent 247 128 0 0 0 0 0\n" + "MouseMoveEvent 247 130 0 0 0 0 0\n" + "MouseMoveEvent 247 131 0 0 0 0 0\n" + "MouseMoveEvent 247 133 0 0 0 0 0\n" + "MouseMoveEvent 247 135 0 0 0 0 0\n" + "TimerEvent 247 135 0 0 0 0 0\n" + "MouseMoveEvent 247 138 0 0 0 0 0\n" + "MouseMoveEvent 247 141 0 0 0 0 0\n" + "MouseMoveEvent 247 145 0 0 0 0 0\n" + "MouseMoveEvent 247 148 0 0 0 0 0\n" + "MouseMoveEvent 247 151 0 0 0 0 0\n" + "MouseMoveEvent 247 155 0 0 0 0 0\n" + "TimerEvent 247 155 0 0 0 0 0\n" + "MouseMoveEvent 247 159 0 0 0 0 0\n" + "MouseMoveEvent 247 161 0 0 0 0 0\n" + "MouseMoveEvent 247 163 0 0 0 0 0\n" + "MouseMoveEvent 246 166 0 0 0 0 0\n" + "MouseMoveEvent 246 168 0 0 0 0 0\n" + "MouseMoveEvent 246 170 0 0 0 0 0\n" + "TimerEvent 246 170 0 0 0 0 0\n" + "MouseMoveEvent 246 172 0 0 0 0 0\n" + "MouseMoveEvent 246 175 0 0 0 0 0\n" + "MouseMoveEvent 246 177 0 0 0 0 0\n" + "MouseMoveEvent 246 180 0 0 0 0 0\n" + "MouseMoveEvent 246 183 0 0 0 0 0\n" + "MouseMoveEvent 246 185 0 0 0 0 0\n" + "TimerEvent 246 185 0 0 0 0 0\n" + "MouseMoveEvent 246 187 0 0 0 0 0\n" + "MouseMoveEvent 246 189 0 0 0 0 0\n" + "MouseMoveEvent 246 192 0 0 0 0 0\n" + "MouseMoveEvent 246 194 0 0 0 0 0\n" + "MouseMoveEvent 246 196 0 0 0 0 0\n" + "MouseMoveEvent 246 198 0 0 0 0 0\n" + "TimerEvent 246 198 0 0 0 0 0\n" + "MouseMoveEvent 246 201 0 0 0 0 0\n" + "MouseMoveEvent 246 202 0 0 0 0 0\n" + "MouseMoveEvent 246 205 0 0 0 0 0\n" + "MouseMoveEvent 246 207 0 0 0 0 0\n" + "MouseMoveEvent 246 209 0 0 0 0 0\n" + "MouseMoveEvent 246 211 0 0 0 0 0\n" + "TimerEvent 246 211 0 0 0 0 0\n" + "MouseMoveEvent 246 214 0 0 0 0 0\n" + "MouseMoveEvent 246 217 0 0 0 0 0\n" + "MouseMoveEvent 246 220 0 0 0 0 0\n" + "MouseMoveEvent 246 222 0 0 0 0 0\n" + "MouseMoveEvent 245 225 0 0 0 0 0\n" + "MouseMoveEvent 245 227 0 0 0 0 0\n" + "TimerEvent 245 227 0 0 0 0 0\n" + "MouseMoveEvent 244 229 0 0 0 0 0\n" + "MouseMoveEvent 244 230 0 0 0 0 0\n" + "MouseMoveEvent 243 233 0 0 0 0 0\n" + "MouseMoveEvent 243 235 0 0 0 0 0\n" + "MouseMoveEvent 242 237 0 0 0 0 0\n" + "MouseMoveEvent 240 240 0 0 0 0 0\n" + "TimerEvent 240 240 0 0 0 0 0\n" + "MouseMoveEvent 240 242 0 0 0 0 0\n" + "MouseMoveEvent 239 244 0 0 0 0 0\n" + "MouseMoveEvent 238 245 0 0 0 0 0\n" + "MouseMoveEvent 237 247 0 0 0 0 0\n" + "MouseMoveEvent 236 248 0 0 0 0 0\n" + "MouseMoveEvent 235 250 0 0 0 0 0\n" + "TimerEvent 235 250 0 0 0 0 0\n" + "MouseMoveEvent 234 251 0 0 0 0 0\n" + "MouseMoveEvent 233 252 0 0 0 0 0\n" + "MouseMoveEvent 232 253 0 0 0 0 0\n" + "MouseMoveEvent 231 255 0 0 0 0 0\n" + "MouseMoveEvent 230 256 0 0 0 0 0\n" + "TimerEvent 230 256 0 0 0 0 0\n" + "MouseMoveEvent 229 257 0 0 0 0 0\n" + "MouseMoveEvent 228 258 0 0 0 0 0\n" + "MouseMoveEvent 227 260 0 0 0 0 0\n" + "MouseMoveEvent 226 261 0 0 0 0 0\n" + "TimerEvent 226 261 0 0 0 0 0\n" + "MouseMoveEvent 225 262 0 0 0 0 0\n" + "MouseMoveEvent 223 262 0 0 0 0 0\n" + "MouseMoveEvent 219 262 0 0 0 0 0\n" + "MouseMoveEvent 215 261 0 0 0 0 0\n" + "MouseMoveEvent 208 259 0 0 0 0 0\n" + "MouseMoveEvent 204 257 0 0 0 0 0\n" + "TimerEvent 204 257 0 0 0 0 0\n" + "MouseMoveEvent 203 256 0 0 0 0 0\n" + "TimerEvent 203 256 0 0 0 0 0\n" + "MouseMoveEvent 202 256 0 0 0 0 0\n" + "MouseMoveEvent 201 256 0 0 0 0 0\n" + "MouseMoveEvent 200 255 0 0 0 0 0\n" + "MouseMoveEvent 199 254 0 0 0 0 0\n" + "MouseMoveEvent 198 251 0 0 0 0 0\n" + "TimerEvent 198 251 0 0 0 0 0\n" + "MouseMoveEvent 196 248 0 0 0 0 0\n" + "MouseMoveEvent 193 245 0 0 0 0 0\n" + "MouseMoveEvent 189 240 0 0 0 0 0\n" + "MouseMoveEvent 185 235 0 0 0 0 0\n" + "MouseMoveEvent 178 228 0 0 0 0 0\n" + "MouseMoveEvent 170 222 0 0 0 0 0\n" + "TimerEvent 170 222 0 0 0 0 0\n" + "MouseMoveEvent 164 216 0 0 0 0 0\n" + "MouseMoveEvent 159 211 0 0 0 0 0\n" + "MouseMoveEvent 154 205 0 0 0 0 0\n" + "MouseMoveEvent 150 201 0 0 0 0 0\n" + "MouseMoveEvent 146 198 0 0 0 0 0\n" + "MouseMoveEvent 142 194 0 0 0 0 0\n" + "TimerEvent 142 194 0 0 0 0 0\n" + "MouseMoveEvent 138 189 0 0 0 0 0\n" + "MouseMoveEvent 133 185 0 0 0 0 0\n" + "MouseMoveEvent 129 177 0 0 0 0 0\n" + "MouseMoveEvent 125 173 0 0 0 0 0\n" + "MouseMoveEvent 123 169 0 0 0 0 0\n" + "MouseMoveEvent 122 165 0 0 0 0 0\n" + "TimerEvent 122 165 0 0 0 0 0\n" + "MouseMoveEvent 120 161 0 0 0 0 0\n" + "MouseMoveEvent 118 157 0 0 0 0 0\n" + "MouseMoveEvent 116 153 0 0 0 0 0\n" + "MouseMoveEvent 113 149 0 0 0 0 0\n" + "MouseMoveEvent 111 145 0 0 0 0 0\n" + "MouseMoveEvent 109 141 0 0 0 0 0\n" + "TimerEvent 109 141 0 0 0 0 0\n" + "MouseMoveEvent 102 137 0 0 0 0 0\n" + "MouseMoveEvent 98 133 0 0 0 0 0\n" + "MouseMoveEvent 94 132 0 0 0 0 0\n" + "MouseMoveEvent 93 131 0 0 0 0 0\n" + "MouseMoveEvent 90 129 0 0 0 0 0\n" + "TimerEvent 90 129 0 0 0 0 0\n" + "MouseMoveEvent 89 129 0 0 0 0 0\n" + "TimerEvent 89 129 0 0 0 0 0\n" + "MouseMoveEvent 89 133 0 0 0 0 0\n" + "MouseMoveEvent 89 137 0 0 0 0 0\n" + "MouseMoveEvent 87 141 0 0 0 0 0\n" + "MouseMoveEvent 85 144 0 0 0 0 0\n" + "TimerEvent 85 144 0 0 0 0 0\n" + "MouseMoveEvent 85 145 0 0 0 0 0\n" + "MouseMoveEvent 84 146 0 0 0 0 0\n" + "MouseMoveEvent 83 147 0 0 0 0 0\n" + "MouseMoveEvent 82 148 0 0 0 0 0\n" + "MouseMoveEvent 81 149 0 0 0 0 0\n" + "MouseMoveEvent 80 150 0 0 0 0 0\n" + "TimerEvent 80 150 0 0 0 0 0\n" + "MouseMoveEvent 79 150 0 0 0 0 0\n" + "MouseMoveEvent 78 150 0 0 0 0 0\n" + "MouseMoveEvent 76 151 0 0 0 0 0\n" + "MouseMoveEvent 74 152 0 0 0 0 0\n" + "MouseMoveEvent 73 152 0 0 0 0 0\n" + "TimerEvent 73 152 0 0 0 0 0\n" + "MouseMoveEvent 71 153 0 0 0 0 0\n" + "MouseMoveEvent 69 154 0 0 0 0 0\n" + "MouseMoveEvent 67 155 0 0 0 0 0\n" + "MouseMoveEvent 66 156 0 0 0 0 0\n" + "MouseMoveEvent 63 157 0 0 0 0 0\n" + "MouseMoveEvent 62 158 0 0 0 0 0\n" + "TimerEvent 62 158 0 0 0 0 0\n" + "MouseMoveEvent 60 159 0 0 0 0 0\n" + "MouseMoveEvent 58 160 0 0 0 0 0\n" + "MouseMoveEvent 56 162 0 0 0 0 0\n" + "MouseMoveEvent 55 163 0 0 0 0 0\n" + "MouseMoveEvent 54 164 0 0 0 0 0\n" + "MouseMoveEvent 52 166 0 0 0 0 0\n" + "TimerEvent 52 166 0 0 0 0 0\n" + "MouseMoveEvent 51 167 0 0 0 0 0\n" + "MouseMoveEvent 50 169 0 0 0 0 0\n" + "MouseMoveEvent 49 170 0 0 0 0 0\n" + "MouseMoveEvent 48 172 0 0 0 0 0\n" + "MouseMoveEvent 48 174 0 0 0 0 0\n" + "MouseMoveEvent 47 176 0 0 0 0 0\n" + "TimerEvent 47 176 0 0 0 0 0\n" + "MouseMoveEvent 47 178 0 0 0 0 0\n" + "MouseMoveEvent 47 179 0 0 0 0 0\n" + "MouseMoveEvent 47 181 0 0 0 0 0\n" + "MouseMoveEvent 47 183 0 0 0 0 0\n" + "MouseMoveEvent 47 184 0 0 0 0 0\n" + "MouseMoveEvent 47 186 0 0 0 0 0\n" + "TimerEvent 47 186 0 0 0 0 0\n" + "MouseMoveEvent 46 188 0 0 0 0 0\n" + "MouseMoveEvent 46 190 0 0 0 0 0\n" + "MouseMoveEvent 45 191 0 0 0 0 0\n" + "MouseMoveEvent 45 193 0 0 0 0 0\n" + "MouseMoveEvent 45 194 0 0 0 0 0\n" + "MouseMoveEvent 45 196 0 0 0 0 0\n" + "TimerEvent 45 196 0 0 0 0 0\n" + "MouseMoveEvent 45 197 0 0 0 0 0\n" + "MouseMoveEvent 45 198 0 0 0 0 0\n" + "MouseMoveEvent 45 199 0 0 0 0 0\n" + "MouseMoveEvent 45 200 0 0 0 0 0\n" + "TimerEvent 45 200 0 0 0 0 0\n" + "MouseMoveEvent 45 201 0 0 0 0 0\n" + "MouseMoveEvent 45 202 0 0 0 0 0\n" + "MouseMoveEvent 45 204 0 0 0 0 0\n" + "MouseMoveEvent 45 205 0 0 0 0 0\n" + "MouseMoveEvent 45 206 0 0 0 0 0\n" + "MouseMoveEvent 45 208 0 0 0 0 0\n" + "TimerEvent 45 208 0 0 0 0 0\n" + "MouseMoveEvent 45 210 0 0 0 0 0\n" + "MouseMoveEvent 45 211 0 0 0 0 0\n" + "MouseMoveEvent 45 213 0 0 0 0 0\n" + "MouseMoveEvent 45 215 0 0 0 0 0\n" + "MouseMoveEvent 46 217 0 0 0 0 0\n" + "MouseMoveEvent 47 219 0 0 0 0 0\n" + "TimerEvent 47 219 0 0 0 0 0\n" + "MouseMoveEvent 47 221 0 0 0 0 0\n" + "MouseMoveEvent 48 223 0 0 0 0 0\n" + "MouseMoveEvent 48 225 0 0 0 0 0\n" + "MouseMoveEvent 48 227 0 0 0 0 0\n" + "MouseMoveEvent 49 228 0 0 0 0 0\n" + "MouseMoveEvent 49 229 0 0 0 0 0\n" + "TimerEvent 49 229 0 0 0 0 0\n" + "MouseMoveEvent 49 230 0 0 0 0 0\n" + "MouseMoveEvent 49 231 0 0 0 0 0\n" + "MouseMoveEvent 49 232 0 0 0 0 0\n" + "MouseMoveEvent 49 234 0 0 0 0 0\n" + "MouseMoveEvent 49 235 0 0 0 0 0\n" + "MouseMoveEvent 50 236 0 0 0 0 0\n" + "TimerEvent 50 236 0 0 0 0 0\n" + "MouseMoveEvent 51 237 0 0 0 0 0\n" + "MouseMoveEvent 52 238 0 0 0 0 0\n" + "MouseMoveEvent 53 239 0 0 0 0 0\n" + "MouseMoveEvent 54 240 0 0 0 0 0\n" + "MouseMoveEvent 55 242 0 0 0 0 0\n" + "MouseMoveEvent 56 243 0 0 0 0 0\n" + "TimerEvent 56 243 0 0 0 0 0\n" + "MouseMoveEvent 57 244 0 0 0 0 0\n" + "MouseMoveEvent 59 246 0 0 0 0 0\n" + "MouseMoveEvent 60 247 0 0 0 0 0\n" + "MouseMoveEvent 62 249 0 0 0 0 0\n" + "MouseMoveEvent 63 250 0 0 0 0 0\n" + "TimerEvent 63 250 0 0 0 0 0\n" + "MouseMoveEvent 64 251 0 0 0 0 0\n" + "MouseMoveEvent 65 252 0 0 0 0 0\n" + "MouseMoveEvent 66 252 0 0 0 0 0\n" + "MouseMoveEvent 67 253 0 0 0 0 0\n" + "MouseMoveEvent 69 253 0 0 0 0 0\n" + "MouseMoveEvent 70 253 0 0 0 0 0\n" + "TimerEvent 70 253 0 0 0 0 0\n" + "MouseMoveEvent 71 254 0 0 0 0 0\n" + "MouseMoveEvent 73 254 0 0 0 0 0\n" + "MouseMoveEvent 75 254 0 0 0 0 0\n" + "MouseMoveEvent 76 255 0 0 0 0 0\n" + "MouseMoveEvent 78 255 0 0 0 0 0\n" + "MouseMoveEvent 79 255 0 0 0 0 0\n" + "TimerEvent 79 255 0 0 0 0 0\n" + "MouseMoveEvent 81 255 0 0 0 0 0\n" + "MouseMoveEvent 83 255 0 0 0 0 0\n" + "MouseMoveEvent 86 256 0 0 0 0 0\n" + "MouseMoveEvent 89 256 0 0 0 0 0\n" + "MouseMoveEvent 94 256 0 0 0 0 0\n" + "MouseMoveEvent 102 257 0 0 0 0 0\n" + "TimerEvent 102 257 0 0 0 0 0\n" + "MouseMoveEvent 110 257 0 0 0 0 0\n" + "MouseMoveEvent 119 260 0 0 0 0 0\n" + "MouseMoveEvent 127 260 0 0 0 0 0\n" + "MouseMoveEvent 134 260 0 0 0 0 0\n" + "MouseMoveEvent 141 261 0 0 0 0 0\n" + "MouseMoveEvent 148 263 0 0 0 0 0\n" + "TimerEvent 148 263 0 0 0 0 0\n" + "MouseMoveEvent 155 263 0 0 0 0 0\n" + "MouseMoveEvent 160 263 0 0 0 0 0\n" + "MouseMoveEvent 166 264 0 0 0 0 0\n" + "MouseMoveEvent 168 264 0 0 0 0 0\n" + "MouseMoveEvent 170 265 0 0 0 0 0\n" + "MouseMoveEvent 171 265 0 0 0 0 0\n" + "TimerEvent 171 265 0 0 0 0 0\n" + "MouseMoveEvent 173 265 0 0 0 0 0\n" + "MouseMoveEvent 175 265 0 0 0 0 0\n" + "MouseMoveEvent 179 265 0 0 0 0 0\n" + "MouseMoveEvent 183 265 0 0 0 0 0\n" + "MouseMoveEvent 188 265 0 0 0 0 0\n" + "MouseMoveEvent 195 265 0 0 0 0 0\n" + "TimerEvent 195 265 0 0 0 0 0\n" + "MouseMoveEvent 202 265 0 0 0 0 0\n" + "MouseMoveEvent 209 265 0 0 0 0 0\n" + "MouseMoveEvent 216 265 0 0 0 0 0\n" + "MouseMoveEvent 223 265 0 0 0 0 0\n" + "MouseMoveEvent 228 265 0 0 0 0 0\n" + "MouseMoveEvent 233 265 0 0 0 0 0\n" + "TimerEvent 233 265 0 0 0 0 0\n" + "MouseMoveEvent 234 265 0 0 0 0 0\n" + "MouseMoveEvent 235 265 0 0 0 0 0\n" + "MouseMoveEvent 236 265 0 0 0 0 0\n" + "TimerEvent 236 265 0 0 0 0 0\n" + "MouseMoveEvent 238 265 0 0 0 0 0\n" + "MouseMoveEvent 240 265 0 0 0 0 0\n" + "MouseMoveEvent 242 265 0 0 0 0 0\n" + "MouseMoveEvent 243 265 0 0 0 0 0\n" + "MouseMoveEvent 245 265 0 0 0 0 0\n" + "MouseMoveEvent 246 265 0 0 0 0 0\n" + "TimerEvent 246 265 0 0 0 0 0\n" + "MouseMoveEvent 249 264 0 0 0 0 0\n" + "MouseMoveEvent 251 263 0 0 0 0 0\n" + "MouseMoveEvent 254 262 0 0 0 0 0\n" + "MouseMoveEvent 257 261 0 0 0 0 0\n" + "MouseMoveEvent 261 260 0 0 0 0 0\n" + "MouseMoveEvent 263 259 0 0 0 0 0\n" + "TimerEvent 263 259 0 0 0 0 0\n" + "MouseMoveEvent 266 259 0 0 0 0 0\n" + "MouseMoveEvent 268 258 0 0 0 0 0\n" + "MouseMoveEvent 269 257 0 0 0 0 0\n" + "MouseMoveEvent 271 256 0 0 0 0 0\n" + "MouseMoveEvent 274 255 0 0 0 0 0\n" + "TimerEvent 274 255 0 0 0 0 0\n" + "MouseMoveEvent 277 253 0 0 0 0 0\n" + "MouseMoveEvent 278 252 0 0 0 0 0\n" + "MouseMoveEvent 279 251 0 0 0 0 0\n" + "MouseMoveEvent 280 250 0 0 0 0 0\n" + "TimerEvent 280 250 0 0 0 0 0\n" + "MouseMoveEvent 281 249 0 0 0 0 0\n" + "MouseMoveEvent 282 248 0 0 0 0 0\n" + "MouseMoveEvent 282 247 0 0 0 0 0\n" + "MouseMoveEvent 282 246 0 0 0 0 0\n" + "MouseMoveEvent 282 243 0 0 0 0 0\n" + "MouseMoveEvent 283 241 0 0 0 0 0\n" + "TimerEvent 283 241 0 0 0 0 0\n" + "MouseMoveEvent 284 239 0 0 0 0 0\n" + "MouseMoveEvent 284 237 0 0 0 0 0\n" + "MouseMoveEvent 284 236 0 0 0 0 0\n" + "MouseMoveEvent 284 234 0 0 0 0 0\n" + "MouseMoveEvent 284 232 0 0 0 0 0\n" + "MouseMoveEvent 285 229 0 0 0 0 0\n" + "TimerEvent 285 229 0 0 0 0 0\n" + "MouseMoveEvent 286 226 0 0 0 0 0\n" + "MouseMoveEvent 286 225 0 0 0 0 0\n" + "MouseMoveEvent 286 223 0 0 0 0 0\n" + "MouseMoveEvent 287 221 0 0 0 0 0\n" + "MouseMoveEvent 287 220 0 0 0 0 0\n" + "MouseMoveEvent 287 218 0 0 0 0 0\n" + "TimerEvent 287 218 0 0 0 0 0\n" + "MouseMoveEvent 287 216 0 0 0 0 0\n" + "MouseMoveEvent 288 214 0 0 0 0 0\n" + "MouseMoveEvent 288 212 0 0 0 0 0\n" + "MouseMoveEvent 288 211 0 0 0 0 0\n" + "MouseMoveEvent 288 209 0 0 0 0 0\n" + "MouseMoveEvent 289 207 0 0 0 0 0\n" + "TimerEvent 289 207 0 0 0 0 0\n" + "MouseMoveEvent 290 205 0 0 0 0 0\n" + "MouseMoveEvent 290 204 0 0 0 0 0\n" + "MouseMoveEvent 291 203 0 0 0 0 0\n" + "MouseMoveEvent 291 202 0 0 0 0 0\n" + "MouseMoveEvent 292 201 0 0 0 0 0\n" + "TimerEvent 292 201 0 0 0 0 0\n" + "MouseMoveEvent 292 200 0 0 0 0 0\n" + "MouseMoveEvent 293 199 0 0 0 0 0\n" + "MouseMoveEvent 294 197 0 0 0 0 0\n" + "MouseMoveEvent 294 195 0 0 0 0 0\n" + "MouseMoveEvent 295 192 0 0 0 0 0\n" + "MouseMoveEvent 296 190 0 0 0 0 0\n" + "TimerEvent 296 190 0 0 0 0 0\n" + "MouseMoveEvent 297 187 0 0 0 0 0\n" + "TimerEvent 297 187 0 0 0 0 0\n" + "LeftButtonReleaseEvent 297 187 0 0 0 0 0\n" + "MouseMoveEvent 296 186 0 0 0 0 0\n" + "MouseMoveEvent 292 186 0 0 0 0 0\n" + "MouseMoveEvent 289 186 0 0 0 0 0\n" + "MouseMoveEvent 283 186 0 0 0 0 0\n" + "MouseMoveEvent 278 185 0 0 0 0 0\n" + "MouseMoveEvent 275 185 0 0 0 0 0\n" + "TimerEvent 275 185 0 0 0 0 0\n" + "MouseMoveEvent 273 184 0 0 0 0 0\n" + "MouseMoveEvent 272 184 0 0 0 0 0\n" + "MouseMoveEvent 268 184 0 0 0 0 0\n" + "MouseMoveEvent 263 184 0 0 0 0 0\n" + "MouseMoveEvent 255 184 0 0 0 0 0\n" + "MouseMoveEvent 244 184 0 0 0 0 0\n" + "TimerEvent 244 184 0 0 0 0 0\n" + "MouseMoveEvent 230 184 0 0 0 0 0\n" + "MouseMoveEvent 216 184 0 0 0 0 0\n" + "MouseMoveEvent 202 187 0 0 0 0 0\n" + "MouseMoveEvent 188 189 0 0 0 0 0\n" + "MouseMoveEvent 177 191 0 0 0 0 0\n" + "MouseMoveEvent 167 193 0 0 0 0 0\n" + "TimerEvent 167 193 0 0 0 0 0\n" + "MouseMoveEvent 159 196 0 0 0 0 0\n" + "MouseMoveEvent 151 199 0 0 0 0 0\n" + "MouseMoveEvent 140 202 0 0 0 0 0\n" + "MouseMoveEvent 132 206 0 0 0 0 0\n" + "MouseMoveEvent 125 208 0 0 0 0 0\n" + "MouseMoveEvent 120 211 0 0 0 0 0\n" + "TimerEvent 120 211 0 0 0 0 0\n" + "MouseMoveEvent 116 214 0 0 0 0 0\n" + "MouseMoveEvent 114 216 0 0 0 0 0\n" + "MouseMoveEvent 113 218 0 0 0 0 0\n" + "MouseMoveEvent 112 222 0 0 0 0 0\n" + "MouseMoveEvent 109 228 0 0 0 0 0\n" + "MouseMoveEvent 109 233 0 0 0 0 0\n" + "TimerEvent 109 233 0 0 0 0 0\n" + "MouseMoveEvent 109 239 0 0 0 0 0\n" + "MouseMoveEvent 109 242 0 0 0 0 0\n" + "MouseMoveEvent 109 245 0 0 0 0 0\n" + "MouseMoveEvent 109 247 0 0 0 0 0\n" + "MouseMoveEvent 109 250 0 0 0 0 0\n" + "MouseMoveEvent 110 252 0 0 0 0 0\n" + "TimerEvent 110 252 0 0 0 0 0\n" + "MouseMoveEvent 111 254 0 0 0 0 0\n" + "MouseMoveEvent 111 255 0 0 0 0 0\n" + "MouseMoveEvent 111 256 0 0 0 0 0\n" + "MouseMoveEvent 111 257 0 0 0 0 0\n" + "MouseMoveEvent 111 258 0 0 0 0 0\n" + "MouseMoveEvent 111 259 0 0 0 0 0\n" + "TimerEvent 111 259 0 0 0 0 0\n" + "MouseMoveEvent 112 260 0 0 0 0 0\n" + "MouseMoveEvent 113 261 0 0 0 0 0\n" + "TimerEvent 113 261 0 0 0 0 0\n" + "MouseMoveEvent 114 261 0 0 0 0 0\n" + "MouseMoveEvent 115 261 0 0 0 0 0\n" + "MouseMoveEvent 117 260 0 0 0 0 0\n" + "MouseMoveEvent 119 258 0 0 0 0 0\n" + "MouseMoveEvent 121 256 0 0 0 0 0\n" + "TimerEvent 121 256 0 0 0 0 0\n" + "MouseMoveEvent 122 255 0 0 0 0 0\n" + "MouseMoveEvent 125 253 0 0 0 0 0\n" + "MouseMoveEvent 128 251 0 0 0 0 0\n" + "MouseMoveEvent 131 249 0 0 0 0 0\n" + "MouseMoveEvent 133 248 0 0 0 0 0\n" + "MouseMoveEvent 134 248 0 0 0 0 0\n" + "TimerEvent 134 248 0 0 0 0 0\n" + "MouseMoveEvent 135 247 0 0 0 0 0\n" + "MouseMoveEvent 136 247 0 0 0 0 0\n" + "MouseMoveEvent 137 247 0 0 0 0 0\n" + "MouseMoveEvent 138 247 0 0 0 0 0\n" + "MouseMoveEvent 139 247 0 0 0 0 0\n" + "TimerEvent 139 247 0 0 0 0 0\n" + "MouseMoveEvent 140 247 0 0 0 0 0\n" + "MouseMoveEvent 141 247 0 0 0 0 0\n" + "MouseMoveEvent 142 247 0 0 0 0 0\n" + "MouseMoveEvent 144 247 0 0 0 0 0\n" + "MouseMoveEvent 145 247 0 0 0 0 0\n" + "TimerEvent 145 247 0 0 0 0 0\n" + "MouseMoveEvent 146 247 0 0 0 0 0\n" + "MouseMoveEvent 147 247 0 0 0 0 0\n" + "MouseMoveEvent 148 248 0 0 0 0 0\n" + "MouseMoveEvent 149 249 0 0 0 0 0\n" + "TimerEvent 149 249 0 0 0 0 0\n" + "MouseMoveEvent 150 250 0 0 0 0 0\n" + "MouseMoveEvent 151 251 0 0 0 0 0\n" + "MouseMoveEvent 152 252 0 0 0 0 0\n" + "MouseMoveEvent 153 253 0 0 0 0 0\n" + "MouseMoveEvent 153 254 0 0 0 0 0\n" + "MouseMoveEvent 154 255 0 0 0 0 0\n" + "TimerEvent 154 255 0 0 0 0 0\n" + "MouseMoveEvent 155 256 0 0 0 0 0\n" + "MouseMoveEvent 156 257 0 0 0 0 0\n" + "TimerEvent 156 257 0 0 0 0 0\n" + "MouseMoveEvent 157 258 0 0 0 0 0\n" + "MouseMoveEvent 157 259 0 0 0 0 0\n" + "TimerEvent 157 259 0 0 0 0 0\n" + "MouseMoveEvent 158 261 0 0 0 0 0\n" + "MouseMoveEvent 159 262 0 0 0 0 0\n" + "MouseMoveEvent 160 263 0 0 0 0 0\n" + "MouseMoveEvent 160 264 0 0 0 0 0\n" + "TimerEvent 160 264 0 0 0 0 0\n" + "MouseMoveEvent 161 265 0 0 0 0 0\n" + "MouseMoveEvent 162 266 0 0 0 0 0\n" + "RightButtonPressEvent 162 266 0 0 0 0 0\n" + "TimerEvent 162 266 0 0 0 0 0\n" + "MouseMoveEvent 162 264 0 0 0 0 0\n" + "MouseMoveEvent 163 260 0 0 0 0 0\n" + "MouseMoveEvent 165 254 0 0 0 0 0\n" + "MouseMoveEvent 165 247 0 0 0 0 0\n" + "MouseMoveEvent 167 239 0 0 0 0 0\n" + "MouseMoveEvent 168 230 0 0 0 0 0\n" + "TimerEvent 168 230 0 0 0 0 0\n" + "MouseMoveEvent 170 220 0 0 0 0 0\n" + "MouseMoveEvent 170 210 0 0 0 0 0\n" + "MouseMoveEvent 172 200 0 0 0 0 0\n" + "MouseMoveEvent 174 190 0 0 0 0 0\n" + "MouseMoveEvent 174 180 0 0 0 0 0\n" + "MouseMoveEvent 175 170 0 0 0 0 0\n" + "TimerEvent 175 170 0 0 0 0 0\n" + "MouseMoveEvent 175 160 0 0 0 0 0\n" + "MouseMoveEvent 175 150 0 0 0 0 0\n" + "MouseMoveEvent 175 140 0 0 0 0 0\n" + "MouseMoveEvent 175 130 0 0 0 0 0\n" + "MouseMoveEvent 175 122 0 0 0 0 0\n" + "MouseMoveEvent 175 113 0 0 0 0 0\n" + "TimerEvent 175 113 0 0 0 0 0\n" + "MouseMoveEvent 175 107 0 0 0 0 0\n" + "MouseMoveEvent 175 103 0 0 0 0 0\n" + "MouseMoveEvent 175 100 0 0 0 0 0\n" + "MouseMoveEvent 176 99 0 0 0 0 0\n" + "MouseMoveEvent 176 98 0 0 0 0 0\n" + "MouseMoveEvent 176 97 0 0 0 0 0\n" + "TimerEvent 176 97 0 0 0 0 0\n" + "MouseMoveEvent 176 96 0 0 0 0 0\n" + "MouseMoveEvent 176 95 0 0 0 0 0\n" + "MouseMoveEvent 176 94 0 0 0 0 0\n" + "MouseMoveEvent 177 92 0 0 0 0 0\n" + "TimerEvent 177 92 0 0 0 0 0\n" + "MouseMoveEvent 178 91 0 0 0 0 0\n" + "MouseMoveEvent 179 90 0 0 0 0 0\n" + "MouseMoveEvent 181 86 0 0 0 0 0\n" + "MouseMoveEvent 183 84 0 0 0 0 0\n" + "MouseMoveEvent 185 82 0 0 0 0 0\n" + "MouseMoveEvent 188 80 0 0 0 0 0\n" + "TimerEvent 188 80 0 0 0 0 0\n" + "MouseMoveEvent 190 79 0 0 0 0 0\n" + "MouseMoveEvent 194 77 0 0 0 0 0\n" + "MouseMoveEvent 197 76 0 0 0 0 0\n" + "MouseMoveEvent 201 75 0 0 0 0 0\n" + "MouseMoveEvent 205 75 0 0 0 0 0\n" + "MouseMoveEvent 210 74 0 0 0 0 0\n" + "TimerEvent 210 74 0 0 0 0 0\n" + "MouseMoveEvent 215 74 0 0 0 0 0\n" + "MouseMoveEvent 221 74 0 0 0 0 0\n" + "MouseMoveEvent 225 74 0 0 0 0 0\n" + "MouseMoveEvent 227 74 0 0 0 0 0\n" + "MouseMoveEvent 230 74 0 0 0 0 0\n" + "MouseMoveEvent 234 74 0 0 0 0 0\n" + "TimerEvent 234 74 0 0 0 0 0\n" + "MouseMoveEvent 237 74 0 0 0 0 0\n" + "MouseMoveEvent 239 74 0 0 0 0 0\n" + "MouseMoveEvent 241 74 0 0 0 0 0\n" + "MouseMoveEvent 243 75 0 0 0 0 0\n" + "MouseMoveEvent 245 75 0 0 0 0 0\n" + "MouseMoveEvent 247 76 0 0 0 0 0\n" + "TimerEvent 247 76 0 0 0 0 0\n" + "MouseMoveEvent 248 76 0 0 0 0 0\n" + "TimerEvent 248 76 0 0 0 0 0\n" + "MouseMoveEvent 250 77 0 0 0 0 0\n" + "MouseMoveEvent 252 77 0 0 0 0 0\n" + "MouseMoveEvent 254 77 0 0 0 0 0\n" + "MouseMoveEvent 255 77 0 0 0 0 0\n" + "MouseMoveEvent 257 78 0 0 0 0 0\n" + "MouseMoveEvent 259 78 0 0 0 0 0\n" + "TimerEvent 259 78 0 0 0 0 0\n" + "MouseMoveEvent 262 78 0 0 0 0 0\n" + "MouseMoveEvent 264 78 0 0 0 0 0\n" + "MouseMoveEvent 265 78 0 0 0 0 0\n" + "MouseMoveEvent 267 79 0 0 0 0 0\n" + "TimerEvent 267 79 0 0 0 0 0\n" + "MouseMoveEvent 269 80 0 0 0 0 0\n" + "TimerEvent 269 80 0 0 0 0 0\n" + "RightButtonReleaseEvent 269 80 0 0 0 0 0\n" + "TimerEvent 269 80 0 0 0 0 0\n" + "MouseMoveEvent 270 81 0 0 0 0 0\n" + "MouseMoveEvent 271 82 0 0 0 0 0\n" + "MouseMoveEvent 273 84 0 0 0 0 0\n" + "MouseMoveEvent 276 87 0 0 0 0 0\n" + "MouseMoveEvent 278 89 0 0 0 0 0\n" + "MouseMoveEvent 280 91 0 0 0 0 0\n" + "TimerEvent 280 91 0 0 0 0 0\n" + "MouseMoveEvent 281 92 0 0 0 0 0\n" + "MouseMoveEvent 284 94 0 0 0 0 0\n" + "MouseMoveEvent 285 95 0 0 0 0 0\n" + "MouseMoveEvent 287 96 0 0 0 0 0\n" + "MouseMoveEvent 289 97 0 0 0 0 0\n" + "MouseMoveEvent 291 98 0 0 0 0 0\n" + "TimerEvent 291 98 0 0 0 0 0\n" + "MouseMoveEvent 292 99 0 0 0 0 0\n" + "MouseMoveEvent 293 100 0 0 0 0 0\n" + "MouseMoveEvent 294 101 0 0 0 0 0\n" + "MouseMoveEvent 295 101 0 0 0 0 0\n" + "TimerEvent 295 101 0 0 0 0 0\n" + "LeftButtonPressEvent 295 101 0 0 0 0 0\n" + "MouseMoveEvent 296 102 0 0 0 0 0\n" + "MouseMoveEvent 294 103 0 0 0 0 0\n" + "MouseMoveEvent 291 104 0 0 0 0 0\n" + "MouseMoveEvent 286 106 0 0 0 0 0\n" + "MouseMoveEvent 282 108 0 0 0 0 0\n" + "MouseMoveEvent 276 109 0 0 0 0 0\n" + "TimerEvent 276 109 0 0 0 0 0\n" + "MouseMoveEvent 271 111 0 0 0 0 0\n" + "MouseMoveEvent 264 112 0 0 0 0 0\n" + "MouseMoveEvent 256 115 0 0 0 0 0\n" + "MouseMoveEvent 249 117 0 0 0 0 0\n" + "MouseMoveEvent 243 119 0 0 0 0 0\n" + "MouseMoveEvent 239 121 0 0 0 0 0\n" + "TimerEvent 239 121 0 0 0 0 0\n" + "MouseMoveEvent 235 123 0 0 0 0 0\n" + "MouseMoveEvent 234 123 0 0 0 0 0\n" + "MouseMoveEvent 233 124 0 0 0 0 0\n" + "MouseMoveEvent 232 124 0 0 0 0 0\n" + "MouseMoveEvent 231 125 0 0 0 0 0\n" + "TimerEvent 231 125 0 0 0 0 0\n" + "MouseMoveEvent 230 125 0 0 0 0 0\n" + "MouseMoveEvent 229 125 0 0 0 0 0\n" + "MouseMoveEvent 228 125 0 0 0 0 0\n" + "MouseMoveEvent 227 126 0 0 0 0 0\n" + "TimerEvent 227 126 0 0 0 0 0\n" + "MouseMoveEvent 225 126 0 0 0 0 0\n" + "MouseMoveEvent 223 127 0 0 0 0 0\n" + "MouseMoveEvent 222 127 0 0 0 0 0\n" + "MouseMoveEvent 220 128 0 0 0 0 0\n" + "MouseMoveEvent 219 128 0 0 0 0 0\n" + "MouseMoveEvent 217 129 0 0 0 0 0\n" + "TimerEvent 217 129 0 0 0 0 0\n" + "MouseMoveEvent 216 129 0 0 0 0 0\n" + "MouseMoveEvent 214 130 0 0 0 0 0\n" + "MouseMoveEvent 212 131 0 0 0 0 0\n" + "TimerEvent 212 131 0 0 0 0 0\n" + "MouseMoveEvent 211 131 0 0 0 0 0\n" + "MouseMoveEvent 210 132 0 0 0 0 0\n" + "MouseMoveEvent 209 133 0 0 0 0 0\n" + "TimerEvent 209 133 0 0 0 0 0\n" + "MouseMoveEvent 208 134 0 0 0 0 0\n" + "MouseMoveEvent 206 135 0 0 0 0 0\n" + "TimerEvent 206 135 0 0 0 0 0\n" + "MouseMoveEvent 205 136 0 0 0 0 0\n" + "MouseMoveEvent 204 137 0 0 0 0 0\n" + "MouseMoveEvent 203 138 0 0 0 0 0\n" + "TimerEvent 203 138 0 0 0 0 0\n" + "MouseMoveEvent 201 139 0 0 0 0 0\n" + "LeftButtonReleaseEvent 201 139 0 0 0 0 0\n" + "MouseMoveEvent 200 139 0 0 0 0 0\n" + "MouseMoveEvent 198 139 0 0 0 0 0\n" + "MouseMoveEvent 195 140 0 0 0 0 0\n" + "MouseMoveEvent 189 141 0 0 0 0 0\n" + "MouseMoveEvent 180 143 0 0 0 0 0\n" + "TimerEvent 180 143 0 0 0 0 0\n" + "MouseMoveEvent 166 144 0 0 0 0 0\n" + "MouseMoveEvent 152 146 0 0 0 0 0\n" + "MouseMoveEvent 138 148 0 0 0 0 0\n" + "MouseMoveEvent 126 150 0 0 0 0 0\n" + "MouseMoveEvent 118 152 0 0 0 0 0\n" + "MouseMoveEvent 111 152 0 0 0 0 0\n" + "TimerEvent 111 152 0 0 0 0 0\n" + "MouseMoveEvent 110 153 0 0 0 0 0\n" + "MouseMoveEvent 109 154 0 0 0 0 0\n" + "MouseMoveEvent 108 155 0 0 0 0 0\n" + "TimerEvent 108 155 0 0 0 0 0\n" + "MouseMoveEvent 108 156 0 0 0 0 0\n" + "MouseMoveEvent 108 157 0 0 0 0 0\n" + "MouseMoveEvent 108 158 0 0 0 0 0\n" + "MouseMoveEvent 108 159 0 0 0 0 0\n" + "MouseMoveEvent 108 160 0 0 0 0 0\n" + "MouseMoveEvent 108 161 0 0 0 0 0\n" + "TimerEvent 108 161 0 0 0 0 0\n" + "MouseMoveEvent 108 162 0 0 0 0 0\n" + "MouseMoveEvent 108 163 0 0 0 0 0\n" + "MouseMoveEvent 108 164 0 0 0 0 0\n" + "MouseMoveEvent 108 165 0 0 0 0 0\n" + "MouseMoveEvent 108 166 0 0 0 0 0\n" + "MouseMoveEvent 108 167 0 0 0 0 0\n" + "TimerEvent 108 167 0 0 0 0 0\n" + "MouseMoveEvent 108 168 0 0 0 0 0\n" + "MouseMoveEvent 108 169 0 0 0 0 0\n" + "MouseMoveEvent 109 170 0 0 0 0 0\n" + "MouseMoveEvent 110 171 0 0 0 0 0\n" + "TimerEvent 110 171 0 0 0 0 0\n" + "MouseMoveEvent 111 172 0 0 0 0 0\n" + "MouseMoveEvent 112 173 0 0 0 0 0\n" + "MouseMoveEvent 113 174 0 0 0 0 0\n" + "MouseMoveEvent 114 174 0 0 0 0 0\n" + "TimerEvent 114 174 0 0 0 0 0\n" + "MouseMoveEvent 115 174 0 0 0 0 0\n" + "MouseMoveEvent 116 175 0 0 0 0 0\n" + "TimerEvent 116 175 0 0 0 0 0\n" + "MouseMoveEvent 116 176 0 0 0 0 0\n" + "MouseMoveEvent 117 177 0 0 0 0 0\n" + "MouseMoveEvent 117 178 0 0 0 0 0\n" + "MouseMoveEvent 117 179 0 0 0 0 0\n" + "MouseMoveEvent 117 181 0 0 0 0 0\n" + "TimerEvent 117 181 0 0 0 0 0\n" + "MouseMoveEvent 117 182 0 0 0 0 0\n" + "MouseMoveEvent 117 183 0 0 0 0 0\n" + "MouseMoveEvent 117 184 0 0 0 0 0\n" + "MouseMoveEvent 117 185 0 0 0 0 0\n" + "MouseMoveEvent 117 187 0 0 0 0 0\n" + "MouseMoveEvent 117 188 0 0 0 0 0\n" + "TimerEvent 117 188 0 0 0 0 0\n" + "MouseMoveEvent 117 189 0 0 0 0 0\n" + "MouseMoveEvent 117 190 0 0 0 0 0\n" + "MouseMoveEvent 117 192 0 0 0 0 0\n" + "MouseMoveEvent 117 193 0 0 0 0 0\n" + "TimerEvent 117 193 0 0 0 0 0\n" + "MouseMoveEvent 117 194 0 0 0 0 0\n" + "MouseMoveEvent 117 195 0 0 0 0 0\n" + "MouseMoveEvent 117 196 0 0 0 0 0\n" + "TimerEvent 117 196 0 0 0 0 0\n" + "MouseMoveEvent 117 197 0 0 0 0 0\n" + "MouseMoveEvent 118 198 0 0 0 0 0\n" + "TimerEvent 118 198 0 0 0 0 0\n" + "MouseMoveEvent 118 197 0 0 0 0 0\n" + "MouseMoveEvent 118 196 0 0 0 0 0\n" + "TimerEvent 118 196 0 0 0 0 0\n" + "MouseMoveEvent 119 195 0 0 0 0 0\n" + "TimerEvent 119 195 0 0 0 0 0\n" + "MouseMoveEvent 120 194 0 0 0 0 0\n" + "MouseMoveEvent 121 195 0 0 0 0 0\n" + "TimerEvent 121 195 0 0 0 0 0\n"; //---------------------------------------------------------------------------- -int TestChartXYInvertedAxis( int argc, char * argv[] ) +int TestChartXYInvertedAxis(int argc, char* argv[]) { // Set up a 2D scene, add an XY chart to it vtkNew view; @@ -1529,7 +1527,7 @@ int TestChartXYInvertedAxis( int argc, char * argv[] ) table->AddColumn(arr1); // Test charting with a few more points... int numPoints = 69; - float inc = 7.5 / (numPoints-1); + float inc = 7.5 / (numPoints - 1); table->SetNumberOfRows(numPoints); for (int i = 0; i < numPoints; ++i) { @@ -1541,7 +1539,7 @@ int TestChartXYInvertedAxis( int argc, char * argv[] ) } // Add multiple line plots, setting the colors etc - vtkPlot *line = chart->AddPlot(vtkChart::LINE); + vtkPlot* line = chart->AddPlot(vtkChart::LINE); line->SetInputData(table, 0, 1); line->SetColor(0, 255, 0, 255); line->SetWidth(1.0); @@ -1564,7 +1562,6 @@ int TestChartXYInvertedAxis( int argc, char * argv[] ) view->GetRenderWindow()->SetMultiSamples(0); view->GetInteractor()->Initialize(); - return vtkTesting::InteractorEventLoop(argc, argv, - view->GetInteractor(), - TestChartXYInvertedAxisLog); + return vtkTesting::InteractorEventLoop( + argc, argv, view->GetInteractor(), TestChartXYInvertedAxisLog); } diff --git a/Charts/Core/Testing/Cxx/TestChartXYZ.cxx b/Charts/Core/Testing/Cxx/TestChartXYZ.cxx index 32058736c1..ca243898c3 100644 --- a/Charts/Core/Testing/Cxx/TestChartXYZ.cxx +++ b/Charts/Core/Testing/Cxx/TestChartXYZ.cxx @@ -32,24 +32,22 @@ namespace { static double angle = 0; -void ProcessEvents(vtkObject *caller, unsigned long, - void *clientData, void *callerData) +void ProcessEvents(vtkObject* caller, unsigned long, void* clientData, void* callerData) { - vtkChartXYZ *chart = reinterpret_cast(clientData); - vtkRenderWindowInteractor *interactor = - reinterpret_cast(caller); + vtkChartXYZ* chart = reinterpret_cast(clientData); + vtkRenderWindowInteractor* interactor = reinterpret_cast(caller); angle += 2; chart->SetAngle(angle); interactor->Render(); if (angle >= 90) { - int timerId = *reinterpret_cast(callerData); + int timerId = *reinterpret_cast(callerData); interactor->DestroyTimer(timerId); } } } // End of anonymous namespace. -int TestChartXYZ(int , char * []) +int TestChartXYZ(int, char*[]) { // Now the chart vtkNew chart; @@ -81,7 +79,7 @@ int TestChartXYZ(int , char * []) table->AddColumn(arrS); // Test charting with a few more points... int numPoints = 69; - float inc = 7.5 / (numPoints-1); + float inc = 7.5 / (numPoints - 1); table->SetNumberOfRows(numPoints); for (int i = 0; i < numPoints; ++i) { @@ -90,16 +88,16 @@ int TestChartXYZ(int , char * []) table->SetValue(i, 2, sin(i * inc) + 0.0); } - //chart->SetAroundX(true); + // chart->SetAroundX(true); // Add the three dimensions we are interested in visualizing. vtkNew plot; plot->SetInputData(table, "X Axis", "Sine", "Cosine"); chart->AddPlot(plot); const vtkColor4ub axisColor(20, 200, 30); chart->SetAxisColor(axisColor); - chart->GetAxis(0)->SetUnscaledRange(-0.1,7.6); - chart->GetAxis(1)->SetUnscaledRange(-1.1,1.1); - chart->GetAxis(2)->SetUnscaledRange(-1.1,1.1); + chart->GetAxis(0)->SetUnscaledRange(-0.1, 7.6); + chart->GetAxis(1)->SetUnscaledRange(-1.1, 1.1); + chart->GetAxis(2)->SetUnscaledRange(-1.1, 1.1); chart->RecalculateTransform(); // We want a duplicate, that does not move. @@ -114,8 +112,7 @@ int TestChartXYZ(int , char * []) vtkNew callback; callback->SetClientData(chart); callback->SetCallback(::ProcessEvents); - view->GetInteractor()->AddObserver(vtkCommand::TimerEvent, callback, - 0); + view->GetInteractor()->AddObserver(vtkCommand::TimerEvent, callback, 0); view->GetInteractor()->CreateRepeatingTimer(1000 / 25); view->GetInteractor()->Start(); diff --git a/Charts/Core/Testing/Cxx/TestChartsOn3D.cxx b/Charts/Core/Testing/Cxx/TestChartsOn3D.cxx index 8f6b3b1056..a59eb41176 100644 --- a/Charts/Core/Testing/Cxx/TestChartsOn3D.cxx +++ b/Charts/Core/Testing/Cxx/TestChartsOn3D.cxx @@ -30,7 +30,7 @@ #include "vtkTable.h" //---------------------------------------------------------------------------- -int TestChartsOn3D(int , char * []) +int TestChartsOn3D(int, char*[]) { vtkNew renwin; @@ -70,7 +70,7 @@ int TestChartsOn3D(int , char * []) chartScene->AddItem(chart); chartActor->SetScene(chartScene); - //both needed + // both needed renderer->AddActor(chartActor); chartScene->SetRenderer(renderer); @@ -90,7 +90,7 @@ int TestChartsOn3D(int , char * []) table->AddColumn(arrT); // Test charting with a few more points... int numPoints = 69; - float inc = 7.5 / (numPoints-1); + float inc = 7.5 / (numPoints - 1); table->SetNumberOfRows(numPoints); table->SetNumberOfRows(numPoints); for (int i = 0; i < numPoints; ++i) @@ -102,7 +102,7 @@ int TestChartsOn3D(int , char * []) } // Add multiple line plots, setting the colors etc - vtkPlot *points = chart->AddPlot(vtkChart::POINTS); + vtkPlot* points = chart->AddPlot(vtkChart::POINTS); points->SetInputData(table, 0, 1); points->SetColor(0, 0, 0, 255); points->SetWidth(1.0); diff --git a/Charts/Core/Testing/Cxx/TestColorTransferFunction.cxx b/Charts/Core/Testing/Cxx/TestColorTransferFunction.cxx index 3fd7b33c64..3379007137 100644 --- a/Charts/Core/Testing/Cxx/TestColorTransferFunction.cxx +++ b/Charts/Core/Testing/Cxx/TestColorTransferFunction.cxx @@ -28,11 +28,10 @@ #include "vtkSmartPointer.h" //---------------------------------------------------------------------------- -int TestColorTransferFunction(int , char * []) +int TestColorTransferFunction(int, char*[]) { // Set up a 2D scene, add an XY chart to it - vtkSmartPointer view = - vtkSmartPointer::New(); + vtkSmartPointer view = vtkSmartPointer::New(); view->GetRenderer()->SetBackground(1.0, 1.0, 1.0); view->GetRenderWindow()->SetSize(400, 300); vtkSmartPointer chart = vtkSmartPointer::New(); @@ -41,9 +40,9 @@ int TestColorTransferFunction(int , char * []) vtkSmartPointer colorTransferFunction = vtkSmartPointer::New(); - colorTransferFunction->AddHSVSegment(50.,0.,1.,1.,85.,0.3333,1.,1.); - colorTransferFunction->AddHSVSegment(85.,0.3333,1.,1.,170.,0.6666,1.,1.); - colorTransferFunction->AddHSVSegment(170.,0.6666,1.,1.,200.,0.,1.,1.); + colorTransferFunction->AddHSVSegment(50., 0., 1., 1., 85., 0.3333, 1., 1.); + colorTransferFunction->AddHSVSegment(85., 0.3333, 1., 1., 170., 0.6666, 1., 1.); + colorTransferFunction->AddHSVSegment(170., 0.6666, 1., 1., 200., 0., 1., 1.); colorTransferFunction->Build(); diff --git a/Charts/Core/Testing/Cxx/TestContext.cxx b/Charts/Core/Testing/Cxx/TestContext.cxx index 6d035ee1fa..81385367e1 100644 --- a/Charts/Core/Testing/Cxx/TestContext.cxx +++ b/Charts/Core/Testing/Cxx/TestContext.cxx @@ -36,14 +36,14 @@ class ContextTest : public vtkContextItem { public: - static ContextTest *New(); + static ContextTest* New(); vtkTypeMacro(ContextTest, vtkContextItem); // Paint event for the chart, called whenever the chart needs to be drawn - bool Paint(vtkContext2D *painter) override; + bool Paint(vtkContext2D* painter) override; }; //---------------------------------------------------------------------------- -int TestContext( int, char * [] ) +int TestContext(int, char*[]) { // Set up a 2D context view, context test object and add it to the scene vtkNew view; @@ -54,7 +54,7 @@ int TestContext( int, char * [] ) // Force the use of the freetype based rendering strategy vtkOpenGLContextDevice2D::SafeDownCast(view->GetContext()->GetDevice()) - ->SetStringRendererToFreeType(); + ->SetStringRendererToFreeType(); view->GetRenderWindow()->SetMultiSamples(0); view->GetInteractor()->Initialize(); @@ -65,7 +65,7 @@ int TestContext( int, char * [] ) // Make our new derived class to draw a diagram vtkStandardNewMacro(ContextTest); // This function aims to test the primitives provided by the 2D API. -bool ContextTest::Paint(vtkContext2D *painter) +bool ContextTest::Paint(vtkContext2D* painter) { // Test the string drawing functionality of the context painter->GetTextProp()->SetVerticalJustificationToCentered(); @@ -80,11 +80,9 @@ bool ContextTest::Paint(vtkContext2D *painter) // Draw some individual lines of different thicknesses. for (int i = 0; i < 10; ++i) { - painter->GetPen()->SetColor(255, - static_cast(float(i)*25.0), - 0); + painter->GetPen()->SetColor(255, static_cast(float(i) * 25.0), 0); painter->GetPen()->SetWidth(1.0 + float(i)); - painter->DrawLine(10, 50 + float(i)*10, 60, 50 + float(i)*10); + painter->DrawLine(10, 50 + float(i) * 10, 60, 50 + float(i) * 10); } // Use the draw lines function now to draw a shape. @@ -92,8 +90,7 @@ bool ContextTest::Paint(vtkContext2D *painter) points->SetNumberOfPoints(30); for (int i = 0; i < 30; ++i) { - double point[2] = { float(i) * 25.0 + 10.0, - sin(float(i) / 5.0) * 100.0 + 200.0 }; + double point[2] = { float(i) * 25.0 + 10.0, sin(float(i) / 5.0) * 100.0 + 200.0 }; points->SetPoint(i, point); } painter->GetPen()->SetColor(0, 255, 0); @@ -109,19 +106,17 @@ bool ContextTest::Paint(vtkContext2D *painter) painter->DrawPoint(790, 590); // Test the markers - float markerPoints[10*2]; - unsigned char markerColors[10*4]; + float markerPoints[10 * 2]; + unsigned char markerColors[10 * 4]; for (int i = 0; i < 10; ++i) { - markerPoints[2 * i] = 500.0 + i * 30.0; + markerPoints[2 * i] = 500.0 + i * 30.0; markerPoints[2 * i + 1] = 20 * sin(markerPoints[2 * i]) + 375.0; - markerColors[4 * i] = static_cast(255 * i / 10.0); - markerColors[4 * i + 1] = - static_cast(255 * (1.0 - i / 10.0)); + markerColors[4 * i] = static_cast(255 * i / 10.0); + markerColors[4 * i + 1] = static_cast(255 * (1.0 - i / 10.0)); markerColors[4 * i + 2] = static_cast(255 * (0.3)); - markerColors[4 * i + 3] = - static_cast(255 * (1.0 - ((i / 10.0) * 0.25))); + markerColors[4 * i + 3] = static_cast(255 * (1.0 - ((i / 10.0) * 0.25))); } for (int style = VTK_MARKER_NONE + 1; style < VTK_MARKER_UNKNOWN; ++style) @@ -136,17 +131,15 @@ bool ContextTest::Paint(vtkContext2D *painter) painter->DrawMarkers(style, false, markerPoints, 10, markerColors, 4); // Highlight the middle 4 points painter->GetPen()->SetColorF(0.9, 0.8, 0.1, 0.5); - painter->DrawMarkers(style, true, markerPoints + 3*2, 4); + painter->DrawMarkers(style, true, markerPoints + 3 * 2, 4); } // Draw some individual lines of different thicknesses. for (int i = 0; i < 10; ++i) { - painter->GetPen()->SetColor(0, - static_cast(float(i)*25.0), - 255, 255); + painter->GetPen()->SetColor(0, static_cast(float(i) * 25.0), 255, 255); painter->GetPen()->SetWidth(1.0 + float(i)); - painter->DrawPoint(75, 50 + float(i)*10); + painter->DrawPoint(75, 50 + float(i) * 10); } painter->GetPen()->SetColor(0, 0, 255); @@ -163,8 +156,7 @@ bool ContextTest::Paint(vtkContext2D *painter) painter->GetPen()->SetColor(159, 0, 255); painter->GetPen()->SetWidth(1.0); painter->GetBrush()->SetColor(100, 55, 0, 200); - painter->DrawQuad(350, 50, 375, 150, - 525, 199, 666, 45); + painter->DrawQuad(350, 50, 375, 150, 525, 199, 666, 45); // Now to test out the transform... vtkNew transform; diff --git a/Charts/Core/Testing/Cxx/TestContextArea.cxx b/Charts/Core/Testing/Cxx/TestContextArea.cxx index a05667e9cf..b5885819c3 100644 --- a/Charts/Core/Testing/Cxx/TestContextArea.cxx +++ b/Charts/Core/Testing/Cxx/TestContextArea.cxx @@ -39,14 +39,13 @@ #include "vtkTextProperty.h" //---------------------------------------------------------------------------- -int TestContextArea(int argc, char *argv[]) +int TestContextArea(int argc, char* argv[]) { // Prepare some data for plotting: - char* fname = - vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); vtkNew demReader; demReader->SetFileName(fname); - delete [] fname; + delete[] fname; // Get dataset metadata: demReader->Update(); @@ -116,8 +115,8 @@ int TestContextArea(int argc, char *argv[]) view->GetInteractor()->Initialize(); vtkNew area; - area->SetDrawAreaBounds(vtkRectd(bounds.GetBound(0), bounds.GetBound(2), - bounds.GetLength(0), bounds.GetLength(1))); + area->SetDrawAreaBounds( + vtkRectd(bounds.GetBound(0), bounds.GetBound(2), bounds.GetLength(0), bounds.GetLength(1))); area->GetAxis(vtkAxis::TOP)->SetTitle("Top Axis"); area->GetAxis(vtkAxis::BOTTOM)->SetTitle("Bottom Axis"); @@ -126,7 +125,7 @@ int TestContextArea(int argc, char *argv[]) for (int i = 0; i < 4; ++i) { - vtkAxis *axis = area->GetAxis(static_cast(i)); + vtkAxis* axis = area->GetAxis(static_cast(i)); axis->GetLabelProperties()->SetColor(.6, .6, .9); axis->GetTitleProperties()->SetColor(.6, .6, .9); axis->GetPen()->SetColor(.6 * 255, .6 * 255, .9 * 255, 255); diff --git a/Charts/Core/Testing/Cxx/TestContextAreaFixedAspect.cxx b/Charts/Core/Testing/Cxx/TestContextAreaFixedAspect.cxx index 84485e67f4..0f3c54d425 100644 --- a/Charts/Core/Testing/Cxx/TestContextAreaFixedAspect.cxx +++ b/Charts/Core/Testing/Cxx/TestContextAreaFixedAspect.cxx @@ -39,14 +39,13 @@ #include "vtkTextProperty.h" //---------------------------------------------------------------------------- -int TestContextAreaFixedAspect(int argc, char *argv[]) +int TestContextAreaFixedAspect(int argc, char* argv[]) { // Prepare some data for plotting: - char* fname = - vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); vtkNew demReader; demReader->SetFileName(fname); - delete [] fname; + delete[] fname; // Get dataset metadata: demReader->Update(); @@ -116,8 +115,8 @@ int TestContextAreaFixedAspect(int argc, char *argv[]) view->GetInteractor()->Initialize(); vtkNew area; - area->SetDrawAreaBounds(vtkRectd(bounds.GetBound(0), bounds.GetBound(2), - bounds.GetLength(0), bounds.GetLength(1))); + area->SetDrawAreaBounds( + vtkRectd(bounds.GetBound(0), bounds.GetBound(2), bounds.GetLength(0), bounds.GetLength(1))); area->SetFixedAspect(bounds.GetLength(0) / bounds.GetLength(1)); area->GetAxis(vtkAxis::TOP)->SetTitle("Top Axis"); @@ -127,7 +126,7 @@ int TestContextAreaFixedAspect(int argc, char *argv[]) for (int i = 0; i < 4; ++i) { - vtkAxis *axis = area->GetAxis(static_cast(i)); + vtkAxis* axis = area->GetAxis(static_cast(i)); axis->GetLabelProperties()->SetColor(.6, .6, .9); axis->GetTitleProperties()->SetColor(.6, .6, .9); axis->GetPen()->SetColor(.6 * 255, .6 * 255, .9 * 255, 255); diff --git a/Charts/Core/Testing/Cxx/TestContextAreaFixedMargins.cxx b/Charts/Core/Testing/Cxx/TestContextAreaFixedMargins.cxx index 5aea0340e7..fffee664fb 100644 --- a/Charts/Core/Testing/Cxx/TestContextAreaFixedMargins.cxx +++ b/Charts/Core/Testing/Cxx/TestContextAreaFixedMargins.cxx @@ -39,14 +39,13 @@ #include "vtkTextProperty.h" //---------------------------------------------------------------------------- -int TestContextAreaFixedMargins(int argc, char *argv[]) +int TestContextAreaFixedMargins(int argc, char* argv[]) { // Prepare some data for plotting: - char* fname = - vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); vtkNew demReader; demReader->SetFileName(fname); - delete [] fname; + delete[] fname; // Get dataset metadata: demReader->Update(); @@ -116,8 +115,8 @@ int TestContextAreaFixedMargins(int argc, char *argv[]) view->GetInteractor()->Initialize(); vtkNew area; - area->SetDrawAreaBounds(vtkRectd(bounds.GetBound(0), bounds.GetBound(2), - bounds.GetLength(0), bounds.GetLength(1))); + area->SetDrawAreaBounds( + vtkRectd(bounds.GetBound(0), bounds.GetBound(2), bounds.GetLength(0), bounds.GetLength(1))); area->SetFixedMargins(25, 50, 100, 200); area->GetAxis(vtkAxis::TOP)->SetTitle("Top Axis"); @@ -127,7 +126,7 @@ int TestContextAreaFixedMargins(int argc, char *argv[]) for (int i = 0; i < 4; ++i) { - vtkAxis *axis = area->GetAxis(static_cast(i)); + vtkAxis* axis = area->GetAxis(static_cast(i)); axis->GetLabelProperties()->SetColor(.6, .6, .9); axis->GetTitleProperties()->SetColor(.6, .6, .9); axis->GetPen()->SetColor(.6 * 255, .6 * 255, .9 * 255, 255); diff --git a/Charts/Core/Testing/Cxx/TestContextAreaFixedRect.cxx b/Charts/Core/Testing/Cxx/TestContextAreaFixedRect.cxx index b25e70e80c..296180d19c 100644 --- a/Charts/Core/Testing/Cxx/TestContextAreaFixedRect.cxx +++ b/Charts/Core/Testing/Cxx/TestContextAreaFixedRect.cxx @@ -39,14 +39,13 @@ #include "vtkTextProperty.h" //---------------------------------------------------------------------------- -int TestContextAreaFixedRect(int argc, char *argv[]) +int TestContextAreaFixedRect(int argc, char* argv[]) { // Prepare some data for plotting: - char* fname = - vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/SainteHelens.dem"); vtkNew demReader; demReader->SetFileName(fname); - delete [] fname; + delete[] fname; // Get dataset metadata: demReader->Update(); @@ -116,8 +115,8 @@ int TestContextAreaFixedRect(int argc, char *argv[]) view->GetInteractor()->Initialize(); vtkNew area; - area->SetDrawAreaBounds(vtkRectd(bounds.GetBound(0), bounds.GetBound(2), - bounds.GetLength(0), bounds.GetLength(1))); + area->SetDrawAreaBounds( + vtkRectd(bounds.GetBound(0), bounds.GetBound(2), bounds.GetLength(0), bounds.GetLength(1))); area->SetFixedRect(100, 50, 200, 400); area->GetAxis(vtkAxis::TOP)->SetTitle("Top Axis"); @@ -127,7 +126,7 @@ int TestContextAreaFixedRect(int argc, char *argv[]) for (int i = 0; i < 4; ++i) { - vtkAxis *axis = area->GetAxis(static_cast(i)); + vtkAxis* axis = area->GetAxis(static_cast(i)); axis->GetLabelProperties()->SetColor(.6, .6, .9); axis->GetTitleProperties()->SetColor(.6, .6, .9); axis->GetPen()->SetColor(.6 * 255, .6 * 255, .9 * 255, 255); diff --git a/Charts/Core/Testing/Cxx/TestContextImage.cxx b/Charts/Core/Testing/Cxx/TestContextImage.cxx index c711bb0c22..400b31a707 100644 --- a/Charts/Core/Testing/Cxx/TestContextImage.cxx +++ b/Charts/Core/Testing/Cxx/TestContextImage.cxx @@ -29,10 +29,9 @@ #include "vtkTestUtilities.h" //---------------------------------------------------------------------------- -int TestContextImage(int argc, char * argv []) +int TestContextImage(int argc, char* argv[]) { - char* logo = vtkTestUtilities::ExpandDataFileName(argc, argv, - "Data/vtk.png"); + char* logo = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/vtk.png"); // Set up a 2D context view, context test object and add it to the scene vtkNew view; @@ -50,6 +49,6 @@ int TestContextImage(int argc, char * argv []) view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); - delete []logo; + delete[] logo; return EXIT_SUCCESS; } diff --git a/Charts/Core/Testing/Cxx/TestContextItemStacking.cxx b/Charts/Core/Testing/Cxx/TestContextItemStacking.cxx index 647cfe1a7c..a05a69370e 100644 --- a/Charts/Core/Testing/Cxx/TestContextItemStacking.cxx +++ b/Charts/Core/Testing/Cxx/TestContextItemStacking.cxx @@ -24,7 +24,7 @@ #include "vtkSmartPointer.h" //---------------------------------------------------------------------------- -int TestContextItemStacking(int ,char * [] ) +int TestContextItemStacking(int, char*[]) { // Set up a 2D context view, context test object and add it to the scene vtkNew view; @@ -36,7 +36,7 @@ int TestContextItemStacking(int ,char * [] ) int i = 0; int s = 120; - int step = s/3; + int step = s / 3; vtkNew test1; test1->SetDimensions(i, i, s, s); test1->SetLabel("1"); @@ -81,13 +81,12 @@ int TestContextItemStacking(int ,char * [] ) view->GetScene()->AddItem(rootItem); // Check indexes - if (index1 != 0 || index2 != 1 || index3 != 2 || index4 != 3 || - index41 != 0 || index411 != 0 || index42 != 1 || index5 != 4) + if (index1 != 0 || index2 != 1 || index3 != 2 || index4 != 3 || index41 != 0 || index411 != 0 || + index42 != 1 || index5 != 4) { - std::cerr << "AddItem, bad indexes: " - << index1 << ", " << index2 << ", " << index3 << ", " - << index4 << ", " << index41 << ", " << index411 << ", " - << index42 << ", " << index5 << std::endl; + std::cerr << "AddItem, bad indexes: " << index1 << ", " << index2 << ", " << index3 << ", " + << index4 << ", " << index41 << ", " << index411 << ", " << index42 << ", " << index5 + << std::endl; return EXIT_FAILURE; } // Restack item 3 under all items @@ -98,10 +97,9 @@ int TestContextItemStacking(int ,char * [] ) index4 = rootItem->GetItemIndex(test4); if (res != 0 || index1 != 1 || index2 != 2 || index3 != 0 || index4 != 3) { - std::cerr << "Lower, bad indexes: " << res << "->" - << index1 << ", " << index2 << ", " << index3 << ", " - << index4 << ", " << index41 << ", " << index411 << ", " - << index42 << ", " << index5 << std::endl; + std::cerr << "Lower, bad indexes: " << res << "->" << index1 << ", " << index2 << ", " << index3 + << ", " << index4 << ", " << index41 << ", " << index411 << ", " << index42 << ", " + << index5 << std::endl; return EXIT_FAILURE; } // Restack item 1 above 4 @@ -113,13 +111,12 @@ int TestContextItemStacking(int ,char * [] ) index41 = test4->GetItemIndex(test41); index42 = test4->GetItemIndex(test42); index5 = rootItem->GetItemIndex(test5); - if (res != 3 || index1 != 3 || index2 != 1 || index3 != 0 || index4 != 2 || - index41 != 0 || index411 != 0 || index42 != 1 || index5 != 4) + if (res != 3 || index1 != 3 || index2 != 1 || index3 != 0 || index4 != 2 || index41 != 0 || + index411 != 0 || index42 != 1 || index5 != 4) { - std::cerr << "StackAbove, bad indexes: " << res << "->" - << index1 << ", " << index2 << ", " << index3 << ", " - << index4 << ", " << index41 << ", " << index411 << ", " - << index42 << ", " << index5 << std::endl; + std::cerr << "StackAbove, bad indexes: " << res << "->" << index1 << ", " << index2 << ", " + << index3 << ", " << index4 << ", " << index41 << ", " << index411 << ", " << index42 + << ", " << index5 << std::endl; return EXIT_FAILURE; } // Restack item 41 above 42 @@ -131,13 +128,12 @@ int TestContextItemStacking(int ,char * [] ) index41 = test4->GetItemIndex(test41); index42 = test4->GetItemIndex(test42); index5 = rootItem->GetItemIndex(test5); - if (res != 1 || index1 != 3 || index2 != 1 || index3 != 0 || index4 != 2 || - index41 != 1 || index411 != 0 || index42 != 0 || index5 != 4) + if (res != 1 || index1 != 3 || index2 != 1 || index3 != 0 || index4 != 2 || index41 != 1 || + index411 != 0 || index42 != 0 || index5 != 4) { - std::cerr << "Raise, bad indexes: " << res << "->" - << index1 << ", " << index2 << ", " << index3 << ", " - << index4 << ", " << index41 << ", " << index411 << ", " - << index42 << ", " << index5 << std::endl; + std::cerr << "Raise, bad indexes: " << res << "->" << index1 << ", " << index2 << ", " << index3 + << ", " << index4 << ", " << index41 << ", " << index411 << ", " << index42 << ", " + << index5 << std::endl; return EXIT_FAILURE; } // Restack item 1 above 4 @@ -149,20 +145,19 @@ int TestContextItemStacking(int ,char * [] ) index41 = test4->GetItemIndex(test41); index42 = test4->GetItemIndex(test42); index5 = rootItem->GetItemIndex(test5); - if (res != 0 || index1 != 3 || index2 != 0 || index3 != 1 || index4 != 2 || - index41 != 1 || index411 != 0 || index42 != 0 || index5 != 4) + if (res != 0 || index1 != 3 || index2 != 0 || index3 != 1 || index4 != 2 || index41 != 1 || + index411 != 0 || index42 != 0 || index5 != 4) { - std::cerr << "StackUnder, bad indexes: " << res << "->" - << index1 << ", " << index2 << ", " << index3 << ", " - << index4 << ", " << index41 << ", " << index411 << ", " - << index42 << ", " << index5 << std::endl; + std::cerr << "StackUnder, bad indexes: " << res << "->" << index1 << ", " << index2 << ", " + << index3 << ", " << index4 << ", " << index41 << ", " << index411 << ", " << index42 + << ", " << index5 << std::endl; return EXIT_FAILURE; } // Turn off the color buffer view->GetScene()->SetUseBufferId(false); - //Finally render the scene and compare the image to a reference image + // Finally render the scene and compare the image to a reference image view->GetRenderWindow()->SetMultiSamples(0); view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); diff --git a/Charts/Core/Testing/Cxx/TestContextScene.cxx b/Charts/Core/Testing/Cxx/TestContextScene.cxx index 779522dd99..fe4447d306 100644 --- a/Charts/Core/Testing/Cxx/TestContextScene.cxx +++ b/Charts/Core/Testing/Cxx/TestContextScene.cxx @@ -26,7 +26,7 @@ #include "vtkRegressionTestImage.h" //---------------------------------------------------------------------------- -int TestContextScene( int argc, char * argv [] ) +int TestContextScene(int argc, char* argv[]) { // Set up a 2D context view, context test object and add it to the scene vtkNew view; @@ -70,11 +70,11 @@ int TestContextScene( int argc, char * argv [] ) view->Render(); int retVal = vtkRegressionTestImage(view->GetRenderWindow()); - if(retVal == vtkRegressionTester::DO_INTERACTOR) + if (retVal == vtkRegressionTester::DO_INTERACTOR) { view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); } return 0; - //return !retVal; + // return !retVal; } diff --git a/Charts/Core/Testing/Cxx/TestContextUnicode.cxx b/Charts/Core/Testing/Cxx/TestContextUnicode.cxx index 314786993e..adeee0a2bf 100644 --- a/Charts/Core/Testing/Cxx/TestContextUnicode.cxx +++ b/Charts/Core/Testing/Cxx/TestContextUnicode.cxx @@ -36,15 +36,15 @@ class ContextUnicode : public vtkContextItem { public: - static ContextUnicode *New(); + static ContextUnicode* New(); vtkTypeMacro(ContextUnicode, vtkContextItem); // Paint event for the chart, called whenever the chart needs to be drawn - bool Paint(vtkContext2D *painter) override; + bool Paint(vtkContext2D* painter) override; std::string FontFile; }; //---------------------------------------------------------------------------- -int TestContextUnicode(int argc, char * argv []) +int TestContextUnicode(int argc, char* argv[]) { if (argc < 2) { @@ -65,7 +65,7 @@ int TestContextUnicode(int argc, char * argv []) view->GetRenderWindow()->Render(); int retVal = vtkRegressionTestImage(view->GetRenderWindow()); - if(retVal == vtkRegressionTester::DO_INTERACTOR) + if (retVal == vtkRegressionTester::DO_INTERACTOR) { view->GetInteractor()->Initialize(); view->GetInteractor()->Start(); @@ -76,7 +76,7 @@ int TestContextUnicode(int argc, char * argv []) // Make our new derived class to draw a diagram vtkStandardNewMacro(ContextUnicode); // This function aims to test the primitives provided by the 2D API. -bool ContextUnicode::Paint(vtkContext2D *painter) +bool ContextUnicode::Paint(vtkContext2D* painter) { // Test the string drawing functionality of the context painter->GetTextProp()->SetVerticalJustificationToCentered(); @@ -87,9 +87,7 @@ bool ContextUnicode::Paint(vtkContext2D *painter) painter->GetTextProp()->SetFontFile(this->FontFile.c_str()); painter->DrawString(70, 20, "Angstrom"); painter->DrawString(150, 20, vtkUnicodeString::from_utf8("\xe2\x84\xab")); - painter->DrawString(100, 80, - vtkUnicodeString::from_utf8("a\xce\xb1")); - painter->DrawString(100, 50, - vtkUnicodeString::from_utf8("\xce\xb1\xce\xb2\xce\xb3")); + painter->DrawString(100, 80, vtkUnicodeString::from_utf8("a\xce\xb1")); + painter->DrawString(100, 50, vtkUnicodeString::from_utf8("\xce\xb1\xce\xb2\xce\xb3")); return true; } diff --git a/Charts/Core/Testing/Cxx/TestControlPointsHandleItem.cxx b/Charts/Core/Testing/Cxx/TestControlPointsHandleItem.cxx index b6b16e41b0..286b2b6cc7 100644 --- a/Charts/Core/Testing/Cxx/TestControlPointsHandleItem.cxx +++ b/Charts/Core/Testing/Cxx/TestControlPointsHandleItem.cxx @@ -31,649 +31,647 @@ #include "vtkSmartPointer.h" #include "vtkTable.h" -static const char *TestControlPointsHandleItemLog = -"# StreamVersion 1\n" -"TimerEvent 0 0 0 0 0 0 0\n" -"EnterEvent 392 142 0 0 0 0 0\n" -"MouseMoveEvent 392 142 0 0 0 0 0\n" -"MouseMoveEvent 388 142 0 0 0 0 0\n" -"MouseMoveEvent 387 142 0 0 0 0 0\n" -"TimerEvent 387 142 0 0 0 0 0\n" -"MouseMoveEvent 384 141 0 0 0 0 0\n" -"MouseMoveEvent 377 141 0 0 0 0 0\n" -"MouseMoveEvent 366 139 0 0 0 0 0\n" -"MouseMoveEvent 357 139 0 0 0 0 0\n" -"MouseMoveEvent 348 139 0 0 0 0 0\n" -"MouseMoveEvent 340 139 0 0 0 0 0\n" -"TimerEvent 340 139 0 0 0 0 0\n" -"MouseMoveEvent 332 139 0 0 0 0 0\n" -"MouseMoveEvent 327 137 0 0 0 0 0\n" -"MouseMoveEvent 323 137 0 0 0 0 0\n" -"TimerEvent 323 137 0 0 0 0 0\n" -"MouseMoveEvent 322 137 0 0 0 0 0\n" -"MouseMoveEvent 319 139 0 0 0 0 0\n" -"MouseMoveEvent 315 141 0 0 0 0 0\n" -"MouseMoveEvent 309 146 0 0 0 0 0\n" -"MouseMoveEvent 303 150 0 0 0 0 0\n" -"MouseMoveEvent 297 156 0 0 0 0 0\n" -"TimerEvent 297 156 0 0 0 0 0\n" -"MouseMoveEvent 291 160 0 0 0 0 0\n" -"MouseMoveEvent 285 166 0 0 0 0 0\n" -"MouseMoveEvent 279 171 0 0 0 0 0\n" -"MouseMoveEvent 275 175 0 0 0 0 0\n" -"MouseMoveEvent 273 177 0 0 0 0 0\n" -"MouseMoveEvent 272 178 0 0 0 0 0\n" -"TimerEvent 272 178 0 0 0 0 0\n" -"MouseMoveEvent 272 179 0 0 0 0 0\n" -"MouseMoveEvent 272 180 0 0 0 0 0\n" -"MouseMoveEvent 272 182 0 0 0 0 0\n" -"MouseMoveEvent 272 183 0 0 0 0 0\n" -"TimerEvent 272 183 0 0 0 0 0\n" -"MouseMoveEvent 272 184 0 0 0 0 0\n" -"MouseMoveEvent 272 185 0 0 0 0 0\n" -"MouseMoveEvent 273 185 0 0 0 0 0\n" -"MouseMoveEvent 273 186 0 0 0 0 0\n" -"TimerEvent 273 186 0 0 0 0 0\n" -"MouseMoveEvent 273 187 0 0 0 0 0\n" -"MouseMoveEvent 273 188 0 0 0 0 0\n" -"MouseMoveEvent 273 189 0 0 0 0 0\n" -"TimerEvent 273 189 0 0 0 0 0\n" -"MouseMoveEvent 273 190 0 0 0 0 0\n" -"MouseMoveEvent 274 191 0 0 0 0 0\n" -"MouseMoveEvent 274 192 0 0 0 0 0\n" -"MouseMoveEvent 274 193 0 0 0 0 0\n" -"TimerEvent 274 193 0 0 0 0 0\n" -"MouseMoveEvent 274 194 0 0 0 0 0\n" -"MouseMoveEvent 274 195 0 0 0 0 0\n" -"MouseMoveEvent 274 196 0 0 0 0 0\n" -"MouseMoveEvent 274 197 0 0 0 0 0\n" -"TimerEvent 274 197 0 0 0 0 0\n" -"MouseMoveEvent 274 198 0 0 0 0 0\n" -"MouseMoveEvent 275 199 0 0 0 0 0\n" -"MouseMoveEvent 275 200 0 0 0 0 0\n" -"TimerEvent 275 200 0 0 0 0 0\n" -"MouseMoveEvent 275 201 0 0 0 0 0\n" -"MouseMoveEvent 275 202 0 0 0 0 0\n" -"TimerEvent 275 202 0 0 0 0 0\n" -"MouseMoveEvent 274 201 0 0 0 0 0\n" -"MouseMoveEvent 272 200 0 0 0 0 0\n" -"MouseMoveEvent 269 199 0 0 0 0 0\n" -"MouseMoveEvent 266 198 0 0 0 0 0\n" -"MouseMoveEvent 264 197 0 0 0 0 0\n" -"MouseMoveEvent 262 197 0 0 0 0 0\n" -"TimerEvent 262 197 0 0 0 0 0\n" -"MouseMoveEvent 261 196 0 0 0 0 0\n" -"MouseMoveEvent 260 196 0 0 0 0 0\n" -"TimerEvent 260 196 0 0 0 0 0\n" -"MouseMoveEvent 262 196 0 0 0 0 0\n" -"MouseMoveEvent 266 196 0 0 0 0 0\n" -"MouseMoveEvent 272 196 0 0 0 0 0\n" -"MouseMoveEvent 277 197 0 0 0 0 0\n" -"MouseMoveEvent 283 197 0 0 0 0 0\n" -"MouseMoveEvent 287 199 0 0 0 0 0\n" -"TimerEvent 287 199 0 0 0 0 0\n" -"MouseMoveEvent 286 198 0 0 0 0 0\n" -"MouseMoveEvent 285 198 0 0 0 0 0\n" -"MouseMoveEvent 285 197 0 0 0 0 0\n" -"MouseMoveEvent 284 197 0 0 0 0 0\n" -"TimerEvent 284 197 0 0 0 0 0\n" -"MouseMoveEvent 283 197 0 0 0 0 0\n" -"MouseMoveEvent 280 197 0 0 0 0 0\n" -"MouseMoveEvent 278 197 0 0 0 0 0\n" -"MouseMoveEvent 277 198 0 0 0 0 0\n" -"MouseMoveEvent 275 199 0 0 0 0 0\n" -"TimerEvent 275 199 0 0 0 0 0\n" -"MouseMoveEvent 273 200 0 0 0 0 0\n" -"MouseMoveEvent 272 201 0 0 0 0 0\n" -"MouseMoveEvent 271 202 0 0 0 0 0\n" -"MouseMoveEvent 270 202 0 0 0 0 0\n" -"TimerEvent 270 202 0 0 0 0 0\n" -"MouseMoveEvent 269 202 0 0 0 0 0\n" -"MouseMoveEvent 269 201 0 0 0 0 0\n" -"MouseMoveEvent 268 200 0 0 0 0 0\n" -"MouseMoveEvent 268 198 0 0 0 0 0\n" -"MouseMoveEvent 268 197 0 0 0 0 0\n" -"TimerEvent 268 197 0 0 0 0 0\n" -"MouseMoveEvent 268 196 0 0 0 0 0\n" -"TimerEvent 268 196 0 0 0 0 0\n" -"MouseMoveEvent 268 197 0 0 0 0 0\n" -"MouseMoveEvent 268 198 0 0 0 0 0\n" -"MouseMoveEvent 268 199 0 0 0 0 0\n" -"TimerEvent 268 199 0 0 0 0 0\n" -"LeftButtonPressEvent 268 199 0 0 0 0 0\n" -"TimerEvent 268 199 0 0 0 0 0\n" -"LeftButtonReleaseEvent 268 199 0 0 0 0 0\n" -"LeftButtonPressEvent 268 199 0 0 0 1 0\n" -"TimerEvent 268 199 0 0 0 1 0\n" -"LeftButtonReleaseEvent 268 199 0 0 0 0 0\n" -"MouseMoveEvent 268 198 0 0 0 0 0\n" -"MouseMoveEvent 268 197 0 0 0 0 0\n" -"MouseMoveEvent 267 196 0 0 0 0 0\n" -"MouseMoveEvent 267 194 0 0 0 0 0\n" -"MouseMoveEvent 267 193 0 0 0 0 0\n" -"TimerEvent 267 193 0 0 0 0 0\n" -"MouseMoveEvent 267 192 0 0 0 0 0\n" -"MouseMoveEvent 267 191 0 0 0 0 0\n" -"TimerEvent 267 191 0 0 0 0 0\n" -"MouseMoveEvent 267 190 0 0 0 0 0\n" -"MouseMoveEvent 267 189 0 0 0 0 0\n" -"MouseMoveEvent 266 188 0 0 0 0 0\n" -"TimerEvent 266 188 0 0 0 0 0\n" -"LeftButtonPressEvent 266 188 0 0 0 0 0\n" -"MouseMoveEvent 266 187 0 0 0 0 0\n" -"TimerEvent 266 187 0 0 0 0 0\n" -"MouseMoveEvent 266 186 0 0 0 0 0\n" -"TimerEvent 266 186 0 0 0 0 0\n" -"MouseMoveEvent 266 185 0 0 0 0 0\n" -"TimerEvent 266 185 0 0 0 0 0\n" -"MouseMoveEvent 266 184 0 0 0 0 0\n" -"MouseMoveEvent 265 183 0 0 0 0 0\n" -"MouseMoveEvent 265 182 0 0 0 0 0\n" -"MouseMoveEvent 265 181 0 0 0 0 0\n" -"MouseMoveEvent 265 180 0 0 0 0 0\n" -"TimerEvent 265 180 0 0 0 0 0\n" -"MouseMoveEvent 265 179 0 0 0 0 0\n" -"MouseMoveEvent 265 178 0 0 0 0 0\n" -"MouseMoveEvent 265 177 0 0 0 0 0\n" -"TimerEvent 265 177 0 0 0 0 0\n" -"MouseMoveEvent 265 176 0 0 0 0 0\n" -"MouseMoveEvent 265 175 0 0 0 0 0\n" -"MouseMoveEvent 265 174 0 0 0 0 0\n" -"TimerEvent 265 174 0 0 0 0 0\n" -"MouseMoveEvent 265 173 0 0 0 0 0\n" -"MouseMoveEvent 265 172 0 0 0 0 0\n" -"MouseMoveEvent 265 171 0 0 0 0 0\n" -"TimerEvent 265 171 0 0 0 0 0\n" -"MouseMoveEvent 265 170 0 0 0 0 0\n" -"TimerEvent 265 170 0 0 0 0 0\n" -"MouseMoveEvent 265 171 0 0 0 0 0\n" -"MouseMoveEvent 265 172 0 0 0 0 0\n" -"TimerEvent 265 172 0 0 0 0 0\n" -"MouseMoveEvent 265 173 0 0 0 0 0\n" -"MouseMoveEvent 265 174 0 0 0 0 0\n" -"MouseMoveEvent 265 175 0 0 0 0 0\n" -"TimerEvent 265 175 0 0 0 0 0\n" -"LeftButtonReleaseEvent 265 175 0 0 0 0 0\n" -"TimerEvent 265 175 0 0 0 0 0\n" -"MouseMoveEvent 265 174 0 0 0 0 0\n" -"MouseMoveEvent 265 173 0 0 0 0 0\n" -"MouseMoveEvent 265 171 0 0 0 0 0\n" -"MouseMoveEvent 265 170 0 0 0 0 0\n" -"MouseMoveEvent 265 168 0 0 0 0 0\n" -"TimerEvent 265 168 0 0 0 0 0\n" -"MouseMoveEvent 263 166 0 0 0 0 0\n" -"MouseMoveEvent 256 163 0 0 0 0 0\n" -"MouseMoveEvent 247 159 0 0 0 0 0\n" -"MouseMoveEvent 239 157 0 0 0 0 0\n" -"MouseMoveEvent 232 155 0 0 0 0 0\n" -"MouseMoveEvent 228 153 0 0 0 0 0\n" -"TimerEvent 228 153 0 0 0 0 0\n" -"MouseMoveEvent 227 152 0 0 0 0 0\n" -"MouseMoveEvent 226 152 0 0 0 0 0\n" -"MouseMoveEvent 224 151 0 0 0 0 0\n" -"MouseMoveEvent 222 150 0 0 0 0 0\n" -"MouseMoveEvent 219 148 0 0 0 0 0\n" -"MouseMoveEvent 215 147 0 0 0 0 0\n" -"TimerEvent 215 147 0 0 0 0 0\n" -"MouseMoveEvent 210 145 0 0 0 0 0\n" -"MouseMoveEvent 202 142 0 0 0 0 0\n" -"MouseMoveEvent 193 138 0 0 0 0 0\n" -"MouseMoveEvent 184 135 0 0 0 0 0\n" -"MouseMoveEvent 177 133 0 0 0 0 0\n" -"MouseMoveEvent 173 133 0 0 0 0 0\n" -"TimerEvent 173 133 0 0 0 0 0\n" -"MouseMoveEvent 173 134 0 0 0 0 0\n" -"MouseMoveEvent 174 138 0 0 0 0 0\n" -"MouseMoveEvent 175 146 0 0 0 0 0\n" -"MouseMoveEvent 175 150 0 0 0 0 0\n" -"MouseMoveEvent 175 151 0 0 0 0 0\n" -"TimerEvent 175 151 0 0 0 0 0\n" -"MouseMoveEvent 175 150 0 0 0 0 0\n" -"MouseMoveEvent 175 149 0 0 0 0 0\n" -"MouseMoveEvent 174 148 0 0 0 0 0\n" -"MouseMoveEvent 172 147 0 0 0 0 0\n" -"MouseMoveEvent 169 145 0 0 0 0 0\n" -"MouseMoveEvent 166 143 0 0 0 0 0\n" -"TimerEvent 166 143 0 0 0 0 0\n" -"MouseMoveEvent 163 141 0 0 0 0 0\n" -"MouseMoveEvent 162 140 0 0 0 0 0\n" -"MouseMoveEvent 160 139 0 0 0 0 0\n" -"MouseMoveEvent 160 138 0 0 0 0 0\n" -"MouseMoveEvent 159 137 0 0 0 0 0\n" -"MouseMoveEvent 158 136 0 0 0 0 0\n" -"TimerEvent 158 136 0 0 0 0 0\n" -"MouseMoveEvent 156 135 0 0 0 0 0\n" -"MouseMoveEvent 155 134 0 0 0 0 0\n" -"MouseMoveEvent 154 133 0 0 0 0 0\n" -"MouseMoveEvent 152 132 0 0 0 0 0\n" -"MouseMoveEvent 151 130 0 0 0 0 0\n" -"MouseMoveEvent 150 129 0 0 0 0 0\n" -"TimerEvent 150 129 0 0 0 0 0\n" -"MouseMoveEvent 149 128 0 0 0 0 0\n" -"MouseMoveEvent 148 127 0 0 0 0 0\n" -"MouseMoveEvent 148 126 0 0 0 0 0\n" -"MouseMoveEvent 148 124 0 0 0 0 0\n" -"MouseMoveEvent 148 123 0 0 0 0 0\n" -"MouseMoveEvent 147 123 0 0 0 0 0\n" -"TimerEvent 147 123 0 0 0 0 0\n" -"MouseMoveEvent 147 122 0 0 0 0 0\n" -"MouseMoveEvent 147 121 0 0 0 0 0\n" -"TimerEvent 147 121 0 0 0 0 0\n" -"MouseMoveEvent 147 120 0 0 0 0 0\n" -"MouseMoveEvent 147 119 0 0 0 0 0\n" -"TimerEvent 147 119 0 0 0 0 0\n" -"MouseMoveEvent 147 118 0 0 0 0 0\n" -"MouseMoveEvent 147 117 0 0 0 0 0\n" -"MouseMoveEvent 145 116 0 0 0 0 0\n" -"MouseMoveEvent 144 115 0 0 0 0 0\n" -"TimerEvent 144 115 0 0 0 0 0\n" -"MouseMoveEvent 142 114 0 0 0 0 0\n" -"MouseMoveEvent 139 114 0 0 0 0 0\n" -"MouseMoveEvent 136 113 0 0 0 0 0\n" -"MouseMoveEvent 135 112 0 0 0 0 0\n" -"MouseMoveEvent 134 112 0 0 0 0 0\n" -"TimerEvent 134 112 0 0 0 0 0\n" -"LeftButtonPressEvent 134 112 0 0 0 0 0\n" -"TimerEvent 134 112 0 0 0 0 0\n" -"LeftButtonReleaseEvent 134 112 0 0 0 0 0\n" -"LeftButtonPressEvent 134 112 0 0 0 0 0\n" -"LeftButtonReleaseEvent 134 112 0 0 0 0 0\n" -"LeftButtonPressEvent 134 112 0 0 0 1 0\n" -"TimerEvent 134 112 0 0 0 1 0\n" -"LeftButtonReleaseEvent 134 112 0 0 0 0 0\n" -"MouseMoveEvent 133 112 0 0 0 0 0\n" -"MouseMoveEvent 132 110 0 0 0 0 0\n" -"MouseMoveEvent 130 109 0 0 0 0 0\n" -"MouseMoveEvent 129 109 0 0 0 0 0\n" -"TimerEvent 129 109 0 0 0 0 0\n" -"MouseMoveEvent 128 109 0 0 0 0 0\n" -"MouseMoveEvent 122 109 0 0 0 0 0\n" -"MouseMoveEvent 116 109 0 0 0 0 0\n" -"MouseMoveEvent 105 109 0 0 0 0 0\n" -"MouseMoveEvent 97 111 0 0 0 0 0\n" -"TimerEvent 97 111 0 0 0 0 0\n" -"MouseMoveEvent 91 111 0 0 0 0 0\n" -"MouseMoveEvent 87 113 0 0 0 0 0\n" -"MouseMoveEvent 86 113 0 0 0 0 0\n" -"TimerEvent 86 113 0 0 0 0 0\n" -"MouseMoveEvent 84 113 0 0 0 0 0\n" -"MouseMoveEvent 78 112 0 0 0 0 0\n" -"MouseMoveEvent 68 109 0 0 0 0 0\n" -"MouseMoveEvent 57 107 0 0 0 0 0\n" -"MouseMoveEvent 49 106 0 0 0 0 0\n" -"MouseMoveEvent 44 104 0 0 0 0 0\n" -"TimerEvent 44 104 0 0 0 0 0\n" -"MouseMoveEvent 40 104 0 0 0 0 0\n" -"TimerEvent 40 104 0 0 0 0 0\n" -"MouseMoveEvent 41 104 0 0 0 0 0\n" -"MouseMoveEvent 42 104 0 0 0 0 0\n" -"TimerEvent 42 104 0 0 0 0 0\n" -"MouseMoveEvent 44 105 0 0 0 0 0\n" -"MouseMoveEvent 48 106 0 0 0 0 0\n" -"MouseMoveEvent 54 107 0 0 0 0 0\n" -"MouseMoveEvent 60 107 0 0 0 0 0\n" -"MouseMoveEvent 66 109 0 0 0 0 0\n" -"MouseMoveEvent 67 109 0 0 0 0 0\n" -"TimerEvent 67 109 0 0 0 0 0\n" -"LeftButtonPressEvent 67 109 0 0 0 0 0\n" -"MouseMoveEvent 67 110 0 0 0 0 0\n" -"MouseMoveEvent 70 110 0 0 0 0 0\n" -"MouseMoveEvent 72 111 0 0 0 0 0\n" -"MouseMoveEvent 73 112 0 0 0 0 0\n" -"TimerEvent 73 112 0 0 0 0 0\n" -"MouseMoveEvent 74 112 0 0 0 0 0\n" -"TimerEvent 74 112 0 0 0 0 0\n" -"MouseMoveEvent 76 112 0 0 0 0 0\n" -"MouseMoveEvent 77 112 0 0 0 0 0\n" -"TimerEvent 77 112 0 0 0 0 0\n" -"MouseMoveEvent 77 111 0 0 0 0 0\n" -"MouseMoveEvent 78 111 0 0 0 0 0\n" -"MouseMoveEvent 80 110 0 0 0 0 0\n" -"MouseMoveEvent 81 110 0 0 0 0 0\n" -"TimerEvent 81 110 0 0 0 0 0\n" -"MouseMoveEvent 81 109 0 0 0 0 0\n" -"TimerEvent 81 109 0 0 0 0 0\n" -"MouseMoveEvent 84 108 0 0 0 0 0\n" -"MouseMoveEvent 88 106 0 0 0 0 0\n" -"MouseMoveEvent 90 106 0 0 0 0 0\n" -"MouseMoveEvent 91 105 0 0 0 0 0\n" -"MouseMoveEvent 92 105 0 0 0 0 0\n" -"TimerEvent 92 105 0 0 0 0 0\n" -"LeftButtonReleaseEvent 92 105 0 0 0 0 0\n" -"TimerEvent 92 105 0 0 0 0 0\n" -"MouseMoveEvent 98 105 0 0 0 0 0\n" -"MouseMoveEvent 104 105 0 0 0 0 0\n" -"MouseMoveEvent 114 103 0 0 0 0 0\n" -"MouseMoveEvent 127 100 0 0 0 0 0\n" -"MouseMoveEvent 148 93 0 0 0 0 0\n" -"MouseMoveEvent 177 86 0 0 0 0 0\n" -"TimerEvent 177 86 0 0 0 0 0\n" -"MouseMoveEvent 212 75 0 0 0 0 0\n" -"MouseMoveEvent 251 64 0 0 0 0 0\n" -"MouseMoveEvent 302 55 0 0 0 0 0\n" -"MouseMoveEvent 363 46 0 0 0 0 0\n" -"LeaveEvent 426 37 0 0 0 0 0\n" -"TimerEvent 426 37 0 0 0 0 0\n" -"EnterEvent 237 16 0 0 0 0 0\n" -"MouseMoveEvent 237 16 0 0 0 0 0\n" -"MouseMoveEvent 222 33 0 0 0 0 0\n" -"MouseMoveEvent 211 48 0 0 0 0 0\n" -"MouseMoveEvent 202 59 0 0 0 0 0\n" -"MouseMoveEvent 195 66 0 0 0 0 0\n" -"MouseMoveEvent 193 70 0 0 0 0 0\n" -"TimerEvent 193 70 0 0 0 0 0\n" -"MouseMoveEvent 193 72 0 0 0 0 0\n" -"MouseMoveEvent 193 74 0 0 0 0 0\n" -"MouseMoveEvent 193 75 0 0 0 0 0\n" -"MouseMoveEvent 193 77 0 0 0 0 0\n" -"MouseMoveEvent 193 78 0 0 0 0 0\n" -"MouseMoveEvent 193 79 0 0 0 0 0\n" -"TimerEvent 193 79 0 0 0 0 0\n" -"MouseMoveEvent 193 81 0 0 0 0 0\n" -"MouseMoveEvent 193 82 0 0 0 0 0\n" -"MouseMoveEvent 193 83 0 0 0 0 0\n" -"MouseMoveEvent 193 84 0 0 0 0 0\n" -"MouseMoveEvent 193 85 0 0 0 0 0\n" -"TimerEvent 193 85 0 0 0 0 0\n" -"MouseMoveEvent 193 86 0 0 0 0 0\n" -"MouseMoveEvent 193 87 0 0 0 0 0\n" -"MouseMoveEvent 193 88 0 0 0 0 0\n" -"MouseMoveEvent 194 89 0 0 0 0 0\n" -"MouseMoveEvent 194 90 0 0 0 0 0\n" -"MouseMoveEvent 194 91 0 0 0 0 0\n" -"TimerEvent 194 91 0 0 0 0 0\n" -"MouseMoveEvent 194 92 0 0 0 0 0\n" -"MouseMoveEvent 193 93 0 0 0 0 0\n" -"MouseMoveEvent 191 94 0 0 0 0 0\n" -"MouseMoveEvent 189 95 0 0 0 0 0\n" -"MouseMoveEvent 186 96 0 0 0 0 0\n" -"MouseMoveEvent 182 97 0 0 0 0 0\n" -"TimerEvent 182 97 0 0 0 0 0\n" -"MouseMoveEvent 180 98 0 0 0 0 0\n" -"MouseMoveEvent 175 99 0 0 0 0 0\n" -"MouseMoveEvent 171 100 0 0 0 0 0\n" -"MouseMoveEvent 169 100 0 0 0 0 0\n" -"MouseMoveEvent 166 101 0 0 0 0 0\n" -"MouseMoveEvent 164 101 0 0 0 0 0\n" -"TimerEvent 164 101 0 0 0 0 0\n" -"MouseMoveEvent 163 101 0 0 0 0 0\n" -"TimerEvent 163 101 0 0 0 0 0\n" -"MouseMoveEvent 162 101 0 0 0 0 0\n" -"TimerEvent 162 101 0 0 0 0 0\n" -"MouseMoveEvent 161 102 0 0 0 0 0\n" -"MouseMoveEvent 160 102 0 0 0 0 0\n" -"MouseMoveEvent 158 103 0 0 0 0 0\n" -"MouseMoveEvent 157 103 0 0 0 0 0\n" -"MouseMoveEvent 156 104 0 0 0 0 0\n" -"TimerEvent 156 104 0 0 0 0 0\n" -"MouseMoveEvent 155 104 0 0 0 0 0\n" -"MouseMoveEvent 154 104 0 0 0 0 0\n" -"MouseMoveEvent 154 105 0 0 0 0 0\n" -"TimerEvent 154 105 0 0 0 0 0\n" -"MouseMoveEvent 153 105 0 0 0 0 0\n" -"MouseMoveEvent 151 106 0 0 0 0 0\n" -"MouseMoveEvent 150 106 0 0 0 0 0\n" -"MouseMoveEvent 149 106 0 0 0 0 0\n" -"MouseMoveEvent 149 107 0 0 0 0 0\n" -"TimerEvent 149 107 0 0 0 0 0\n" -"MouseMoveEvent 148 107 0 0 0 0 0\n" -"MouseMoveEvent 147 108 0 0 0 0 0\n" -"MouseMoveEvent 146 108 0 0 0 0 0\n" -"TimerEvent 146 108 0 0 0 0 0\n" -"MouseMoveEvent 145 109 0 0 0 0 0\n" -"MouseMoveEvent 144 109 0 0 0 0 0\n" -"MouseMoveEvent 144 110 0 0 0 0 0\n" -"MouseMoveEvent 143 110 0 0 0 0 0\n" -"TimerEvent 143 110 0 0 0 0 0\n" -"MouseMoveEvent 142 110 0 0 0 0 0\n" -"MouseMoveEvent 142 111 0 0 0 0 0\n" -"MouseMoveEvent 141 111 0 0 0 0 0\n" -"TimerEvent 141 111 0 0 0 0 0\n" -"MouseMoveEvent 140 111 0 0 0 0 0\n" -"TimerEvent 140 111 0 0 0 0 0\n" -"MouseMoveEvent 140 110 0 0 0 0 0\n" -"MouseMoveEvent 139 110 0 0 0 0 0\n" -"MouseMoveEvent 138 109 0 0 0 0 0\n" -"MouseMoveEvent 138 108 0 0 0 0 0\n" -"TimerEvent 138 108 0 0 0 0 0\n" -"MouseMoveEvent 137 108 0 0 0 0 0\n" -"MouseMoveEvent 136 108 0 0 0 0 0\n" -"MouseMoveEvent 136 109 0 0 0 0 0\n" -"TimerEvent 136 109 0 0 0 0 0\n" -"LeftButtonPressEvent 136 109 0 0 0 0 0\n" -"LeftButtonReleaseEvent 136 109 0 0 0 0 0\n" -"LeftButtonPressEvent 136 109 0 0 0 0 0\n" -"LeftButtonReleaseEvent 136 109 0 0 0 0 0\n" -"LeftButtonPressEvent 136 109 0 0 0 1 0\n" -"TimerEvent 136 109 0 0 0 1 0\n" -"LeftButtonReleaseEvent 136 109 0 0 0 0 0\n" -"MouseMoveEvent 136 101 0 0 0 0 0\n" -"MouseMoveEvent 146 80 0 0 0 0 0\n" -"MouseMoveEvent 171 59 0 0 0 0 0\n" -"MouseMoveEvent 218 42 0 0 0 0 0\n" -"MouseMoveEvent 297 27 0 0 0 0 0\n" -"LeaveEvent 400 18 0 0 0 0 0\n" -"TimerEvent 400 18 0 0 0 0 0\n" -"EnterEvent 392 259 0 0 0 0 0\n" -"MouseMoveEvent 392 259 0 0 0 0 0\n" -"MouseMoveEvent 381 264 0 0 0 0 0\n" -"MouseMoveEvent 370 269 0 0 0 0 0\n" -"MouseMoveEvent 359 274 0 0 0 0 0\n" -"MouseMoveEvent 348 279 0 0 0 0 0\n" -"MouseMoveEvent 339 281 0 0 0 0 0\n" -"TimerEvent 339 281 0 0 0 0 0\n" -"MouseMoveEvent 328 284 0 0 0 0 0\n" -"MouseMoveEvent 319 286 0 0 0 0 0\n" -"MouseMoveEvent 310 289 0 0 0 0 0\n" -"MouseMoveEvent 301 292 0 0 0 0 0\n" -"MouseMoveEvent 296 292 0 0 0 0 0\n" -"MouseMoveEvent 292 294 0 0 0 0 0\n" -"TimerEvent 292 294 0 0 0 0 0\n" -"MouseMoveEvent 288 297 0 0 0 0 0\n" -"MouseMoveEvent 284 298 0 0 0 0 0\n" -"MouseMoveEvent 282 299 0 0 0 0 0\n" -"LeaveEvent 281 300 0 0 0 0 0\n" -"TimerEvent 281 300 0 0 0 0 0\n" -"KeyPressEvent 276 304 0 0 98 1 b\n" -"TimerEvent 0 0 0 0 0 0 0\n" -"EnterEvent 385 3 0 0 0 0 0\n" -"MouseMoveEvent 385 3 0 0 0 0 0\n" -"LeaveEvent 406 10 0 0 0 0 0\n" -"TimerEvent 406 10 0 0 0 0 0\n" -"EnterEvent 391 93 0 0 0 0 0\n" -"MouseMoveEvent 391 93 0 0 0 0 0\n" -"MouseMoveEvent 372 93 0 0 0 0 0\n" -"MouseMoveEvent 351 96 0 0 0 0 0\n" -"MouseMoveEvent 330 99 0 0 0 0 0\n" -"MouseMoveEvent 309 101 0 0 0 0 0\n" -"MouseMoveEvent 284 104 0 0 0 0 0\n" -"TimerEvent 284 104 0 0 0 0 0\n" -"MouseMoveEvent 263 107 0 0 0 0 0\n" -"MouseMoveEvent 244 110 0 0 0 0 0\n" -"MouseMoveEvent 229 112 0 0 0 0 0\n" -"MouseMoveEvent 216 112 0 0 0 0 0\n" -"MouseMoveEvent 207 114 0 0 0 0 0\n" -"MouseMoveEvent 198 116 0 0 0 0 0\n" -"TimerEvent 198 116 0 0 0 0 0\n" -"MouseMoveEvent 192 116 0 0 0 0 0\n" -"MouseMoveEvent 185 118 0 0 0 0 0\n" -"MouseMoveEvent 179 118 0 0 0 0 0\n" -"MouseMoveEvent 173 118 0 0 0 0 0\n" -"MouseMoveEvent 166 120 0 0 0 0 0\n" -"MouseMoveEvent 160 120 0 0 0 0 0\n" -"TimerEvent 160 120 0 0 0 0 0\n" -"MouseMoveEvent 153 120 0 0 0 0 0\n" -"MouseMoveEvent 146 120 0 0 0 0 0\n" -"MouseMoveEvent 139 120 0 0 0 0 0\n" -"MouseMoveEvent 133 118 0 0 0 0 0\n" -"MouseMoveEvent 127 118 0 0 0 0 0\n" -"MouseMoveEvent 121 118 0 0 0 0 0\n" -"TimerEvent 121 118 0 0 0 0 0\n" -"MouseMoveEvent 120 118 0 0 0 0 0\n" -"MouseMoveEvent 119 118 0 0 0 0 0\n" -"TimerEvent 119 118 0 0 0 0 0\n" -"MouseMoveEvent 119 117 0 0 0 0 0\n" -"MouseMoveEvent 119 116 0 0 0 0 0\n" -"MouseMoveEvent 121 114 0 0 0 0 0\n" -"MouseMoveEvent 122 114 0 0 0 0 0\n" -"TimerEvent 122 114 0 0 0 0 0\n" -"MouseMoveEvent 123 113 0 0 0 0 0\n" -"MouseMoveEvent 124 113 0 0 0 0 0\n" -"MouseMoveEvent 125 113 0 0 0 0 0\n" -"TimerEvent 125 113 0 0 0 0 0\n" -"MouseMoveEvent 125 112 0 0 0 0 0\n" -"MouseMoveEvent 127 112 0 0 0 0 0\n" -"MouseMoveEvent 129 111 0 0 0 0 0\n" -"MouseMoveEvent 131 110 0 0 0 0 0\n" -"TimerEvent 131 110 0 0 0 0 0\n" -"MouseMoveEvent 132 110 0 0 0 0 0\n" -"MouseMoveEvent 132 109 0 0 0 0 0\n" -"MouseMoveEvent 133 109 0 0 0 0 0\n" -"TimerEvent 133 109 0 0 0 0 0\n" -"LeftButtonPressEvent 133 109 0 0 0 0 0\n" -"TimerEvent 133 109 0 0 0 0 0\n" -"LeftButtonReleaseEvent 133 109 0 0 0 0 0\n" -"LeftButtonPressEvent 133 109 0 0 0 1 0\n" -"TimerEvent 133 109 0 0 0 1 0\n" -"LeftButtonReleaseEvent 133 109 0 0 0 0 0\n" -"MouseMoveEvent 134 109 0 0 0 0 0\n" -"MouseMoveEvent 134 110 0 0 0 0 0\n" -"MouseMoveEvent 134 111 0 0 0 0 0\n" -"TimerEvent 134 111 0 0 0 0 0\n" -"MouseMoveEvent 134 112 0 0 0 0 0\n" -"MouseMoveEvent 134 113 0 0 0 0 0\n" -"MouseMoveEvent 134 114 0 0 0 0 0\n" -"MouseMoveEvent 134 116 0 0 0 0 0\n" -"TimerEvent 134 116 0 0 0 0 0\n" -"MouseMoveEvent 135 116 0 0 0 0 0\n" -"MouseMoveEvent 135 117 0 0 0 0 0\n" -"TimerEvent 135 117 0 0 0 0 0\n" -"LeftButtonPressEvent 135 117 0 0 0 0 0\n" -"MouseMoveEvent 135 118 0 0 0 0 0\n" -"MouseMoveEvent 135 119 0 0 0 0 0\n" -"TimerEvent 135 119 0 0 0 0 0\n" -"MouseMoveEvent 135 120 0 0 0 0 0\n" -"MouseMoveEvent 135 121 0 0 0 0 0\n" -"MouseMoveEvent 135 122 0 0 0 0 0\n" -"MouseMoveEvent 135 123 0 0 0 0 0\n" -"MouseMoveEvent 135 124 0 0 0 0 0\n" -"TimerEvent 135 124 0 0 0 0 0\n" -"MouseMoveEvent 135 125 0 0 0 0 0\n" -"MouseMoveEvent 135 126 0 0 0 0 0\n" -"MouseMoveEvent 135 127 0 0 0 0 0\n" -"TimerEvent 135 127 0 0 0 0 0\n" -"MouseMoveEvent 136 128 0 0 0 0 0\n" -"MouseMoveEvent 136 130 0 0 0 0 0\n" -"MouseMoveEvent 136 131 0 0 0 0 0\n" -"MouseMoveEvent 136 132 0 0 0 0 0\n" -"MouseMoveEvent 137 133 0 0 0 0 0\n" -"MouseMoveEvent 137 134 0 0 0 0 0\n" -"TimerEvent 137 134 0 0 0 0 0\n" -"MouseMoveEvent 137 136 0 0 0 0 0\n" -"MouseMoveEvent 137 137 0 0 0 0 0\n" -"MouseMoveEvent 137 138 0 0 0 0 0\n" -"MouseMoveEvent 137 139 0 0 0 0 0\n" -"MouseMoveEvent 137 140 0 0 0 0 0\n" -"MouseMoveEvent 137 142 0 0 0 0 0\n" -"TimerEvent 137 142 0 0 0 0 0\n" -"MouseMoveEvent 138 143 0 0 0 0 0\n" -"MouseMoveEvent 138 144 0 0 0 0 0\n" -"MouseMoveEvent 138 145 0 0 0 0 0\n" -"MouseMoveEvent 138 146 0 0 0 0 0\n" -"MouseMoveEvent 138 147 0 0 0 0 0\n" -"MouseMoveEvent 139 148 0 0 0 0 0\n" -"TimerEvent 139 148 0 0 0 0 0\n" -"MouseMoveEvent 139 149 0 0 0 0 0\n" -"MouseMoveEvent 139 151 0 0 0 0 0\n" -"MouseMoveEvent 139 152 0 0 0 0 0\n" -"MouseMoveEvent 140 153 0 0 0 0 0\n" -"MouseMoveEvent 140 155 0 0 0 0 0\n" -"MouseMoveEvent 140 156 0 0 0 0 0\n" -"TimerEvent 140 156 0 0 0 0 0\n" -"MouseMoveEvent 140 157 0 0 0 0 0\n" -"MouseMoveEvent 140 158 0 0 0 0 0\n" -"MouseMoveEvent 140 159 0 0 0 0 0\n" -"TimerEvent 140 159 0 0 0 0 0\n" -"MouseMoveEvent 140 160 0 0 0 0 0\n" -"TimerEvent 140 160 0 0 0 0 0\n" -"LeftButtonReleaseEvent 140 160 0 0 0 0 0\n" -"TimerEvent 140 160 0 0 0 0 0\n" -"MouseMoveEvent 140 159 0 0 0 0 0\n" -"MouseMoveEvent 140 158 0 0 0 0 0\n" -"MouseMoveEvent 140 157 0 0 0 0 0\n" -"MouseMoveEvent 140 156 0 0 0 0 0\n" -"MouseMoveEvent 140 154 0 0 0 0 0\n" -"MouseMoveEvent 140 153 0 0 0 0 0\n" -"TimerEvent 140 153 0 0 0 0 0\n" -"MouseMoveEvent 140 152 0 0 0 0 0\n" -"MouseMoveEvent 140 150 0 0 0 0 0\n" -"MouseMoveEvent 140 149 0 0 0 0 0\n" -"MouseMoveEvent 139 147 0 0 0 0 0\n" -"MouseMoveEvent 139 146 0 0 0 0 0\n" -"TimerEvent 139 146 0 0 0 0 0\n" -"MouseMoveEvent 139 144 0 0 0 0 0\n" -"MouseMoveEvent 139 143 0 0 0 0 0\n" -"MouseMoveEvent 139 142 0 0 0 0 0\n" -"MouseMoveEvent 139 141 0 0 0 0 0\n" -"MouseMoveEvent 139 140 0 0 0 0 0\n" -"MouseMoveEvent 139 139 0 0 0 0 0\n" -"TimerEvent 139 139 0 0 0 0 0\n" -"MouseMoveEvent 139 138 0 0 0 0 0\n" -"MouseMoveEvent 138 136 0 0 0 0 0\n" -"MouseMoveEvent 138 135 0 0 0 0 0\n" -"MouseMoveEvent 138 134 0 0 0 0 0\n" -"MouseMoveEvent 138 133 0 0 0 0 0\n" -"MouseMoveEvent 138 132 0 0 0 0 0\n" -"TimerEvent 138 132 0 0 0 0 0\n" -"MouseMoveEvent 138 131 0 0 0 0 0\n" -"MouseMoveEvent 137 130 0 0 0 0 0\n" -"MouseMoveEvent 137 129 0 0 0 0 0\n" -"MouseMoveEvent 137 128 0 0 0 0 0\n" -"MouseMoveEvent 137 127 0 0 0 0 0\n" -"MouseMoveEvent 137 126 0 0 0 0 0\n" -"TimerEvent 137 126 0 0 0 0 0\n" -"MouseMoveEvent 137 125 0 0 0 0 0\n" -"MouseMoveEvent 137 124 0 0 0 0 0\n" -"MouseMoveEvent 137 123 0 0 0 0 0\n" -"MouseMoveEvent 137 122 0 0 0 0 0\n" -"MouseMoveEvent 137 121 0 0 0 0 0\n" -"MouseMoveEvent 137 120 0 0 0 0 0\n" -"TimerEvent 137 120 0 0 0 0 0\n" -"MouseMoveEvent 137 119 0 0 0 0 0\n" -"MouseMoveEvent 137 118 0 0 0 0 0\n" -"MouseMoveEvent 137 117 0 0 0 0 0\n" -"MouseMoveEvent 136 116 0 0 0 0 0\n" -"MouseMoveEvent 136 115 0 0 0 0 0\n" -"TimerEvent 136 115 0 0 0 0 0\n" -"MouseMoveEvent 136 114 0 0 0 0 0\n" -"MouseMoveEvent 136 113 0 0 0 0 0\n" -"MouseMoveEvent 136 112 0 0 0 0 0\n" -"TimerEvent 136 112 0 0 0 0 0\n" -"MouseMoveEvent 136 111 0 0 0 0 0\n" -"MouseMoveEvent 136 110 0 0 0 0 0\n" -"MouseMoveEvent 136 109 0 0 0 0 0\n" -"TimerEvent 136 109 0 0 0 0 0\n" -"MouseMoveEvent 136 108 0 0 0 0 0\n" -"MouseMoveEvent 136 107 0 0 0 0 0\n" -"TimerEvent 136 107 0 0 0 0 0\n" -"MouseMoveEvent 136 106 0 0 0 0 0\n" -"TimerEvent 136 106 0 0 0 0 0\n" -"LeftButtonPressEvent 136 106 0 0 0 0 0\n" -"LeftButtonReleaseEvent 136 106 0 0 0 0 0\n" -"LeftButtonPressEvent 136 106 0 0 0 1 0\n" -"TimerEvent 136 106 0 0 0 1 0\n" -"LeftButtonReleaseEvent 136 106 0 0 0 0 0\n" -"MouseMoveEvent 143 94 0 0 0 0 0\n" -"MouseMoveEvent 171 73 0 0 0 0 0\n" -"MouseMoveEvent 224 50 0 0 0 0 0\n" -"MouseMoveEvent 299 29 0 0 0 0 0\n" -"MouseMoveEvent 388 12 0 0 0 0 0\n" -"LeaveEvent 489 -5 0 0 0 0 0\n" -"TimerEvent 489 -5 0 0 0 0 0\n" -; +static const char* TestControlPointsHandleItemLog = "# StreamVersion 1\n" + "TimerEvent 0 0 0 0 0 0 0\n" + "EnterEvent 392 142 0 0 0 0 0\n" + "MouseMoveEvent 392 142 0 0 0 0 0\n" + "MouseMoveEvent 388 142 0 0 0 0 0\n" + "MouseMoveEvent 387 142 0 0 0 0 0\n" + "TimerEvent 387 142 0 0 0 0 0\n" + "MouseMoveEvent 384 141 0 0 0 0 0\n" + "MouseMoveEvent 377 141 0 0 0 0 0\n" + "MouseMoveEvent 366 139 0 0 0 0 0\n" + "MouseMoveEvent 357 139 0 0 0 0 0\n" + "MouseMoveEvent 348 139 0 0 0 0 0\n" + "MouseMoveEvent 340 139 0 0 0 0 0\n" + "TimerEvent 340 139 0 0 0 0 0\n" + "MouseMoveEvent 332 139 0 0 0 0 0\n" + "MouseMoveEvent 327 137 0 0 0 0 0\n" + "MouseMoveEvent 323 137 0 0 0 0 0\n" + "TimerEvent 323 137 0 0 0 0 0\n" + "MouseMoveEvent 322 137 0 0 0 0 0\n" + "MouseMoveEvent 319 139 0 0 0 0 0\n" + "MouseMoveEvent 315 141 0 0 0 0 0\n" + "MouseMoveEvent 309 146 0 0 0 0 0\n" + "MouseMoveEvent 303 150 0 0 0 0 0\n" + "MouseMoveEvent 297 156 0 0 0 0 0\n" + "TimerEvent 297 156 0 0 0 0 0\n" + "MouseMoveEvent 291 160 0 0 0 0 0\n" + "MouseMoveEvent 285 166 0 0 0 0 0\n" + "MouseMoveEvent 279 171 0 0 0 0 0\n" + "MouseMoveEvent 275 175 0 0 0 0 0\n" + "MouseMoveEvent 273 177 0 0 0 0 0\n" + "MouseMoveEvent 272 178 0 0 0 0 0\n" + "TimerEvent 272 178 0 0 0 0 0\n" + "MouseMoveEvent 272 179 0 0 0 0 0\n" + "MouseMoveEvent 272 180 0 0 0 0 0\n" + "MouseMoveEvent 272 182 0 0 0 0 0\n" + "MouseMoveEvent 272 183 0 0 0 0 0\n" + "TimerEvent 272 183 0 0 0 0 0\n" + "MouseMoveEvent 272 184 0 0 0 0 0\n" + "MouseMoveEvent 272 185 0 0 0 0 0\n" + "MouseMoveEvent 273 185 0 0 0 0 0\n" + "MouseMoveEvent 273 186 0 0 0 0 0\n" + "TimerEvent 273 186 0 0 0 0 0\n" + "MouseMoveEvent 273 187 0 0 0 0 0\n" + "MouseMoveEvent 273 188 0 0 0 0 0\n" + "MouseMoveEvent 273 189 0 0 0 0 0\n" + "TimerEvent 273 189 0 0 0 0 0\n" + "MouseMoveEvent 273 190 0 0 0 0 0\n" + "MouseMoveEvent 274 191 0 0 0 0 0\n" + "MouseMoveEvent 274 192 0 0 0 0 0\n" + "MouseMoveEvent 274 193 0 0 0 0 0\n" + "TimerEvent 274 193 0 0 0 0 0\n" + "MouseMoveEvent 274 194 0 0 0 0 0\n" + "MouseMoveEvent 274 195 0 0 0 0 0\n" + "MouseMoveEvent 274 196 0 0 0 0 0\n" + "MouseMoveEvent 274 197 0 0 0 0 0\n" + "TimerEvent 274 197 0 0 0 0 0\n" + "MouseMoveEvent 274 198 0 0 0 0 0\n" + "MouseMoveEvent 275 199 0 0 0 0 0\n" + "MouseMoveEvent 275 200 0 0 0 0 0\n" + "TimerEvent 275 200 0 0 0 0 0\n" + "MouseMoveEvent 275 201 0 0 0 0 0\n" + "MouseMoveEvent 275 202 0 0 0 0 0\n" + "TimerEvent 275 202 0 0 0 0 0\n" + "MouseMoveEvent 274 201 0 0 0 0 0\n" + "MouseMoveEvent 272 200 0 0 0 0 0\n" + "MouseMoveEvent 269 199 0 0 0 0 0\n" + "MouseMoveEvent 266 198 0 0 0 0 0\n" + "MouseMoveEvent 264 197 0 0 0 0 0\n" + "MouseMoveEvent 262 197 0 0 0 0 0\n" + "TimerEvent 262 197 0 0 0 0 0\n" + "MouseMoveEvent 261 196 0 0 0 0 0\n" + "MouseMoveEvent 260 196 0 0 0 0 0\n" + "TimerEvent 260 196 0 0 0 0 0\n" + "MouseMoveEvent 262 196 0 0 0 0 0\n" + "MouseMoveEvent 266 196 0 0 0 0 0\n" + "MouseMoveEvent 272 196 0 0 0 0 0\n" + "MouseMoveEvent 277 197 0 0 0 0 0\n" + "MouseMoveEvent 283 197 0 0 0 0 0\n" + "MouseMoveEvent 287 199 0 0 0 0 0\n" + "TimerEvent 287 199 0 0 0 0 0\n" + "MouseMoveEvent 286 198 0 0 0 0 0\n" + "MouseMoveEvent 285 198 0 0 0 0 0\n" + "MouseMoveEvent 285 197 0 0 0 0 0\n" + "MouseMoveEvent 284 197 0 0 0 0 0\n" + "TimerEvent 284 197 0 0 0 0 0\n" + "MouseMoveEvent 283 197 0 0 0 0 0\n" + "MouseMoveEvent 280 197 0 0 0 0 0\n" + "MouseMoveEvent 278 197 0 0 0 0 0\n" + "MouseMoveEvent 277 198 0 0 0 0 0\n" + "MouseMoveEvent 275 199 0 0 0 0 0\n" + "TimerEvent 275 199 0 0 0 0 0\n" + "MouseMoveEvent 273 200 0 0 0 0 0\n" + "MouseMoveEvent 272 201 0 0 0 0 0\n" + "MouseMoveEvent 271 202 0 0 0 0 0\n" + "MouseMoveEvent 270 202 0 0 0 0 0\n" + "TimerEvent 270 202 0 0 0 0 0\n" + "MouseMoveEvent 269 202 0 0 0 0 0\n" + "MouseMoveEvent 269 201 0 0 0 0 0\n" + "MouseMoveEvent 268 200 0 0 0 0 0\n" + "MouseMoveEvent 268 198 0 0 0 0 0\n" + "MouseMoveEvent 268 197 0 0 0 0 0\n" + "TimerEvent 268 197 0 0 0 0 0\n" + "MouseMoveEvent 268 196 0 0 0 0 0\n" + "TimerEvent 268 196 0 0 0 0 0\n" + "MouseMoveEvent 268 197 0 0 0 0 0\n" + "MouseMoveEvent 268 198 0 0 0 0 0\n" + "MouseMoveEvent 268 199 0 0 0 0 0\n" + "TimerEvent 268 199 0 0 0 0 0\n" + "LeftButtonPressEvent 268 199 0 0 0 0 0\n" + "TimerEvent 268 199 0 0 0 0 0\n" + "LeftButtonReleaseEvent 268 199 0 0 0 0 0\n" + "LeftButtonPressEvent 268 199 0 0 0 1 0\n" + "TimerEvent 268 199 0 0 0 1 0\n" + "LeftButtonReleaseEvent 268 199 0 0 0 0 0\n" + "MouseMoveEvent 268 198 0 0 0 0 0\n" + "MouseMoveEvent 268 197 0 0 0 0 0\n" + "MouseMoveEvent 267 196 0 0 0 0 0\n" + "MouseMoveEvent 267 194 0 0 0 0 0\n" + "MouseMoveEvent 267 193 0 0 0 0 0\n" + "TimerEvent 267 193 0 0 0 0 0\n" + "MouseMoveEvent 267 192 0 0 0 0 0\n" + "MouseMoveEvent 267 191 0 0 0 0 0\n" + "TimerEvent 267 191 0 0 0 0 0\n" + "MouseMoveEvent 267 190 0 0 0 0 0\n" + "MouseMoveEvent 267 189 0 0 0 0 0\n" + "MouseMoveEvent 266 188 0 0 0 0 0\n" + "TimerEvent 266 188 0 0 0 0 0\n" + "LeftButtonPressEvent 266 188 0 0 0 0 0\n" + "MouseMoveEvent 266 187 0 0 0 0 0\n" + "TimerEvent 266 187 0 0 0 0 0\n" + "MouseMoveEvent 266 186 0 0 0 0 0\n" + "TimerEvent 266 186 0 0 0 0 0\n" + "MouseMoveEvent 266 185 0 0 0 0 0\n" + "TimerEvent 266 185 0 0 0 0 0\n" + "MouseMoveEvent 266 184 0 0 0 0 0\n" + "MouseMoveEvent 265 183 0 0 0 0 0\n" + "MouseMoveEvent 265 182 0 0 0 0 0\n" + "MouseMoveEvent 265 181 0 0 0 0 0\n" + "MouseMoveEvent 265 180 0 0 0 0 0\n" + "TimerEvent 265 180 0 0 0 0 0\n" + "MouseMoveEvent 265 179 0 0 0 0 0\n" + "MouseMoveEvent 265 178 0 0 0 0 0\n" + "MouseMoveEvent 265 177 0 0 0 0 0\n" + "TimerEvent 265 177 0 0 0 0 0\n" + "MouseMoveEvent 265 176 0 0 0 0 0\n" + "MouseMoveEvent 265 175 0 0 0 0 0\n" + "MouseMoveEvent 265 174 0 0 0 0 0\n" + "TimerEvent 265 174 0 0 0 0 0\n" + "MouseMoveEvent 265 173 0 0 0 0 0\n" + "MouseMoveEvent 265 172 0 0 0 0 0\n" + "MouseMoveEvent 265 171 0 0 0 0 0\n" + "TimerEvent 265 171 0 0 0 0 0\n" + "MouseMoveEvent 265 170 0 0 0 0 0\n" + "TimerEvent 265 170 0 0 0 0 0\n" + "MouseMoveEvent 265 171 0 0 0 0 0\n" + "MouseMoveEvent 265 172 0 0 0 0 0\n" + "TimerEvent 265 172 0 0 0 0 0\n" + "MouseMoveEvent 265 173 0 0 0 0 0\n" + "MouseMoveEvent 265 174 0 0 0 0 0\n" + "MouseMoveEvent 265 175 0 0 0 0 0\n" + "TimerEvent 265 175 0 0 0 0 0\n" + "LeftButtonReleaseEvent 265 175 0 0 0 0 0\n" + "TimerEvent 265 175 0 0 0 0 0\n" + "MouseMoveEvent 265 174 0 0 0 0 0\n" + "MouseMoveEvent 265 173 0 0 0 0 0\n" + "MouseMoveEvent 265 171 0 0 0 0 0\n" + "MouseMoveEvent 265 170 0 0 0 0 0\n" + "MouseMoveEvent 265 168 0 0 0 0 0\n" + "TimerEvent 265 168 0 0 0 0 0\n" + "MouseMoveEvent 263 166 0 0 0 0 0\n" + "MouseMoveEvent 256 163 0 0 0 0 0\n" + "MouseMoveEvent 247 159 0 0 0 0 0\n" + "MouseMoveEvent 239 157 0 0 0 0 0\n" + "MouseMoveEvent 232 155 0 0 0 0 0\n" + "MouseMoveEvent 228 153 0 0 0 0 0\n" + "TimerEvent 228 153 0 0 0 0 0\n" + "MouseMoveEvent 227 152 0 0 0 0 0\n" + "MouseMoveEvent 226 152 0 0 0 0 0\n" + "MouseMoveEvent 224 151 0 0 0 0 0\n" + "MouseMoveEvent 222 150 0 0 0 0 0\n" + "MouseMoveEvent 219 148 0 0 0 0 0\n" + "MouseMoveEvent 215 147 0 0 0 0 0\n" + "TimerEvent 215 147 0 0 0 0 0\n" + "MouseMoveEvent 210 145 0 0 0 0 0\n" + "MouseMoveEvent 202 142 0 0 0 0 0\n" + "MouseMoveEvent 193 138 0 0 0 0 0\n" + "MouseMoveEvent 184 135 0 0 0 0 0\n" + "MouseMoveEvent 177 133 0 0 0 0 0\n" + "MouseMoveEvent 173 133 0 0 0 0 0\n" + "TimerEvent 173 133 0 0 0 0 0\n" + "MouseMoveEvent 173 134 0 0 0 0 0\n" + "MouseMoveEvent 174 138 0 0 0 0 0\n" + "MouseMoveEvent 175 146 0 0 0 0 0\n" + "MouseMoveEvent 175 150 0 0 0 0 0\n" + "MouseMoveEvent 175 151 0 0 0 0 0\n" + "TimerEvent 175 151 0 0 0 0 0\n" + "MouseMoveEvent 175 150 0 0 0 0 0\n" + "MouseMoveEvent 175 149 0 0 0 0 0\n" + "MouseMoveEvent 174 148 0 0 0 0 0\n" + "MouseMoveEvent 172 147 0 0 0 0 0\n" + "MouseMoveEvent 169 145 0 0 0 0 0\n" + "MouseMoveEvent 166 143 0 0 0 0 0\n" + "TimerEvent 166 143 0 0 0 0 0\n" + "MouseMoveEvent 163 141 0 0 0 0 0\n" + "MouseMoveEvent 162 140 0 0 0 0 0\n" + "MouseMoveEvent 160 139 0 0 0 0 0\n" + "MouseMoveEvent 160 138 0 0 0 0 0\n" + "MouseMoveEvent 159 137 0 0 0 0 0\n" + "MouseMoveEvent 158 136 0 0 0 0 0\n" + "TimerEvent 158 136 0 0 0 0 0\n" + "MouseMoveEvent 156 135 0 0 0 0 0\n" + "MouseMoveEvent 155 134 0 0 0 0 0\n" + "MouseMoveEvent 154 133 0 0 0 0 0\n" + "MouseMoveEvent 152 132 0 0 0 0 0\n" + "MouseMoveEvent 151 130 0 0 0 0 0\n" + "MouseMoveEvent 150 129 0 0 0 0 0\n" + "TimerEvent 150 129 0 0 0 0 0\n" + "MouseMoveEvent 149 128 0 0 0 0 0\n" + "MouseMoveEvent 148 127 0 0 0 0 0\n" + "MouseMoveEvent 148 126 0 0 0 0 0\n" + "MouseMoveEvent 148 124 0 0 0 0 0\n" + "MouseMoveEvent 148 123 0 0 0 0 0\n" + "MouseMoveEvent 147 123 0 0 0 0 0\n" + "TimerEvent 147 123 0 0 0 0 0\n" + "MouseMoveEvent 147 122 0 0 0 0 0\n" + "MouseMoveEvent 147 121 0 0 0 0 0\n" + "TimerEvent 147 121 0 0 0 0 0\n" + "MouseMoveEvent 147 120 0 0 0 0 0\n" + "MouseMoveEvent 147 119 0 0 0 0 0\n" + "TimerEvent 147 119 0 0 0 0 0\n" + "MouseMoveEvent 147 118 0 0 0 0 0\n" + "MouseMoveEvent 147 117 0 0 0 0 0\n" + "MouseMoveEvent 145 116 0 0 0 0 0\n" + "MouseMoveEvent 144 115 0 0 0 0 0\n" + "TimerEvent 144 115 0 0 0 0 0\n" + "MouseMoveEvent 142 114 0 0 0 0 0\n" + "MouseMoveEvent 139 114 0 0 0 0 0\n" + "MouseMoveEvent 136 113 0 0 0 0 0\n" + "MouseMoveEvent 135 112 0 0 0 0 0\n" + "MouseMoveEvent 134 112 0 0 0 0 0\n" + "TimerEvent 134 112 0 0 0 0 0\n" + "LeftButtonPressEvent 134 112 0 0 0 0 0\n" + "TimerEvent 134 112 0 0 0 0 0\n" + "LeftButtonReleaseEvent 134 112 0 0 0 0 0\n" + "LeftButtonPressEvent 134 112 0 0 0 0 0\n" + "LeftButtonReleaseEvent 134 112 0 0 0 0 0\n" + "LeftButtonPressEvent 134 112 0 0 0 1 0\n" + "TimerEvent 134 112 0 0 0 1 0\n" + "LeftButtonReleaseEvent 134 112 0 0 0 0 0\n" + "MouseMoveEvent 133 112 0 0 0 0 0\n" + "MouseMoveEvent 132 110 0 0 0 0 0\n" + "MouseMoveEvent 130 109 0 0 0 0 0\n" + "MouseMoveEvent 129 109 0 0 0 0 0\n" + "TimerEvent 129 109 0 0 0 0 0\n" + "MouseMoveEvent 128 109 0 0 0 0 0\n" + "MouseMoveEvent 122 109 0 0 0 0 0\n" + "MouseMoveEvent 116 109 0 0 0 0 0\n" + "MouseMoveEvent 105 109 0 0 0 0 0\n" + "MouseMoveEvent 97 111 0 0 0 0 0\n" + "TimerEvent 97 111 0 0 0 0 0\n" + "MouseMoveEvent 91 111 0 0 0 0 0\n" + "MouseMoveEvent 87 113 0 0 0 0 0\n" + "MouseMoveEvent 86 113 0 0 0 0 0\n" + "TimerEvent 86 113 0 0 0 0 0\n" + "MouseMoveEvent 84 113 0 0 0 0 0\n" + "MouseMoveEvent 78 112 0 0 0 0 0\n" + "MouseMoveEvent 68 109 0 0 0 0 0\n" + "MouseMoveEvent 57 107 0 0 0 0 0\n" + "MouseMoveEvent 49 106 0 0 0 0 0\n" + "MouseMoveEvent 44 104 0 0 0 0 0\n" + "TimerEvent 44 104 0 0 0 0 0\n" + "MouseMoveEvent 40 104 0 0 0 0 0\n" + "TimerEvent 40 104 0 0 0 0 0\n" + "MouseMoveEvent 41 104 0 0 0 0 0\n" + "MouseMoveEvent 42 104 0 0 0 0 0\n" + "TimerEvent 42 104 0 0 0 0 0\n" + "MouseMoveEvent 44 105 0 0 0 0 0\n" + "MouseMoveEvent 48 106 0 0 0 0 0\n" + "MouseMoveEvent 54 107 0 0 0 0 0\n" + "MouseMoveEvent 60 107 0 0 0 0 0\n" + "MouseMoveEvent 66 109 0 0 0 0 0\n" + "MouseMoveEvent 67 109 0 0 0 0 0\n" + "TimerEvent 67 109 0 0 0 0 0\n" + "LeftButtonPressEvent 67 109 0 0 0 0 0\n" + "MouseMoveEvent 67 110 0 0 0 0 0\n" + "MouseMoveEvent 70 110 0 0 0 0 0\n" + "MouseMoveEvent 72 111 0 0 0 0 0\n" + "MouseMoveEvent 73 112 0 0 0 0 0\n" + "TimerEvent 73 112 0 0 0 0 0\n" + "MouseMoveEvent 74 112 0 0 0 0 0\n" + "TimerEvent 74 112 0 0 0 0 0\n" + "MouseMoveEvent 76 112 0 0 0 0 0\n" + "MouseMoveEvent 77 112 0 0 0 0 0\n" + "TimerEvent 77 112 0 0 0 0 0\n" + "MouseMoveEvent 77 111 0 0 0 0 0\n" + "MouseMoveEvent 78 111 0 0 0 0 0\n" + "MouseMoveEvent 80 110 0 0 0 0 0\n" + "MouseMoveEvent 81 110 0 0 0 0 0\n" + "TimerEvent 81 110 0 0 0 0 0\n" +