From 95265d6c29393218a59fc1f3f9e51f8bcdb91152 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Fri, 22 Dec 2023 11:29:57 -0500 Subject: [PATCH] ENH: Rename complex to simplnx (#801) The previous repo would have been at https://www.github.com/bluequartzsoftware/complex Signed-off-by: Michael Jackson --- .all-contributorsrc | 2 +- .azure/azure-pipelines.yml | 6 +- .clang-tidy | 4 +- .../ISSUE_TEMPLATE/functionality_report.yml | 2 +- .github/pull_request_template.md | 11 +- CMakeLists.txt | 1192 ++++++++--------- CMakePresets.json | 32 +- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 28 +- PortingFilters.md | 18 +- README.md | 34 +- cmake/Plugin.cmake | 146 +- ...exVersion.cpp.in => SIMPLNXVersion.cpp.in} | 2 +- ...{ComplexVersion.hpp => SIMPLNXVersion.hpp} | 32 +- cmake/Summary.cmake | 42 +- cmake/Utility.cmake | 18 +- cmake/complex_export_extra.hpp | 6 - cmake/plugin_filter_registration.h.in | 6 +- ...Config.cmake.in => simplnxConfig.cmake.in} | 4 +- cmake/simplnx_export_extra.hpp | 6 + conda/bld.bat | 6 +- conda/build.sh | 4 +- conda/meta.yaml | 16 +- conda/recipe.yaml | 12 +- docs/Build_From_Source.md | 44 +- docs/CMakeLists.txt | 34 +- docs/Code_Style_Guide.md | 4 +- docs/Porting_Filters.md | 14 +- docs/conf.py | 4 +- pipelines/Combo-EBSD-osc_r0c0.d3dpipeline | 40 +- pipelines/PorosityAnalysis.d3dpipeline | 26 +- scripts/filter.cpp.in | 12 +- scripts/filter.hpp.in | 14 +- scripts/generate_simpl_conversion_code.py | 44 +- scripts/make_filter.py | 2 +- .../ComplexCoreLegacyUUIDMapping.hpp | 248 ---- .../src/ComplexCore/ComplexCorePlugin.cpp | 30 - .../src/ComplexCore/ComplexCorePlugin.hpp | 25 - src/Plugins/ComplexCore/test/test_dirs.hpp.in | 21 - src/Plugins/ITKImageProcessing/CMakeLists.txt | 26 +- .../cmake/ITKImageProcessingConfig.hpp.in | 2 +- .../(02) Image Segmentation.d3dpipeline | 22 +- .../(03) Porosity Mesh Export.d3dpipeline | 24 +- .../Common/ITKArrayHelper.cpp | 4 +- .../Common/ITKArrayHelper.hpp | 64 +- .../Common/ITKDream3DFilterInterruption.hpp | 2 +- .../Common/ITKProgressObserver.hpp | 10 +- .../Common/ReadImageUtils.hpp | 8 +- .../ITKImageProcessing/Common/sitkCommon.hpp | 2 +- .../Algorithms/ITKImportFijiMontage.cpp | 26 +- .../Algorithms/ITKImportFijiMontage.hpp | 12 +- .../Filters/ITKAbsImage.cpp | 16 +- .../Filters/ITKAbsImage.hpp | 12 +- .../Filters/ITKAcosImage.cpp | 16 +- .../Filters/ITKAcosImage.hpp | 12 +- .../ITKAdaptiveHistogramEqualizationImage.cpp | 20 +- .../ITKAdaptiveHistogramEqualizationImage.hpp | 12 +- .../Filters/ITKAsinImage.cpp | 16 +- .../Filters/ITKAsinImage.hpp | 12 +- .../Filters/ITKAtanImage.cpp | 16 +- .../Filters/ITKAtanImage.hpp | 12 +- .../Filters/ITKBinaryContourImage.cpp | 20 +- .../Filters/ITKBinaryContourImage.hpp | 12 +- .../Filters/ITKBinaryDilateImage.cpp | 24 +- .../Filters/ITKBinaryDilateImage.hpp | 12 +- .../Filters/ITKBinaryErodeImage.cpp | 24 +- .../Filters/ITKBinaryErodeImage.hpp | 12 +- .../ITKBinaryMorphologicalClosingImage.cpp | 22 +- .../ITKBinaryMorphologicalClosingImage.hpp | 10 +- .../ITKBinaryMorphologicalOpeningImage.cpp | 22 +- .../ITKBinaryMorphologicalOpeningImage.hpp | 12 +- .../ITKBinaryOpeningByReconstructionImage.cpp | 24 +- .../ITKBinaryOpeningByReconstructionImage.hpp | 12 +- .../Filters/ITKBinaryProjectionImage.cpp | 18 +- .../Filters/ITKBinaryProjectionImage.hpp | 12 +- .../Filters/ITKBinaryThinningImage.cpp | 16 +- .../Filters/ITKBinaryThinningImage.hpp | 12 +- .../Filters/ITKBinaryThresholdImage.cpp | 18 +- .../Filters/ITKBinaryThresholdImage.hpp | 12 +- .../Filters/ITKBlackTopHatImage.cpp | 22 +- .../Filters/ITKBlackTopHatImage.hpp | 12 +- .../ITKClosingByReconstructionImage.cpp | 22 +- .../ITKClosingByReconstructionImage.hpp | 12 +- .../Filters/ITKCosImage.cpp | 16 +- .../Filters/ITKCosImage.hpp | 12 +- .../ITKDilateObjectMorphologyImage.cpp | 22 +- .../ITKDilateObjectMorphologyImage.hpp | 12 +- .../Filters/ITKDiscreteGaussianImage.cpp | 22 +- .../Filters/ITKDiscreteGaussianImage.hpp | 12 +- .../Filters/ITKErodeObjectMorphologyImage.cpp | 22 +- .../Filters/ITKErodeObjectMorphologyImage.hpp | 12 +- .../Filters/ITKExpImage.cpp | 16 +- .../Filters/ITKExpImage.hpp | 12 +- .../Filters/ITKExpNegativeImage.cpp | 16 +- .../Filters/ITKExpNegativeImage.hpp | 12 +- .../Filters/ITKGradientMagnitudeImage.cpp | 18 +- .../Filters/ITKGradientMagnitudeImage.hpp | 12 +- ...radientMagnitudeRecursiveGaussianImage.cpp | 26 +- ...radientMagnitudeRecursiveGaussianImage.hpp | 10 +- .../Filters/ITKGrayscaleDilateImage.cpp | 20 +- .../Filters/ITKGrayscaleDilateImage.hpp | 12 +- .../Filters/ITKGrayscaleErodeImage.cpp | 20 +- .../Filters/ITKGrayscaleErodeImage.hpp | 12 +- .../Filters/ITKGrayscaleFillholeImage.cpp | 18 +- .../Filters/ITKGrayscaleFillholeImage.hpp | 12 +- .../Filters/ITKGrayscaleGrindPeakImage.cpp | 18 +- .../Filters/ITKGrayscaleGrindPeakImage.hpp | 12 +- .../ITKGrayscaleMorphologicalClosingImage.cpp | 22 +- .../ITKGrayscaleMorphologicalClosingImage.hpp | 12 +- .../ITKGrayscaleMorphologicalOpeningImage.cpp | 22 +- .../ITKGrayscaleMorphologicalOpeningImage.hpp | 12 +- .../Filters/ITKHConvexImage.cpp | 20 +- .../Filters/ITKHConvexImage.hpp | 12 +- .../Filters/ITKHMaximaImage.cpp | 18 +- .../Filters/ITKHMaximaImage.hpp | 12 +- .../Filters/ITKHMinimaImage.cpp | 20 +- .../Filters/ITKHMinimaImage.hpp | 12 +- .../Filters/ITKImageReader.cpp | 26 +- .../Filters/ITKImageReader.hpp | 12 +- .../Filters/ITKImageWriter.cpp | 30 +- .../Filters/ITKImageWriter.hpp | 12 +- .../Filters/ITKImportFijiMontageFilter.cpp | 36 +- .../Filters/ITKImportFijiMontageFilter.hpp | 14 +- .../Filters/ITKImportImageStack.cpp | 50 +- .../Filters/ITKImportImageStack.hpp | 12 +- .../Filters/ITKIntensityWindowingImage.cpp | 18 +- .../Filters/ITKIntensityWindowingImage.hpp | 12 +- .../Filters/ITKInvertIntensityImage.cpp | 18 +- .../Filters/ITKInvertIntensityImage.hpp | 12 +- .../Filters/ITKLabelContourImage.cpp | 20 +- .../Filters/ITKLabelContourImage.hpp | 12 +- .../Filters/ITKLog10Image.cpp | 16 +- .../Filters/ITKLog10Image.hpp | 12 +- .../Filters/ITKLogImage.cpp | 16 +- .../Filters/ITKLogImage.hpp | 12 +- .../Filters/ITKMaskImage.cpp | 22 +- .../Filters/ITKMaskImage.hpp | 12 +- .../Filters/ITKMedianImage.cpp | 18 +- .../Filters/ITKMedianImage.hpp | 12 +- .../Filters/ITKMhaFileReader.cpp | 46 +- .../Filters/ITKMhaFileReader.hpp | 10 +- .../Filters/ITKMorphologicalGradientImage.cpp | 20 +- .../Filters/ITKMorphologicalGradientImage.hpp | 12 +- .../ITKMorphologicalWatershedImage.cpp | 20 +- .../ITKMorphologicalWatershedImage.hpp | 12 +- .../Filters/ITKNormalizeImage.cpp | 16 +- .../Filters/ITKNormalizeImage.hpp | 12 +- .../Filters/ITKNotImage.cpp | 16 +- .../Filters/ITKNotImage.hpp | 12 +- .../ITKOpeningByReconstructionImage.cpp | 22 +- .../ITKOpeningByReconstructionImage.hpp | 12 +- .../ITKOtsuMultipleThresholdsImage.cpp | 20 +- .../ITKOtsuMultipleThresholdsImage.hpp | 12 +- .../Filters/ITKRelabelComponentImage.cpp | 20 +- .../Filters/ITKRelabelComponentImage.hpp | 12 +- .../Filters/ITKRescaleIntensityImage.cpp | 18 +- .../Filters/ITKRescaleIntensityImage.hpp | 12 +- .../Filters/ITKSigmoidImage.cpp | 18 +- .../Filters/ITKSigmoidImage.hpp | 12 +- .../ITKSignedMaurerDistanceMapImage.cpp | 20 +- .../ITKSignedMaurerDistanceMapImage.hpp | 12 +- .../Filters/ITKSinImage.cpp | 16 +- .../Filters/ITKSinImage.hpp | 12 +- .../Filters/ITKSqrtImage.cpp | 16 +- .../Filters/ITKSqrtImage.hpp | 12 +- .../Filters/ITKSquareImage.cpp | 16 +- .../Filters/ITKSquareImage.hpp | 12 +- .../Filters/ITKTanImage.cpp | 16 +- .../Filters/ITKTanImage.hpp | 12 +- .../Filters/ITKThresholdImage.cpp | 18 +- .../Filters/ITKThresholdImage.hpp | 12 +- .../Filters/ITKValuedRegionalMaximaImage.cpp | 18 +- .../Filters/ITKValuedRegionalMaximaImage.hpp | 12 +- .../Filters/ITKValuedRegionalMinimaImage.cpp | 18 +- .../Filters/ITKValuedRegionalMinimaImage.hpp | 12 +- .../Filters/ITKWhiteTopHatImage.cpp | 22 +- .../Filters/ITKWhiteTopHatImage.hpp | 12 +- .../Filters_Private/ITKImportFijiMontage.cpp | 28 +- .../ITKImportRoboMetMontage.cpp | 28 +- .../IlluminationCorrection.cpp | 34 +- .../ImportAxioVisionV4Montage.cpp | 24 +- .../ImportVectorImageStack.cpp | 24 +- .../Filters_Private/ImportZenInfoMontage.cpp | 28 +- .../ITKImageProcessingLegacyUUIDMapping.hpp | 128 +- .../ITKImageProcessingPlugin.cpp | 8 +- .../ITKImageProcessingPlugin.hpp | 10 +- .../ITKImageProcessing/test/CMakeLists.txt | 10 +- .../test/ITKAbsImageTest.cpp | 26 +- .../test/ITKAcosImageTest.cpp | 16 +- ...AdaptiveHistogramEqualizationImageTest.cpp | 58 +- .../test/ITKAsinImageTest.cpp | 16 +- .../test/ITKAtanImageTest.cpp | 16 +- .../test/ITKBinaryContourImageTest.cpp | 22 +- .../test/ITKBinaryDilateImageTest.cpp | 30 +- .../test/ITKBinaryErodeImageTest.cpp | 24 +- ...ITKBinaryMorphologicalClosingImageTest.cpp | 26 +- ...ITKBinaryMorphologicalOpeningImageTest.cpp | 22 +- ...BinaryOpeningByReconstructionImageTest.cpp | 24 +- .../test/ITKBinaryProjectionImageTest.cpp | 24 +- .../test/ITKBinaryThinningImageTest.cpp | 16 +- .../test/ITKBinaryThresholdImageTest.cpp | 20 +- .../test/ITKBlackTopHatImageTest.cpp | 22 +- .../ITKClosingByReconstructionImageTest.cpp | 18 +- .../test/ITKCosImageTest.cpp | 26 +- .../ITKDilateObjectMorphologyImageTest.cpp | 36 +- .../test/ITKDiscreteGaussianImageTest.cpp | 42 +- .../ITKErodeObjectMorphologyImageTest.cpp | 36 +- .../test/ITKExpImageTest.cpp | 20 +- .../test/ITKExpNegativeImageTest.cpp | 20 +- .../test/ITKGradientMagnitudeImageTest.cpp | 18 +- .../test/ITKGrayscaleDilateImageTest.cpp | 20 +- .../test/ITKGrayscaleErodeImageTest.cpp | 20 +- .../test/ITKGrayscaleFillholeImageTest.cpp | 20 +- .../test/ITKGrayscaleGrindPeakImageTest.cpp | 24 +- ...GrayscaleMorphologicalClosingImageTest.cpp | 22 +- ...GrayscaleMorphologicalOpeningImageTest.cpp | 34 +- .../test/ITKHConvexImageTest.cpp | 20 +- .../test/ITKHMaximaImageTest.cpp | 18 +- .../test/ITKHMinimaImageTest.cpp | 20 +- .../test/ITKImageReaderTest.cpp | 14 +- .../test/ITKImageWriterTest.cpp | 24 +- .../test/ITKImportFijiMontageTest.cpp | 20 +- .../test/ITKImportImageStackTest.cpp | 22 +- .../test/ITKIntensityWindowingImageTest.cpp | 30 +- .../test/ITKInvertIntensityImageTest.cpp | 14 +- .../test/ITKLabelContourImageTest.cpp | 20 +- .../test/ITKLog10ImageTest.cpp | 16 +- .../test/ITKLogImageTest.cpp | 16 +- .../test/ITKMaskImageTest.cpp | 40 +- .../test/ITKMedianImageTest.cpp | 20 +- .../test/ITKMhaFileReaderTest.cpp | 12 +- .../ITKMorphologicalGradientImageTest.cpp | 20 +- .../ITKMorphologicalWatershedImageTest.cpp | 22 +- .../test/ITKNormalizeImageTest.cpp | 26 +- .../test/ITKNotImageTest.cpp | 16 +- .../ITKOpeningByReconstructionImageTest.cpp | 18 +- .../ITKOtsuMultipleThresholdsImageTest.cpp | 34 +- .../test/ITKRelabelComponentImageTest.cpp | 32 +- .../test/ITKRescaleIntensityImageTest.cpp | 22 +- .../test/ITKSigmoidImageTest.cpp | 18 +- .../ITKSignedMaurerDistanceMapImageTest.cpp | 18 +- .../test/ITKSinImageTest.cpp | 16 +- .../test/ITKSqrtImageTest.cpp | 16 +- .../test/ITKSquareImageTest.cpp | 16 +- .../test/ITKTanImageTest.cpp | 16 +- .../ITKImageProcessing/test/ITKTestBase.cpp | 8 +- .../ITKImageProcessing/test/ITKTestBase.hpp | 16 +- .../test/ITKThresholdImageTest.cpp | 30 +- .../test/ITKValuedRegionalMaximaImageTest.cpp | 18 +- .../test/ITKValuedRegionalMinimaImageTest.cpp | 18 +- .../test/ITKWhiteTopHatImageTest.cpp | 22 +- .../ITKImageProcessing/test/test_dirs.hpp.in | 20 +- .../ITKImageProcessing/tools/ReadMe.md | 2 +- .../ITKImageProcessing/tools/filter.cpp.in | 6 +- .../ITKImageProcessing/tools/filter.hpp.in | 10 +- .../tools/itk_filter_generator.py | 52 +- .../wrapping/python/itkimageprocessing.cpp | 6 +- .../OrientationAnalysis/CMakeLists.txt | 38 +- .../docs/ReadH5EbsdFilter.md | 4 +- .../docs/ReadH5EspritDataFilter.md | 6 +- .../docs/ReadH5OimDataFilter.md | 4 +- ...AlignSectionsMutualInformation.d3dpipeline | 10 +- .../pipelines/CI_Histogram.d3dpipeline | 14 +- .../(01) Small IN100 Archive.d3dpipeline | 2 +- ...mall IN100 Full Reconstruction.d3dpipeline | 44 +- ...IN100 Morphological Statistics.d3dpipeline | 18 +- ...00 Crystallographic Statistics.d3dpipeline | 78 +- .../(01) Small IN100 Quick Mesh.d3dpipeline | 10 +- .../(02) Small IN100 Smooth Mesh.d3dpipeline | 6 +- ...3) Small IN100 Mesh Statistics.d3dpipeline | 16 +- .../(04) Small IN100 GBCD.d3dpipeline | 16 +- .../(05) Small IN100 GBCD Metric.d3dpipeline | 8 +- .../pipelines/Edax_IPF_Colors.d3dpipeline | 12 +- .../pipelines/EnsembleInfoReader.d3dpipeline | 14 +- .../FindGBCD-GBPDMetricBased.d3dpipeline | 116 +- .../ImportBrukerNanoEspritData.d3dpipeline | 4 +- .../pipelines/ImportEdaxOIMData.d3dpipeline | 8 +- .../pipelines/ReadAng.d3dpipeline | 10 +- .../pipelines/ReadCTF.d3dpipeline | 8 +- .../pipelines/TxCopper_Exposed.d3dpipeline | 14 +- .../pipelines/TxCopper_Unexposed.d3dpipeline | 14 +- .../pipelines/aptr12_Analysis.d3dpipeline | 48 +- .../pipelines/avtr12_Analysis.d3dpipeline | 48 +- .../AlignSectionsMisorientation.cpp | 20 +- .../AlignSectionsMisorientation.hpp | 14 +- .../AlignSectionsMutualInformation.cpp | 18 +- .../AlignSectionsMutualInformation.hpp | 18 +- .../BadDataNeighborOrientationCheck.cpp | 14 +- .../BadDataNeighborOrientationCheck.hpp | 10 +- .../Algorithms/CAxisSegmentFeatures.cpp | 14 +- .../Algorithms/CAxisSegmentFeatures.hpp | 14 +- .../Algorithms/ConvertHexGridToSquareGrid.cpp | 14 +- .../Algorithms/ConvertHexGridToSquareGrid.hpp | 26 +- .../Filters/Algorithms/ConvertQuaternion.cpp | 10 +- .../Filters/Algorithms/ConvertQuaternion.hpp | 20 +- .../Filters/Algorithms/CreateEnsembleInfo.cpp | 8 +- .../Filters/Algorithms/CreateEnsembleInfo.hpp | 12 +- .../Algorithms/EBSDSegmentFeatures.cpp | 14 +- .../Algorithms/EBSDSegmentFeatures.hpp | 18 +- .../Filters/Algorithms/EbsdToH5Ebsd.cpp | 10 +- .../Filters/Algorithms/EbsdToH5Ebsd.hpp | 26 +- .../Filters/Algorithms/FindAvgCAxes.cpp | 8 +- .../Filters/Algorithms/FindAvgCAxes.hpp | 10 +- .../Algorithms/FindAvgOrientations.cpp | 20 +- .../Algorithms/FindAvgOrientations.hpp | 14 +- .../Algorithms/FindBoundaryStrengths.cpp | 8 +- .../Algorithms/FindBoundaryStrengths.hpp | 18 +- .../Filters/Algorithms/FindCAxisLocations.cpp | 6 +- .../Filters/Algorithms/FindCAxisLocations.hpp | 10 +- .../FindFeatureNeighborCAxisMisalignments.cpp | 10 +- .../FindFeatureNeighborCAxisMisalignments.hpp | 10 +- ...ndFeatureReferenceCAxisMisorientations.cpp | 12 +- ...ndFeatureReferenceCAxisMisorientations.hpp | 14 +- .../FindFeatureReferenceMisorientations.cpp | 12 +- .../FindFeatureReferenceMisorientations.hpp | 12 +- .../Filters/Algorithms/FindGBCD.cpp | 14 +- .../Filters/Algorithms/FindGBCD.hpp | 10 +- .../Algorithms/FindGBCDMetricBased.cpp | 28 +- .../Algorithms/FindGBCDMetricBased.hpp | 16 +- .../Algorithms/FindGBPDMetricBased.cpp | 28 +- .../Algorithms/FindGBPDMetricBased.hpp | 12 +- .../FindKernelAvgMisorientations.cpp | 14 +- .../FindKernelAvgMisorientations.hpp | 12 +- .../Algorithms/FindMisorientations.cpp | 12 +- .../Algorithms/FindMisorientations.hpp | 10 +- .../Filters/Algorithms/FindSchmids.cpp | 8 +- .../Filters/Algorithms/FindSchmids.hpp | 12 +- .../Filters/Algorithms/FindShapes.cpp | 14 +- .../Filters/Algorithms/FindShapes.hpp | 10 +- .../FindSlipTransmissionMetrics.cpp | 6 +- .../FindSlipTransmissionMetrics.hpp | 14 +- .../Algorithms/FindTriangleGeomShapes.cpp | 10 +- .../Algorithms/FindTriangleGeomShapes.hpp | 10 +- .../Algorithms/GenerateFaceIPFColoring.cpp | 10 +- .../Algorithms/GenerateFaceIPFColoring.hpp | 14 +- .../GenerateFaceMisorientationColoring.cpp | 10 +- .../GenerateFaceMisorientationColoring.hpp | 14 +- .../Algorithms/GenerateGBCDPoleFigure.cpp | 12 +- .../Algorithms/GenerateGBCDPoleFigure.hpp | 12 +- .../Filters/Algorithms/GenerateIPFColors.cpp | 44 +- .../Filters/Algorithms/GenerateIPFColors.hpp | 14 +- .../GenerateQuaternionConjugate.cpp | 8 +- .../GenerateQuaternionConjugate.hpp | 16 +- .../Filters/Algorithms/GroupFeatures.cpp | 6 +- .../Filters/Algorithms/GroupFeatures.hpp | 10 +- .../Filters/Algorithms/MergeTwins.cpp | 12 +- .../Filters/Algorithms/MergeTwins.hpp | 10 +- .../NeighborOrientationCorrelation.cpp | 18 +- .../NeighborOrientationCorrelation.hpp | 12 +- .../Filters/Algorithms/ReadAngData.cpp | 18 +- .../Filters/Algorithms/ReadAngData.hpp | 14 +- .../Filters/Algorithms/ReadCtfData.cpp | 8 +- .../Filters/Algorithms/ReadCtfData.hpp | 12 +- .../Filters/Algorithms/ReadEnsembleInfo.cpp | 8 +- .../Filters/Algorithms/ReadEnsembleInfo.hpp | 12 +- .../Filters/Algorithms/ReadH5Ebsd.cpp | 120 +- .../Filters/Algorithms/ReadH5Ebsd.hpp | 10 +- .../Filters/Algorithms/ReadH5EspritData.cpp | 8 +- .../Filters/Algorithms/ReadH5EspritData.hpp | 8 +- .../Filters/Algorithms/ReadH5OimData.cpp | 6 +- .../Filters/Algorithms/ReadH5OimData.hpp | 4 +- .../Filters/Algorithms/RodriguesConvertor.cpp | 8 +- .../Filters/Algorithms/RodriguesConvertor.hpp | 18 +- .../Algorithms/RotateEulerRefFrame.cpp | 18 +- .../Algorithms/RotateEulerRefFrame.hpp | 8 +- .../Filters/Algorithms/WriteGBCDGMTFile.cpp | 14 +- .../Filters/Algorithms/WriteGBCDGMTFile.hpp | 14 +- .../Algorithms/WriteGBCDTriangleData.cpp | 6 +- .../Algorithms/WriteGBCDTriangleData.hpp | 14 +- .../Filters/Algorithms/WriteINLFile.cpp | 18 +- .../Filters/Algorithms/WriteINLFile.hpp | 14 +- .../Filters/Algorithms/WritePoleFigure.cpp | 42 +- .../Filters/Algorithms/WritePoleFigure.hpp | 22 +- .../Algorithms/WriteStatsGenOdfAngleFile.cpp | 10 +- .../Algorithms/WriteStatsGenOdfAngleFile.hpp | 16 +- .../AlignSectionsMisorientationFilter.cpp | 46 +- .../AlignSectionsMisorientationFilter.hpp | 12 +- .../AlignSectionsMutualInformationFilter.cpp | 32 +- .../AlignSectionsMutualInformationFilter.hpp | 12 +- .../BadDataNeighborOrientationCheckFilter.cpp | 24 +- .../BadDataNeighborOrientationCheckFilter.hpp | 12 +- .../Filters/CAxisSegmentFeaturesFilter.cpp | 28 +- .../Filters/CAxisSegmentFeaturesFilter.hpp | 12 +- .../ConvertHexGridToSquareGridFilter.cpp | 20 +- .../ConvertHexGridToSquareGridFilter.hpp | 10 +- .../Filters/ConvertOrientations.cpp | 142 +- .../Filters/ConvertOrientations.hpp | 12 +- .../Filters/ConvertQuaternionFilter.cpp | 26 +- .../Filters/ConvertQuaternionFilter.hpp | 12 +- .../Filters/CreateEnsembleInfoFilter.cpp | 24 +- .../Filters/CreateEnsembleInfoFilter.hpp | 12 +- .../Filters/EBSDSegmentFeaturesFilter.cpp | 36 +- .../Filters/EBSDSegmentFeaturesFilter.hpp | 12 +- .../Filters/EbsdToH5EbsdFilter.cpp | 22 +- .../Filters/EbsdToH5EbsdFilter.hpp | 10 +- .../Filters/FindAvgCAxesFilter.cpp | 18 +- .../Filters/FindAvgCAxesFilter.hpp | 12 +- .../Filters/FindAvgOrientationsFilter.cpp | 22 +- .../Filters/FindAvgOrientationsFilter.hpp | 12 +- .../Filters/FindBoundaryStrengthsFilter.cpp | 22 +- .../Filters/FindBoundaryStrengthsFilter.hpp | 12 +- .../Filters/FindCAxisLocationsFilter.cpp | 18 +- .../Filters/FindCAxisLocationsFilter.hpp | 12 +- ...eatureNeighborCAxisMisalignmentsFilter.cpp | 24 +- ...eatureNeighborCAxisMisalignmentsFilter.hpp | 12 +- ...ureReferenceCAxisMisorientationsFilter.cpp | 20 +- ...ureReferenceCAxisMisorientationsFilter.hpp | 12 +- ...dFeatureReferenceMisorientationsFilter.cpp | 26 +- ...dFeatureReferenceMisorientationsFilter.hpp | 12 +- .../Filters/FindGBCDFilter.cpp | 26 +- .../Filters/FindGBCDFilter.hpp | 12 +- .../Filters/FindGBCDMetricBasedFilter.cpp | 30 +- .../Filters/FindGBCDMetricBasedFilter.hpp | 12 +- .../Filters/FindGBPDMetricBasedFilter.cpp | 22 +- .../Filters/FindGBPDMetricBasedFilter.hpp | 12 +- .../FindKernelAvgMisorientationsFilter.cpp | 24 +- .../FindKernelAvgMisorientationsFilter.hpp | 12 +- .../Filters/FindMisorientationsFilter.cpp | 38 +- .../Filters/FindMisorientationsFilter.hpp | 12 +- .../Filters/FindSchmidsFilter.cpp | 30 +- .../Filters/FindSchmidsFilter.hpp | 12 +- .../Filters/FindShapesFilter.cpp | 22 +- .../Filters/FindShapesFilter.hpp | 12 +- .../FindSlipTransmissionMetricsFilter.cpp | 22 +- .../FindSlipTransmissionMetricsFilter.hpp | 12 +- .../Filters/FindTriangleGeomShapesFilter.cpp | 32 +- .../Filters/FindTriangleGeomShapesFilter.hpp | 10 +- .../Filters/GenerateFZQuaternions.cpp | 28 +- .../Filters/GenerateFZQuaternions.hpp | 12 +- .../Filters/GenerateFaceIPFColoringFilter.cpp | 20 +- .../Filters/GenerateFaceIPFColoringFilter.hpp | 12 +- ...nerateFaceMisorientationColoringFilter.cpp | 20 +- ...nerateFaceMisorientationColoringFilter.hpp | 12 +- .../Filters/GenerateGBCDPoleFigureFilter.cpp | 32 +- .../Filters/GenerateGBCDPoleFigureFilter.hpp | 12 +- .../Filters/GenerateIPFColorsFilter.cpp | 24 +- .../Filters/GenerateIPFColorsFilter.hpp | 12 +- .../GenerateQuaternionConjugateFilter.cpp | 24 +- .../GenerateQuaternionConjugateFilter.hpp | 12 +- .../Filters/MergeTwinsFilter.cpp | 30 +- .../Filters/MergeTwinsFilter.hpp | 12 +- .../NeighborOrientationCorrelationFilter.cpp | 26 +- .../NeighborOrientationCorrelationFilter.hpp | 12 +- .../Filters/ReadAngDataFilter.cpp | 38 +- .../Filters/ReadAngDataFilter.hpp | 12 +- .../Filters/ReadCtfDataFilter.cpp | 42 +- .../Filters/ReadCtfDataFilter.hpp | 12 +- .../Filters/ReadEnsembleInfoFilter.cpp | 22 +- .../Filters/ReadEnsembleInfoFilter.hpp | 12 +- .../Filters/ReadH5EbsdFilter.cpp | 36 +- .../Filters/ReadH5EbsdFilter.hpp | 12 +- .../Filters/ReadH5EspritDataFilter.cpp | 32 +- .../Filters/ReadH5EspritDataFilter.hpp | 12 +- .../Filters/ReadH5OimDataFilter.cpp | 32 +- .../Filters/ReadH5OimDataFilter.hpp | 12 +- .../Filters/RodriguesConvertorFilter.cpp | 24 +- .../Filters/RodriguesConvertorFilter.hpp | 12 +- .../Filters/RotateEulerRefFrameFilter.cpp | 20 +- .../Filters/RotateEulerRefFrameFilter.hpp | 12 +- .../Filters/WriteGBCDGMTFileFilter.cpp | 24 +- .../Filters/WriteGBCDGMTFileFilter.hpp | 12 +- .../Filters/WriteGBCDTriangleDataFilter.cpp | 20 +- .../Filters/WriteGBCDTriangleDataFilter.hpp | 12 +- .../Filters/WriteINLFileFilter.cpp | 24 +- .../Filters/WriteINLFileFilter.hpp | 12 +- .../Filters/WritePoleFigureFilter.cpp | 36 +- .../Filters/WritePoleFigureFilter.hpp | 12 +- .../WriteStatsGenOdfAngleFileFilter.cpp | 24 +- .../WriteStatsGenOdfAngleFileFilter.hpp | 12 +- .../OrientationAnalysis/Math/Matrix3X1.hpp | 4 +- .../OrientationAnalysis/Math/Matrix3X3.hpp | 4 +- .../OrientationAnalysisLegacyUUIDMapping.hpp | 134 +- .../OrientationAnalysisPlugin.cpp | 10 +- .../OrientationAnalysisPlugin.hpp | 10 +- .../OEMEbsdScanSelectionParameter.cpp | 12 +- .../OEMEbsdScanSelectionParameter.h | 16 +- .../Parameters/ReadH5EbsdFileParameter.cpp | 8 +- .../Parameters/ReadH5EbsdFileParameter.h | 16 +- .../utilities/OrientationUtilities.cpp | 4 +- .../utilities/OrientationUtilities.hpp | 4 +- .../utilities/PhaseType.cpp | 2 +- .../utilities/PhaseType.hpp | 6 +- .../utilities/ReadH5Data.hpp | 12 +- .../utilities/SIMPLConversion.hpp | 6 +- .../utilities/TiffWriter.cpp | 4 +- .../test/AlignSectionsMisorientationTest.cpp | 50 +- .../AlignSectionsMutualInformationTest.cpp | 46 +- .../BadDataNeighborOrientationCheckTest.cpp | 24 +- .../test/CAxisSegmentFeaturesTest.cpp | 18 +- .../OrientationAnalysis/test/CMakeLists.txt | 18 +- .../test/ConvertHexGridToSquareGridTest.cpp | 36 +- .../test/ConvertOrientationsTest.cpp | 18 +- .../test/ConvertQuaternionTest.cpp | 22 +- .../test/CreateEnsembleInfoTest.cpp | 26 +- .../test/EBSDSegmentFeaturesFilterTest.cpp | 26 +- .../test/EbsdToH5EbsdTest.cpp | 24 +- .../test/FindAvgCAxesTest.cpp | 18 +- .../test/FindAvgOrientationsTest.cpp | 36 +- .../test/FindBoundaryStrengthsTest.cpp | 10 +- .../test/FindCAxisLocationsTest.cpp | 18 +- ...dFeatureNeighborCAxisMisalignmentsTest.cpp | 20 +- ...atureReferenceCAxisMisorientationsTest.cpp | 18 +- ...indFeatureReferenceMisorientationsTest.cpp | 26 +- .../test/FindGBCDMetricBasedTest.cpp | 48 +- .../OrientationAnalysis/test/FindGBCDTest.cpp | 26 +- .../test/FindGBPDMetricBasedTest.cpp | 44 +- .../test/FindKernelAvgMisorientationsTest.cpp | 26 +- .../test/FindMisorientationsTest.cpp | 24 +- .../test/FindSchmidsTest.cpp | 26 +- .../test/FindShapesFilterTest.cpp | 20 +- .../test/FindSlipTransmissionMetricsTest.cpp | 8 +- .../test/FindTriangleGeomShapesTest.cpp | 20 +- .../test/GenerateFZQuaternionsTest.cpp | 32 +- .../test/GenerateFaceIPFColoringTest.cpp | 40 +- ...GenerateFaceMisorientationColoringTest.cpp | 44 +- .../test/GenerateGBCDPoleFigureTest.cpp | 34 +- .../test/GenerateIPFColorsTest.cpp | 32 +- .../test/GenerateQuaternionConjugateTest.cpp | 14 +- .../test/MergeTwinsTest.cpp | 24 +- .../NeighborOrientationCorrelationTest.cpp | 32 +- .../test/OrientationAnalysisTestUtils.hpp | 66 +- .../test/ReadAngDataTest.cpp | 16 +- .../test/ReadCtfDataTest.cpp | 16 +- .../test/ReadEnsembleInfoTest.cpp | 32 +- .../test/ReadH5EbsdTest.cpp | 20 +- .../test/ReadH5EspritDataTest.cpp | 26 +- .../test/ReadH5OimDataTest.cpp | 26 +- .../test/RodriguesConvertorTest.cpp | 14 +- .../test/RotateEulerRefFrameTest.cpp | 34 +- .../test/WriteGBCDGMTFileTest.cpp | 52 +- .../test/WriteGBCDTriangleDataTest.cpp | 28 +- .../test/WriteINLFileTest.cpp | 8 +- .../test/WritePoleFigureTest.cpp | 42 +- .../test/WriteStatsGenOdfAngleFileTest.cpp | 30 +- .../OrientationAnalysis/test/test_dirs.hpp.in | 20 +- .../wrapping/python/orientationanalysis.cpp | 10 +- .../CMakeLists.txt | 20 +- .../docs/AddBadDataFilter.md | 0 .../docs/AlignGeometries.md | 0 .../AlignSectionsFeatureCentroidFilter.md | 0 .../docs/AlignSectionsListFilter.md | 0 .../docs/AppendImageGeometryZSliceFilter.md | 0 .../ApplyTransformationToGeometryFilter.md | 6 +- .../docs/ApproximatePointCloudHull.md | 0 .../docs/ArrayCalculatorFilter.md | 0 .../docs/CalculateArrayHistogramFilter.md | 0 .../docs/CalculateFeatureSizesFilter.md | 0 .../docs/CalculateTriangleAreasFilter.md | 0 .../docs/ChangeAngleRepresentation.md | 0 .../docs/CombineAttributeArraysFilter.md | 0 .../docs/CombineStlFilesFilter.md | 0 .../docs/ComputeFeatureRectFilter.md | 0 .../docs/ComputeMomentInvariants2DFilter.md | 0 .../docs/ConditionalSetValue.md | 0 .../docs/ConvertColorToGrayScaleFilter.md | 0 .../docs/ConvertDataFilter.md | 0 .../docs/CopyDataObjectFilter.md | 0 .../docs/CopyFeatureArrayToElementArray.md | 0 .../docs/CreateAttributeMatrixFilter.md | 0 .../docs/CreateDataArray.md | 0 .../docs/CreateDataGroup.md | 0 .../CreateFeatureArrayFromElementArray.md | 0 .../docs/CreateGeometryFilter.md | 0 .../docs/CreateImageGeometry.md | 0 .../docs/CropImageGeometry.md | 0 .../docs/CropVertexGeometry.md | 0 .../docs/DeleteData.md | 0 .../docs/ErodeDilateBadDataFilter.md | 0 .../ErodeDilateCoordinationNumberFilter.md | 0 .../docs/ErodeDilateMaskFilter.md | 0 .../docs/ExecuteProcessFilter.md | 0 .../docs/ExtractComponentAsArrayFilter.md | 0 ...actInternalSurfacesFromTriangleGeometry.md | 0 .../docs/ExtractVertexGeometryFilter.md | 0 .../docs/FeatureFaceCurvatureFilter.md | 0 .../docs/FillBadDataFilter.md | 0 .../docs/FindArrayStatisticsFilter.md | 0 .../docs/FindBiasedFeaturesFilter.md | 0 .../docs/FindBoundaryCellsFilter.md | 0 .../FindBoundaryElementFractionsFilter.md | 0 .../docs/FindDifferencesMap.md | 0 .../docs/FindEuclideanDistMapFilter.md | 0 .../docs/FindFeatureCentroidsFilter.md | 0 .../docs/FindFeatureClusteringFilter.md | 0 .../docs/FindFeaturePhasesBinaryFilter.md | 0 .../docs/FindFeaturePhasesFilter.md | 0 .../docs/FindLargestCrossSectionsFilter.md | 0 .../docs/FindNeighborListStatistics.md | 0 .../docs/FindNeighborhoodsFilter.md | 0 .../docs/FindNeighbors.md | 0 .../docs/FindNumFeaturesFilter.md | 0 .../docs/FindSurfaceAreaToVolumeFilter.md | 0 .../docs/FindSurfaceFeatures.md | 0 .../docs/FindTriangleGeomCentroidsFilter.md | 0 .../docs/FindTriangleGeomSizesFilter.md | 0 .../FindVertexToTriangleDistancesFilter.md | 0 .../docs/FindVolFractionsFilter.md | 0 .../docs/GenerateColorTableFilter.md | 0 .../docs/GenerateVectorColorsFilter.md | 0 .../docs/IdentifySample.md | 0 .../docs/ImageContouringFilter.md | 0 .../docs/Images/3D-contouring.png | Bin .../Images/ApplyTransformation_AsRead.png | Bin .../Images/ApplyTransformation_Rotated.png | Bin .../Images/ApplyTransformation_Scaled.png | Bin .../Images/CombineAttributeArraysGUI_1.png | Bin .../Images/CombineAttributeArraysGUI_2.png | Bin .../docs/Images/ComputeMomentInvariants2D.png | Bin .../Images/ComputeMomentInvariants_Fig1.png | Bin .../docs/Images/CropImageGeometry_1.png | Bin .../docs/Images/ErodeDilateBadData_1.png | Bin .../docs/Images/ErodeDilateBadData_2.png | Bin .../docs/Images/ErodeDilateBadData_3.png | Bin .../ErodeDilateCoordinationNumber_After.png | Bin .../ErodeDilateCoordinationNumber_Before.png | Bin .../docs/Images/ErodeDilateMask_Before.png | Bin .../docs/Images/ErodeDilateMask_Dilate.png | Bin .../docs/Images/ErodeDilateMask_Erode.png | Bin .../docs/Images/ExtractVertexGeometry_1.png | Bin .../Images/FeatureFaceCurvatureFilter.png | Bin .../FindBiasedFeaturesBeforeAndAfter.png | Bin .../docs/Images/FindBoundaryCellsInput.png | Bin .../docs/Images/FindBoundaryCellsOutput.png | Bin .../Images/FindSurfaceFeatures_Cylinder.png | Bin .../Images/FindSurfaceFeatures_Square.png | Bin .../docs/Images/HistogramExample.png | Bin .../docs/Images/ImportAsciDataArray_ui.png | Bin .../docs/Images/ImportHDF5Dataset_ui.png | Bin .../docs/Images/Laplacian_Eq1.png | Bin .../docs/Images/Laplacian_Eq2.png | Bin .../docs/Images/Laplacian_Fig1.png | Bin .../docs/Images/Laplacian_Fig2.png | Bin .../Images/NeighborReplace_After_Cleanup.png | Bin .../NeighborReplace_After_Cleanup_2.png | Bin .../docs/Images/NeighborReplace_CTF_After.png | Bin .../Images/NeighborReplace_CTF_Before.png | Bin .../docs/Images/NeighborReplace_Exemplar.bmp | Bin .../Images/NeighborReplace_No_Cleanup.png | Bin .../Images/NeighborReplace_No_Cleanup_2.png | Bin .../NeighborReplace_No_Cleanup_Mask.png | Bin .../NeighborReplace_Small_IN100_After.png | Bin .../NeighborReplace_Small_IN100_Before.png | Bin .../docs/Images/PSTG_2.png | Bin .../docs/Images/PSTG_3.png | Bin .../docs/Images/PSTG_4.png | Bin .../docs/Images/PSTG_5.png | Bin .../docs/Images/PSTG_6.png | Bin .../docs/Images/PSTG_7.png | Bin .../docs/Images/PSTG_8.png | Bin .../PartitionGeometry/Advanced_Mode_1.png | Bin .../PartitionGeometry/Advanced_Mode_1a.png | Bin .../PartitionGeometry/Advanced_Mode_1b.png | Bin .../PartitionGeometry/Advanced_Mode_2.png | Bin .../PartitionGeometry/Advanced_Mode_2a.png | Bin .../PartitionGeometry/Advanced_Mode_2b.png | Bin .../Images/PartitionGeometry/Basic_Mode.png | Bin .../PartitionGeometry/Basic_Mode_Result1a.png | Bin .../PartitionGeometry/Basic_Mode_Result1b.png | Bin .../PartitionGeometry/BoundingBox_Mode_1.png | Bin .../PartitionGeometry/BoundingBox_Mode_1a.png | Bin .../PartitionGeometry/BoundingBox_Mode_1b.png | Bin .../PartitionGeometry/UseVertexMask_1a.png | Bin .../PartitionGeometry/UseVertexMask_1b.png | Bin .../PointSampleTriangleGeometry_Eqn1.png | Bin .../docs/Images/QuickMesh_NodeType_2.png | Bin .../docs/Images/QuickMesh_NodeType_3.png | Bin .../docs/Images/QuickMesh_NodeType_4.png | Bin .../docs/Images/QuickSurface_Output.png | Bin .../Images/QuickSurface_Smooth_Output.png | Bin .../docs/Images/Read_CSV.png | Bin .../docs/Images/Read_CSV_1.png | Bin .../docs/Images/Read_CSV_10.png | Bin .../docs/Images/Read_CSV_2.png | Bin .../docs/Images/Read_CSV_3.png | Bin .../docs/Images/Read_CSV_4.png | Bin .../docs/Images/Read_CSV_5.png | Bin .../docs/Images/Read_CSV_6.png | Bin .../docs/Images/Read_CSV_7.png | Bin .../docs/Images/Read_CSV_8.png | Bin .../docs/Images/Read_CSV_9.png | Bin .../docs/Images/RotateSampleRefFrame_1.png | Bin .../docs/Images/SharedFeaturFace_1.png | Bin .../docs/Images/SharedFeaturFace_2.png | Bin .../docs/Images/Small_IN100.png | Bin .../docs/Images/Sphericity_Equation.png | Bin .../docs/Images/SurfaceNets_Output.png | Bin .../docs/Images/SurfaceNets_Smooth_Output.png | Bin .../docs/Images/VectorColors.png | Bin .../docs/Images/aptr12_001_0.png | Bin .../docs/Images/fill_bad_data_after.png | Bin .../docs/Images/fill_bad_data_before.png | Bin .../docs/Images/latex24.png | Bin .../docs/InitializeData.md | 0 .../docs/InitializeImageGeomCellData.md | 0 ...nterpolatePointCloudToRegularGridFilter.md | 0 .../docs/IterativeClosestPointFilter.md | 0 .../docs/KMeansFilter.md | 0 .../docs/KMedoidsFilter.md | 0 .../docs/LaplacianSmoothingFilter.md | 0 .../docs/MapPointCloudToRegularGridFilter.md | 0 .../docs/MinNeighbors.md | 0 .../docs/MoveData.md | 0 .../docs/MultiThresholdObjects.md | 0 .../NearestPointFuseRegularGridsFilter.md | 0 .../docs/PartitionGeometryFilter.md | 0 .../docs/PointSampleTriangleGeometryFilter.md | 0 .../docs/QuickSurfaceMeshFilter.md | 0 .../docs/ReadBinaryCTNorthstarFilter.md | 0 .../docs/ReadCSVFileFilter.md | 0 .../docs/ReadDREAM3DFilter.md | 0 .../docs/ReadDeformKeyFileV12Filter.md | 0 .../docs/ReadHDF5Dataset.md | 0 .../docs/ReadRawBinaryFilter.md | 0 .../docs/ReadStlFileFilter.md | 0 .../docs/ReadTextDataArrayFilter.md | 0 .../docs/ReadVolumeGraphicsFileFilter.md | 0 .../docs/RegularGridSampleSurfaceMesh.md | 0 .../RegularGridSampleSurfaceMeshFilter.md | 0 .../docs/RemoveFlaggedFeaturesFilter.md | 0 .../docs/RemoveFlaggedVertices.md | 0 .../docs/RemoveMinimumSizeFeaturesFilter.md | 0 .../docs/RenameDataObject.md | 0 ...ementAttributesWithNeighborValuesFilter.md | 0 .../docs/ResampleImageGeomFilter.md | 2 +- .../docs/ResampleRectGridToImageGeomFilter.md | 0 .../docs/ReverseTriangleWindingFilter.md | 0 .../docs/RobustAutomaticThreshold.md | 0 .../docs/RotateSampleRefFrameFilter.md | 0 .../docs/ScalarSegmentFeaturesFilter.md | 0 .../docs/SetImageGeomOriginScalingFilter.md | 0 .../docs/SharedFeatureFaceFilter.md | 0 .../docs/SilhouetteFilter.md | 0 .../docs/SplitAttributeArrayFilter.md | 0 .../docs/SurfaceNetsFilter.md | 4 +- .../docs/TriangleCentroidFilter.md | 0 .../docs/TriangleDihedralAngleFilter.md | 0 .../docs/TriangleNormalFilter.md | 0 .../UncertainRegularGridSampleSurfaceMesh.md | 0 ...rtainRegularGridSampleSurfaceMeshFilter.md | 0 .../docs/WriteASCIIDataFilter.md | 0 .../docs/WriteAbaqusHexahedronFilter.md | 0 .../WriteAvizoRectilinearCoordinateFilter.md | 0 .../docs/WriteAvizoUniformCoordinateFilter.md | 0 .../docs/WriteBinaryDataFilter.md | 0 .../docs/WriteDREAM3DFilter.md | 0 .../docs/WriteFeatureDataCSVFilter.md | 0 .../docs/WriteLosAlamosFFTFilter.md | 0 .../docs/WriteStlFileFilter.md | 0 .../docs/WriteVtkRectilinearGridFilter.md | 0 .../AppendImageGeometryZSlice.d3dpipeline | 18 +- .../ApplyTransformation_Demo.d3dpipeline | 10 +- .../ApplyTransformation_Image.d3dpipeline | 24 +- .../ApplyTransformation_Node.d3dpipeline | 16 +- .../ArrayCalculatorExample.d3dpipeline | 20 +- .../pipelines/AvizoWriters.d3dpipeline | 6 +- .../pipelines/CombineStlFiles.d3dpipeline | 4 +- .../pipelines/ExecuteProcess.d3dpipeline | 4 +- .../ExtractVertexGeometry.d3dpipeline | 14 +- .../pipelines/FindBiasedFeatures.d3dpipeline | 12 +- .../pipelines/FindBoundaryCells.d3dpipeline | 6 +- .../FindLargestCrossSections.d3dpipeline | 12 +- .../pipelines/Import_ASCII.d3dpipeline | 16 +- .../pipelines/Import_ASCII_Data.d3dworkflow | 4 +- .../pipelines/Import_CSV_Data.d3dpipeline | 10 +- .../pipelines/Import_STL_Model.d3dpipeline | 6 +- ...eElementAttributesWithNeighbor.d3dpipeline | 18 +- .../ResamplePorosityImage.d3dpipeline | 10 +- .../ResampleRectGridToImageGeom.d3dpipeline | 20 +- .../pipelines/SurfaceNets_Demo.d3dpipeline | 10 +- .../Triangle_Face_Data_Demo.d3dpipeline | 10 +- .../VtkRectilinearGridWriter.d3dpipeline | 48 +- .../SimplnxCore}/Filters/AddBadDataFilter.cpp | 30 +- .../SimplnxCore}/Filters/AddBadDataFilter.hpp | 16 +- .../Filters/Algorithms/AddBadData.cpp | 10 +- .../Filters/Algorithms/AddBadData.hpp | 20 +- .../AlignSectionsFeatureCentroid.cpp | 26 +- .../AlignSectionsFeatureCentroid.hpp | 20 +- .../Filters/Algorithms/AlignSectionsList.cpp | 10 +- .../Filters/Algorithms/AlignSectionsList.hpp | 24 +- .../Algorithms/AppendImageGeometryZSlice.cpp | 10 +- .../Algorithms/AppendImageGeometryZSlice.hpp | 18 +- .../ApplyTransformationToGeometry.cpp | 16 +- .../ApplyTransformationToGeometry.hpp | 56 +- .../Filters/Algorithms/ArrayCalculator.cpp | 66 +- .../Filters/Algorithms/ArrayCalculator.hpp | 26 +- .../Algorithms/CalculateArrayHistogram.cpp | 12 +- .../Algorithms/CalculateArrayHistogram.hpp | 18 +- .../CalculateTriangleGroupCurvatures.cpp | 12 +- .../CalculateTriangleGroupCurvatures.hpp | 14 +- .../Algorithms/CombineAttributeArrays.cpp | 8 +- .../Algorithms/CombineAttributeArrays.hpp | 20 +- .../Filters/Algorithms/CombineStlFiles.cpp | 14 +- .../Filters/Algorithms/CombineStlFiles.hpp | 20 +- .../Filters/Algorithms/ComputeFeatureRect.cpp | 4 +- .../Filters/Algorithms/ComputeFeatureRect.hpp | 16 +- .../Algorithms/ComputeMomentInvariants2D.cpp | 10 +- .../Algorithms/ComputeMomentInvariants2D.hpp | 16 +- .../Algorithms/ConvertColorToGrayScale.cpp | 18 +- .../Algorithms/ConvertColorToGrayScale.hpp | 24 +- .../Filters/Algorithms/ConvertData.cpp | 8 +- .../Filters/Algorithms/ConvertData.hpp | 16 +- .../Filters/Algorithms/ErodeDilateBadData.cpp | 14 +- .../Filters/Algorithms/ErodeDilateBadData.hpp | 26 +- .../ErodeDilateCoordinationNumber.cpp | 12 +- .../ErodeDilateCoordinationNumber.hpp | 24 +- .../Filters/Algorithms/ErodeDilateMask.cpp | 8 +- .../Filters/Algorithms/ErodeDilateMask.hpp | 30 +- .../Filters/Algorithms/ExecuteProcess.cpp | 12 +- .../Filters/Algorithms/ExecuteProcess.hpp | 22 +- .../Algorithms/ExtractComponentAsArray.cpp | 8 +- .../Algorithms/ExtractComponentAsArray.hpp | 22 +- .../Algorithms/ExtractVertexGeometry.cpp | 14 +- .../Algorithms/ExtractVertexGeometry.hpp | 18 +- .../Filters/Algorithms/FillBadData.cpp | 16 +- .../Filters/Algorithms/FillBadData.hpp | 16 +- .../Algorithms/FindArrayStatistics.cpp | 16 +- .../Algorithms/FindArrayStatistics.hpp | 18 +- .../Filters/Algorithms/FindBiasedFeatures.cpp | 6 +- .../Filters/Algorithms/FindBiasedFeatures.hpp | 16 +- .../Filters/Algorithms/FindBoundaryCells.cpp | 6 +- .../Filters/Algorithms/FindBoundaryCells.hpp | 16 +- .../Algorithms/FindEuclideanDistMap.cpp | 10 +- .../Algorithms/FindEuclideanDistMap.hpp | 16 +- .../Algorithms/FindFeatureCentroids.cpp | 16 +- .../Algorithms/FindFeatureCentroids.hpp | 16 +- .../Algorithms/FindFeatureClustering.cpp | 8 +- .../Algorithms/FindFeatureClustering.hpp | 18 +- .../Algorithms/FindLargestCrossSections.cpp | 8 +- .../Algorithms/FindLargestCrossSections.hpp | 18 +- .../Filters/Algorithms/FindNRingNeighbors.cpp | 6 +- .../Filters/Algorithms/FindNRingNeighbors.hpp | 20 +- .../Filters/Algorithms/FindNeighborhoods.cpp | 10 +- .../Filters/Algorithms/FindNeighborhoods.hpp | 20 +- .../Algorithms/FindSurfaceAreaToVolume.cpp | 12 +- .../Algorithms/FindSurfaceAreaToVolume.hpp | 16 +- .../Algorithms/FindTriangleGeomCentroids.cpp | 10 +- .../Algorithms/FindTriangleGeomCentroids.hpp | 16 +- .../Algorithms/FindTriangleGeomSizes.cpp | 12 +- .../Algorithms/FindTriangleGeomSizes.hpp | 16 +- .../FindVertexToTriangleDistances.cpp | 14 +- .../FindVertexToTriangleDistances.hpp | 22 +- .../Filters/Algorithms/GenerateColorTable.cpp | 16 +- .../Filters/Algorithms/GenerateColorTable.hpp | 22 +- .../Algorithms/GenerateVectorColors.cpp | 14 +- .../Algorithms/GenerateVectorColors.hpp | 20 +- .../Filters/Algorithms/ImageContouring.cpp | 6 +- .../Filters/Algorithms/ImageContouring.hpp | 12 +- .../Filters/Algorithms/KMeans.cpp | 8 +- .../Filters/Algorithms/KMeans.hpp | 30 +- .../Filters/Algorithms/KMedoids.cpp | 8 +- .../Filters/Algorithms/KMedoids.hpp | 20 +- .../Filters/Algorithms/LaplacianSmoothing.cpp | 22 +- .../Filters/Algorithms/LaplacianSmoothing.hpp | 16 +- .../NearestPointFuseRegularGrids.cpp | 16 +- .../NearestPointFuseRegularGrids.hpp | 18 +- .../Filters/Algorithms/PartitionGeometry.cpp | 12 +- .../Filters/Algorithms/PartitionGeometry.hpp | 24 +- .../PointSampleTriangleGeometry.cpp | 6 +- .../PointSampleTriangleGeometry.hpp | 34 +- .../Filters/Algorithms/QuickSurfaceMesh.cpp | 18 +- .../Filters/Algorithms/QuickSurfaceMesh.hpp | 20 +- .../Algorithms/ReadBinaryCTNorthstar.cpp | 8 +- .../Algorithms/ReadBinaryCTNorthstar.hpp | 20 +- .../Algorithms/ReadDeformKeyFileV12.cpp | 12 +- .../Algorithms/ReadDeformKeyFileV12.hpp | 18 +- .../Filters/Algorithms/ReadRawBinary.cpp | 20 +- .../Filters/Algorithms/ReadRawBinary.hpp | 16 +- .../Filters/Algorithms/ReadStlFile.cpp | 36 +- .../Filters/Algorithms/ReadStlFile.hpp | 16 +- .../Algorithms/ReadVolumeGraphicsFile.cpp | 8 +- .../Algorithms/ReadVolumeGraphicsFile.hpp | 16 +- .../RegularGridSampleSurfaceMesh.cpp | 8 +- .../RegularGridSampleSurfaceMesh.hpp | 32 +- .../Algorithms/RemoveFlaggedFeatures.cpp | 20 +- .../Algorithms/RemoveFlaggedFeatures.hpp | 18 +- ...aceElementAttributesWithNeighborValues.cpp | 10 +- ...aceElementAttributesWithNeighborValues.hpp | 26 +- .../Filters/Algorithms/ResampleImageGeom.cpp | 24 +- .../Filters/Algorithms/ResampleImageGeom.hpp | 18 +- .../ResampleRectGridToImageGeom.cpp | 12 +- .../ResampleRectGridToImageGeom.hpp | 22 +- .../Algorithms/ScalarSegmentFeatures.cpp | 44 +- .../Algorithms/ScalarSegmentFeatures.hpp | 22 +- .../Filters/Algorithms/SharedFeatureFace.cpp | 14 +- .../Filters/Algorithms/SharedFeatureFace.hpp | 16 +- .../Filters/Algorithms/Silhouette.cpp | 8 +- .../Filters/Algorithms/Silhouette.hpp | 24 +- .../Algorithms/SplitAttributeArray.cpp | 8 +- .../Algorithms/SplitAttributeArray.hpp | 16 +- .../Filters/Algorithms/SurfaceNets.cpp | 24 +- .../Filters/Algorithms/SurfaceNets.hpp | 30 +- .../Filters/Algorithms/TriangleCentroid.cpp | 16 +- .../Filters/Algorithms/TriangleCentroid.hpp | 20 +- .../Filters/Algorithms/TupleTransfer.cpp | 4 +- .../Filters/Algorithms/TupleTransfer.hpp | 18 +- .../UncertainRegularGridSampleSurfaceMesh.cpp | 4 +- .../UncertainRegularGridSampleSurfaceMesh.hpp | 32 +- .../Algorithms/WriteAbaqusHexahedron.cpp | 12 +- .../Algorithms/WriteAbaqusHexahedron.hpp | 24 +- .../WriteAvizoRectilinearCoordinate.cpp | 12 +- .../WriteAvizoRectilinearCoordinate.hpp | 10 +- .../WriteAvizoUniformCoordinate.cpp | 8 +- .../WriteAvizoUniformCoordinate.hpp | 10 +- .../Filters/Algorithms/WriteLosAlamosFFT.cpp | 12 +- .../Filters/Algorithms/WriteLosAlamosFFT.hpp | 20 +- .../Filters/Algorithms/WriteStlFile.cpp | 12 +- .../Filters/Algorithms/WriteStlFile.hpp | 22 +- .../Algorithms/WriteVtkRectilinearGrid.cpp | 14 +- .../Algorithms/WriteVtkRectilinearGrid.hpp | 20 +- .../SimplnxCore}/Filters/AlignGeometries.cpp | 28 +- .../SimplnxCore}/Filters/AlignGeometries.hpp | 18 +- .../AlignSectionsFeatureCentroidFilter.cpp | 40 +- .../AlignSectionsFeatureCentroidFilter.hpp | 16 +- .../Filters/AlignSectionsListFilter.cpp | 28 +- .../Filters/AlignSectionsListFilter.hpp | 16 +- .../AppendImageGeometryZSliceFilter.cpp | 38 +- .../AppendImageGeometryZSliceFilter.hpp | 16 +- .../ApplyTransformationToGeometryFilter.cpp | 86 +- .../ApplyTransformationToGeometryFilter.hpp | 16 +- .../Filters/ApproximatePointCloudHull.cpp | 20 +- .../Filters/ApproximatePointCloudHull.hpp | 18 +- .../Filters/ArrayCalculatorFilter.cpp | 32 +- .../Filters/ArrayCalculatorFilter.hpp | 16 +- .../Filters/CalculateArrayHistogramFilter.cpp | 32 +- .../Filters/CalculateArrayHistogramFilter.hpp | 16 +- .../Filters/CalculateFeatureSizesFilter.cpp | 38 +- .../Filters/CalculateFeatureSizesFilter.hpp | 20 +- .../Filters/CalculateTriangleAreasFilter.cpp | 32 +- .../Filters/CalculateTriangleAreasFilter.hpp | 16 +- .../Filters/ChangeAngleRepresentation.cpp | 24 +- .../Filters/ChangeAngleRepresentation.hpp | 16 +- .../Filters/CombineAttributeArraysFilter.cpp | 30 +- .../Filters/CombineAttributeArraysFilter.hpp | 16 +- .../Filters/CombineStlFilesFilter.cpp | 30 +- .../Filters/CombineStlFilesFilter.hpp | 16 +- .../Filters/ComputeFeatureRectFilter.cpp | 24 +- .../Filters/ComputeFeatureRectFilter.hpp | 16 +- .../ComputeMomentInvariants2DFilter.cpp | 30 +- .../ComputeMomentInvariants2DFilter.hpp | 16 +- .../Filters/ConditionalSetValue.cpp | 28 +- .../Filters/ConditionalSetValue.hpp | 16 +- .../Filters/ConvertColorToGrayScaleFilter.cpp | 34 +- .../Filters/ConvertColorToGrayScaleFilter.hpp | 16 +- .../Filters/ConvertDataFilter.cpp | 30 +- .../Filters/ConvertDataFilter.hpp | 16 +- .../Filters/CopyDataObjectFilter.cpp | 24 +- .../Filters/CopyDataObjectFilter.hpp | 18 +- .../CopyFeatureArrayToElementArray.cpp | 32 +- .../CopyFeatureArrayToElementArray.hpp | 16 +- .../Filters/CreateAttributeMatrixFilter.cpp | 18 +- .../Filters/CreateAttributeMatrixFilter.hpp | 22 +- .../SimplnxCore}/Filters/CreateDataArray.cpp | 30 +- .../SimplnxCore}/Filters/CreateDataArray.hpp | 18 +- .../SimplnxCore}/Filters/CreateDataGroup.cpp | 14 +- .../SimplnxCore}/Filters/CreateDataGroup.hpp | 22 +- .../CreateFeatureArrayFromElementArray.cpp | 30 +- .../CreateFeatureArrayFromElementArray.hpp | 16 +- .../Filters/CreateGeometryFilter.cpp | 42 +- .../Filters/CreateGeometryFilter.hpp | 14 +- .../Filters/CreateImageGeometry.cpp | 22 +- .../Filters/CreateImageGeometry.hpp | 16 +- .../Filters/CropImageGeometry.cpp | 70 +- .../Filters/CropImageGeometry.hpp | 18 +- .../Filters/CropVertexGeometry.cpp | 28 +- .../Filters/CropVertexGeometry.hpp | 18 +- .../src/SimplnxCore}/Filters/DeleteData.cpp | 16 +- .../src/SimplnxCore}/Filters/DeleteData.hpp | 18 +- .../Filters/ErodeDilateBadDataFilter.cpp | 34 +- .../Filters/ErodeDilateBadDataFilter.hpp | 16 +- .../ErodeDilateCoordinationNumberFilter.cpp | 26 +- .../ErodeDilateCoordinationNumberFilter.hpp | 16 +- .../Filters/ErodeDilateMaskFilter.cpp | 26 +- .../Filters/ErodeDilateMaskFilter.hpp | 16 +- .../Filters/ExecuteProcessFilter.cpp | 24 +- .../Filters/ExecuteProcessFilter.hpp | 16 +- .../Filters/ExtractComponentAsArrayFilter.cpp | 36 +- .../Filters/ExtractComponentAsArrayFilter.hpp | 16 +- ...ctInternalSurfacesFromTriangleGeometry.cpp | 26 +- ...ctInternalSurfacesFromTriangleGeometry.hpp | 18 +- .../Filters/ExtractVertexGeometryFilter.cpp | 44 +- .../Filters/ExtractVertexGeometryFilter.hpp | 14 +- .../Filters/FeatureFaceCurvatureFilter.cpp | 42 +- .../Filters/FeatureFaceCurvatureFilter.hpp | 14 +- .../Filters/FillBadDataFilter.cpp | 30 +- .../Filters/FillBadDataFilter.hpp | 16 +- .../Filters/FindArrayStatisticsFilter.cpp | 40 +- .../Filters/FindArrayStatisticsFilter.hpp | 18 +- .../Filters/FindBiasedFeaturesFilter.cpp | 26 +- .../Filters/FindBiasedFeaturesFilter.hpp | 16 +- .../Filters/FindBoundaryCellsFilter.cpp | 28 +- .../Filters/FindBoundaryCellsFilter.hpp | 16 +- .../FindBoundaryElementFractionsFilter.cpp | 24 +- .../FindBoundaryElementFractionsFilter.hpp | 16 +- .../Filters/FindDifferencesMap.cpp | 24 +- .../Filters/FindDifferencesMap.hpp | 18 +- .../Filters/FindEuclideanDistMapFilter.cpp | 28 +- .../Filters/FindEuclideanDistMapFilter.hpp | 16 +- .../Filters/FindFeatureCentroidsFilter.cpp | 28 +- .../Filters/FindFeatureCentroidsFilter.hpp | 16 +- .../Filters/FindFeatureClusteringFilter.cpp | 40 +- .../Filters/FindFeatureClusteringFilter.hpp | 16 +- .../Filters/FindFeaturePhasesBinaryFilter.cpp | 26 +- .../Filters/FindFeaturePhasesBinaryFilter.hpp | 16 +- .../Filters/FindFeaturePhasesFilter.cpp | 24 +- .../Filters/FindFeaturePhasesFilter.hpp | 16 +- .../FindLargestCrossSectionsFilter.cpp | 30 +- .../FindLargestCrossSectionsFilter.hpp | 16 +- .../Filters/FindNeighborListStatistics.cpp | 28 +- .../Filters/FindNeighborListStatistics.hpp | 18 +- .../Filters/FindNeighborhoodsFilter.cpp | 26 +- .../Filters/FindNeighborhoodsFilter.hpp | 16 +- .../SimplnxCore}/Filters/FindNeighbors.cpp | 38 +- .../SimplnxCore}/Filters/FindNeighbors.hpp | 18 +- .../Filters/FindNumFeaturesFilter.cpp | 26 +- .../Filters/FindNumFeaturesFilter.hpp | 16 +- .../Filters/FindSurfaceAreaToVolumeFilter.cpp | 28 +- .../Filters/FindSurfaceAreaToVolumeFilter.hpp | 16 +- .../Filters/FindSurfaceFeatures.cpp | 32 +- .../Filters/FindSurfaceFeatures.hpp | 16 +- .../FindTriangleGeomCentroidsFilter.cpp | 28 +- .../FindTriangleGeomCentroidsFilter.hpp | 14 +- .../Filters/FindTriangleGeomSizesFilter.cpp | 30 +- .../Filters/FindTriangleGeomSizesFilter.hpp | 14 +- .../FindVertexToTriangleDistancesFilter.cpp | 34 +- .../FindVertexToTriangleDistancesFilter.hpp | 16 +- .../Filters/FindVolFractionsFilter.cpp | 24 +- .../Filters/FindVolFractionsFilter.hpp | 16 +- .../Filters/GenerateColorTableFilter.cpp | 32 +- .../Filters/GenerateColorTableFilter.hpp | 16 +- .../Filters/GenerateVectorColorsFilter.cpp | 24 +- .../Filters/GenerateVectorColorsFilter.hpp | 16 +- .../SimplnxCore}/Filters/IdentifySample.cpp | 20 +- .../SimplnxCore}/Filters/IdentifySample.hpp | 18 +- .../Filters/ImageContouringFilter.cpp | 32 +- .../Filters/ImageContouringFilter.hpp | 14 +- .../SimplnxCore}/Filters/InitializeData.cpp | 32 +- .../SimplnxCore}/Filters/InitializeData.hpp | 16 +- .../Filters/InitializeImageGeomCellData.cpp | 36 +- .../Filters/InitializeImageGeomCellData.hpp | 18 +- ...terpolatePointCloudToRegularGridFilter.cpp | 46 +- ...terpolatePointCloudToRegularGridFilter.hpp | 18 +- .../Filters/IterativeClosestPointFilter.cpp | 22 +- .../Filters/IterativeClosestPointFilter.hpp | 18 +- .../src/SimplnxCore}/Filters/KMeansFilter.cpp | 46 +- .../src/SimplnxCore}/Filters/KMeansFilter.hpp | 16 +- .../SimplnxCore}/Filters/KMedoidsFilter.cpp | 46 +- .../SimplnxCore}/Filters/KMedoidsFilter.hpp | 16 +- .../Filters/LaplacianSmoothingFilter.cpp | 26 +- .../Filters/LaplacianSmoothingFilter.hpp | 16 +- .../MapPointCloudToRegularGridFilter.cpp | 34 +- .../MapPointCloudToRegularGridFilter.hpp | 18 +- .../src/SimplnxCore}/Filters/MinNeighbors.cpp | 40 +- .../src/SimplnxCore}/Filters/MinNeighbors.hpp | 18 +- .../src/SimplnxCore}/Filters/MoveData.cpp | 14 +- .../src/SimplnxCore}/Filters/MoveData.hpp | 18 +- .../Filters/MultiThresholdObjects.cpp | 44 +- .../Filters/MultiThresholdObjects.hpp | 18 +- .../NearestPointFuseRegularGridsFilter.cpp | 34 +- .../NearestPointFuseRegularGridsFilter.hpp | 16 +- .../Filters/PartitionGeometryFilter.cpp | 44 +- .../Filters/PartitionGeometryFilter.hpp | 22 +- .../PointSampleTriangleGeometryFilter.cpp | 38 +- .../PointSampleTriangleGeometryFilter.hpp | 16 +- .../Filters/QuickSurfaceMeshFilter.cpp | 46 +- .../Filters/QuickSurfaceMeshFilter.hpp | 16 +- .../Filters/ReadBinaryCTNorthstarFilter.cpp | 38 +- .../Filters/ReadBinaryCTNorthstarFilter.hpp | 14 +- .../Filters/ReadCSVFileFilter.cpp | 70 +- .../Filters/ReadCSVFileFilter.hpp | 22 +- .../Filters/ReadDREAM3DFilter.cpp | 30 +- .../Filters/ReadDREAM3DFilter.hpp | 20 +- .../Filters/ReadDeformKeyFileV12Filter.cpp | 20 +- .../Filters/ReadDeformKeyFileV12Filter.hpp | 16 +- .../SimplnxCore}/Filters/ReadHDF5Dataset.cpp | 68 +- .../SimplnxCore}/Filters/ReadHDF5Dataset.hpp | 20 +- .../Filters/ReadRawBinaryFilter.cpp | 28 +- .../Filters/ReadRawBinaryFilter.hpp | 16 +- .../Filters/ReadStlFileFilter.cpp | 36 +- .../Filters/ReadStlFileFilter.hpp | 18 +- .../Filters/ReadTextDataArrayFilter.cpp | 64 +- .../Filters/ReadTextDataArrayFilter.hpp | 16 +- .../Filters/ReadVolumeGraphicsFileFilter.cpp | 26 +- .../Filters/ReadVolumeGraphicsFileFilter.hpp | 20 +- .../RegularGridSampleSurfaceMeshFilter.cpp | 32 +- .../RegularGridSampleSurfaceMeshFilter.hpp | 16 +- .../Filters/RemoveFlaggedFeaturesFilter.cpp | 50 +- .../Filters/RemoveFlaggedFeaturesFilter.hpp | 16 +- .../Filters/RemoveFlaggedVertices.cpp | 44 +- .../Filters/RemoveFlaggedVertices.hpp | 16 +- .../RemoveMinimumSizeFeaturesFilter.cpp | 36 +- .../RemoveMinimumSizeFeaturesFilter.hpp | 18 +- .../SimplnxCore}/Filters/RenameDataObject.cpp | 18 +- .../SimplnxCore}/Filters/RenameDataObject.hpp | 18 +- ...mentAttributesWithNeighborValuesFilter.cpp | 32 +- ...mentAttributesWithNeighborValuesFilter.hpp | 16 +- .../Filters/ResampleImageGeomFilter.cpp | 76 +- .../Filters/ResampleImageGeomFilter.hpp | 16 +- .../ResampleRectGridToImageGeomFilter.cpp | 50 +- .../ResampleRectGridToImageGeomFilter.hpp | 16 +- .../Filters/ReverseTriangleWindingFilter.cpp | 18 +- .../Filters/ReverseTriangleWindingFilter.hpp | 16 +- .../Filters/RobustAutomaticThreshold.cpp | 24 +- .../Filters/RobustAutomaticThreshold.hpp | 16 +- .../Filters/RotateSampleRefFrameFilter.cpp | 80 +- .../Filters/RotateSampleRefFrameFilter.hpp | 18 +- .../Filters/ScalarSegmentFeaturesFilter.cpp | 32 +- .../Filters/ScalarSegmentFeaturesFilter.hpp | 22 +- .../SetImageGeomOriginScalingFilter.cpp | 26 +- .../SetImageGeomOriginScalingFilter.hpp | 18 +- .../Filters/SharedFeatureFaceFilter.cpp | 32 +- .../Filters/SharedFeatureFaceFilter.hpp | 14 +- .../SimplnxCore}/Filters/SilhouetteFilter.cpp | 36 +- .../SimplnxCore}/Filters/SilhouetteFilter.hpp | 16 +- .../Filters/SplitAttributeArrayFilter.cpp | 30 +- .../Filters/SplitAttributeArrayFilter.hpp | 16 +- .../Filters/SurfaceNetsFilter.cpp | 54 +- .../Filters/SurfaceNetsFilter.hpp | 14 +- .../Filters/TriangleCentroidFilter.cpp | 26 +- .../Filters/TriangleCentroidFilter.hpp | 16 +- .../Filters/TriangleDihedralAngleFilter.cpp | 36 +- .../Filters/TriangleDihedralAngleFilter.hpp | 16 +- .../Filters/TriangleNormalFilter.cpp | 30 +- .../Filters/TriangleNormalFilter.hpp | 16 +- ...tainRegularGridSampleSurfaceMeshFilter.cpp | 40 +- ...tainRegularGridSampleSurfaceMeshFilter.hpp | 16 +- .../Filters/WriteASCIIDataFilter.cpp | 36 +- .../Filters/WriteASCIIDataFilter.hpp | 16 +- .../Filters/WriteAbaqusHexahedronFilter.cpp | 26 +- .../Filters/WriteAbaqusHexahedronFilter.hpp | 16 +- .../WriteAvizoRectilinearCoordinateFilter.cpp | 28 +- .../WriteAvizoRectilinearCoordinateFilter.hpp | 16 +- .../WriteAvizoUniformCoordinateFilter.cpp | 28 +- .../WriteAvizoUniformCoordinateFilter.hpp | 16 +- .../Filters/WriteBinaryDataFilter.cpp | 30 +- .../Filters/WriteBinaryDataFilter.hpp | 14 +- .../Filters/WriteDREAM3DFilter.cpp | 26 +- .../Filters/WriteDREAM3DFilter.hpp | 20 +- .../Filters/WriteFeatureDataCSVFilter.cpp | 30 +- .../Filters/WriteFeatureDataCSVFilter.hpp | 16 +- .../Filters/WriteLosAlamosFFTFilter.cpp | 24 +- .../Filters/WriteLosAlamosFFTFilter.hpp | 16 +- .../Filters/WriteStlFileFilter.cpp | 28 +- .../Filters/WriteStlFileFilter.hpp | 16 +- .../Filters/WriteVtkRectilinearGridFilter.cpp | 26 +- .../Filters/WriteVtkRectilinearGridFilter.hpp | 16 +- .../SimplnxCoreLegacyUUIDMapping.hpp | 248 ++++ .../src/SimplnxCore/SimplnxCorePlugin.cpp | 30 + .../src/SimplnxCore/SimplnxCorePlugin.hpp | 25 + .../src/SimplnxCore}/SurfaceNets/LICENSE.txt | 0 .../SimplnxCore}/SurfaceNets/MMCellFlag.cpp | 0 .../src/SimplnxCore}/SurfaceNets/MMCellFlag.h | 0 .../SimplnxCore}/SurfaceNets/MMCellMap.cpp | 0 .../src/SimplnxCore}/SurfaceNets/MMCellMap.h | 0 .../SimplnxCore}/SurfaceNets/MMGeometryGL.cpp | 0 .../SimplnxCore}/SurfaceNets/MMGeometryGL.h | 0 .../SurfaceNets/MMGeometryOBJ.cpp | 0 .../SimplnxCore}/SurfaceNets/MMGeometryOBJ.h | 0 .../SimplnxCore}/SurfaceNets/MMSurfaceNet.cpp | 0 .../SimplnxCore}/SurfaceNets/MMSurfaceNet.h | 0 .../src/SimplnxCore}/utils/ABSOperator.cpp | 6 +- .../src/SimplnxCore}/utils/ABSOperator.hpp | 10 +- .../src/SimplnxCore}/utils/ACosOperator.cpp | 6 +- .../src/SimplnxCore}/utils/ACosOperator.hpp | 10 +- .../src/SimplnxCore}/utils/ASinOperator.cpp | 6 +- .../src/SimplnxCore}/utils/ASinOperator.hpp | 10 +- .../src/SimplnxCore}/utils/ATanOperator.cpp | 6 +- .../src/SimplnxCore}/utils/ATanOperator.hpp | 10 +- .../SimplnxCore}/utils/AdditionOperator.cpp | 6 +- .../SimplnxCore}/utils/AdditionOperator.hpp | 10 +- .../src/SimplnxCore}/utils/AvizoWriter.cpp | 6 +- .../src/SimplnxCore}/utils/AvizoWriter.hpp | 20 +- .../src/SimplnxCore}/utils/BinaryOperator.cpp | 8 +- .../src/SimplnxCore}/utils/BinaryOperator.hpp | 10 +- .../src/SimplnxCore}/utils/CSVDataParser.hpp | 8 +- .../SimplnxCore}/utils/CalculatorArray.hpp | 14 +- .../src/SimplnxCore}/utils/CalculatorItem.cpp | 8 +- .../src/SimplnxCore}/utils/CalculatorItem.hpp | 8 +- .../SimplnxCore}/utils/CalculatorOperator.cpp | 6 +- .../SimplnxCore}/utils/CalculatorOperator.hpp | 16 +- .../utils/CalculatorSeparator.cpp | 4 +- .../utils/CalculatorSeparator.hpp | 10 +- .../src/SimplnxCore}/utils/CeilOperator.cpp | 6 +- .../src/SimplnxCore}/utils/CeilOperator.hpp | 10 +- .../src/SimplnxCore}/utils/CommaSeparator.cpp | 6 +- .../src/SimplnxCore}/utils/CommaSeparator.hpp | 10 +- .../src/SimplnxCore}/utils/CosOperator.cpp | 6 +- .../src/SimplnxCore}/utils/CosOperator.hpp | 10 +- .../SimplnxCore}/utils/DivisionOperator.cpp | 4 +- .../SimplnxCore}/utils/DivisionOperator.hpp | 10 +- .../src/SimplnxCore}/utils/ExpOperator.cpp | 6 +- .../src/SimplnxCore}/utils/ExpOperator.hpp | 10 +- .../src/SimplnxCore}/utils/FloorOperator.cpp | 6 +- .../src/SimplnxCore}/utils/FloorOperator.hpp | 10 +- .../SimplnxCore}/utils/ICalculatorArray.cpp | 4 +- .../SimplnxCore}/utils/ICalculatorArray.hpp | 12 +- .../utils/LeftParenthesisItem.cpp | 6 +- .../utils/LeftParenthesisItem.hpp | 10 +- .../src/SimplnxCore}/utils/LnOperator.cpp | 6 +- .../src/SimplnxCore}/utils/LnOperator.hpp | 10 +- .../src/SimplnxCore}/utils/Log10Operator.cpp | 6 +- .../src/SimplnxCore}/utils/Log10Operator.hpp | 10 +- .../src/SimplnxCore}/utils/LogOperator.cpp | 6 +- .../src/SimplnxCore}/utils/LogOperator.hpp | 10 +- .../utils/MultiplicationOperator.cpp | 6 +- .../utils/MultiplicationOperator.hpp | 10 +- .../SimplnxCore}/utils/NegativeOperator.cpp | 10 +- .../SimplnxCore}/utils/NegativeOperator.hpp | 10 +- .../src/SimplnxCore}/utils/PowOperator.cpp | 6 +- .../src/SimplnxCore}/utils/PowOperator.hpp | 10 +- .../utils/RightParenthesisItem.cpp | 6 +- .../utils/RightParenthesisItem.hpp | 10 +- .../src/SimplnxCore}/utils/RootOperator.cpp | 6 +- .../src/SimplnxCore}/utils/RootOperator.hpp | 10 +- .../src/SimplnxCore}/utils/SinOperator.cpp | 6 +- .../src/SimplnxCore}/utils/SinOperator.hpp | 10 +- .../src/SimplnxCore}/utils/SqrtOperator.cpp | 6 +- .../src/SimplnxCore}/utils/SqrtOperator.hpp | 10 +- .../src/SimplnxCore}/utils/StlUtilities.cpp | 2 +- .../src/SimplnxCore}/utils/StlUtilities.hpp | 4 +- .../utils/SubtractionOperator.cpp | 6 +- .../utils/SubtractionOperator.hpp | 10 +- .../src/SimplnxCore}/utils/TanOperator.cpp | 6 +- .../src/SimplnxCore}/utils/TanOperator.hpp | 10 +- .../src/SimplnxCore}/utils/UnaryOperator.cpp | 14 +- .../src/SimplnxCore}/utils/UnaryOperator.hpp | 10 +- .../src/SimplnxCore}/utils/nanoflann.hpp | 0 .../test/AddBadDataTest.cpp | 12 +- .../test/AlignGeometriesTest.cpp | 24 +- .../test/AlignSectionsFeatureCentroidTest.cpp | 54 +- .../test/AlignSectionsListTest.cpp | 44 +- .../test/AppendImageGeometryZSliceTest.cpp | 46 +- .../ApplyTransformationToGeometryTest.cpp | 328 ++--- .../test/ApproximatePointCloudHullTest.cpp | 26 +- .../test/ArrayCalculatorTest.cpp | 54 +- .../test/CMakeLists.txt | 12 +- .../test/CalculateArrayHistogramTest.cpp | 22 +- .../test/CalculateFeatureSizesTest.cpp | 34 +- .../test/CalculateTriangleAreasFilterTest.cpp | 26 +- .../test/ChangeAngleRepresentationTest.cpp | 22 +- .../test/CombineAttributeArraysTest.cpp | 104 +- .../test/CombineStlFilesTest.cpp | 32 +- .../test/ComputeFeatureRectTest.cpp | 16 +- .../test/ComputeMomentInvariants2DTest.cpp | 28 +- .../test/ConditionalSetValueTest.cpp | 52 +- .../test/ConvertColorToGrayScaleTest.cpp | 40 +- .../test/ConvertDataTest.cpp | 26 +- .../test/CopyDataObjectTest.cpp | 28 +- .../CopyFeatureArrayToElementArrayTest.cpp | 28 +- .../test/CoreFilterTest.cpp | 26 +- .../test/CreateAttributeMatrixTest.cpp | 20 +- .../test/CreateDataArrayTest.cpp | 38 +- ...CreateFeatureArrayFromElementArrayTest.cpp | 36 +- .../test/CreateGeometryTest.cpp | 76 +- .../test/CreateImageGeometryTest.cpp | 18 +- .../test/CropImageGeometryTest.cpp | 48 +- .../test/CropVertexGeometryTest.cpp | 16 +- .../test/DREAM3DFileTest.cpp | 58 +- .../test/DeleteDataTest.cpp | 44 +- .../test/ErodeDilateBadDataTest.cpp | 38 +- .../ErodeDilateCoordinationNumberTest.cpp | 26 +- .../test/ErodeDilateMaskTest.cpp | 34 +- .../test/ExecuteProcessTest.cpp | 40 +- .../test/ExtractComponentAsArrayTest.cpp | 24 +- ...ternalSurfacesFromTriangleGeometryTest.cpp | 20 +- .../test/ExtractVertexGeometryTest.cpp | 38 +- .../test/FeatureFaceCurvatureTest.cpp | 22 +- .../test/FillBadDataTest.cpp | 30 +- .../test/FindArrayStatisticsTest.cpp | 18 +- .../test/FindBiasedFeaturesTest.cpp | 32 +- .../test/FindBoundaryCellsTest.cpp | 28 +- .../test/FindBoundaryElementFractionsTest.cpp | 14 +- .../test/FindDifferencesMapTest.cpp | 12 +- .../test/FindEuclideanDistMapTest.cpp | 26 +- .../test/FindFeatureCentroidsFilterTest.cpp | 30 +- .../test/FindFeatureClusteringTest.cpp | 32 +- .../test/FindFeaturePhasesBinaryTest.cpp | 12 +- .../test/FindFeaturePhasesFilterTest.cpp | 34 +- .../test/FindLargestCrossSectionsTest.cpp | 30 +- .../test/FindNeighborListStatisticsTest.cpp | 14 +- .../test/FindNeighborhoodsTest.cpp | 26 +- .../test/FindNeighborsTest.cpp | 26 +- .../test/FindNumFeaturesTest.cpp | 22 +- .../test/FindSurfaceAreaToVolumeTest.cpp | 26 +- .../test/FindSurfaceFeaturesTest.cpp | 44 +- .../test/FindTriangleGeomCentroidsTest.cpp | 26 +- .../test/FindTriangleGeomSizesTest.cpp | 26 +- .../FindVertexToTriangleDistancesTest.cpp | 22 +- .../test/FindVolFractionsTest.cpp | 22 +- .../test/GenerateColorTableTest.cpp | 30 +- .../test/GenerateVectorColorsTest.cpp | 12 +- .../test/IdentifySampleTest.cpp | 26 +- .../test/ImageContouringTest.cpp | 30 +- .../test/ImageGeomTest.cpp | 10 +- .../test/InitializeDataTest.cpp | 136 +- .../test/InitializeImageGeomCellDataTest.cpp | 34 +- ...InterpolatePointCloudToRegularGridTest.cpp | 40 +- .../test/IterativeClosestPointTest.cpp | 14 +- .../test/KMeansTest.cpp | 16 +- .../test/KMedoidsTest.cpp | 16 +- .../test/LaplacianSmoothingFilterTest.cpp | 38 +- .../test/MapPointCloudToRegularGridTest.cpp | 50 +- .../test/MinNeighborsTest.cpp | 50 +- .../test/MoveDataTest.cpp | 18 +- .../test/MultiThresholdObjectsTest.cpp | 84 +- .../test/NearestPointFuseRegularGridsTest.cpp | 32 +- .../test/PartitionGeometryTest.cpp | 60 +- .../test/PipelineTest.cpp | 28 +- .../PointSampleTriangleGeometryFilterTest.cpp | 44 +- .../test/QuickSurfaceMeshFilterTest.cpp | 34 +- .../test/ReadBinaryCTNorthstarTest.cpp | 54 +- .../test/ReadCSVFileTest.cpp | 52 +- .../test/ReadDeformKeyFileV12Test.cpp | 36 +- .../test/ReadHDF5DatasetTest.cpp | 46 +- .../test/ReadRawBinaryTest.cpp | 50 +- .../test/ReadStlFileTest.cpp | 26 +- .../test/ReadTextDataArrayTest.cpp | 54 +- .../test/ReadVolumeGraphicsFileTest.cpp | 26 +- .../test/RegularGridSampleSurfaceMeshTest.cpp | 18 +- .../test/RemoveFlaggedFeaturesTest.cpp | 42 +- .../test/RemoveFlaggedVerticesTest.cpp | 26 +- .../test/RemoveMinimumSizeFeaturesTest.cpp | 32 +- .../test/RenameDataObjectTest.cpp | 24 +- ...lementAttributesWithNeighborValuesTest.cpp | 28 +- .../test/ResampleImageGeomTest.cpp | 64 +- .../test/ResampleRectGridToImageGeomTest.cpp | 38 +- .../test/ReverseTriangleWindingTest.cpp | 17 +- .../test/RobustAutomaticThresholdTest.cpp | 22 +- .../test/RotateSampleRefFrameTest.cpp | 44 +- .../test/ScalarSegmentFeaturesFilterTest.cpp | 38 +- .../SetImageGeomOriginScalingFilterTest.cpp | 18 +- .../test/SharedFeatureFaceTest.cpp | 26 +- .../test/SilhouetteTest.cpp | 16 +- .../test/SimplnxCore_test_main.cpp} | 0 .../test/SplitAttributeArrayTest.cpp | 24 +- .../test/SurfaceNetsTest.cpp | 40 +- .../test/TriangleCentroidTest.cpp | 22 +- .../test/TriangleDihedralAngleFilterTest.cpp | 22 +- .../test/TriangleNormalFilterTest.cpp | 38 +- ...ertainRegularGridSampleSurfaceMeshTest.cpp | 18 +- .../test/WriteASCIIDataTest.cpp | 20 +- .../test/WriteAbaqusHexahedronTest.cpp | 22 +- .../WriteAvizoRectilinearCoordinateTest.cpp | 30 +- .../test/WriteAvizoUniformCoordinateTest.cpp | 30 +- .../test/WriteBinaryDataTest.cpp | 24 +- .../test/WriteFeatureDataCSVTest.cpp | 28 +- .../test/WriteLosAlamosFFTTest.cpp | 22 +- .../test/WriteStlFileTest.cpp | 18 +- .../test/WriteVtkRectilinearGridTest.cpp | 42 +- src/Plugins/SimplnxCore/test/test_dirs.hpp.in | 21 + .../wrapping/python/simplnxpy.cpp} | 402 +++--- src/Plugins/TestOne/CMakeLists.txt | 8 +- .../TestOne/Filters/CreateOutOfCoreArray.cpp | 24 +- .../TestOne/Filters/CreateOutOfCoreArray.hpp | 10 +- .../TestOne/Filters/DynamicTableExample.cpp | 10 +- .../TestOne/Filters/DynamicTableExample.hpp | 10 +- .../TestOne/Filters/ErrorWarningFilter.cpp | 18 +- .../TestOne/Filters/ErrorWarningFilter.hpp | 26 +- .../src/TestOne/Filters/ExampleFilter1.cpp | 28 +- .../src/TestOne/Filters/ExampleFilter1.hpp | 10 +- .../src/TestOne/Filters/ExampleFilter2.cpp | 32 +- .../src/TestOne/Filters/ExampleFilter2.hpp | 10 +- .../src/TestOne/Filters/TestFilter.cpp | 22 +- .../src/TestOne/Filters/TestFilter.hpp | 26 +- .../TestOne/src/TestOne/TestOnePlugin.cpp | 6 +- .../TestOne/src/TestOne/TestOnePlugin.hpp | 8 +- src/Plugins/TestOne/test/CMakeLists.txt | 4 +- .../TestOne/test/ErrorWarningFilterTest.cpp | 14 +- src/Plugins/TestOne/test/test_dirs.hpp.in | 8 +- src/Plugins/TestTwo/CMakeLists.txt | 6 +- .../src/TestTwo/Filters/Test2Filter.cpp | 22 +- .../src/TestTwo/Filters/Test2Filter.hpp | 26 +- .../TestTwo/src/TestTwo/TestTwoPlugin.cpp | 6 +- .../TestTwo/src/TestTwo/TestTwoPlugin.hpp | 8 +- src/complex/Common/ComplexConstants.hpp | 25 - .../DataStructure/IO/HDF5/IDataStoreIO.cpp | 31 - .../Pipeline/Messaging/NodeStatusMessage.hpp | 51 - src/complex/Utilities/DataObjectUtilities.hpp | 280 ---- src/complex/Utilities/MemoryUtilities.hpp | 22 - src/nxrunner/CMakeLists.txt | 8 +- src/nxrunner/docs/NX_CLI.md | 8 +- src/nxrunner/src/CliObserver.cpp | 18 +- src/nxrunner/src/CliObserver.hpp | 8 +- src/nxrunner/src/nxrunner.cpp | 54 +- src/{complex => simplnx}/Common/Any.hpp | 4 +- src/{complex => simplnx}/Common/Array.hpp | 6 +- .../Common/AtomicFile.cpp | 4 +- .../Common/AtomicFile.hpp | 10 +- src/{complex => simplnx}/Common/Bit.hpp | 14 +- .../Common/BoundingBox.hpp | 8 +- src/{complex => simplnx}/Common/Constants.hpp | 6 +- .../Common/DataVector.hpp | 12 +- .../Common/EulerAngle.hpp | 4 +- .../Common/IteratorUtility.hpp | 4 +- src/{complex => simplnx}/Common/Numbers.hpp | 4 +- src/{complex => simplnx}/Common/Range.cpp | 6 +- src/{complex => simplnx}/Common/Range.hpp | 14 +- src/{complex => simplnx}/Common/Range2D.cpp | 6 +- src/{complex => simplnx}/Common/Range2D.hpp | 14 +- src/{complex => simplnx}/Common/Range3D.cpp | 6 +- src/{complex => simplnx}/Common/Range3D.hpp | 14 +- src/{complex => simplnx}/Common/Ray.hpp | 8 +- src/{complex => simplnx}/Common/Result.hpp | 18 +- src/{complex => simplnx}/Common/RgbColor.cpp | 4 +- src/{complex => simplnx}/Common/RgbColor.hpp | 30 +- .../Common/ScopeGuard.hpp | 4 +- src/simplnx/Common/SimplnxConstants.hpp | 25 + .../Common/StringLiteral.hpp | 10 +- .../Common/TypeTraits.hpp | 4 +- src/{complex => simplnx}/Common/Types.hpp | 18 +- .../Common/TypesUtility.hpp | 42 +- src/{complex => simplnx}/Common/Uuid.hpp | 20 +- src/{complex => simplnx}/Core/Application.cpp | 34 +- src/{complex => simplnx}/Core/Application.hpp | 24 +- src/{complex => simplnx}/Core/Preferences.cpp | 10 +- src/{complex => simplnx}/Core/Preferences.hpp | 12 +- .../DataStructure/AbstractDataStore.hpp | 12 +- .../DataStructure/AttributeMatrix.cpp | 6 +- .../DataStructure/AttributeMatrix.hpp | 12 +- .../DataStructure/BaseGroup.cpp | 6 +- .../DataStructure/BaseGroup.hpp | 12 +- .../DataStructure/DataArray.hpp | 22 +- .../DataStructure/DataGroup.cpp | 4 +- .../DataStructure/DataGroup.hpp | 10 +- .../DataStructure/DataMap.cpp | 10 +- .../DataStructure/DataMap.hpp | 10 +- .../DataStructure/DataObject.cpp | 12 +- .../DataStructure/DataObject.hpp | 14 +- .../DataStructure/DataPath.cpp | 12 +- .../DataStructure/DataPath.hpp | 10 +- .../DataStructure/DataStore.hpp | 6 +- .../DataStructure/DataStructure.cpp | 36 +- .../DataStructure/DataStructure.hpp | 16 +- .../DataStructure/DynamicListArray.hpp | 8 +- .../DataStructure/EmptyDataStore.hpp | 6 +- .../DataStructure/Geometry/EdgeGeom.cpp | 8 +- .../DataStructure/Geometry/EdgeGeom.hpp | 10 +- .../DataStructure/Geometry/HexahedralGeom.cpp | 8 +- .../DataStructure/Geometry/HexahedralGeom.hpp | 10 +- .../DataStructure/Geometry/IGeometry.cpp | 4 +- .../DataStructure/Geometry/IGeometry.hpp | 20 +- .../DataStructure/Geometry/IGridGeometry.cpp | 4 +- .../DataStructure/Geometry/IGridGeometry.hpp | 16 +- .../Geometry/INodeGeometry0D.cpp | 4 +- .../Geometry/INodeGeometry0D.hpp | 18 +- .../Geometry/INodeGeometry1D.cpp | 4 +- .../Geometry/INodeGeometry1D.hpp | 8 +- .../Geometry/INodeGeometry2D.cpp | 4 +- .../Geometry/INodeGeometry2D.hpp | 8 +- .../Geometry/INodeGeometry3D.cpp | 4 +- .../Geometry/INodeGeometry3D.hpp | 8 +- .../DataStructure/Geometry/ImageGeom.cpp | 10 +- .../DataStructure/Geometry/ImageGeom.hpp | 18 +- .../Geometry/LinkedGeometryData.cpp | 2 +- .../Geometry/LinkedGeometryData.hpp | 14 +- .../DataStructure/Geometry/QuadGeom.cpp | 8 +- .../DataStructure/Geometry/QuadGeom.hpp | 10 +- .../DataStructure/Geometry/RectGridGeom.cpp | 8 +- .../DataStructure/Geometry/RectGridGeom.hpp | 12 +- .../Geometry/TetrahedralGeom.cpp | 8 +- .../Geometry/TetrahedralGeom.hpp | 10 +- .../DataStructure/Geometry/TriangleGeom.cpp | 10 +- .../DataStructure/Geometry/TriangleGeom.hpp | 10 +- .../DataStructure/Geometry/VertexGeom.cpp | 10 +- .../DataStructure/Geometry/VertexGeom.hpp | 12 +- .../DataStructure/IArray.hpp | 8 +- .../DataStructure/IDataArray.hpp | 10 +- .../DataStructure/IDataStore.hpp | 10 +- .../DataStructure/INeighborList.cpp | 6 +- .../DataStructure/INeighborList.hpp | 8 +- .../IO/Generic/CoreDataIOManager.cpp | 8 +- .../IO/Generic/CoreDataIOManager.hpp | 10 +- .../IO/Generic/DataIOCollection.cpp | 16 +- .../IO/Generic/DataIOCollection.hpp | 14 +- .../DataStructure/IO/Generic/IDataFactory.hpp | 10 +- .../IO/Generic/IDataIOManager.cpp | 4 +- .../IO/Generic/IDataIOManager.hpp | 16 +- .../DataStructure/IO/Generic/IOConstants.hpp | 6 +- .../IO/HDF5/AttributeMatrixIO.cpp | 14 +- .../IO/HDF5/AttributeMatrixIO.hpp | 8 +- .../DataStructure/IO/HDF5/BaseGroupIO.cpp | 10 +- .../DataStructure/IO/HDF5/BaseGroupIO.hpp | 10 +- .../DataStructure/IO/HDF5/DataArrayIO.hpp | 52 +- .../DataStructure/IO/HDF5/DataGroupIO.cpp | 8 +- .../DataStructure/IO/HDF5/DataGroupIO.hpp | 8 +- .../DataStructure/IO/HDF5/DataIOManager.cpp | 32 +- .../DataStructure/IO/HDF5/DataIOManager.hpp | 10 +- .../DataStructure/IO/HDF5/DataStoreIO.hpp | 32 +- .../IO/HDF5/DataStructureReader.cpp | 28 +- .../IO/HDF5/DataStructureReader.hpp | 28 +- .../IO/HDF5/DataStructureWriter.cpp | 32 +- .../IO/HDF5/DataStructureWriter.hpp | 18 +- .../DataStructure/IO/HDF5/EdgeGeomIO.cpp | 10 +- .../DataStructure/IO/HDF5/EdgeGeomIO.hpp | 10 +- .../IO/HDF5/EmptyDataStoreIO.hpp | 10 +- .../DataStructure/IO/HDF5/GridMontageIO.cpp | 8 +- .../DataStructure/IO/HDF5/GridMontageIO.hpp | 8 +- .../IO/HDF5/HexahedralGeomIO.cpp | 8 +- .../IO/HDF5/HexahedralGeomIO.hpp | 8 +- .../DataStructure/IO/HDF5/IDataIO.cpp | 10 +- .../DataStructure/IO/HDF5/IDataIO.hpp | 22 +- .../DataStructure/IO/HDF5/IDataStoreIO.cpp | 31 + .../DataStructure/IO/HDF5/IDataStoreIO.hpp | 12 +- .../DataStructure/IO/HDF5/IGeometryIO.cpp | 10 +- .../DataStructure/IO/HDF5/IGeometryIO.hpp | 12 +- .../DataStructure/IO/HDF5/IGridGeometryIO.cpp | 10 +- .../DataStructure/IO/HDF5/IGridGeometryIO.hpp | 10 +- .../DataStructure/IO/HDF5/INodeGeom0dIO.cpp | 12 +- .../DataStructure/IO/HDF5/INodeGeom0dIO.hpp | 10 +- .../DataStructure/IO/HDF5/INodeGeom1dIO.cpp | 10 +- .../DataStructure/IO/HDF5/INodeGeom1dIO.hpp | 10 +- .../DataStructure/IO/HDF5/INodeGeom2dIO.cpp | 10 +- .../DataStructure/IO/HDF5/INodeGeom2dIO.hpp | 10 +- .../DataStructure/IO/HDF5/INodeGeom3dIO.cpp | 8 +- .../DataStructure/IO/HDF5/INodeGeom3dIO.hpp | 10 +- .../DataStructure/IO/HDF5/IOUtilities.cpp | 34 +- .../DataStructure/IO/HDF5/IOUtilities.hpp | 24 +- .../DataStructure/IO/HDF5/ImageGeomIO.cpp | 24 +- .../DataStructure/IO/HDF5/ImageGeomIO.hpp | 8 +- .../DataStructure/IO/HDF5/NeighborListIO.hpp | 20 +- .../DataStructure/IO/HDF5/QuadGeomIO.cpp | 8 +- .../DataStructure/IO/HDF5/QuadGeomIO.hpp | 8 +- .../DataStructure/IO/HDF5/RectGridGeomIO.cpp | 14 +- .../DataStructure/IO/HDF5/RectGridGeomIO.hpp | 8 +- .../DataStructure/IO/HDF5/ScalarDataIO.hpp | 10 +- .../DataStructure/IO/HDF5/StringArrayIO.cpp | 10 +- .../DataStructure/IO/HDF5/StringArrayIO.hpp | 8 +- .../IO/HDF5/TetrahedralGeomIO.cpp | 12 +- .../IO/HDF5/TetrahedralGeomIO.hpp | 8 +- .../DataStructure/IO/HDF5/TriangleGeomIO.cpp | 10 +- .../DataStructure/IO/HDF5/TriangleGeomIO.hpp | 8 +- .../DataStructure/IO/HDF5/VertexGeomIO.cpp | 8 +- .../DataStructure/IO/HDF5/VertexGeomIO.hpp | 8 +- .../DataStructure/LinkedPath.cpp | 6 +- .../DataStructure/LinkedPath.hpp | 12 +- .../AbstractDataStructureMessage.cpp | 2 +- .../AbstractDataStructureMessage.hpp | 10 +- .../Messaging/DataAddedMessage.cpp | 4 +- .../Messaging/DataAddedMessage.hpp | 14 +- .../Messaging/DataRemovedMessage.cpp | 2 +- .../Messaging/DataRemovedMessage.hpp | 14 +- .../Messaging/DataRenamedMessage.cpp | 4 +- .../Messaging/DataRenamedMessage.hpp | 14 +- .../Messaging/DataReparentedMessage.cpp | 4 +- .../Messaging/DataReparentedMessage.hpp | 14 +- .../DataStructure/Metadata.cpp | 6 +- .../DataStructure/Metadata.hpp | 8 +- .../DataStructure/Montage/AbstractMontage.cpp | 4 +- .../DataStructure/Montage/AbstractMontage.hpp | 16 +- .../Montage/AbstractTileIndex.cpp | 2 +- .../Montage/AbstractTileIndex.hpp | 10 +- .../DataStructure/Montage/GridMontage.cpp | 6 +- .../DataStructure/Montage/GridMontage.hpp | 14 +- .../DataStructure/Montage/GridTileIndex.cpp | 4 +- .../DataStructure/Montage/GridTileIndex.hpp | 12 +- .../DataStructure/NeighborList.cpp | 50 +- .../DataStructure/NeighborList.hpp | 30 +- .../AbstractDataStructureObserver.cpp | 6 +- .../AbstractDataStructureObserver.hpp | 8 +- .../DataStructure/ReadMe.md | 7 +- .../DataStructure/ScalarData.hpp | 8 +- .../DataStructure/StringArray.cpp | 6 +- .../DataStructure/StringArray.hpp | 8 +- .../Filter/AbstractParameter.cpp | 4 +- .../Filter/AbstractParameter.hpp | 10 +- .../Actions/CopyArrayInstanceAction.cpp | 14 +- .../Actions/CopyArrayInstanceAction.hpp | 10 +- .../Filter/Actions/CopyDataObjectAction.cpp | 10 +- .../Filter/Actions/CopyDataObjectAction.hpp | 10 +- .../Filter/Actions/CreateArrayAction.cpp | 12 +- .../Filter/Actions/CreateArrayAction.hpp | 14 +- .../Actions/CreateAttributeMatrixAction.cpp | 8 +- .../Actions/CreateAttributeMatrixAction.hpp | 12 +- .../Filter/Actions/CreateDataGroupAction.cpp | 8 +- .../Filter/Actions/CreateDataGroupAction.hpp | 10 +- .../Filter/Actions/CreateGeometry1DAction.hpp | 28 +- .../Filter/Actions/CreateGeometry2DAction.hpp | 30 +- .../Filter/Actions/CreateGeometry3DAction.hpp | 30 +- .../Actions/CreateGridMontageAction.cpp | 8 +- .../Actions/CreateGridMontageAction.hpp | 14 +- .../Actions/CreateImageGeometryAction.cpp | 8 +- .../Actions/CreateImageGeometryAction.hpp | 14 +- .../Actions/CreateNeighborListAction.cpp | 10 +- .../Actions/CreateNeighborListAction.hpp | 10 +- .../Actions/CreateRectGridGeometryAction.cpp | 12 +- .../Actions/CreateRectGridGeometryAction.hpp | 14 +- .../Actions/CreateStringArrayAction.cpp | 12 +- .../Actions/CreateStringArrayAction.hpp | 10 +- .../Actions/CreateVertexGeometryAction.hpp | 24 +- .../Filter/Actions/DeleteDataAction.cpp | 18 +- .../Filter/Actions/DeleteDataAction.hpp | 10 +- .../Filter/Actions/EmptyAction.hpp | 10 +- .../Actions/ImportH5ObjectPathsAction.cpp | 20 +- .../Actions/ImportH5ObjectPathsAction.hpp | 10 +- .../Filter/Actions/ImportObjectAction.cpp | 12 +- .../Filter/Actions/ImportObjectAction.hpp | 8 +- .../Filter/Actions/MoveDataAction.cpp | 10 +- .../Filter/Actions/MoveDataAction.hpp | 10 +- .../Filter/Actions/RenameDataAction.cpp | 10 +- .../Filter/Actions/RenameDataAction.hpp | 10 +- .../Filter/Actions/UpdateImageGeomAction.cpp | 8 +- .../Filter/Actions/UpdateImageGeomAction.hpp | 12 +- .../Filter/AnyCloneable.hpp | 4 +- src/{complex => simplnx}/Filter/Arguments.cpp | 4 +- src/{complex => simplnx}/Filter/Arguments.hpp | 12 +- .../Filter/ConstDataParameter.cpp | 4 +- .../Filter/ConstDataParameter.hpp | 8 +- .../Filter/DataParameter.cpp | 4 +- .../Filter/DataParameter.hpp | 12 +- .../Filter/FilterHandle.cpp | 8 +- .../Filter/FilterHandle.hpp | 22 +- .../Filter/FilterList.cpp | 4 +- .../Filter/FilterList.hpp | 20 +- .../Filter/FilterTraits.hpp | 26 +- src/{complex => simplnx}/Filter/IFilter.cpp | 12 +- src/{complex => simplnx}/Filter/IFilter.hpp | 20 +- .../Filter/IParameter.cpp | 4 +- .../Filter/IParameter.hpp | 18 +- .../Filter/MutableDataParameter.cpp | 4 +- .../Filter/MutableDataParameter.hpp | 8 +- src/{complex => simplnx}/Filter/Output.cpp | 6 +- src/{complex => simplnx}/Filter/Output.hpp | 22 +- .../Filter/ParameterTraits.hpp | 22 +- .../Filter/Parameters.cpp | 6 +- .../Filter/Parameters.hpp | 16 +- .../Filter/ValueParameter.cpp | 4 +- .../Filter/ValueParameter.hpp | 10 +- .../Parameters/ArrayCreationParameter.cpp | 10 +- .../Parameters/ArrayCreationParameter.hpp | 14 +- .../Parameters/ArraySelectionParameter.cpp | 36 +- .../Parameters/ArraySelectionParameter.hpp | 16 +- .../Parameters/ArrayThresholdsParameter.cpp | 20 +- .../Parameters/ArrayThresholdsParameter.hpp | 18 +- .../AttributeMatrixSelectionParameter.cpp | 14 +- .../AttributeMatrixSelectionParameter.hpp | 16 +- .../Parameters/BoolParameter.cpp | 4 +- .../Parameters/BoolParameter.hpp | 14 +- .../Parameters/CalculatorParameter.cpp | 16 +- .../Parameters/CalculatorParameter.hpp | 16 +- .../Parameters/ChoicesParameter.cpp | 10 +- .../Parameters/ChoicesParameter.hpp | 14 +- .../Parameters/DataGroupCreationParameter.cpp | 10 +- .../Parameters/DataGroupCreationParameter.hpp | 16 +- .../DataGroupSelectionParameter.cpp | 8 +- .../DataGroupSelectionParameter.hpp | 18 +- .../Parameters/DataObjectNameParameter.cpp | 12 +- .../Parameters/DataObjectNameParameter.hpp | 14 +- .../Parameters/DataPathSelectionParameter.cpp | 10 +- .../Parameters/DataPathSelectionParameter.hpp | 16 +- .../Parameters/DataStoreFormatParameter.cpp | 10 +- .../Parameters/DataStoreFormatParameter.hpp | 14 +- .../Parameters/DataTypeParameter.cpp | 28 +- .../Parameters/DataTypeParameter.hpp | 16 +- .../Parameters/Dream3dImportParameter.cpp | 14 +- .../Parameters/Dream3dImportParameter.hpp | 18 +- .../Parameters/DynamicTableParameter.cpp | 6 +- .../Parameters/DynamicTableParameter.hpp | 16 +- .../Parameters/EnsembleInfoParameter.cpp | 8 +- .../Parameters/EnsembleInfoParameter.hpp | 16 +- .../Parameters/FileSystemPathParameter.cpp | 30 +- .../Parameters/FileSystemPathParameter.hpp | 14 +- .../GenerateColorTableParameter.cpp | 6 +- .../GenerateColorTableParameter.hpp | 14 +- .../Parameters/GeneratedFileListParameter.cpp | 14 +- .../Parameters/GeneratedFileListParameter.hpp | 16 +- .../Parameters/GeometrySelectionParameter.cpp | 18 +- .../Parameters/GeometrySelectionParameter.hpp | 16 +- .../MultiArraySelectionParameter.cpp | 12 +- .../MultiArraySelectionParameter.hpp | 14 +- .../MultiPathSelectionParameter.cpp | 6 +- .../MultiPathSelectionParameter.hpp | 14 +- .../NeighborListSelectionParameter.cpp | 28 +- .../NeighborListSelectionParameter.hpp | 16 +- .../Parameters/NumberParameter.cpp | 24 +- .../Parameters/NumberParameter.hpp | 28 +- .../Parameters/NumericTypeParameter.cpp | 26 +- .../Parameters/NumericTypeParameter.hpp | 16 +- .../Parameters/ReadCSVFileParameter.cpp | 4 +- .../Parameters/ReadCSVFileParameter.hpp | 16 +- .../Parameters/ReadHDF5DatasetParameter.cpp | 6 +- .../Parameters/ReadHDF5DatasetParameter.hpp | 18 +- .../Parameters/StringParameter.cpp | 6 +- .../Parameters/StringParameter.hpp | 14 +- .../Parameters/VectorParameter.cpp | 28 +- .../Parameters/VectorParameter.hpp | 28 +- .../Parameters/util/DynamicTableInfo.cpp | 2 +- .../Parameters/util/DynamicTableInfo.hpp | 20 +- .../Parameters/util/ReadCSVData.cpp | 2 +- .../Parameters/util/ReadCSVData.hpp | 16 +- .../Pipeline/AbstractPipelineNode.cpp | 38 +- .../Pipeline/AbstractPipelineNode.hpp | 12 +- .../Messaging/AbstractPipelineMessage.cpp | 2 +- .../Messaging/AbstractPipelineMessage.hpp | 8 +- .../Messaging/FilterPreflightMessage.cpp | 14 +- .../Messaging/FilterPreflightMessage.hpp | 24 +- .../Pipeline/Messaging/NodeAddedMessage.cpp | 4 +- .../Pipeline/Messaging/NodeAddedMessage.hpp | 10 +- .../Pipeline/Messaging/NodeMovedMessage.cpp | 6 +- .../Pipeline/Messaging/NodeMovedMessage.hpp | 10 +- .../Pipeline/Messaging/NodeRemovedMessage.cpp | 4 +- .../Pipeline/Messaging/NodeRemovedMessage.hpp | 10 +- .../Pipeline/Messaging/NodeStatusMessage.cpp | 16 +- .../Pipeline/Messaging/NodeStatusMessage.hpp | 51 + .../Messaging/OutputRenamedMessage.cpp | 4 +- .../Messaging/OutputRenamedMessage.hpp | 12 +- .../Messaging/PipelineFilterMessage.cpp | 4 +- .../Messaging/PipelineFilterMessage.hpp | 10 +- .../Messaging/PipelineNodeMessage.cpp | 2 +- .../Messaging/PipelineNodeMessage.hpp | 8 +- .../Messaging/PipelineNodeObserver.cpp | 4 +- .../Messaging/PipelineNodeObserver.hpp | 8 +- .../Pipeline/Messaging/RenamedMessage.cpp | 4 +- .../Pipeline/Messaging/RenamedMessage.hpp | 8 +- .../Pipeline/Pipeline.cpp | 24 +- .../Pipeline/Pipeline.hpp | 30 +- .../Pipeline/PipelineFilter.cpp | 30 +- .../Pipeline/PipelineFilter.hpp | 30 +- .../Plugin/AbstractPlugin.cpp | 8 +- .../Plugin/AbstractPlugin.hpp | 48 +- .../Plugin/PluginLoader.cpp | 26 +- .../Plugin/PluginLoader.hpp | 14 +- .../Utilities/AlignSections.cpp | 12 +- .../Utilities/AlignSections.hpp | 20 +- .../Utilities/ArrayThreshold.cpp | 4 +- .../Utilities/ArrayThreshold.hpp | 18 +- .../Utilities/ColorPresetsUtilities.cpp | 4 +- .../Utilities/ColorPresetsUtilities.hpp | 12 +- .../Utilities/DataArrayUtilities.cpp | 16 +- .../Utilities/DataArrayUtilities.hpp | 112 +- .../Utilities/DataGroupUtilities.cpp | 8 +- .../Utilities/DataGroupUtilities.hpp | 28 +- src/simplnx/Utilities/DataObjectUtilities.hpp | 280 ++++ .../Utilities/FilePathGenerator.cpp | 4 +- .../Utilities/FilePathGenerator.hpp | 12 +- .../Utilities/FileUtilities.hpp | 6 +- .../Utilities/FilterUtilities.cpp | 6 +- .../Utilities/FilterUtilities.hpp | 24 +- .../Utilities/FlyingEdges.hpp | 18 +- .../Utilities/GeometryHelpers.cpp | 8 +- .../Utilities/GeometryHelpers.hpp | 18 +- .../Utilities/GeometryUtilities.cpp | 6 +- .../Utilities/GeometryUtilities.hpp | 20 +- .../Utilities/IParallelAlgorithm.cpp | 10 +- .../Utilities/IParallelAlgorithm.hpp | 14 +- .../Utilities/ImageRotationUtilities.cpp | 4 +- .../Utilities/ImageRotationUtilities.hpp | 46 +- .../Utilities/KUtilities.hpp | 10 +- .../Utilities/Math/GeometryMath.cpp | 16 +- .../Utilities/Math/GeometryMath.hpp | 82 +- .../Utilities/Math/MatrixMath.cpp | 6 +- .../Utilities/Math/MatrixMath.hpp | 10 +- .../Utilities/Math/StatisticsCalculations.hpp | 0 .../Utilities/MemoryUtilities.cpp | 4 +- src/simplnx/Utilities/MemoryUtilities.hpp | 22 + .../Utilities/MontageUtilities.cpp | 2 +- .../Utilities/MontageUtilities.hpp | 8 +- .../Utilities/OStreamUtilities.cpp | 16 +- .../Utilities/OStreamUtilities.hpp | 36 +- .../Utilities/ParallelAlgorithmUtilities.hpp | 6 +- .../Utilities/ParallelData2DAlgorithm.cpp | 2 +- .../Utilities/ParallelData2DAlgorithm.hpp | 18 +- .../Utilities/ParallelData3DAlgorithm.cpp | 2 +- .../Utilities/ParallelData3DAlgorithm.hpp | 18 +- .../Utilities/ParallelDataAlgorithm.cpp | 2 +- .../Utilities/ParallelDataAlgorithm.hpp | 16 +- .../Utilities/ParallelTaskAlgorithm.cpp | 8 +- .../Utilities/ParallelTaskAlgorithm.hpp | 16 +- .../Utilities/Parsing/DREAM3D/Dream3dIO.cpp | 126 +- .../Utilities/Parsing/DREAM3D/Dream3dIO.hpp | 38 +- .../Utilities/Parsing/HDF5/H5.cpp | 22 +- .../Utilities/Parsing/HDF5/H5.hpp | 22 +- .../Utilities/Parsing/HDF5/H5Support.cpp | 16 +- .../Utilities/Parsing/HDF5/H5Support.hpp | 26 +- .../Utilities/Parsing/HDF5/IO/AttributeIO.cpp | 6 +- .../Utilities/Parsing/HDF5/IO/AttributeIO.hpp | 108 +- .../Utilities/Parsing/HDF5/IO/DatasetIO.cpp | 132 +- .../Utilities/Parsing/HDF5/IO/DatasetIO.hpp | 12 +- .../Utilities/Parsing/HDF5/IO/FileIO.cpp | 6 +- .../Utilities/Parsing/HDF5/IO/FileIO.hpp | 12 +- .../Utilities/Parsing/HDF5/IO/GroupIO.cpp | 6 +- .../Utilities/Parsing/HDF5/IO/GroupIO.hpp | 8 +- .../Utilities/Parsing/HDF5/IO/ObjectIO.cpp | 8 +- .../Utilities/Parsing/HDF5/IO/ObjectIO.hpp | 10 +- .../Parsing/HDF5/Readers/AttributeReader.cpp | 26 +- .../Parsing/HDF5/Readers/AttributeReader.hpp | 10 +- .../Parsing/HDF5/Readers/DatasetReader.cpp | 56 +- .../Parsing/HDF5/Readers/DatasetReader.hpp | 10 +- .../Parsing/HDF5/Readers/FileReader.cpp | 6 +- .../Parsing/HDF5/Readers/FileReader.hpp | 10 +- .../Parsing/HDF5/Readers/GroupReader.cpp | 6 +- .../Parsing/HDF5/Readers/GroupReader.hpp | 8 +- .../Parsing/HDF5/Readers/ObjectReader.cpp | 6 +- .../Parsing/HDF5/Readers/ObjectReader.hpp | 10 +- .../Parsing/HDF5/Writers/AttributeWriter.cpp | 10 +- .../Parsing/HDF5/Writers/AttributeWriter.hpp | 14 +- .../Parsing/HDF5/Writers/DatasetWriter.cpp | 6 +- .../Parsing/HDF5/Writers/DatasetWriter.hpp | 10 +- .../Parsing/HDF5/Writers/FileWriter.cpp | 4 +- .../Parsing/HDF5/Writers/FileWriter.hpp | 10 +- .../Parsing/HDF5/Writers/GroupWriter.cpp | 6 +- .../Parsing/HDF5/Writers/GroupWriter.hpp | 10 +- .../Parsing/HDF5/Writers/ObjectWriter.cpp | 6 +- .../Parsing/HDF5/Writers/ObjectWriter.hpp | 12 +- .../Parsing/JSON/IJsonFilterParser.hpp | 4 +- .../Parsing/JSON/IJsonPipelineParser.cpp | 2 +- .../Parsing/JSON/IJsonPipelineParser.hpp | 4 +- .../Utilities/Parsing/JSON/Json.hpp | 2 +- .../Parsing/JSON/JsonFilterParserV6.cpp | 0 .../Parsing/JSON/JsonFilterParserV6.hpp | 6 +- .../Parsing/JSON/JsonFilterParserV7.cpp | 0 .../Parsing/JSON/JsonFilterParserV7.hpp | 6 +- .../Parsing/JSON/JsonPipelineBuilder.cpp | 2 +- .../Parsing/JSON/JsonPipelineBuilder.hpp | 4 +- .../Parsing/JSON/JsonPipelineParserV6.cpp | 2 +- .../Parsing/JSON/JsonPipelineParserV6.hpp | 6 +- .../Parsing/JSON/JsonPipelineParserV7.cpp | 2 +- .../Parsing/JSON/JsonPipelineParserV7.hpp | 6 +- .../Utilities/Parsing/Text/CsvParser.cpp | 6 +- .../Utilities/Parsing/Text/CsvParser.hpp | 38 +- src/{complex => simplnx}/Utilities/RTree.hpp | 2 +- .../Utilities/SIMPLConversion.hpp | 68 +- .../Utilities/SampleSurfaceMesh.cpp | 16 +- .../Utilities/SampleSurfaceMesh.hpp | 28 +- .../Utilities/SamplingUtils.hpp | 16 +- .../Utilities/SegmentFeatures.cpp | 6 +- .../Utilities/SegmentFeatures.hpp | 18 +- .../Utilities/StringUtilities.hpp | 6 +- .../Utilities/TemplateHelpers.hpp | 34 +- .../Utilities/TimeUtilities.hpp | 4 +- .../Utilities/TooltipGenerator.cpp | 2 +- .../Utilities/TooltipGenerator.hpp | 10 +- .../Utilities/TooltipRowItem.cpp | 2 +- .../Utilities/TooltipRowItem.hpp | 10 +- test/AppTest.cpp | 6 +- test/ArgumentsTest.cpp | 6 +- test/BitTest.cpp | 4 +- test/CMakeLists.txt | 48 +- test/DataArrayTest.cpp | 24 +- test/DataPathTest.cpp | 4 +- test/DataStructObserver.cpp | 16 +- test/DataStructObserver.hpp | 16 +- test/DataStructTest.cpp | 42 +- test/DownloadTestData.cmake | 22 +- test/DynamicFilterInstantiationTest.cpp | 16 +- test/FilePathGeneratorTest.cpp | 8 +- test/GeometryTest.cpp | 22 +- test/GeometryTestUtilities.hpp | 10 +- test/H5Test.cpp | 156 +-- test/IOFormat.cpp | 8 +- test/MontageTest.cpp | 8 +- test/ParametersTest.cpp | 12 +- test/PipelineSaveTest.cpp | 8 +- test/PluginTest.cpp | 24 +- test/UnitTestCommon/CMakeLists.txt | 6 +- .../UnitTest/UnitTestCommon.hpp | 98 +- test/UuidTest.cpp | 6 +- test/complex_test_dirs.hpp.in | 16 - test/simplnx_test_dirs.hpp.in | 16 + ...ex_test_main.cpp => simplnx_test_main.cpp} | 0 vcpkg-configuration.json | 2 +- vcpkg.json | 2 +- wrapping/python/CMakeLists.txt | 136 +- wrapping/python/ComplexPython.hpp.in | 5 - .../python/CxPybind/CxPybind/CxPybind.hpp | 40 +- wrapping/python/ReadMe.md | 16 +- wrapping/python/SimplnxPython.hpp.in | 5 + wrapping/python/cmake/FilterBinding.cpp.in | 6 +- wrapping/python/cmake/FilterBinding.hpp.in | 6 +- wrapping/python/docs/CMakeLists.txt | 34 +- wrapping/python/docs/Makefile.in | 6 +- wrapping/python/docs/ReadMe.md | 2 +- wrapping/python/docs/generate_sphinx_docs.cpp | 270 ++-- wrapping/python/docs/index_template.rst | 4 +- wrapping/python/docs/make.bat.in | 6 +- wrapping/python/docs/source/API.rst | 22 +- wrapping/python/docs/source/DataObjects.rst | 76 +- wrapping/python/docs/source/Installation.rst | 4 +- .../docs/source/Python_Introduction.rst | 56 +- .../python/docs/source/ReleaseNotes_110.rst | 4 +- .../python/docs/source/ReleaseNotes_120.rst | 4 +- .../python/docs/source/ReleaseNotes_121.rst | 6 +- .../python/examples/TestPlugin/CreateArray.py | 56 +- .../examples/TestPlugin/InitializeData.py | 70 +- wrapping/python/examples/TestPlugin/Plugin.py | 6 +- .../examples/TestPlugin/TemplateFilter.py | 24 +- wrapping/python/examples/angle_conversion.py | 12 +- wrapping/python/examples/basic_arrays.py | 36 +- wrapping/python/examples/basic_ebsd_ipf.py | 70 +- wrapping/python/examples/basic_numpy.py | 20 +- .../python/examples/create_ensemble_info.py | 6 +- .../python/examples/generated_file_list.py | 10 +- wrapping/python/examples/geometry_examples.py | 100 +- wrapping/python/examples/import_d3d.py | 12 +- wrapping/python/examples/import_hdf5.py | 16 +- wrapping/python/examples/output_file.py | 12 +- wrapping/python/examples/pipeline.py | 10 +- wrapping/python/examples/read_csv_file.py | 16 +- wrapping/python/examples/read_esprit_data.py | 8 +- wrapping/python/fix_pyi_file.py | 4 +- .../python/notebooks/angle_conversion.ipynb | 2 +- wrapping/python/notebooks/basic_arrays.ipynb | 2 +- .../python/notebooks/basic_ebsd_ipf.ipynb | 2 +- wrapping/python/notebooks/basic_numpy.ipynb | 10 +- .../python/notebooks/create_image_geom.ipynb | 2 +- wrapping/python/notebooks/import_d3d.ipynb | 2 +- wrapping/python/notebooks/output_file.ipynb | 2 +- wrapping/python/notebooks/pipeline.ipynb | 2 +- 1906 files changed, 17501 insertions(+), 17500 deletions(-) rename cmake/{ComplexVersion.cpp.in => SIMPLNXVersion.cpp.in} (99%) rename cmake/{ComplexVersion.hpp => SIMPLNXVersion.hpp} (54%) delete mode 100644 cmake/complex_export_extra.hpp rename cmake/{complexConfig.cmake.in => simplnxConfig.cmake.in} (73%) create mode 100644 cmake/simplnx_export_extra.hpp delete mode 100644 src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp delete mode 100644 src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.cpp delete mode 100644 src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.hpp delete mode 100644 src/Plugins/ComplexCore/test/test_dirs.hpp.in rename src/Plugins/{ComplexCore => SimplnxCore}/CMakeLists.txt (97%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/AddBadDataFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/AlignGeometries.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/AlignSectionsFeatureCentroidFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/AlignSectionsListFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/AppendImageGeometryZSliceFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ApplyTransformationToGeometryFilter.md (95%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ApproximatePointCloudHull.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ArrayCalculatorFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CalculateArrayHistogramFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CalculateFeatureSizesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CalculateTriangleAreasFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ChangeAngleRepresentation.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CombineAttributeArraysFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CombineStlFilesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ComputeFeatureRectFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ComputeMomentInvariants2DFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ConditionalSetValue.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ConvertColorToGrayScaleFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ConvertDataFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CopyDataObjectFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CopyFeatureArrayToElementArray.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CreateAttributeMatrixFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CreateDataArray.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CreateDataGroup.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CreateFeatureArrayFromElementArray.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CreateGeometryFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CreateImageGeometry.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CropImageGeometry.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/CropVertexGeometry.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/DeleteData.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ErodeDilateBadDataFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ErodeDilateCoordinationNumberFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ErodeDilateMaskFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ExecuteProcessFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ExtractComponentAsArrayFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ExtractInternalSurfacesFromTriangleGeometry.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ExtractVertexGeometryFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FeatureFaceCurvatureFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FillBadDataFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindArrayStatisticsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindBiasedFeaturesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindBoundaryCellsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindBoundaryElementFractionsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindDifferencesMap.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindEuclideanDistMapFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindFeatureCentroidsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindFeatureClusteringFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindFeaturePhasesBinaryFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindFeaturePhasesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindLargestCrossSectionsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindNeighborListStatistics.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindNeighborhoodsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindNeighbors.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindNumFeaturesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindSurfaceAreaToVolumeFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindSurfaceFeatures.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindTriangleGeomCentroidsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindTriangleGeomSizesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindVertexToTriangleDistancesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/FindVolFractionsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/GenerateColorTableFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/GenerateVectorColorsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/IdentifySample.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ImageContouringFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/3D-contouring.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ApplyTransformation_AsRead.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ApplyTransformation_Rotated.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ApplyTransformation_Scaled.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/CombineAttributeArraysGUI_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/CombineAttributeArraysGUI_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ComputeMomentInvariants2D.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ComputeMomentInvariants_Fig1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/CropImageGeometry_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateBadData_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateBadData_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateBadData_3.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateCoordinationNumber_After.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateCoordinationNumber_Before.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateMask_Before.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateMask_Dilate.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ErodeDilateMask_Erode.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ExtractVertexGeometry_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/FeatureFaceCurvatureFilter.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/FindBiasedFeaturesBeforeAndAfter.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/FindBoundaryCellsInput.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/FindBoundaryCellsOutput.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/FindSurfaceFeatures_Cylinder.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/FindSurfaceFeatures_Square.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/HistogramExample.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ImportAsciDataArray_ui.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/ImportHDF5Dataset_ui.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Laplacian_Eq1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Laplacian_Eq2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Laplacian_Fig1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Laplacian_Fig2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_After_Cleanup.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_After_Cleanup_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_CTF_After.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_CTF_Before.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_Exemplar.bmp (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_No_Cleanup.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_No_Cleanup_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_No_Cleanup_Mask.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_Small_IN100_After.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/NeighborReplace_Small_IN100_Before.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_3.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_4.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_5.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_6.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_7.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PSTG_8.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Advanced_Mode_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Advanced_Mode_1a.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Advanced_Mode_1b.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Advanced_Mode_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Advanced_Mode_2a.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Advanced_Mode_2b.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Basic_Mode.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Basic_Mode_Result1a.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/Basic_Mode_Result1b.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/BoundingBox_Mode_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/BoundingBox_Mode_1a.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/BoundingBox_Mode_1b.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/UseVertexMask_1a.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PartitionGeometry/UseVertexMask_1b.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/PointSampleTriangleGeometry_Eqn1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/QuickMesh_NodeType_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/QuickMesh_NodeType_3.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/QuickMesh_NodeType_4.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/QuickSurface_Output.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/QuickSurface_Smooth_Output.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_10.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_3.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_4.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_5.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_6.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_7.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_8.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Read_CSV_9.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/RotateSampleRefFrame_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/SharedFeaturFace_1.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/SharedFeaturFace_2.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Small_IN100.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/Sphericity_Equation.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/SurfaceNets_Output.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/SurfaceNets_Smooth_Output.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/VectorColors.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/aptr12_001_0.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/fill_bad_data_after.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/fill_bad_data_before.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/Images/latex24.png (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/InitializeData.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/InitializeImageGeomCellData.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/InterpolatePointCloudToRegularGridFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/IterativeClosestPointFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/KMeansFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/KMedoidsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/LaplacianSmoothingFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/MapPointCloudToRegularGridFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/MinNeighbors.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/MoveData.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/MultiThresholdObjects.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/NearestPointFuseRegularGridsFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/PartitionGeometryFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/PointSampleTriangleGeometryFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/QuickSurfaceMeshFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadBinaryCTNorthstarFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadCSVFileFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadDREAM3DFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadDeformKeyFileV12Filter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadHDF5Dataset.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadRawBinaryFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadStlFileFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadTextDataArrayFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReadVolumeGraphicsFileFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RegularGridSampleSurfaceMesh.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RegularGridSampleSurfaceMeshFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RemoveFlaggedFeaturesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RemoveFlaggedVertices.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RemoveMinimumSizeFeaturesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RenameDataObject.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReplaceElementAttributesWithNeighborValuesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ResampleImageGeomFilter.md (99%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ResampleRectGridToImageGeomFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ReverseTriangleWindingFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RobustAutomaticThreshold.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/RotateSampleRefFrameFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/ScalarSegmentFeaturesFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/SetImageGeomOriginScalingFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/SharedFeatureFaceFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/SilhouetteFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/SplitAttributeArrayFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/SurfaceNetsFilter.md (94%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/TriangleCentroidFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/TriangleDihedralAngleFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/TriangleNormalFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/UncertainRegularGridSampleSurfaceMesh.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/UncertainRegularGridSampleSurfaceMeshFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteASCIIDataFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteAbaqusHexahedronFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteAvizoRectilinearCoordinateFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteAvizoUniformCoordinateFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteBinaryDataFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteDREAM3DFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteFeatureDataCSVFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteLosAlamosFFTFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteStlFileFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/docs/WriteVtkRectilinearGridFilter.md (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/AppendImageGeometryZSlice.d3dpipeline (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ApplyTransformation_Demo.d3dpipeline (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ApplyTransformation_Image.d3dpipeline (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ApplyTransformation_Node.d3dpipeline (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ArrayCalculatorExample.d3dpipeline (89%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/AvizoWriters.d3dpipeline (94%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/CombineStlFiles.d3dpipeline (89%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ExecuteProcess.d3dpipeline (89%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ExtractVertexGeometry.d3dpipeline (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/FindBiasedFeatures.d3dpipeline (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/FindBoundaryCells.d3dpipeline (95%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/FindLargestCrossSections.d3dpipeline (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/Import_ASCII.d3dpipeline (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/Import_ASCII_Data.d3dworkflow (95%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/Import_CSV_Data.d3dpipeline (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/Import_STL_Model.d3dpipeline (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ResamplePorosityImage.d3dpipeline (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/ResampleRectGridToImageGeom.d3dpipeline (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/SurfaceNets_Demo.d3dpipeline (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/Triangle_Face_Data_Demo.d3dpipeline (86%) rename src/Plugins/{ComplexCore => SimplnxCore}/pipelines/VtkRectilinearGridWriter.d3dpipeline (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AddBadDataFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AddBadDataFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AddBadData.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AddBadData.hpp (71%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp (87%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp (76%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AlignSectionsList.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AlignSectionsList.hpp (68%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AppendImageGeometryZSlice.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/AppendImageGeometryZSlice.hpp (74%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ApplyTransformationToGeometry.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ApplyTransformationToGeometry.hpp (57%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ArrayCalculator.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ArrayCalculator.hpp (81%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CalculateArrayHistogram.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CalculateArrayHistogram.hpp (80%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CombineAttributeArrays.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CombineAttributeArrays.hpp (72%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CombineStlFiles.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/CombineStlFiles.hpp (71%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ComputeFeatureRect.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ComputeFeatureRect.hpp (73%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ComputeMomentInvariants2D.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ComputeMomentInvariants2D.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ConvertColorToGrayScale.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ConvertColorToGrayScale.hpp (72%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ConvertData.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ConvertData.hpp (75%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ErodeDilateBadData.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ErodeDilateBadData.hpp (69%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp (68%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ErodeDilateMask.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ErodeDilateMask.hpp (62%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ExecuteProcess.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ExecuteProcess.hpp (71%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ExtractComponentAsArray.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ExtractComponentAsArray.hpp (70%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ExtractVertexGeometry.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ExtractVertexGeometry.hpp (75%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FillBadData.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FillBadData.hpp (77%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindArrayStatistics.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindArrayStatistics.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindBiasedFeatures.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindBiasedFeatures.hpp (78%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindBoundaryCells.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindBoundaryCells.hpp (77%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindEuclideanDistMap.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindEuclideanDistMap.hpp (81%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindFeatureCentroids.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindFeatureCentroids.hpp (77%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindFeatureClustering.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindFeatureClustering.hpp (77%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindLargestCrossSections.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindLargestCrossSections.hpp (74%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindNRingNeighbors.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindNRingNeighbors.hpp (70%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindNeighborhoods.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindNeighborhoods.hpp (79%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindSurfaceAreaToVolume.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindSurfaceAreaToVolume.hpp (78%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindTriangleGeomCentroids.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindTriangleGeomCentroids.hpp (77%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindTriangleGeomSizes.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindTriangleGeomSizes.hpp (78%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindVertexToTriangleDistances.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/FindVertexToTriangleDistances.hpp (74%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/GenerateColorTable.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/GenerateColorTable.hpp (65%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/GenerateVectorColors.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/GenerateVectorColors.hpp (70%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ImageContouring.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ImageContouring.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/KMeans.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/KMeans.hpp (65%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/KMedoids.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/KMedoids.hpp (72%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/LaplacianSmoothing.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/LaplacianSmoothing.hpp (80%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/NearestPointFuseRegularGrids.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/NearestPointFuseRegularGrids.hpp (75%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/PartitionGeometry.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/PartitionGeometry.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/PointSampleTriangleGeometry.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/PointSampleTriangleGeometry.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/QuickSurfaceMesh.cpp (99%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/QuickSurfaceMesh.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadBinaryCTNorthstar.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadBinaryCTNorthstar.hpp (76%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadDeformKeyFileV12.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadDeformKeyFileV12.hpp (81%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadRawBinary.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadRawBinary.hpp (75%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadStlFile.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadStlFile.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadVolumeGraphicsFile.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReadVolumeGraphicsFile.hpp (74%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp (67%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/RemoveFlaggedFeatures.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/RemoveFlaggedFeatures.hpp (80%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp (71%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ResampleImageGeom.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ResampleImageGeom.hpp (76%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ResampleRectGridToImageGeom.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ResampleRectGridToImageGeom.hpp (72%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ScalarSegmentFeatures.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/ScalarSegmentFeatures.hpp (78%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/SharedFeatureFace.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/SharedFeatureFace.hpp (78%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/Silhouette.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/Silhouette.hpp (67%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/SplitAttributeArray.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/SplitAttributeArray.hpp (76%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/SurfaceNets.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/SurfaceNets.hpp (68%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/TriangleCentroid.cpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/TriangleCentroid.hpp (69%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/TupleTransfer.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/TupleTransfer.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp (70%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteAbaqusHexahedron.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteAbaqusHexahedron.hpp (69%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp (81%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteLosAlamosFFT.cpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteLosAlamosFFT.hpp (71%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteStlFile.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteStlFile.hpp (69%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteVtkRectilinearGrid.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/Algorithms/WriteVtkRectilinearGrid.hpp (81%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AlignGeometries.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AlignGeometries.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AlignSectionsFeatureCentroidFilter.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AlignSectionsFeatureCentroidFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AlignSectionsListFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AlignSectionsListFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AppendImageGeometryZSliceFilter.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/AppendImageGeometryZSliceFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ApplyTransformationToGeometryFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ApplyTransformationToGeometryFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ApproximatePointCloudHull.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ApproximatePointCloudHull.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ArrayCalculatorFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ArrayCalculatorFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CalculateArrayHistogramFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CalculateArrayHistogramFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CalculateFeatureSizesFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CalculateFeatureSizesFilter.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CalculateTriangleAreasFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CalculateTriangleAreasFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ChangeAngleRepresentation.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ChangeAngleRepresentation.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CombineAttributeArraysFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CombineAttributeArraysFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CombineStlFilesFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CombineStlFilesFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ComputeFeatureRectFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ComputeFeatureRectFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ComputeMomentInvariants2DFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ComputeMomentInvariants2DFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ConditionalSetValue.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ConditionalSetValue.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ConvertColorToGrayScaleFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ConvertColorToGrayScaleFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ConvertDataFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ConvertDataFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CopyDataObjectFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CopyDataObjectFilter.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CopyFeatureArrayToElementArray.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CopyFeatureArrayToElementArray.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateAttributeMatrixFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateAttributeMatrixFilter.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateDataArray.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateDataArray.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateDataGroup.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateDataGroup.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateFeatureArrayFromElementArray.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateFeatureArrayFromElementArray.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateGeometryFilter.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateGeometryFilter.hpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateImageGeometry.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CreateImageGeometry.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CropImageGeometry.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CropImageGeometry.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CropVertexGeometry.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/CropVertexGeometry.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/DeleteData.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/DeleteData.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ErodeDilateBadDataFilter.cpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ErodeDilateBadDataFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ErodeDilateCoordinationNumberFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ErodeDilateCoordinationNumberFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ErodeDilateMaskFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ErodeDilateMaskFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExecuteProcessFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExecuteProcessFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExtractComponentAsArrayFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExtractComponentAsArrayFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExtractVertexGeometryFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ExtractVertexGeometryFilter.hpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FeatureFaceCurvatureFilter.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FeatureFaceCurvatureFilter.hpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FillBadDataFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FillBadDataFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindArrayStatisticsFilter.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindArrayStatisticsFilter.hpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindBiasedFeaturesFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindBiasedFeaturesFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindBoundaryCellsFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindBoundaryCellsFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindBoundaryElementFractionsFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindBoundaryElementFractionsFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindDifferencesMap.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindDifferencesMap.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindEuclideanDistMapFilter.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindEuclideanDistMapFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeatureCentroidsFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeatureCentroidsFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeatureClusteringFilter.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeatureClusteringFilter.hpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeaturePhasesBinaryFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeaturePhasesBinaryFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeaturePhasesFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindFeaturePhasesFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindLargestCrossSectionsFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindLargestCrossSectionsFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNeighborListStatistics.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNeighborListStatistics.hpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNeighborhoodsFilter.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNeighborhoodsFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNeighbors.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNeighbors.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNumFeaturesFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindNumFeaturesFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindSurfaceAreaToVolumeFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindSurfaceAreaToVolumeFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindSurfaceFeatures.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindSurfaceFeatures.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindTriangleGeomCentroidsFilter.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindTriangleGeomCentroidsFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindTriangleGeomSizesFilter.cpp (87%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindTriangleGeomSizesFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindVertexToTriangleDistancesFilter.cpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindVertexToTriangleDistancesFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindVolFractionsFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/FindVolFractionsFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/GenerateColorTableFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/GenerateColorTableFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/GenerateVectorColorsFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/GenerateVectorColorsFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/IdentifySample.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/IdentifySample.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ImageContouringFilter.cpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ImageContouringFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/InitializeData.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/InitializeData.hpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/InitializeImageGeomCellData.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/InitializeImageGeomCellData.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/InterpolatePointCloudToRegularGridFilter.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/InterpolatePointCloudToRegularGridFilter.hpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/IterativeClosestPointFilter.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/IterativeClosestPointFilter.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/KMeansFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/KMeansFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/KMedoidsFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/KMedoidsFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/LaplacianSmoothingFilter.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/LaplacianSmoothingFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MapPointCloudToRegularGridFilter.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MapPointCloudToRegularGridFilter.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MinNeighbors.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MinNeighbors.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MoveData.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MoveData.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MultiThresholdObjects.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/MultiThresholdObjects.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/NearestPointFuseRegularGridsFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/NearestPointFuseRegularGridsFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/PartitionGeometryFilter.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/PartitionGeometryFilter.hpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/PointSampleTriangleGeometryFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/PointSampleTriangleGeometryFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/QuickSurfaceMeshFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/QuickSurfaceMeshFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadBinaryCTNorthstarFilter.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadBinaryCTNorthstarFilter.hpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadCSVFileFilter.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadCSVFileFilter.hpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadDREAM3DFilter.cpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadDREAM3DFilter.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadDeformKeyFileV12Filter.cpp (95%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadDeformKeyFileV12Filter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadHDF5Dataset.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadHDF5Dataset.hpp (87%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadRawBinaryFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadRawBinaryFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadStlFileFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadStlFileFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadTextDataArrayFilter.cpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadTextDataArrayFilter.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadVolumeGraphicsFileFilter.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReadVolumeGraphicsFileFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RegularGridSampleSurfaceMeshFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RegularGridSampleSurfaceMeshFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RemoveFlaggedFeaturesFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RemoveFlaggedFeaturesFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RemoveFlaggedVertices.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RemoveFlaggedVertices.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RemoveMinimumSizeFeaturesFilter.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RemoveMinimumSizeFeaturesFilter.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RenameDataObject.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RenameDataObject.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ResampleImageGeomFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ResampleImageGeomFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ResampleRectGridToImageGeomFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ResampleRectGridToImageGeomFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReverseTriangleWindingFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ReverseTriangleWindingFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RobustAutomaticThreshold.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RobustAutomaticThreshold.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RotateSampleRefFrameFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/RotateSampleRefFrameFilter.hpp (86%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ScalarSegmentFeaturesFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/ScalarSegmentFeaturesFilter.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SetImageGeomOriginScalingFilter.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SetImageGeomOriginScalingFilter.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SharedFeatureFaceFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SharedFeatureFaceFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SilhouetteFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SilhouetteFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SplitAttributeArrayFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SplitAttributeArrayFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SurfaceNetsFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/SurfaceNetsFilter.hpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/TriangleCentroidFilter.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/TriangleCentroidFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/TriangleDihedralAngleFilter.cpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/TriangleDihedralAngleFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/TriangleNormalFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/TriangleNormalFilter.hpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteASCIIDataFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteASCIIDataFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteAbaqusHexahedronFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteAbaqusHexahedronFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteAvizoRectilinearCoordinateFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteAvizoRectilinearCoordinateFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteAvizoUniformCoordinateFilter.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteAvizoUniformCoordinateFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteBinaryDataFilter.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteBinaryDataFilter.hpp (91%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteDREAM3DFilter.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteDREAM3DFilter.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteFeatureDataCSVFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteFeatureDataCSVFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteLosAlamosFFTFilter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteLosAlamosFFTFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteStlFileFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteStlFileFilter.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteVtkRectilinearGridFilter.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/Filters/WriteVtkRectilinearGridFilter.hpp (89%) create mode 100644 src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp create mode 100644 src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.cpp create mode 100644 src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.hpp rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/LICENSE.txt (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMCellFlag.cpp (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMCellFlag.h (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMCellMap.cpp (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMCellMap.h (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMGeometryGL.cpp (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMGeometryGL.h (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMGeometryOBJ.cpp (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMGeometryOBJ.h (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMSurfaceNet.cpp (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/SurfaceNets/MMSurfaceNet.h (100%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ABSOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ABSOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ACosOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ACosOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ASinOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ASinOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ATanOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ATanOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/AdditionOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/AdditionOperator.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/AvizoWriter.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/AvizoWriter.hpp (72%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/BinaryOperator.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/BinaryOperator.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CSVDataParser.hpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorArray.hpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorItem.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorItem.hpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorOperator.cpp (97%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorOperator.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorSeparator.cpp (88%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CalculatorSeparator.hpp (80%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CeilOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CeilOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CommaSeparator.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CommaSeparator.hpp (82%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CosOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/CosOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/DivisionOperator.cpp (93%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/DivisionOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ExpOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ExpOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/FloorOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/FloorOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ICalculatorArray.cpp (89%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/ICalculatorArray.hpp (81%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/LeftParenthesisItem.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/LeftParenthesisItem.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/LnOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/LnOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/Log10Operator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/Log10Operator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/LogOperator.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/LogOperator.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/MultiplicationOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/MultiplicationOperator.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/NegativeOperator.cpp (94%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/NegativeOperator.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/PowOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/PowOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/RightParenthesisItem.cpp (92%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/RightParenthesisItem.hpp (85%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/RootOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/RootOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/SinOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/SinOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/SqrtOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/SqrtOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/StlUtilities.cpp (98%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/StlUtilities.hpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/SubtractionOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/SubtractionOperator.hpp (84%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/TanOperator.cpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/TanOperator.hpp (83%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/UnaryOperator.cpp (96%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/UnaryOperator.hpp (90%) rename src/Plugins/{ComplexCore/src/ComplexCore => SimplnxCore/src/SimplnxCore}/utils/nanoflann.hpp (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/AddBadDataTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/AlignGeometriesTest.cpp (83%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/AlignSectionsFeatureCentroidTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/AlignSectionsListTest.cpp (60%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/AppendImageGeometryZSliceTest.cpp (86%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ApplyTransformationToGeometryTest.cpp (66%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ApproximatePointCloudHullTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ArrayCalculatorTest.cpp (97%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CMakeLists.txt (98%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CalculateArrayHistogramTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CalculateFeatureSizesTest.cpp (69%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CalculateTriangleAreasFilterTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ChangeAngleRepresentationTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CombineAttributeArraysTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CombineStlFilesTest.cpp (75%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ComputeFeatureRectTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ComputeMomentInvariants2DTest.cpp (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ConditionalSetValueTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ConvertColorToGrayScaleTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ConvertDataTest.cpp (97%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CopyDataObjectTest.cpp (82%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CopyFeatureArrayToElementArrayTest.cpp (84%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CoreFilterTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CreateAttributeMatrixTest.cpp (71%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CreateDataArrayTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CreateFeatureArrayFromElementArrayTest.cpp (68%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CreateGeometryTest.cpp (98%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CreateImageGeometryTest.cpp (82%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CropImageGeometryTest.cpp (87%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/CropVertexGeometryTest.cpp (89%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/DREAM3DFileTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/DeleteDataTest.cpp (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ErodeDilateBadDataTest.cpp (77%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ErodeDilateCoordinationNumberTest.cpp (71%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ErodeDilateMaskTest.cpp (77%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ExecuteProcessTest.cpp (72%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ExtractComponentAsArrayTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ExtractVertexGeometryTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FeatureFaceCurvatureTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FillBadDataTest.cpp (69%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindArrayStatisticsTest.cpp (97%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindBiasedFeaturesTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindBoundaryCellsTest.cpp (76%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindBoundaryElementFractionsTest.cpp (75%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindDifferencesMapTest.cpp (87%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindEuclideanDistMapTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindFeatureCentroidsFilterTest.cpp (71%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindFeatureClusteringTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindFeaturePhasesBinaryTest.cpp (78%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindFeaturePhasesFilterTest.cpp (61%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindLargestCrossSectionsTest.cpp (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindNeighborListStatisticsTest.cpp (96%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindNeighborhoodsTest.cpp (79%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindNeighborsTest.cpp (79%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindNumFeaturesTest.cpp (76%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindSurfaceAreaToVolumeTest.cpp (80%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindSurfaceFeaturesTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindTriangleGeomCentroidsTest.cpp (77%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindTriangleGeomSizesTest.cpp (76%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindVertexToTriangleDistancesTest.cpp (78%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/FindVolFractionsTest.cpp (77%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/GenerateColorTableTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/GenerateVectorColorsTest.cpp (74%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/IdentifySampleTest.cpp (69%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ImageContouringTest.cpp (77%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ImageGeomTest.cpp (94%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/InitializeDataTest.cpp (77%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/InitializeImageGeomCellDataTest.cpp (89%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/InterpolatePointCloudToRegularGridTest.cpp (86%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/IterativeClosestPointTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/KMeansTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/KMedoidsTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/LaplacianSmoothingFilterTest.cpp (78%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/MapPointCloudToRegularGridTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/MinNeighborsTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/MoveDataTest.cpp (86%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/MultiThresholdObjectsTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/NearestPointFuseRegularGridsTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/PartitionGeometryTest.cpp (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/PipelineTest.cpp (94%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/PointSampleTriangleGeometryFilterTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/QuickSurfaceMeshFilterTest.cpp (79%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadBinaryCTNorthstarTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadCSVFileTest.cpp (95%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadDeformKeyFileV12Test.cpp (87%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadHDF5DatasetTest.cpp (94%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadRawBinaryTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadStlFileTest.cpp (67%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadTextDataArrayTest.cpp (90%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReadVolumeGraphicsFileTest.cpp (67%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RegularGridSampleSurfaceMeshTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RemoveFlaggedFeaturesTest.cpp (89%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RemoveFlaggedVerticesTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RemoveMinimumSizeFeaturesTest.cpp (83%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RenameDataObjectTest.cpp (73%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReplaceElementAttributesWithNeighborValuesTest.cpp (69%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ResampleImageGeomTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ResampleRectGridToImageGeomTest.cpp (82%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ReverseTriangleWindingTest.cpp (67%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RobustAutomaticThresholdTest.cpp (74%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/RotateSampleRefFrameTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/ScalarSegmentFeaturesFilterTest.cpp (72%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/SetImageGeomOriginScalingFilterTest.cpp (79%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/SharedFeatureFaceTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/SilhouetteTest.cpp (83%) rename src/Plugins/{ComplexCore/test/ComplexCore_test_main.cpp => SimplnxCore/test/SimplnxCore_test_main.cpp} (100%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/SplitAttributeArrayTest.cpp (91%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/SurfaceNetsTest.cpp (85%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/TriangleCentroidTest.cpp (87%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/TriangleDihedralAngleFilterTest.cpp (88%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/TriangleNormalFilterTest.cpp (76%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/UncertainRegularGridSampleSurfaceMeshTest.cpp (86%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteASCIIDataTest.cpp (92%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteAbaqusHexahedronTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteAvizoRectilinearCoordinateTest.cpp (75%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteAvizoUniformCoordinateTest.cpp (75%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteBinaryDataTest.cpp (93%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteFeatureDataCSVTest.cpp (79%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteLosAlamosFFTTest.cpp (75%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteStlFileTest.cpp (81%) rename src/Plugins/{ComplexCore => SimplnxCore}/test/WriteVtkRectilinearGridTest.cpp (72%) create mode 100644 src/Plugins/SimplnxCore/test/test_dirs.hpp.in rename src/Plugins/{ComplexCore/wrapping/python/complexpy.cpp => SimplnxCore/wrapping/python/simplnxpy.cpp} (83%) delete mode 100644 src/complex/Common/ComplexConstants.hpp delete mode 100644 src/complex/DataStructure/IO/HDF5/IDataStoreIO.cpp delete mode 100644 src/complex/Pipeline/Messaging/NodeStatusMessage.hpp delete mode 100644 src/complex/Utilities/DataObjectUtilities.hpp delete mode 100644 src/complex/Utilities/MemoryUtilities.hpp rename src/{complex => simplnx}/Common/Any.hpp (93%) rename src/{complex => simplnx}/Common/Array.hpp (99%) rename src/{complex => simplnx}/Common/AtomicFile.cpp (97%) rename src/{complex => simplnx}/Common/AtomicFile.hpp (87%) rename src/{complex => simplnx}/Common/Bit.hpp (93%) rename src/{complex => simplnx}/Common/BoundingBox.hpp (98%) rename src/{complex => simplnx}/Common/Constants.hpp (98%) rename src/{complex => simplnx}/Common/DataVector.hpp (98%) rename src/{complex => simplnx}/Common/EulerAngle.hpp (90%) rename src/{complex => simplnx}/Common/IteratorUtility.hpp (75%) rename src/{complex => simplnx}/Common/Numbers.hpp (98%) rename src/{complex => simplnx}/Common/Range.cpp (93%) rename src/{complex => simplnx}/Common/Range.hpp (86%) rename src/{complex => simplnx}/Common/Range2D.cpp (96%) rename src/{complex => simplnx}/Common/Range2D.hpp (92%) rename src/{complex => simplnx}/Common/Range3D.cpp (95%) rename src/{complex => simplnx}/Common/Range3D.hpp (90%) rename src/{complex => simplnx}/Common/Ray.hpp (97%) rename src/{complex => simplnx}/Common/Result.hpp (94%) rename src/{complex => simplnx}/Common/RgbColor.cpp (98%) rename src/{complex => simplnx}/Common/RgbColor.hpp (71%) rename src/{complex => simplnx}/Common/ScopeGuard.hpp (97%) create mode 100644 src/simplnx/Common/SimplnxConstants.hpp rename src/{complex => simplnx}/Common/StringLiteral.hpp (95%) rename src/{complex => simplnx}/Common/TypeTraits.hpp (88%) rename src/{complex => simplnx}/Common/Types.hpp (68%) rename src/{complex => simplnx}/Common/TypesUtility.hpp (83%) rename src/{complex => simplnx}/Common/Uuid.hpp (93%) rename src/{complex => simplnx}/Core/Application.cpp (90%) rename src/{complex => simplnx}/Core/Application.hpp (90%) rename src/{complex => simplnx}/Core/Preferences.cpp (97%) rename src/{complex => simplnx}/Core/Preferences.hpp (93%) rename src/{complex => simplnx}/DataStructure/AbstractDataStore.hpp (98%) rename src/{complex => simplnx}/DataStructure/AttributeMatrix.cpp (96%) rename src/{complex => simplnx}/DataStructure/AttributeMatrix.hpp (96%) rename src/{complex => simplnx}/DataStructure/BaseGroup.cpp (98%) rename src/{complex => simplnx}/DataStructure/BaseGroup.hpp (97%) rename src/{complex => simplnx}/DataStructure/DataArray.hpp (97%) rename src/{complex => simplnx}/DataStructure/DataGroup.cpp (96%) rename src/{complex => simplnx}/DataStructure/DataGroup.hpp (95%) rename src/{complex => simplnx}/DataStructure/DataMap.cpp (96%) rename src/{complex => simplnx}/DataStructure/DataMap.hpp (98%) rename src/{complex => simplnx}/DataStructure/DataObject.cpp (97%) rename src/{complex => simplnx}/DataStructure/DataObject.hpp (97%) rename src/{complex => simplnx}/DataStructure/DataPath.cpp (93%) rename src/{complex => simplnx}/DataStructure/DataPath.hpp (96%) rename src/{complex => simplnx}/DataStructure/DataStore.hpp (99%) rename src/{complex => simplnx}/DataStructure/DataStructure.cpp (95%) rename src/{complex => simplnx}/DataStructure/DataStructure.hpp (98%) rename src/{complex => simplnx}/DataStructure/DynamicListArray.hpp (98%) rename src/{complex => simplnx}/DataStructure/EmptyDataStore.hpp (98%) rename src/{complex => simplnx}/DataStructure/Geometry/EdgeGeom.cpp (97%) rename src/{complex => simplnx}/DataStructure/Geometry/EdgeGeom.hpp (94%) rename src/{complex => simplnx}/DataStructure/Geometry/HexahedralGeom.cpp (98%) rename src/{complex => simplnx}/DataStructure/Geometry/HexahedralGeom.hpp (95%) rename src/{complex => simplnx}/DataStructure/Geometry/IGeometry.cpp (99%) rename src/{complex => simplnx}/DataStructure/Geometry/IGeometry.hpp (91%) rename src/{complex => simplnx}/DataStructure/Geometry/IGridGeometry.cpp (97%) rename src/{complex => simplnx}/DataStructure/Geometry/IGridGeometry.hpp (92%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry0D.cpp (99%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry0D.hpp (93%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry1D.cpp (99%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry1D.hpp (97%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry2D.cpp (99%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry2D.hpp (96%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry3D.cpp (99%) rename src/{complex => simplnx}/DataStructure/Geometry/INodeGeometry3D.hpp (96%) rename src/{complex => simplnx}/DataStructure/Geometry/ImageGeom.cpp (98%) rename src/{complex => simplnx}/DataStructure/Geometry/ImageGeom.hpp (95%) rename src/{complex => simplnx}/DataStructure/Geometry/LinkedGeometryData.cpp (98%) rename src/{complex => simplnx}/DataStructure/Geometry/LinkedGeometryData.hpp (89%) rename src/{complex => simplnx}/DataStructure/Geometry/QuadGeom.cpp (98%) rename src/{complex => simplnx}/DataStructure/Geometry/QuadGeom.hpp (94%) rename src/{complex => simplnx}/DataStructure/Geometry/RectGridGeom.cpp (99%) rename src/{complex => simplnx}/DataStructure/Geometry/RectGridGeom.hpp (96%) rename src/{complex => simplnx}/DataStructure/Geometry/TetrahedralGeom.cpp (98%) rename src/{complex => simplnx}/DataStructure/Geometry/TetrahedralGeom.hpp (95%) rename src/{complex => simplnx}/DataStructure/Geometry/TriangleGeom.cpp (97%) rename src/{complex => simplnx}/DataStructure/Geometry/TriangleGeom.hpp (95%) rename src/{complex => simplnx}/DataStructure/Geometry/VertexGeom.cpp (94%) rename src/{complex => simplnx}/DataStructure/Geometry/VertexGeom.hpp (91%) rename src/{complex => simplnx}/DataStructure/IArray.hpp (95%) rename src/{complex => simplnx}/DataStructure/IDataArray.hpp (95%) rename src/{complex => simplnx}/DataStructure/IDataStore.hpp (95%) rename src/{complex => simplnx}/DataStructure/INeighborList.cpp (93%) rename src/{complex => simplnx}/DataStructure/INeighborList.hpp (94%) rename src/{complex => simplnx}/DataStructure/IO/Generic/CoreDataIOManager.cpp (88%) rename src/{complex => simplnx}/DataStructure/IO/Generic/CoreDataIOManager.hpp (72%) rename src/{complex => simplnx}/DataStructure/IO/Generic/DataIOCollection.cpp (86%) rename src/{complex => simplnx}/DataStructure/IO/Generic/DataIOCollection.hpp (89%) rename src/{complex => simplnx}/DataStructure/IO/Generic/IDataFactory.hpp (81%) rename src/{complex => simplnx}/DataStructure/IO/Generic/IDataIOManager.cpp (96%) rename src/{complex => simplnx}/DataStructure/IO/Generic/IDataIOManager.hpp (88%) rename src/{complex => simplnx}/DataStructure/IO/Generic/IOConstants.hpp (95%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/AttributeMatrixIO.cpp (82%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/AttributeMatrixIO.hpp (93%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/BaseGroupIO.cpp (87%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/BaseGroupIO.hpp (90%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataArrayIO.hpp (83%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataGroupIO.cpp (89%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataGroupIO.hpp (92%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataIOManager.cpp (65%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataIOManager.hpp (68%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataStoreIO.hpp (79%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataStructureReader.cpp (79%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataStructureReader.hpp (66%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataStructureWriter.cpp (82%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/DataStructureWriter.hpp (88%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/EdgeGeomIO.cpp (93%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/EdgeGeomIO.hpp (89%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp (65%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/GridMontageIO.cpp (89%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/GridMontageIO.hpp (92%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/HexahedralGeomIO.cpp (89%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/HexahedralGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IDataIO.cpp (90%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IDataIO.hpp (80%) create mode 100644 src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.cpp rename src/{complex => simplnx}/DataStructure/IO/HDF5/IDataStoreIO.hpp (57%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IGeometryIO.cpp (82%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IGeometryIO.hpp (85%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IGridGeometryIO.cpp (83%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IGridGeometryIO.hpp (87%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom0dIO.cpp (83%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom0dIO.hpp (87%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom1dIO.cpp (89%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom1dIO.hpp (87%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom2dIO.cpp (86%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom2dIO.hpp (87%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom3dIO.cpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/INodeGeom3dIO.hpp (87%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IOUtilities.cpp (69%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/IOUtilities.hpp (76%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/ImageGeomIO.cpp (89%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/ImageGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/NeighborListIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/QuadGeomIO.cpp (88%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/QuadGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/RectGridGeomIO.cpp (90%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/RectGridGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/ScalarDataIO.hpp (93%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/StringArrayIO.cpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/StringArrayIO.hpp (92%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp (82%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/TriangleGeomIO.cpp (85%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/TriangleGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/VertexGeomIO.cpp (88%) rename src/{complex => simplnx}/DataStructure/IO/HDF5/VertexGeomIO.hpp (91%) rename src/{complex => simplnx}/DataStructure/LinkedPath.cpp (96%) rename src/{complex => simplnx}/DataStructure/LinkedPath.hpp (95%) rename src/{complex => simplnx}/DataStructure/Messaging/AbstractDataStructureMessage.cpp (96%) rename src/{complex => simplnx}/DataStructure/Messaging/AbstractDataStructureMessage.hpp (87%) rename src/{complex => simplnx}/DataStructure/Messaging/DataAddedMessage.cpp (92%) rename src/{complex => simplnx}/DataStructure/Messaging/DataAddedMessage.hpp (83%) rename src/{complex => simplnx}/DataStructure/Messaging/DataRemovedMessage.cpp (97%) rename src/{complex => simplnx}/DataStructure/Messaging/DataRemovedMessage.hpp (84%) rename src/{complex => simplnx}/DataStructure/Messaging/DataRenamedMessage.cpp (94%) rename src/{complex => simplnx}/DataStructure/Messaging/DataRenamedMessage.hpp (85%) rename src/{complex => simplnx}/DataStructure/Messaging/DataReparentedMessage.cpp (95%) rename src/{complex => simplnx}/DataStructure/Messaging/DataReparentedMessage.hpp (87%) rename src/{complex => simplnx}/DataStructure/Metadata.cpp (94%) rename src/{complex => simplnx}/DataStructure/Metadata.hpp (96%) rename src/{complex => simplnx}/DataStructure/Montage/AbstractMontage.cpp (96%) rename src/{complex => simplnx}/DataStructure/Montage/AbstractMontage.hpp (93%) rename src/{complex => simplnx}/DataStructure/Montage/AbstractTileIndex.cpp (95%) rename src/{complex => simplnx}/DataStructure/Montage/AbstractTileIndex.hpp (90%) rename src/{complex => simplnx}/DataStructure/Montage/GridMontage.cpp (97%) rename src/{complex => simplnx}/DataStructure/Montage/GridMontage.hpp (96%) rename src/{complex => simplnx}/DataStructure/Montage/GridTileIndex.cpp (93%) rename src/{complex => simplnx}/DataStructure/Montage/GridTileIndex.hpp (88%) rename src/{complex => simplnx}/DataStructure/NeighborList.cpp (86%) rename src/{complex => simplnx}/DataStructure/NeighborList.hpp (92%) rename src/{complex => simplnx}/DataStructure/Observers/AbstractDataStructureObserver.cpp (87%) rename src/{complex => simplnx}/DataStructure/Observers/AbstractDataStructureObserver.hpp (94%) rename src/{complex => simplnx}/DataStructure/ReadMe.md (78%) rename src/{complex => simplnx}/DataStructure/ScalarData.hpp (98%) rename src/{complex => simplnx}/DataStructure/StringArray.cpp (98%) rename src/{complex => simplnx}/DataStructure/StringArray.hpp (96%) rename src/{complex => simplnx}/Filter/AbstractParameter.cpp (92%) rename src/{complex => simplnx}/Filter/AbstractParameter.hpp (85%) rename src/{complex => simplnx}/Filter/Actions/CopyArrayInstanceAction.cpp (92%) rename src/{complex => simplnx}/Filter/Actions/CopyArrayInstanceAction.hpp (89%) rename src/{complex => simplnx}/Filter/Actions/CopyDataObjectAction.cpp (91%) rename src/{complex => simplnx}/Filter/Actions/CopyDataObjectAction.hpp (91%) rename src/{complex => simplnx}/Filter/Actions/CreateArrayAction.cpp (92%) rename src/{complex => simplnx}/Filter/Actions/CreateArrayAction.hpp (89%) rename src/{complex => simplnx}/Filter/Actions/CreateAttributeMatrixAction.cpp (94%) rename src/{complex => simplnx}/Filter/Actions/CreateAttributeMatrixAction.hpp (84%) rename src/{complex => simplnx}/Filter/Actions/CreateDataGroupAction.cpp (87%) rename src/{complex => simplnx}/Filter/Actions/CreateDataGroupAction.hpp (85%) rename src/{complex => simplnx}/Filter/Actions/CreateGeometry1DAction.hpp (93%) rename src/{complex => simplnx}/Filter/Actions/CreateGeometry2DAction.hpp (93%) rename src/{complex => simplnx}/Filter/Actions/CreateGeometry3DAction.hpp (93%) rename src/{complex => simplnx}/Filter/Actions/CreateGridMontageAction.cpp (93%) rename src/{complex => simplnx}/Filter/Actions/CreateGridMontageAction.hpp (88%) rename src/{complex => simplnx}/Filter/Actions/CreateImageGeometryAction.cpp (96%) rename src/{complex => simplnx}/Filter/Actions/CreateImageGeometryAction.hpp (89%) rename src/{complex => simplnx}/Filter/Actions/CreateNeighborListAction.cpp (93%) rename src/{complex => simplnx}/Filter/Actions/CreateNeighborListAction.hpp (90%) rename src/{complex => simplnx}/Filter/Actions/CreateRectGridGeometryAction.cpp (97%) rename src/{complex => simplnx}/Filter/Actions/CreateRectGridGeometryAction.hpp (94%) rename src/{complex => simplnx}/Filter/Actions/CreateStringArrayAction.cpp (92%) rename src/{complex => simplnx}/Filter/Actions/CreateStringArrayAction.hpp (89%) rename src/{complex => simplnx}/Filter/Actions/CreateVertexGeometryAction.hpp (93%) rename src/{complex => simplnx}/Filter/Actions/DeleteDataAction.cpp (92%) rename src/{complex => simplnx}/Filter/Actions/DeleteDataAction.hpp (88%) rename src/{complex => simplnx}/Filter/Actions/EmptyAction.hpp (83%) rename src/{complex => simplnx}/Filter/Actions/ImportH5ObjectPathsAction.cpp (88%) rename src/{complex => simplnx}/Filter/Actions/ImportH5ObjectPathsAction.hpp (90%) rename src/{complex => simplnx}/Filter/Actions/ImportObjectAction.cpp (86%) rename src/{complex => simplnx}/Filter/Actions/ImportObjectAction.hpp (91%) rename src/{complex => simplnx}/Filter/Actions/MoveDataAction.cpp (95%) rename src/{complex => simplnx}/Filter/Actions/MoveDataAction.hpp (86%) rename src/{complex => simplnx}/Filter/Actions/RenameDataAction.cpp (87%) rename src/{complex => simplnx}/Filter/Actions/RenameDataAction.hpp (86%) rename src/{complex => simplnx}/Filter/Actions/UpdateImageGeomAction.cpp (92%) rename src/{complex => simplnx}/Filter/Actions/UpdateImageGeomAction.hpp (89%) rename src/{complex => simplnx}/Filter/AnyCloneable.hpp (97%) rename src/{complex => simplnx}/Filter/Arguments.cpp (95%) rename src/{complex => simplnx}/Filter/Arguments.hpp (94%) rename src/{complex => simplnx}/Filter/ConstDataParameter.cpp (76%) rename src/{complex => simplnx}/Filter/ConstDataParameter.hpp (87%) rename src/{complex => simplnx}/Filter/DataParameter.cpp (90%) rename src/{complex => simplnx}/Filter/DataParameter.hpp (86%) rename src/{complex => simplnx}/Filter/FilterHandle.cpp (92%) rename src/{complex => simplnx}/Filter/FilterHandle.hpp (88%) rename src/{complex => simplnx}/Filter/FilterList.cpp (98%) rename src/{complex => simplnx}/Filter/FilterList.hpp (92%) rename src/{complex => simplnx}/Filter/FilterTraits.hpp (56%) rename src/{complex => simplnx}/Filter/IFilter.cpp (97%) rename src/{complex => simplnx}/Filter/IFilter.hpp (94%) rename src/{complex => simplnx}/Filter/IParameter.cpp (73%) rename src/{complex => simplnx}/Filter/IParameter.hpp (92%) rename src/{complex => simplnx}/Filter/MutableDataParameter.cpp (77%) rename src/{complex => simplnx}/Filter/MutableDataParameter.hpp (87%) rename src/{complex => simplnx}/Filter/Output.cpp (95%) rename src/{complex => simplnx}/Filter/Output.hpp (93%) rename src/{complex => simplnx}/Filter/ParameterTraits.hpp (60%) rename src/{complex => simplnx}/Filter/Parameters.cpp (98%) rename src/{complex => simplnx}/Filter/Parameters.hpp (95%) rename src/{complex => simplnx}/Filter/ValueParameter.cpp (71%) rename src/{complex => simplnx}/Filter/ValueParameter.hpp (81%) rename src/{complex => simplnx}/Parameters/ArrayCreationParameter.cpp (86%) rename src/{complex => simplnx}/Parameters/ArrayCreationParameter.hpp (83%) rename src/{complex => simplnx}/Parameters/ArraySelectionParameter.cpp (78%) rename src/{complex => simplnx}/Parameters/ArraySelectionParameter.hpp (91%) rename src/{complex => simplnx}/Parameters/ArrayThresholdsParameter.cpp (79%) rename src/{complex => simplnx}/Parameters/ArrayThresholdsParameter.hpp (84%) rename src/{complex => simplnx}/Parameters/AttributeMatrixSelectionParameter.cpp (81%) rename src/{complex => simplnx}/Parameters/AttributeMatrixSelectionParameter.hpp (87%) rename src/{complex => simplnx}/Parameters/BoolParameter.cpp (97%) rename src/{complex => simplnx}/Parameters/BoolParameter.hpp (83%) rename src/{complex => simplnx}/Parameters/CalculatorParameter.cpp (91%) rename src/{complex => simplnx}/Parameters/CalculatorParameter.hpp (82%) rename src/{complex => simplnx}/Parameters/ChoicesParameter.cpp (87%) rename src/{complex => simplnx}/Parameters/ChoicesParameter.hpp (85%) rename src/{complex => simplnx}/Parameters/DataGroupCreationParameter.cpp (87%) rename src/{complex => simplnx}/Parameters/DataGroupCreationParameter.hpp (87%) rename src/{complex => simplnx}/Parameters/DataGroupSelectionParameter.cpp (97%) rename src/{complex => simplnx}/Parameters/DataGroupSelectionParameter.hpp (86%) rename src/{complex => simplnx}/Parameters/DataObjectNameParameter.cpp (81%) rename src/{complex => simplnx}/Parameters/DataObjectNameParameter.hpp (81%) rename src/{complex => simplnx}/Parameters/DataPathSelectionParameter.cpp (86%) rename src/{complex => simplnx}/Parameters/DataPathSelectionParameter.hpp (87%) rename src/{complex => simplnx}/Parameters/DataStoreFormatParameter.cpp (92%) rename src/{complex => simplnx}/Parameters/DataStoreFormatParameter.hpp (81%) rename src/{complex => simplnx}/Parameters/DataTypeParameter.cpp (77%) rename src/{complex => simplnx}/Parameters/DataTypeParameter.hpp (77%) rename src/{complex => simplnx}/Parameters/Dream3dImportParameter.cpp (95%) rename src/{complex => simplnx}/Parameters/Dream3dImportParameter.hpp (82%) rename src/{complex => simplnx}/Parameters/DynamicTableParameter.cpp (96%) rename src/{complex => simplnx}/Parameters/DynamicTableParameter.hpp (85%) rename src/{complex => simplnx}/Parameters/EnsembleInfoParameter.cpp (97%) rename src/{complex => simplnx}/Parameters/EnsembleInfoParameter.hpp (84%) rename src/{complex => simplnx}/Parameters/FileSystemPathParameter.cpp (90%) rename src/{complex => simplnx}/Parameters/FileSystemPathParameter.hpp (89%) rename src/{complex => simplnx}/Parameters/GenerateColorTableParameter.cpp (95%) rename src/{complex => simplnx}/Parameters/GenerateColorTableParameter.hpp (82%) rename src/{complex => simplnx}/Parameters/GeneratedFileListParameter.cpp (93%) rename src/{complex => simplnx}/Parameters/GeneratedFileListParameter.hpp (85%) rename src/{complex => simplnx}/Parameters/GeometrySelectionParameter.cpp (84%) rename src/{complex => simplnx}/Parameters/GeometrySelectionParameter.hpp (88%) rename src/{complex => simplnx}/Parameters/MultiArraySelectionParameter.cpp (94%) rename src/{complex => simplnx}/Parameters/MultiArraySelectionParameter.hpp (91%) rename src/{complex => simplnx}/Parameters/MultiPathSelectionParameter.cpp (98%) rename src/{complex => simplnx}/Parameters/MultiPathSelectionParameter.hpp (88%) rename src/{complex => simplnx}/Parameters/NeighborListSelectionParameter.cpp (76%) rename src/{complex => simplnx}/Parameters/NeighborListSelectionParameter.hpp (88%) rename src/{complex => simplnx}/Parameters/NumberParameter.cpp (73%) rename src/{complex => simplnx}/Parameters/NumberParameter.hpp (68%) rename src/{complex => simplnx}/Parameters/NumericTypeParameter.cpp (78%) rename src/{complex => simplnx}/Parameters/NumericTypeParameter.hpp (77%) rename src/{complex => simplnx}/Parameters/ReadCSVFileParameter.cpp (98%) rename src/{complex => simplnx}/Parameters/ReadCSVFileParameter.hpp (89%) rename src/{complex => simplnx}/Parameters/ReadHDF5DatasetParameter.cpp (98%) rename src/{complex => simplnx}/Parameters/ReadHDF5DatasetParameter.hpp (93%) rename src/{complex => simplnx}/Parameters/StringParameter.cpp (95%) rename src/{complex => simplnx}/Parameters/StringParameter.hpp (79%) rename src/{complex => simplnx}/Parameters/VectorParameter.cpp (82%) rename src/{complex => simplnx}/Parameters/VectorParameter.hpp (73%) rename src/{complex => simplnx}/Parameters/util/DynamicTableInfo.cpp (99%) rename src/{complex => simplnx}/Parameters/util/DynamicTableInfo.hpp (95%) rename src/{complex => simplnx}/Parameters/util/ReadCSVData.cpp (99%) rename src/{complex => simplnx}/Parameters/util/ReadCSVData.hpp (89%) rename src/{complex => simplnx}/Pipeline/AbstractPipelineNode.cpp (88%) rename src/{complex => simplnx}/Pipeline/AbstractPipelineNode.hpp (98%) rename src/{complex => simplnx}/Pipeline/Messaging/AbstractPipelineMessage.cpp (91%) rename src/{complex => simplnx}/Pipeline/Messaging/AbstractPipelineMessage.hpp (85%) rename src/{complex => simplnx}/Pipeline/Messaging/FilterPreflightMessage.cpp (63%) rename src/{complex => simplnx}/Pipeline/Messaging/FilterPreflightMessage.hpp (65%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeAddedMessage.cpp (88%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeAddedMessage.hpp (83%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeMovedMessage.cpp (81%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeMovedMessage.hpp (82%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeRemovedMessage.cpp (86%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeRemovedMessage.hpp (79%) rename src/{complex => simplnx}/Pipeline/Messaging/NodeStatusMessage.cpp (66%) create mode 100644 src/simplnx/Pipeline/Messaging/NodeStatusMessage.hpp rename src/{complex => simplnx}/Pipeline/Messaging/OutputRenamedMessage.cpp (89%) rename src/{complex => simplnx}/Pipeline/Messaging/OutputRenamedMessage.hpp (83%) rename src/{complex => simplnx}/Pipeline/Messaging/PipelineFilterMessage.cpp (93%) rename src/{complex => simplnx}/Pipeline/Messaging/PipelineFilterMessage.hpp (79%) rename src/{complex => simplnx}/Pipeline/Messaging/PipelineNodeMessage.cpp (94%) rename src/{complex => simplnx}/Pipeline/Messaging/PipelineNodeMessage.hpp (84%) rename src/{complex => simplnx}/Pipeline/Messaging/PipelineNodeObserver.cpp (91%) rename src/{complex => simplnx}/Pipeline/Messaging/PipelineNodeObserver.hpp (93%) rename src/{complex => simplnx}/Pipeline/Messaging/RenamedMessage.cpp (89%) rename src/{complex => simplnx}/Pipeline/Messaging/RenamedMessage.hpp (86%) rename src/{complex => simplnx}/Pipeline/Pipeline.cpp (97%) rename src/{complex => simplnx}/Pipeline/Pipeline.hpp (96%) rename src/{complex => simplnx}/Pipeline/PipelineFilter.cpp (95%) rename src/{complex => simplnx}/Pipeline/PipelineFilter.hpp (90%) rename src/{complex => simplnx}/Plugin/AbstractPlugin.cpp (94%) rename src/{complex => simplnx}/Plugin/AbstractPlugin.hpp (84%) rename src/{complex => simplnx}/Plugin/PluginLoader.cpp (82%) rename src/{complex => simplnx}/Plugin/PluginLoader.hpp (88%) rename src/{complex => simplnx}/Utilities/AlignSections.cpp (96%) rename src/{complex => simplnx}/Utilities/AlignSections.hpp (86%) rename src/{complex => simplnx}/Utilities/ArrayThreshold.cpp (99%) rename src/{complex => simplnx}/Utilities/ArrayThreshold.hpp (86%) rename src/{complex => simplnx}/Utilities/ColorPresetsUtilities.cpp (96%) rename src/{complex => simplnx}/Utilities/ColorPresetsUtilities.hpp (67%) rename src/{complex => simplnx}/Utilities/DataArrayUtilities.cpp (97%) rename src/{complex => simplnx}/Utilities/DataArrayUtilities.hpp (94%) rename src/{complex => simplnx}/Utilities/DataGroupUtilities.cpp (98%) rename src/{complex => simplnx}/Utilities/DataGroupUtilities.hpp (82%) create mode 100644 src/simplnx/Utilities/DataObjectUtilities.hpp rename src/{complex => simplnx}/Utilities/FilePathGenerator.cpp (97%) rename src/{complex => simplnx}/Utilities/FilePathGenerator.hpp (90%) rename src/{complex => simplnx}/Utilities/FileUtilities.hpp (98%) rename src/{complex => simplnx}/Utilities/FilterUtilities.cpp (88%) rename src/{complex => simplnx}/Utilities/FilterUtilities.hpp (88%) rename src/{complex => simplnx}/Utilities/FlyingEdges.hpp (99%) rename src/{complex => simplnx}/Utilities/GeometryHelpers.cpp (69%) rename src/{complex => simplnx}/Utilities/GeometryHelpers.hpp (98%) rename src/{complex => simplnx}/Utilities/GeometryUtilities.cpp (97%) rename src/{complex => simplnx}/Utilities/GeometryUtilities.hpp (75%) rename src/{complex => simplnx}/Utilities/IParallelAlgorithm.cpp (90%) rename src/{complex => simplnx}/Utilities/IParallelAlgorithm.hpp (79%) rename src/{complex => simplnx}/Utilities/ImageRotationUtilities.cpp (99%) rename src/{complex => simplnx}/Utilities/ImageRotationUtilities.hpp (95%) rename src/{complex => simplnx}/Utilities/KUtilities.hpp (95%) rename src/{complex => simplnx}/Utilities/Math/GeometryMath.cpp (81%) rename src/{complex => simplnx}/Utilities/Math/GeometryMath.hpp (78%) rename src/{complex => simplnx}/Utilities/Math/MatrixMath.cpp (96%) rename src/{complex => simplnx}/Utilities/Math/MatrixMath.hpp (98%) rename src/{complex => simplnx}/Utilities/Math/StatisticsCalculations.hpp (100%) rename src/{complex => simplnx}/Utilities/MemoryUtilities.cpp (95%) create mode 100644 src/simplnx/Utilities/MemoryUtilities.hpp rename src/{complex => simplnx}/Utilities/MontageUtilities.cpp (98%) rename src/{complex => simplnx}/Utilities/MontageUtilities.hpp (63%) rename src/{complex => simplnx}/Utilities/OStreamUtilities.cpp (98%) rename src/{complex => simplnx}/Utilities/OStreamUtilities.hpp (82%) rename src/{complex => simplnx}/Utilities/ParallelAlgorithmUtilities.hpp (96%) rename src/{complex => simplnx}/Utilities/ParallelData2DAlgorithm.cpp (97%) rename src/{complex => simplnx}/Utilities/ParallelData2DAlgorithm.hpp (92%) rename src/{complex => simplnx}/Utilities/ParallelData3DAlgorithm.cpp (97%) rename src/{complex => simplnx}/Utilities/ParallelData3DAlgorithm.hpp (92%) rename src/{complex => simplnx}/Utilities/ParallelDataAlgorithm.cpp (96%) rename src/{complex => simplnx}/Utilities/ParallelDataAlgorithm.hpp (85%) rename src/{complex => simplnx}/Utilities/ParallelTaskAlgorithm.cpp (90%) rename src/{complex => simplnx}/Utilities/ParallelTaskAlgorithm.hpp (85%) rename src/{complex => simplnx}/Utilities/Parsing/DREAM3D/Dream3dIO.cpp (91%) rename src/{complex => simplnx}/Utilities/Parsing/DREAM3D/Dream3dIO.hpp (69%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/H5.cpp (76%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/H5.hpp (72%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/H5Support.cpp (87%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/H5Support.hpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/AttributeIO.cpp (99%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/AttributeIO.hpp (65%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/DatasetIO.cpp (84%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/DatasetIO.hpp (98%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/FileIO.cpp (97%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/FileIO.hpp (90%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/GroupIO.cpp (97%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/GroupIO.hpp (96%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/ObjectIO.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/IO/ObjectIO.hpp (95%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/AttributeReader.cpp (85%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/AttributeReader.hpp (95%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/DatasetReader.cpp (84%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/DatasetReader.hpp (95%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/FileReader.cpp (85%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/FileReader.hpp (81%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/GroupReader.cpp (96%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/GroupReader.hpp (93%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/ObjectReader.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Readers/ObjectReader.hpp (93%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/AttributeWriter.cpp (96%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp (95%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/DatasetWriter.cpp (98%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/DatasetWriter.hpp (96%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/FileWriter.cpp (97%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/FileWriter.hpp (90%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/GroupWriter.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp (89%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/ObjectWriter.cpp (91%) rename src/{complex => simplnx}/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp (90%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/IJsonFilterParser.hpp (91%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/IJsonPipelineParser.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/IJsonPipelineParser.hpp (95%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/Json.hpp (66%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonFilterParserV6.cpp (100%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonFilterParserV6.hpp (83%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonFilterParserV7.cpp (100%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonFilterParserV7.hpp (83%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonPipelineBuilder.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonPipelineBuilder.hpp (96%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonPipelineParserV6.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonPipelineParserV6.hpp (87%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonPipelineParserV7.cpp (94%) rename src/{complex => simplnx}/Utilities/Parsing/JSON/JsonPipelineParserV7.hpp (87%) rename src/{complex => simplnx}/Utilities/Parsing/Text/CsvParser.cpp (95%) rename src/{complex => simplnx}/Utilities/Parsing/Text/CsvParser.hpp (87%) rename src/{complex => simplnx}/Utilities/RTree.hpp (99%) rename src/{complex => simplnx}/Utilities/SIMPLConversion.hpp (97%) rename src/{complex => simplnx}/Utilities/SampleSurfaceMesh.cpp (96%) rename src/{complex => simplnx}/Utilities/SampleSurfaceMesh.hpp (73%) rename src/{complex => simplnx}/Utilities/SamplingUtils.hpp (87%) rename src/{complex => simplnx}/Utilities/SegmentFeatures.cpp (95%) rename src/{complex => simplnx}/Utilities/SegmentFeatures.hpp (87%) rename src/{complex => simplnx}/Utilities/StringUtilities.hpp (98%) rename src/{complex => simplnx}/Utilities/TemplateHelpers.hpp (95%) rename src/{complex => simplnx}/Utilities/TimeUtilities.hpp (95%) rename src/{complex => simplnx}/Utilities/TooltipGenerator.cpp (98%) rename src/{complex => simplnx}/Utilities/TooltipGenerator.hpp (92%) rename src/{complex => simplnx}/Utilities/TooltipRowItem.cpp (98%) rename src/{complex => simplnx}/Utilities/TooltipRowItem.hpp (94%) rename test/UnitTestCommon/include/{complex => simplnx}/UnitTest/UnitTestCommon.hpp (95%) delete mode 100644 test/complex_test_dirs.hpp.in create mode 100644 test/simplnx_test_dirs.hpp.in rename test/{complex_test_main.cpp => simplnx_test_main.cpp} (100%) delete mode 100644 wrapping/python/ComplexPython.hpp.in create mode 100644 wrapping/python/SimplnxPython.hpp.in diff --git a/.all-contributorsrc b/.all-contributorsrc index dd4ff773c4..8b1f25116a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1,5 +1,5 @@ { - "projectName": "complex", + "projectName": "simplnx", "projectOwner": "BlueQuartzSoftware", "repoType": "github", "repoHost": "https://github.com", diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 2f1eb3748d..0ea9f59d29 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -1,10 +1,10 @@ resources: repositories: - - repository: complex + - repository: simplnx type: github endpoint: BlueQuartzSoftware - name: BlueQuartzSoftware/complex + name: BlueQuartzSoftware/simplnx trigger: - develop @@ -58,7 +58,7 @@ jobs: displayName: Appending to PATH - script: | - cmake -S $(complex_source_dir) -B $(Build.BinariesDirectory) -G Ninja -DCMAKE_BUILD_TYPE:STRING=$(build_type) -DDREAM3D_DATA_DIR=$(dream3d_data_dir) -C $(Agent.WorkFolder)/NX.cmake -DBUILDNAME:STRING="complex-$(Agent.MachineName)-$(Agent.OS)-PR$(System.PullRequest.PullRequestNumber)" + cmake -S $(complex_source_dir) -B $(Build.BinariesDirectory) -G Ninja -DCMAKE_BUILD_TYPE:STRING=$(build_type) -DDREAM3D_DATA_DIR=$(dream3d_data_dir) -C $(Agent.WorkFolder)/NX.cmake -DBUILDNAME:STRING="simplnx-$(Agent.MachineName)-$(Agent.OS)-PR$(System.PullRequest.PullRequestNumber)" displayName: Configure COMPLEX diff --git a/.clang-tidy b/.clang-tidy index 1fcca7b8f8..6384629a0a 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -30,10 +30,10 @@ Checks: "-abseil-*, -readability-uppercase-literal-suffix, -readability-magic-numbers" WarningsAsErrors: '*' -HeaderFilterRegex: 'complex/.*\.hpp' +HeaderFilterRegex: 'simplnx/.*\.hpp' FormatStyle: file CheckOptions: - cppcoreguidelines-macro-usage.AllowedRegexp: 'COMPLEX_EXPORT|COMPLEX_NO_EXPORT|COMPLEX_DEPRECATED' + cppcoreguidelines-macro-usage.AllowedRegexp: 'SIMPLNX_EXPORT|SIMPLNX_NO_EXPORT|SIMPLNX_DEPRECATED' readability-identifier-naming.IgnoreMainLikeFunctions: 'false' readability-identifier-naming.PrivateMemberPrefix: 'm_' readability-identifier-naming.NamespaceCase: lower_case diff --git a/.github/ISSUE_TEMPLATE/functionality_report.yml b/.github/ISSUE_TEMPLATE/functionality_report.yml index b8d2ba98b5..40f76c910f 100644 --- a/.github/ISSUE_TEMPLATE/functionality_report.yml +++ b/.github/ISSUE_TEMPLATE/functionality_report.yml @@ -19,7 +19,7 @@ body: attributes: label: Description of the Feature, Filter, or Functionality? description: Describe your feature in detail or even provide an implementation plan/existing open source library to reference! - value: What if complex had... + value: What if simplnx had... validations: required: true - type: dropdown diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 3c455cefe4..b6a3a678e5 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,11 +1,11 @@ - ## Naming Conventions -Naming of variables should descriptive where needed. Loop Control Variables can use `i` if warranted. Most of these conventions are enforced through the clang-tidy and clang-format configuration files. See the file `complex/docs/Code_Style_Guide.md` for a more in depth explanation. +Naming of variables should descriptive where needed. Loop Control Variables can use `i` if warranted. Most of these conventions are enforced through the clang-tidy and clang-format configuration files. See the file `simplnx/docs/Code_Style_Guide.md` for a more in depth explanation. ## Filter Checklist -The help file `complex/docs/Porting_Filters.md` has documentation to help you port or write new filters. At the top is a nice checklist of items that should be noted when porting a filter. +The help file `simplnx/docs/Porting_Filters.md` has documentation to help you port or write new filters. At the top is a nice checklist of items that should be noted when porting a filter. ## Unit Testing @@ -58,4 +57,4 @@ The idea of unit testing is to test the filter for proper execution and error ha - [ ] Classes and methods are properly documented - + diff --git a/CMakeLists.txt b/CMakeLists.txt index ae7ca2fcdb..a616d88edb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,65 +5,65 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/Utility.cmake) # ------------------------------------------------------------------------------ # Is this a commercial or Free build # ------------------------------------------------------------------------------ -option(COMPLEX_BUILD_PYTHON "Enable building Python building" OFF) +option(SIMPLNX_BUILD_PYTHON "Enable building Python building" OFF) include(CMakeDependentOption) -cmake_dependent_option(COMPLEX_EMBED_PYTHON "Embeds python interpreter in nxrunner" ON "COMPLEX_BUILD_PYTHON" OFF) -enable_vcpkg_manifest_feature(TEST_VAR COMPLEX_BUILD_PYTHON FEATURE "python") +cmake_dependent_option(SIMPLNX_EMBED_PYTHON "Embeds python interpreter in nxrunner" ON "SIMPLNX_BUILD_PYTHON" OFF) +enable_vcpkg_manifest_feature(TEST_VAR SIMPLNX_BUILD_PYTHON FEATURE "python") # ------------------------------------------------------------------------------ # is building unit tests enabled # ------------------------------------------------------------------------------ -option(COMPLEX_BUILD_TESTS "Enable building COMPLEX tests" ON) -enable_vcpkg_manifest_feature(TEST_VAR COMPLEX_BUILD_TESTS FEATURE "tests") +option(SIMPLNX_BUILD_TESTS "Enable buildingtests" ON) +enable_vcpkg_manifest_feature(TEST_VAR SIMPLNX_BUILD_TESTS FEATURE "tests") # ------------------------------------------------------------------------------ # are multithreading algorithms enabled # ------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_MULTICORE "Enable multicore support" ON) -enable_vcpkg_manifest_feature(TEST_VAR COMPLEX_ENABLE_MULTICORE FEATURE "parallel") +option(SIMPLNX_ENABLE_MULTICORE "Enable multicore support" ON) +enable_vcpkg_manifest_feature(TEST_VAR SIMPLNX_ENABLE_MULTICORE FEATURE "parallel") # ------------------------------------------------------------------------------ # Are any out-of-core compressors enabled # ------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_COMPRESSORS "Install data compressors" OFF) -enable_vcpkg_manifest_feature(TEST_VAR COMPLEX_ENABLE_COMPRESSORS FEATURE "compressors") +option(SIMPLNX_ENABLE_COMPRESSORS "Install data compressors" OFF) +enable_vcpkg_manifest_feature(TEST_VAR SIMPLNX_ENABLE_COMPRESSORS FEATURE "compressors") # ------------------------------------------------------------------------------ # Is downloading of the test files enabled # ------------------------------------------------------------------------------ -option(COMPLEX_DOWNLOAD_TEST_FILES "Download the test files" ON) +option(SIMPLNX_DOWNLOAD_TEST_FILES "Download the test files" ON) # ------------------------------------------------------------------------------ # Will each unit test output the final DataStructure to a file # ------------------------------------------------------------------------------ -option(COMPLEX_WRITE_TEST_OUTPUT "Write unit test output files" OFF) +option(SIMPLNX_WRITE_TEST_OUTPUT "Write unit test output files" OFF) # ------------------------------------------------------------------------------ -# Is the ComplexCore Plugin enabled [DEFAULT=ON] +# Is the SimplnxCore Plugin enabled [DEFAULT=ON] # ------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_ComplexCore "Enable the ComplexCore Plugin" ON) +option(SIMPLNX_ENABLE_SimplnxCore "Enable the SimplnxCore Plugin" ON) # ------------------------------------------------------------------------------ # Is the ITKImageProcessing Plugin enabled [DEFAULT=ON] # ------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_ITKImageProcessing "Enable the ITKImageProcessing Plugin" ON) -enable_vcpkg_manifest_feature(TEST_VAR COMPLEX_ENABLE_ITKImageProcessing FEATURE "itk") +option(SIMPLNX_ENABLE_ITKImageProcessing "Enable the ITKImageProcessing Plugin" ON) +enable_vcpkg_manifest_feature(TEST_VAR SIMPLNX_ENABLE_ITKImageProcessing FEATURE "itk") # ------------------------------------------------------------------------------ # Is the OrientationAnalysis Plugin enabled [DEFAULT=ON] # ------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_OrientationAnalysis "Enable the OrientationAnalysis Plugin" ON) -enable_vcpkg_manifest_feature(TEST_VAR COMPLEX_ENABLE_OrientationAnalysis FEATURE "ebsd") +option(SIMPLNX_ENABLE_OrientationAnalysis "Enable the OrientationAnalysis Plugin" ON) +enable_vcpkg_manifest_feature(TEST_VAR SIMPLNX_ENABLE_OrientationAnalysis FEATURE "ebsd") # ------------------------------------------------------------------------------ -# Complex being built for an Anaconda Python distribution [DEFAULT=OFF] +# Simplnx being built for an Anaconda Python distribution [DEFAULT=OFF] # ------------------------------------------------------------------------------ -option(COMPLEX_CONDA_BUILD "Enables conda-build specific layout" OFF) +option(SIMPLNX_CONDA_BUILD "Enables conda-build specific layout" OFF) # ------------------------------------------------------------------------------ # Enable all installation rules [DEFAULT=ON] # ------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_INSTALL "Enables COMPLEX install rules" ON) +option(SIMPLNX_ENABLE_INSTALL "Enablesinstall rules" ON) # ------------------------------------------------------------------------------ # Check if a different Data_Archive web site is being used. @@ -71,37 +71,37 @@ option(COMPLEX_ENABLE_INSTALL "Enables COMPLEX install rules" ON) # local webserver # ------------------------------------------------------------------------------ if("${DATA_ARCHIVE_WEB_SITE}" STREQUAL "") - set(DATA_ARCHIVE_WEB_SITE "https://github.com/BlueQuartzSoftware/complex/releases/download/Data_Archive/") + set(DATA_ARCHIVE_WEB_SITE "https://github.com/bluequartzsoftware/simplnx/releases/download/Data_Archive/") endif() # ------------------------------------------------------------------------------ file(TO_CMAKE_PATH "${CMAKE_COMMAND}" CMAKE_COMMAND_NORM) -project(complex +project(simplnx VERSION 1.2.1 DESCRIPTION "SIMPL Redesign" - HOMEPAGE_URL "https://github.com/BlueQuartzSoftware/complex" + HOMEPAGE_URL "https://github.com/bluequartzsoftware/simplnx" LANGUAGES CXX ) -set(COMPLEX_BIN_DIR ${PROJECT_BINARY_DIR}/bin) +set(SIMPLNX_BIN_DIR ${PROJECT_BINARY_DIR}/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${COMPLEX_BIN_DIR} CACHE PATH "Single Directory for all Libraries") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SIMPLNX_BIN_DIR} CACHE PATH "Single Directory for all Libraries") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${COMPLEX_BIN_DIR} CACHE PATH "Single Directory for all Executables.") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SIMPLNX_BIN_DIR} CACHE PATH "Single Directory for all Executables.") -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${COMPLEX_BIN_DIR} CACHE PATH "Single Directory for all static libraries.") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SIMPLNX_BIN_DIR} CACHE PATH "Single Directory for all static libraries.") -list(APPEND CMAKE_MODULE_PATH ${complex_SOURCE_DIR}/cmake) +list(APPEND CMAKE_MODULE_PATH ${simplnx_SOURCE_DIR}/cmake) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -set(COMPLEX_DEBUG_POSTFIX "_d") -set_property(GLOBAL PROPERTY COMPLEX_DEBUG_POSTFIX ${COMPLEX_DEBUG_POSTFIX}) -get_property(COMPLEX_DEBUG_POSTFIX GLOBAL PROPERTY COMPLEX_DEBUG_POSTFIX) +set(SIMPLNX_DEBUG_POSTFIX "_d") +set_property(GLOBAL PROPERTY SIMPLNX_DEBUG_POSTFIX ${SIMPLNX_DEBUG_POSTFIX}) +get_property(SIMPLNX_DEBUG_POSTFIX GLOBAL PROPERTY SIMPLNX_DEBUG_POSTFIX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -110,7 +110,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) # files, test data files, pipelines into a single cmake file that gets # generated. This reduces the many copy targets to a single target. # ----------------------------------------------------------------------- -set(FETCH_FILE_PATH "${complex_BINARY_DIR}/complex_fetch_remote_files.cmake") +set(FETCH_FILE_PATH "${simplnx_BINARY_DIR}/simplnx_fetch_remote_files.cmake") set_property(GLOBAL PROPERTY FETCH_FILE_PATH "${FETCH_FILE_PATH}") file(WRITE ${FETCH_FILE_PATH} "# ----------------------------------------------------------------------- # This file has the commands to download each of the test files. @@ -126,7 +126,7 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio") set(TEST_WORKING_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<$:Debug>$<$:Release>") endif() -if(COMPLEX_BUILD_TESTS AND COMPLEX_DOWNLOAD_TEST_FILES) +if(SIMPLNX_BUILD_TESTS AND SIMPLNX_DOWNLOAD_TEST_FILES) add_custom_target(Fetch_Remote_Data_Files ALL COMMAND "${CMAKE_COMMAND}" -DCMAKE_CONFIG=$ -P "${FETCH_FILE_PATH}" COMMENT "Downloading Test Data Files" @@ -153,61 +153,61 @@ find_package(nod CONFIG REQUIRED) find_package(HDF5 MODULE REQUIRED) get_target_property(hdf5_dll_path hdf5::hdf5 IMPORTED_LOCATION_RELEASE) get_filename_component(hdf5_dll_path "${hdf5_dll_path}" DIRECTORY) -get_property(COMPLEX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS) -set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${hdf5_dll_path}) +get_property(SIMPLNX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS) +set_property(GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS ${SIMPLNX_EXTRA_LIBRARY_DIRS} ${hdf5_dll_path}) # ----------------------------------------------------------------------- # Find oneTBB and get the path to the DLL libraries and put that into a # global property for later install, debugging and packaging # ----------------------------------------------------------------------- -if(COMPLEX_ENABLE_MULTICORE) +if(SIMPLNX_ENABLE_MULTICORE) find_package(TBB CONFIG REQUIRED) get_target_property(tbb_dll_path TBB::tbb IMPORTED_LOCATION_RELEASE) get_filename_component(tbb_dll_path "${tbb_dll_path}" DIRECTORY) - get_property(COMPLEX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS) - set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${tbb_dll_path}) + get_property(SIMPLNX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS) + set_property(GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS ${SIMPLNX_EXTRA_LIBRARY_DIRS} ${tbb_dll_path}) endif() # ----------------------------------------------------------------------- # Create the ${DREAM3D_DATA_DIR} if necessary # ----------------------------------------------------------------------- if("${DREAM3D_DATA_DIR}" STREQUAL "") - message(WARNING "DREAM3D_DATA_DIR is not defined externally. Defining to ${complex_BINARY_DIR}/DREAM3D_Data") - set(DREAM3D_DATA_DIR "${complex_BINARY_DIR}/DREAM3D_Data") + message(WARNING "DREAM3D_DATA_DIR is not defined externally. Defining to ${simplnx_BINARY_DIR}/DREAM3D_Data") + set(DREAM3D_DATA_DIR "${simplnx_BINARY_DIR}/DREAM3D_Data") endif() file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") -add_library(complex SHARED) -add_library(complex::complex ALIAS complex) +add_library(simplnx SHARED) +add_library(simplnx::simplnx ALIAS simplnx) -target_compile_features(complex +target_compile_features(simplnx PUBLIC cxx_std_17 ) -set_target_properties(complex +set_target_properties(simplnx PROPERTIES - DEBUG_POSTFIX "${COMPLEX_DEBUG_POSTFIX}" + DEBUG_POSTFIX "${SIMPLNX_DEBUG_POSTFIX}" ) -complex_enable_warnings(TARGET complex) +simplnx_enable_warnings(TARGET simplnx) if(MSVC) - target_compile_options(complex + target_compile_options(simplnx PRIVATE /MP ) endif() # Force HDF5 1.10 API -target_compile_definitions(complex PUBLIC "H5_USE_110_API") +target_compile_definitions(simplnx PUBLIC "H5_USE_110_API") -if(COMPLEX_ENABLE_MULTICORE) - target_compile_definitions(complex PUBLIC "COMPLEX_ENABLE_MULTICORE") - target_link_libraries(complex PUBLIC TBB::tbb) +if(SIMPLNX_ENABLE_MULTICORE) + target_compile_definitions(simplnx PUBLIC "SIMPLNX_ENABLE_MULTICORE") + target_link_libraries(simplnx PUBLIC TBB::tbb) endif() -target_link_libraries(complex +target_link_libraries(simplnx PUBLIC fmt::fmt nlohmann_json::nlohmann_json @@ -220,32 +220,32 @@ target_link_libraries(complex ) if(UNIX) - target_link_libraries(complex + target_link_libraries(simplnx PRIVATE ${CMAKE_DL_LIBS} ) endif() -option(COMPLEX_ENABLE_LINK_FILESYSTEM "Enables linking to a C++ filesystem library" OFF) -if(COMPLEX_ENABLE_LINK_FILESYSTEM) - set(COMPLEX_FILESYSTEM_LIB "stdc++fs" CACHE STRING "C++ filesystem library to link to") - set_property(CACHE COMPLEX_FILESYSTEM_LIB PROPERTY STRINGS "stdc++fs" "c++fs") - target_link_libraries(complex +option(SIMPLNX_ENABLE_LINK_FILESYSTEM "Enables linking to a C++ filesystem library" OFF) +if(SIMPLNX_ENABLE_LINK_FILESYSTEM) + set(SIMPLNX_FILESYSTEM_LIB "stdc++fs" CACHE STRING "C++ filesystem library to link to") + set_property(CACHE SIMPLNX_FILESYSTEM_LIB PROPERTY STRINGS "stdc++fs" "c++fs") + target_link_libraries(simplnx PUBLIC - ${COMPLEX_FILESYSTEM_LIB} + ${SIMPLNX_FILESYSTEM_LIB} ) endif() -set(COMPLEX_GENERATED_DIR ${complex_BINARY_DIR}/generated) -set(COMPLEX_GENERATED_HEADER_DIR ${complex_BINARY_DIR}/generated/complex) -set(COMPLEX_EXPORT_HEADER ${COMPLEX_GENERATED_HEADER_DIR}/complex_export.hpp) +set(SIMPLNX_GENERATED_DIR ${simplnx_BINARY_DIR}/generated) +set(SIMPLNX_GENERATED_HEADER_DIR ${simplnx_BINARY_DIR}/generated/simplnx) +set(SIMPLNX_EXPORT_HEADER ${SIMPLNX_GENERATED_HEADER_DIR}/simplnx_export.hpp) -file(READ ${complex_SOURCE_DIR}/cmake/complex_export_extra.hpp COMPLEX_EXPORT_HEADER_EXTRA) +file(READ ${simplnx_SOURCE_DIR}/cmake/simplnx_export_extra.hpp SIMPLNX_EXPORT_HEADER_EXTRA) include(GenerateExportHeader) -generate_export_header(complex - EXPORT_FILE_NAME ${COMPLEX_EXPORT_HEADER} - CUSTOM_CONTENT_FROM_VARIABLE COMPLEX_EXPORT_HEADER_EXTRA +generate_export_header(simplnx + EXPORT_FILE_NAME ${SIMPLNX_EXPORT_HEADER} + CUSTOM_CONTENT_FROM_VARIABLE SIMPLNX_EXPORT_HEADER_EXTRA ) # Specify parameters here @@ -281,479 +281,479 @@ set(CoreParameters VectorParameter ) -set(COMPLEX_SOURCE_DIR ${complex_SOURCE_DIR}/src/complex) - -set(COMPLEX_HDRS - ${COMPLEX_SOURCE_DIR}/Common/Any.hpp - ${COMPLEX_SOURCE_DIR}/Common/Array.hpp - ${COMPLEX_SOURCE_DIR}/Common/AtomicFile.hpp - ${COMPLEX_SOURCE_DIR}/Common/Bit.hpp - ${COMPLEX_SOURCE_DIR}/Common/BoundingBox.hpp - ${COMPLEX_SOURCE_DIR}/Common/ComplexConstants.hpp - ${COMPLEX_SOURCE_DIR}/Common/Constants.hpp - ${COMPLEX_SOURCE_DIR}/Common/DataVector.hpp - ${COMPLEX_SOURCE_DIR}/Common/EulerAngle.hpp - ${COMPLEX_SOURCE_DIR}/Common/IteratorUtility.hpp - ${COMPLEX_SOURCE_DIR}/Common/Numbers.hpp - ${COMPLEX_SOURCE_DIR}/Common/Range.hpp - ${COMPLEX_SOURCE_DIR}/Common/Range2D.hpp - ${COMPLEX_SOURCE_DIR}/Common/Range3D.hpp - ${COMPLEX_SOURCE_DIR}/Common/Ray.hpp - ${COMPLEX_SOURCE_DIR}/Common/Result.hpp - ${COMPLEX_SOURCE_DIR}/Common/RgbColor.hpp - ${COMPLEX_SOURCE_DIR}/Common/ScopeGuard.hpp - ${COMPLEX_SOURCE_DIR}/Common/StringLiteral.hpp - ${COMPLEX_SOURCE_DIR}/Common/TypeTraits.hpp - ${COMPLEX_SOURCE_DIR}/Common/Types.hpp - ${COMPLEX_SOURCE_DIR}/Common/TypesUtility.hpp - ${COMPLEX_SOURCE_DIR}/Common/Uuid.hpp - - ${COMPLEX_SOURCE_DIR}/Core/Application.hpp - ${COMPLEX_SOURCE_DIR}/Core/Preferences.hpp - - ${COMPLEX_SOURCE_DIR}/Filter/FilterHandle.hpp - ${COMPLEX_SOURCE_DIR}/Filter/FilterList.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/CoreDataIOManager.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/DataIOCollection.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/IDataFactory.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/IDataIOManager.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/IOConstants.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataIOManager.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureReader.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureWriter.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IOUtilities.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStoreIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataStoreIO.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/AttributeMatrixIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/BaseGroupIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataArrayIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataGroupIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/EdgeGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/GridMontageIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/HexahedralGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/ImageGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IGeometryIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IGridGeometryIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom0dIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom1dIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom2dIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom3dIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/NeighborListIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/QuadGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/RectGridGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/ScalarDataIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/StringArrayIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/TriangleGeomIO.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/VertexGeomIO.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/AbstractDataStructureMessage.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataAddedMessage.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataRemovedMessage.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataRenamedMessage.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataReparentedMessage.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Observers/AbstractDataStructureObserver.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/EdgeGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/HexahedralGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/ImageGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/QuadGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/RectGridGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/TetrahedralGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/TriangleGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/VertexGeom.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/LinkedGeometryData.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/IGeometry.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/IGridGeometry.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry0D.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry1D.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry2D.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry3D.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/DynamicListArray.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/EmptyDataStore.hpp - - ${COMPLEX_SOURCE_DIR}/Plugin/AbstractPlugin.hpp - ${COMPLEX_SOURCE_DIR}/Plugin/PluginLoader.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/AbstractMontage.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/AbstractTileIndex.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/GridMontage.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/GridTileIndex.hpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/AbstractDataStore.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/AttributeMatrix.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/BaseGroup.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataArray.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataGroup.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataMap.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataObject.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataPath.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataStore.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataStructure.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DynamicListArray.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/EmptyDataStore.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IArray.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IDataArray.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IDataStore.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/INeighborList.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/LinkedPath.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Metadata.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/NeighborList.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/ScalarData.hpp - ${COMPLEX_SOURCE_DIR}/DataStructure/StringArray.hpp - - ${COMPLEX_SOURCE_DIR}/Filter/AbstractParameter.hpp - ${COMPLEX_SOURCE_DIR}/Filter/AnyCloneable.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Arguments.hpp - ${COMPLEX_SOURCE_DIR}/Filter/ConstDataParameter.hpp - ${COMPLEX_SOURCE_DIR}/Filter/DataParameter.hpp - ${COMPLEX_SOURCE_DIR}/Filter/FilterTraits.hpp - ${COMPLEX_SOURCE_DIR}/Filter/IFilter.hpp - ${COMPLEX_SOURCE_DIR}/Filter/IParameter.hpp - ${COMPLEX_SOURCE_DIR}/Filter/MutableDataParameter.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Output.hpp - ${COMPLEX_SOURCE_DIR}/Filter/ParameterTraits.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Parameters.hpp - ${COMPLEX_SOURCE_DIR}/Filter/ValueParameter.hpp - - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateArrayAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateStringArrayAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CopyArrayInstanceAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CopyDataObjectAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateDataGroupAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateImageGeometryAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateRectGridGeometryAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGeometry1DAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGeometry2DAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGeometry3DAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateNeighborListAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateVertexGeometryAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/DeleteDataAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/ImportH5ObjectPathsAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/ImportObjectAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/EmptyAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/MoveDataAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/RenameDataAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/UpdateImageGeomAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateAttributeMatrixAction.hpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGridMontageAction.hpp - - ${COMPLEX_SOURCE_DIR}/Parameters/util/DynamicTableInfo.hpp - ${COMPLEX_SOURCE_DIR}/Parameters/util/ReadCSVData.hpp - - ${COMPLEX_SOURCE_DIR}/Pipeline/AbstractPipelineNode.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Pipeline.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/PipelineFilter.hpp - - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/AbstractPipelineMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/FilterPreflightMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeAddedMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeMovedMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeRemovedMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeStatusMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/OutputRenamedMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/PipelineFilterMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeMessage.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeObserver.hpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/RenamedMessage.hpp - - ${COMPLEX_SOURCE_DIR}/Plugin/AbstractPlugin.hpp - ${COMPLEX_SOURCE_DIR}/Plugin/PluginLoader.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/AlignSections.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ArrayThreshold.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/DataArrayUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/DataGroupUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/DataObjectUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/FilePathGenerator.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ColorPresetsUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/FileUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/FilterUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/GeometryUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/GeometryHelpers.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/MemoryUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/StringUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/IParallelAlgorithm.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelDataAlgorithm.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelData2DAlgorithm.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelData3DAlgorithm.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelTaskAlgorithm.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/SamplingUtils.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/SegmentFeatures.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/TimeUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/TooltipGenerator.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/TooltipRowItem.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/OStreamUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelAlgorithmUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/RTree.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/ImageRotationUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/FlyingEdges.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/SampleSurfaceMesh.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/KUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/MontageUtilities.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/SIMPLConversion.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Math/GeometryMath.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Math/MatrixMath.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Math/StatisticsCalculations.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/DREAM3D/Dream3dIO.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5Support.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/AttributeIO.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/DatasetIO.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/FileIO.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/GroupIO.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/ObjectIO.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/AttributeReader.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/DatasetReader.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/FileReader.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/GroupReader.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/ObjectReader.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/DatasetWriter.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/FileWriter.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/Text/CsvParser.hpp +set(SIMPLNX_SOURCE_DIR ${simplnx_SOURCE_DIR}/src/simplnx) + +set(SIMPLNX_HDRS + ${SIMPLNX_SOURCE_DIR}/Common/Any.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Array.hpp + ${SIMPLNX_SOURCE_DIR}/Common/AtomicFile.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Bit.hpp + ${SIMPLNX_SOURCE_DIR}/Common/BoundingBox.hpp + ${SIMPLNX_SOURCE_DIR}/Common/SimplnxConstants.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Constants.hpp + ${SIMPLNX_SOURCE_DIR}/Common/DataVector.hpp + ${SIMPLNX_SOURCE_DIR}/Common/EulerAngle.hpp + ${SIMPLNX_SOURCE_DIR}/Common/IteratorUtility.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Numbers.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Range.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Range2D.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Range3D.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Ray.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Result.hpp + ${SIMPLNX_SOURCE_DIR}/Common/RgbColor.hpp + ${SIMPLNX_SOURCE_DIR}/Common/ScopeGuard.hpp + ${SIMPLNX_SOURCE_DIR}/Common/StringLiteral.hpp + ${SIMPLNX_SOURCE_DIR}/Common/TypeTraits.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Types.hpp + ${SIMPLNX_SOURCE_DIR}/Common/TypesUtility.hpp + ${SIMPLNX_SOURCE_DIR}/Common/Uuid.hpp + + ${SIMPLNX_SOURCE_DIR}/Core/Application.hpp + ${SIMPLNX_SOURCE_DIR}/Core/Preferences.hpp + + ${SIMPLNX_SOURCE_DIR}/Filter/FilterHandle.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/FilterList.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/CoreDataIOManager.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/DataIOCollection.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/IDataFactory.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/IDataIOManager.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/IOConstants.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataIOManager.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureReader.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureWriter.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IOUtilities.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStoreIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataStoreIO.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/AttributeMatrixIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/BaseGroupIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataArrayIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataGroupIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/EdgeGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/GridMontageIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/HexahedralGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/ImageGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IGeometryIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IGridGeometryIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom0dIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom1dIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom2dIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom3dIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/NeighborListIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/QuadGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/RectGridGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/ScalarDataIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/StringArrayIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/TriangleGeomIO.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/VertexGeomIO.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/AbstractDataStructureMessage.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataAddedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataRemovedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataRenamedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataReparentedMessage.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Observers/AbstractDataStructureObserver.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/EdgeGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/HexahedralGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/ImageGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/QuadGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/RectGridGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/TetrahedralGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/TriangleGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/VertexGeom.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/LinkedGeometryData.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/IGeometry.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/IGridGeometry.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry0D.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry1D.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry2D.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry3D.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/DynamicListArray.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/EmptyDataStore.hpp + + ${SIMPLNX_SOURCE_DIR}/Plugin/AbstractPlugin.hpp + ${SIMPLNX_SOURCE_DIR}/Plugin/PluginLoader.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/AbstractMontage.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/AbstractTileIndex.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/GridMontage.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/GridTileIndex.hpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/AbstractDataStore.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/AttributeMatrix.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/BaseGroup.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataArray.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataGroup.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataMap.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataObject.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataPath.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataStore.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataStructure.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DynamicListArray.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/EmptyDataStore.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IArray.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IDataArray.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IDataStore.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/INeighborList.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/LinkedPath.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Metadata.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/NeighborList.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/ScalarData.hpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/StringArray.hpp + + ${SIMPLNX_SOURCE_DIR}/Filter/AbstractParameter.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/AnyCloneable.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Arguments.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/ConstDataParameter.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/DataParameter.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/FilterTraits.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/IFilter.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/IParameter.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/MutableDataParameter.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Output.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/ParameterTraits.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Parameters.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/ValueParameter.hpp + + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateArrayAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateStringArrayAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CopyArrayInstanceAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CopyDataObjectAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateDataGroupAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateImageGeometryAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateRectGridGeometryAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateGeometry1DAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateGeometry2DAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateGeometry3DAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateNeighborListAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateVertexGeometryAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/DeleteDataAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/ImportH5ObjectPathsAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/ImportObjectAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/EmptyAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/MoveDataAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/RenameDataAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/UpdateImageGeomAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateAttributeMatrixAction.hpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateGridMontageAction.hpp + + ${SIMPLNX_SOURCE_DIR}/Parameters/util/DynamicTableInfo.hpp + ${SIMPLNX_SOURCE_DIR}/Parameters/util/ReadCSVData.hpp + + ${SIMPLNX_SOURCE_DIR}/Pipeline/AbstractPipelineNode.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Pipeline.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/PipelineFilter.hpp + + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/AbstractPipelineMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/FilterPreflightMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeAddedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeMovedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeRemovedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeStatusMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/OutputRenamedMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/PipelineFilterMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeMessage.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeObserver.hpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/RenamedMessage.hpp + + ${SIMPLNX_SOURCE_DIR}/Plugin/AbstractPlugin.hpp + ${SIMPLNX_SOURCE_DIR}/Plugin/PluginLoader.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/AlignSections.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ArrayThreshold.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/DataArrayUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/DataGroupUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/DataObjectUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/FilePathGenerator.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ColorPresetsUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/FileUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/FilterUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/GeometryUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/GeometryHelpers.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/MemoryUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/StringUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/IParallelAlgorithm.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelDataAlgorithm.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelData2DAlgorithm.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelData3DAlgorithm.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelTaskAlgorithm.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/SamplingUtils.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/SegmentFeatures.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/TimeUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/TooltipGenerator.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/TooltipRowItem.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/OStreamUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelAlgorithmUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/RTree.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ImageRotationUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/FlyingEdges.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/SampleSurfaceMesh.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/KUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/MontageUtilities.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/SIMPLConversion.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Math/GeometryMath.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Math/MatrixMath.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Math/StatisticsCalculations.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/DREAM3D/Dream3dIO.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5Support.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/AttributeIO.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/DatasetIO.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/FileIO.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/GroupIO.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/ObjectIO.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/AttributeReader.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/DatasetReader.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/FileReader.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/GroupReader.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/ObjectReader.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/DatasetWriter.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/FileWriter.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/Text/CsvParser.hpp ) -set(COMPLEX_GENERATED_HEADERS - ${COMPLEX_EXPORT_HEADER} +set(SIMPLNX_GENERATED_HEADERS + ${SIMPLNX_EXPORT_HEADER} ) -set(COMPLEX_SRCS - ${COMPLEX_SOURCE_DIR}/Common/AtomicFile.cpp - ${COMPLEX_SOURCE_DIR}/Common/RgbColor.cpp - ${COMPLEX_SOURCE_DIR}/Common/Range.cpp - ${COMPLEX_SOURCE_DIR}/Common/Range2D.cpp - ${COMPLEX_SOURCE_DIR}/Common/Range3D.cpp - - ${COMPLEX_SOURCE_DIR}/Core/Application.cpp - ${COMPLEX_SOURCE_DIR}/Core/Preferences.cpp - - ${COMPLEX_SOURCE_DIR}/Filter/FilterHandle.cpp - ${COMPLEX_SOURCE_DIR}/Filter/FilterList.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/AbstractDataStructureMessage.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataAddedMessage.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataRemovedMessage.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataRenamedMessage.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Messaging/DataReparentedMessage.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Observers/AbstractDataStructureObserver.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/DataIOCollection.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/IDataIOManager.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/Generic/CoreDataIOManager.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataIOManager.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureReader.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureWriter.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IOUtilities.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataStoreIO.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/AttributeMatrixIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/BaseGroupIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/DataGroupIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/EdgeGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/GridMontageIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/HexahedralGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/ImageGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IGeometryIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/IGridGeometryIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom0dIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom1dIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom2dIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom3dIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/QuadGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/RectGridGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/StringArrayIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/TriangleGeomIO.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/IO/HDF5/VertexGeomIO.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/IGeometry.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/IGridGeometry.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry0D.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry1D.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry2D.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry3D.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/EdgeGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/HexahedralGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/ImageGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/QuadGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/RectGridGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/TetrahedralGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/TriangleGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/VertexGeom.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Geometry/LinkedGeometryData.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/AbstractMontage.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/AbstractTileIndex.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/GridMontage.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Montage/GridTileIndex.cpp - - ${COMPLEX_SOURCE_DIR}/DataStructure/AttributeMatrix.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/BaseGroup.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataGroup.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataMap.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataObject.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataPath.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/DataStructure.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/INeighborList.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/LinkedPath.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/Metadata.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/NeighborList.cpp - ${COMPLEX_SOURCE_DIR}/DataStructure/StringArray.cpp - - ${COMPLEX_SOURCE_DIR}/Filter/AbstractParameter.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Arguments.cpp - ${COMPLEX_SOURCE_DIR}/Filter/ConstDataParameter.cpp - ${COMPLEX_SOURCE_DIR}/Filter/DataParameter.cpp - ${COMPLEX_SOURCE_DIR}/Filter/IFilter.cpp - ${COMPLEX_SOURCE_DIR}/Filter/IParameter.cpp - ${COMPLEX_SOURCE_DIR}/Filter/MutableDataParameter.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Output.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Parameters.cpp - ${COMPLEX_SOURCE_DIR}/Filter/ValueParameter.cpp - - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateArrayAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateStringArrayAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CopyArrayInstanceAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CopyDataObjectAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateDataGroupAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateImageGeometryAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateRectGridGeometryAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateNeighborListAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/DeleteDataAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/ImportH5ObjectPathsAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/ImportObjectAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/MoveDataAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/RenameDataAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/UpdateImageGeomAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateAttributeMatrixAction.cpp - ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGridMontageAction.cpp - - ${COMPLEX_SOURCE_DIR}/Parameters/util/ReadCSVData.cpp - ${COMPLEX_SOURCE_DIR}/Parameters/util/DynamicTableInfo.cpp - - ${COMPLEX_SOURCE_DIR}/Pipeline/AbstractPipelineNode.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Pipeline.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/PipelineFilter.cpp - - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/AbstractPipelineMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/FilterPreflightMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeAddedMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeMovedMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeRemovedMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/NodeStatusMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/OutputRenamedMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/PipelineFilterMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeMessage.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeObserver.cpp - ${COMPLEX_SOURCE_DIR}/Pipeline/Messaging/RenamedMessage.cpp - - ${COMPLEX_SOURCE_DIR}/Plugin/AbstractPlugin.cpp - ${COMPLEX_SOURCE_DIR}/Plugin/PluginLoader.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/ArrayThreshold.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/FilePathGenerator.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/FilterUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/TooltipGenerator.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/TooltipRowItem.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/DataArrayUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/DataGroupUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/MemoryUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/IParallelAlgorithm.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelDataAlgorithm.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelData2DAlgorithm.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelData3DAlgorithm.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/ParallelTaskAlgorithm.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/SegmentFeatures.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/AlignSections.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/OStreamUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/GeometryHelpers.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/GeometryUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/ColorPresetsUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/ImageRotationUtilities.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Math/GeometryMath.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Math/MatrixMath.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/SampleSurfaceMesh.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/MontageUtilities.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/DREAM3D/Dream3dIO.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5Support.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/AttributeIO.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/DatasetIO.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/FileIO.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/GroupIO.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/ObjectIO.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/AttributeReader.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/DatasetReader.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/FileReader.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/GroupReader.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/ObjectReader.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/AttributeWriter.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/DatasetWriter.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/FileWriter.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/GroupWriter.cpp - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/ObjectWriter.cpp - - ${COMPLEX_SOURCE_DIR}/Utilities/Parsing/Text/CsvParser.cpp +set(SIMPLNX_SRCS + ${SIMPLNX_SOURCE_DIR}/Common/AtomicFile.cpp + ${SIMPLNX_SOURCE_DIR}/Common/RgbColor.cpp + ${SIMPLNX_SOURCE_DIR}/Common/Range.cpp + ${SIMPLNX_SOURCE_DIR}/Common/Range2D.cpp + ${SIMPLNX_SOURCE_DIR}/Common/Range3D.cpp + + ${SIMPLNX_SOURCE_DIR}/Core/Application.cpp + ${SIMPLNX_SOURCE_DIR}/Core/Preferences.cpp + + ${SIMPLNX_SOURCE_DIR}/Filter/FilterHandle.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/FilterList.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/AbstractDataStructureMessage.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataAddedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataRemovedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataRenamedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Messaging/DataReparentedMessage.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Observers/AbstractDataStructureObserver.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/DataIOCollection.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/IDataIOManager.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/Generic/CoreDataIOManager.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataIOManager.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureReader.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataStructureWriter.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IOUtilities.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IDataStoreIO.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/AttributeMatrixIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/BaseGroupIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/DataGroupIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/EdgeGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/GridMontageIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/HexahedralGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/ImageGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IGeometryIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/IGridGeometryIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom0dIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom1dIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom2dIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/INodeGeom3dIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/QuadGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/RectGridGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/StringArrayIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/TriangleGeomIO.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/IO/HDF5/VertexGeomIO.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/IGeometry.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/IGridGeometry.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry0D.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry1D.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry2D.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/INodeGeometry3D.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/EdgeGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/HexahedralGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/ImageGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/QuadGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/RectGridGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/TetrahedralGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/TriangleGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/VertexGeom.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Geometry/LinkedGeometryData.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/AbstractMontage.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/AbstractTileIndex.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/GridMontage.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Montage/GridTileIndex.cpp + + ${SIMPLNX_SOURCE_DIR}/DataStructure/AttributeMatrix.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/BaseGroup.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataGroup.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataMap.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataObject.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataPath.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/DataStructure.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/INeighborList.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/LinkedPath.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/Metadata.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/NeighborList.cpp + ${SIMPLNX_SOURCE_DIR}/DataStructure/StringArray.cpp + + ${SIMPLNX_SOURCE_DIR}/Filter/AbstractParameter.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Arguments.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/ConstDataParameter.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/DataParameter.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/IFilter.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/IParameter.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/MutableDataParameter.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Output.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Parameters.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/ValueParameter.cpp + + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateArrayAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateStringArrayAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CopyArrayInstanceAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CopyDataObjectAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateDataGroupAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateImageGeometryAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateRectGridGeometryAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateNeighborListAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/DeleteDataAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/ImportH5ObjectPathsAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/ImportObjectAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/MoveDataAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/RenameDataAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/UpdateImageGeomAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateAttributeMatrixAction.cpp + ${SIMPLNX_SOURCE_DIR}/Filter/Actions/CreateGridMontageAction.cpp + + ${SIMPLNX_SOURCE_DIR}/Parameters/util/ReadCSVData.cpp + ${SIMPLNX_SOURCE_DIR}/Parameters/util/DynamicTableInfo.cpp + + ${SIMPLNX_SOURCE_DIR}/Pipeline/AbstractPipelineNode.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Pipeline.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/PipelineFilter.cpp + + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/AbstractPipelineMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/FilterPreflightMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeAddedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeMovedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeRemovedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/NodeStatusMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/OutputRenamedMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/PipelineFilterMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeMessage.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/PipelineNodeObserver.cpp + ${SIMPLNX_SOURCE_DIR}/Pipeline/Messaging/RenamedMessage.cpp + + ${SIMPLNX_SOURCE_DIR}/Plugin/AbstractPlugin.cpp + ${SIMPLNX_SOURCE_DIR}/Plugin/PluginLoader.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/ArrayThreshold.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/FilePathGenerator.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/FilterUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/TooltipGenerator.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/TooltipRowItem.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/DataArrayUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/DataGroupUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/MemoryUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/IParallelAlgorithm.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelDataAlgorithm.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelData2DAlgorithm.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelData3DAlgorithm.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ParallelTaskAlgorithm.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/SegmentFeatures.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/AlignSections.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/OStreamUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/GeometryHelpers.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/GeometryUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ColorPresetsUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/ImageRotationUtilities.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Math/GeometryMath.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Math/MatrixMath.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/SampleSurfaceMesh.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/MontageUtilities.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/DREAM3D/Dream3dIO.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/H5Support.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/AttributeIO.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/DatasetIO.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/FileIO.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/GroupIO.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/IO/ObjectIO.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/AttributeReader.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/DatasetReader.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/FileReader.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/GroupReader.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Readers/ObjectReader.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/AttributeWriter.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/DatasetWriter.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/FileWriter.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/GroupWriter.cpp + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/HDF5/Writers/ObjectWriter.cpp + + ${SIMPLNX_SOURCE_DIR}/Utilities/Parsing/Text/CsvParser.cpp ) # Add Core FilterParameters foreach(param ${CoreParameters}) - list(APPEND COMPLEX_HDRS - "${COMPLEX_SOURCE_DIR}/Parameters/${param}.hpp" + list(APPEND SIMPLNX_HDRS + "${SIMPLNX_SOURCE_DIR}/Parameters/${param}.hpp" ) - list(APPEND COMPLEX_SRCS - "${COMPLEX_SOURCE_DIR}/Parameters/${param}.cpp" + list(APPEND SIMPLNX_SRCS + "${SIMPLNX_SOURCE_DIR}/Parameters/${param}.cpp" ) endforeach() -set(COMPLEX_GENERATED_PYTHON_HEADER ${COMPLEX_GENERATED_HEADER_DIR}/ComplexPython.hpp) -set(COMPLEX_PYTHON_MODULE "complex") -configure_file(${complex_SOURCE_DIR}/wrapping/python/ComplexPython.hpp.in ${COMPLEX_GENERATED_PYTHON_HEADER}) +set(SIMPLNX_GENERATED_PYTHON_HEADER ${SIMPLNX_GENERATED_HEADER_DIR}/SimplnxPython.hpp) +set(SIMPLNX_PYTHON_MODULE "simplnx") +configure_file(${simplnx_SOURCE_DIR}/wrapping/python/SimplnxPython.hpp.in ${SIMPLNX_GENERATED_PYTHON_HEADER}) -list(APPEND COMPLEX_GENERATED_HEADERS - ${COMPLEX_GENERATED_PYTHON_HEADER} +list(APPEND SIMPLNX_GENERATED_HEADERS + ${SIMPLNX_GENERATED_PYTHON_HEADER} ) -# set(COMPLEX_GENERATED_VERSION_HEADER ${COMPLEX_GENERATED_HEADER_DIR}/ComplexVersion.h) -# configure_file(${complex_SOURCE_DIR}/cmake/ComplexVersion.h.in ${COMPLEX_GENERATED_VERSION_HEADER}) +# set(SIMPLNX_GENERATED_VERSION_HEADER ${SIMPLNX_GENERATED_HEADER_DIR}/SIMPLNXVersion.h) +# configure_file(${simplnx_SOURCE_DIR}/cmake/SIMPLNXVersion.h.in ${SIMPLNX_GENERATED_VERSION_HEADER}) -set(CMP_VERSION_HDR_TEMPLATE_FILE ${complex_SOURCE_DIR}/cmake/ComplexVersion.hpp) -set(CMP_VERSION_SRC_TEMPLATE_FILE ${complex_SOURCE_DIR}/cmake/ComplexVersion.cpp.in) -set(VERSION_GEN_HEADER_FILE_NAME "ComplexVersion.hpp") +set(CMP_VERSION_HDR_TEMPLATE_FILE ${simplnx_SOURCE_DIR}/cmake/SIMPLNXVersion.hpp) +set(CMP_VERSION_SRC_TEMPLATE_FILE ${simplnx_SOURCE_DIR}/cmake/SIMPLNXVersion.cpp.in) +set(VERSION_GEN_HEADER_FILE_NAME "SIMPLNXVersion.hpp") -cmpBuildDateRevisionString(GENERATED_HEADER_FILE_PATH "generated/complex/ComplexVersion.hpp" - GENERATED_SOURCE_FILE_PATH "generated/complex/ComplexVersion.cpp" - NAMESPACE complex - PROJECT_NAME complex +cmpBuildDateRevisionString(GENERATED_HEADER_FILE_PATH "generated/simplnx/SIMPLNXVersion.hpp" + GENERATED_SOURCE_FILE_PATH "generated/simplnx/SIMPLNXVersion.cpp" + NAMESPACE nx::core + PROJECT_NAME simplnx EXPORT_MACRO "" VERSION_MACRO_PATH "" STRING_CLASS std::string @@ -762,89 +762,89 @@ cmpBuildDateRevisionString(GENERATED_HEADER_FILE_PATH "generated/complex/Complex -list(APPEND COMPLEX_GENERATED_HEADERS - ${COMPLEX_GENERATED_HEADER_DIR}/ComplexVersion.hpp - ${COMPLEX_GENERATED_HEADER_DIR}/ComplexVersion.cpp +list(APPEND SIMPLNX_GENERATED_HEADERS + ${SIMPLNX_GENERATED_HEADER_DIR}/SIMPLNXVersion.hpp + ${SIMPLNX_GENERATED_HEADER_DIR}/SIMPLNXVersion.cpp ) -set(COMPLEX_ALL_HDRS - ${COMPLEX_HDRS} - ${COMPLEX_GENERATED_HEADERS} +set(SIMPLNX_ALL_HDRS + ${SIMPLNX_HDRS} + ${SIMPLNX_GENERATED_HEADERS} ) -target_sources(complex +target_sources(simplnx PRIVATE - ${COMPLEX_ALL_HDRS} - ${COMPLEX_SRCS} + ${SIMPLNX_ALL_HDRS} + ${SIMPLNX_SRCS} ) -source_group(TREE ${COMPLEX_SOURCE_DIR} PREFIX "complex" FILES ${COMPLEX_HDRS}) -source_group(TREE ${COMPLEX_GENERATED_HEADER_DIR} PREFIX "complex/generated" FILES ${COMPLEX_GENERATED_HEADERS}) -source_group(TREE ${COMPLEX_SOURCE_DIR} PREFIX "complex" FILES ${COMPLEX_SRCS}) +source_group(TREE ${SIMPLNX_SOURCE_DIR} PREFIX "simplnx" FILES ${SIMPLNX_HDRS}) +source_group(TREE ${SIMPLNX_GENERATED_HEADER_DIR} PREFIX "simplnx/generated" FILES ${SIMPLNX_GENERATED_HEADERS}) +source_group(TREE ${SIMPLNX_SOURCE_DIR} PREFIX "simplnx" FILES ${SIMPLNX_SRCS}) -set(COMPLEX_INCLUDE_DIR ${complex_SOURCE_DIR}/src) +set(SIMPLNX_INCLUDE_DIR ${simplnx_SOURCE_DIR}/src) -target_include_directories(complex +target_include_directories(simplnx PUBLIC - $ - $ + $ + $ $ ) # ------------------------------------------------------------------------------ # CLI Executable # ------------------------------------------------------------------------------ -add_subdirectory(${complex_SOURCE_DIR}/src/nxrunner) +add_subdirectory(${simplnx_SOURCE_DIR}/src/nxrunner) #------------------------------------------------------------------------------ -# Complex Plugins Section +# Simplnx Plugins Section #------------------------------------------------------------------------------ -get_property(ComplexPluginTargets GLOBAL PROPERTY ComplexPluginTargets) +get_property(simplnxPluginTargets GLOBAL PROPERTY simplnxPluginTargets) -if(NOT "${ComplexPluginTargets}" STREQUAL "") - set_property(GLOBAL PROPERTY ComplexPluginTargets "") +if(NOT "${simplnxPluginTargets}" STREQUAL "") + set_property(GLOBAL PROPERTY simplnxPluginTargets "") endif() -include(${complex_SOURCE_DIR}/cmake/Plugin.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Plugin.cmake) -# add_subdirectory(${complex_SOURCE_DIR}/src/Plugins/${P_PLUGIN_NAME} ${complex_BINARY_DIR}/Plugins/${P_PLUGIN_NAME}) +# add_subdirectory(${simplnx_SOURCE_DIR}/src/Plugins/${P_PLUGIN_NAME} ${simplnx_BINARY_DIR}/Plugins/${P_PLUGIN_NAME}) # get_property(PluginNumFilters GLOBAL PROPERTY ${P_PLUGIN_NAME}_filter_count) # message(STATUS "${P_PLUGIN_NAME} [ENABLED] ${PluginNumFilters} Filters") -set_property(GLOBAL PROPERTY COMPLEX_PLUGIN_COUNT 0) +set_property(GLOBAL PROPERTY SIMPLNX_PLUGIN_COUNT 0) #------------------------------------------------------------------------------ -# Add user defined Plugin Dirs based on the COMPLEX_PLUGIN_SEARCH_DIRS variable -# and falling back to complex_SOURCE_DIR/../complex_plugins if not defined -# Use 'COMPLEX_PLUGIN_SEARCH_DIRS' hints to look for plugins in specific directories -set(COMPLEX_PLUGIN_LIST "") -if(COMPLEX_ENABLE_ComplexCore) - set(COMPLEX_PLUGIN_LIST ${COMPLEX_PLUGIN_LIST} ComplexCore) +# Add user defined Plugin Dirs based on the SIMPLNX_PLUGIN_SEARCH_DIRS variable +# and falling back to simplnx_SOURCE_DIR/../simplnx_plugins if not defined +# Use 'SIMPLNX_PLUGIN_SEARCH_DIRS' hints to look for plugins in specific directories +set(SIMPLNX_PLUGIN_LIST "") +if(SIMPLNX_ENABLE_SimplnxCore) + set(SIMPLNX_PLUGIN_LIST ${SIMPLNX_PLUGIN_LIST} SimplnxCore) endif() -if(COMPLEX_ENABLE_ITKImageProcessing) - set(COMPLEX_PLUGIN_LIST ${COMPLEX_PLUGIN_LIST} ITKImageProcessing) +if(SIMPLNX_ENABLE_ITKImageProcessing) + set(SIMPLNX_PLUGIN_LIST ${SIMPLNX_PLUGIN_LIST} ITKImageProcessing) endif() # Ensure ITKImageProcessing comes before OrientationAnalysis as there is currently # a dependency of ITKImageWriter inside some of the example OrientationAnalysis pipelines -if(COMPLEX_ENABLE_OrientationAnalysis) - set(COMPLEX_PLUGIN_LIST ${COMPLEX_PLUGIN_LIST} OrientationAnalysis) +if(SIMPLNX_ENABLE_OrientationAnalysis) + set(SIMPLNX_PLUGIN_LIST ${SIMPLNX_PLUGIN_LIST} OrientationAnalysis) endif() -if(COMPLEX_BUILD_TESTS) - list(APPEND COMPLEX_PLUGIN_LIST TestOne TestTwo) +if(SIMPLNX_BUILD_TESTS) + list(APPEND SIMPLNX_PLUGIN_LIST TestOne TestTwo) endif() # Add any plugins to the list -set(COMPLEX_PLUGIN_LIST ${COMPLEX_PLUGIN_LIST} ${COMPLEX_EXTRA_PLUGINS}) +set(SIMPLNX_PLUGIN_LIST ${SIMPLNX_PLUGIN_LIST} ${SIMPLNX_EXTRA_PLUGINS}) -foreach(plugin ${COMPLEX_PLUGIN_LIST}) - if(NOT DEFINED COMPLEX_PLUGIN_ENABLE_${plugin}) - set(COMPLEX_PLUGIN_ENABLE_${plugin} ON) +foreach(plugin ${SIMPLNX_PLUGIN_LIST}) + if(NOT DEFINED SIMPLNX_PLUGIN_ENABLE_${plugin}) + set(SIMPLNX_PLUGIN_ENABLE_${plugin} ON) endif() - complex_add_plugin(PLUGIN_NAME ${plugin}) + simplnx_add_plugin(PLUGIN_NAME ${plugin}) endforeach() -set(COMPLEX_PACKAGE_NAMESPACE "complex::") +set(SIMPLNX_PACKAGE_NAMESPACE "simplnx::") #------------------------------------------------------------------------------ # Install the appropriate example pipelines based on which plugins are loaded @@ -861,9 +861,9 @@ file(TO_CMAKE_PATH "${DREAM3D_DATA_DIR}" DREAM3D_DATA_DIR_NORM) set(PIPELINE_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CX_CONFIG_DIR}/pipelines") set(PIPELINE_EXAMPLES_DEST_DIR "${PIPELINE_DEST_DIR}/Examples") -if(COMPLEX_DOWNLOAD_TEST_FILES AND TARGET ComplexCore AND TARGET ITKImageProcessing AND TARGET OrientationAnalysis) +if(SIMPLNX_DOWNLOAD_TEST_FILES AND TARGET SimplnxCore AND TARGET ITKImageProcessing AND TARGET OrientationAnalysis) add_custom_target(Copy_PorosityAnalysis_Pipelines ALL - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${complex_SOURCE_DIR}/pipelines/PorosityAnalysis.d3dpipeline" "${PIPELINE_EXAMPLES_DEST_DIR}/PorosityAnalysis.d3dpipeline" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${simplnx_SOURCE_DIR}/pipelines/PorosityAnalysis.d3dpipeline" "${PIPELINE_EXAMPLES_DEST_DIR}/PorosityAnalysis.d3dpipeline" COMMENT "Copying Example Pipelines into Binary Directory" COMMAND_EXPAND_LISTS VERBATIM @@ -871,7 +871,7 @@ if(COMPLEX_DOWNLOAD_TEST_FILES AND TARGET ComplexCore AND TARGET ITKImageProcess set_target_properties(Copy_PorosityAnalysis_Pipelines PROPERTIES FOLDER ZZ_COPY_FILES) add_custom_target(Copy_CAxis_Pipelines ALL - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${complex_SOURCE_DIR}/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline" "${PIPELINE_EXAMPLES_DEST_DIR}/Combo-EBSD-osc_r0c0.d3dpipeline" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${simplnx_SOURCE_DIR}/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline" "${PIPELINE_EXAMPLES_DEST_DIR}/Combo-EBSD-osc_r0c0.d3dpipeline" COMMENT "Copying Example Pipelines into Binary Directory" COMMAND_EXPAND_LISTS VERBATIM @@ -892,35 +892,35 @@ if(COMPLEX_DOWNLOAD_TEST_FILES AND TARGET ComplexCore AND TARGET ITKImageProcess set_target_properties(Copy_CAxis_Data PROPERTIES FOLDER ZZ_COPY_FILES) endif() -if(COMPLEX_ENABLE_INSTALL) - install(TARGETS complex - EXPORT complexTargets +if(SIMPLNX_ENABLE_INSTALL) + install(TARGETS simplnx + EXPORT simplnxTargets ) - export(EXPORT complexTargets NAMESPACE ${COMPLEX_PACKAGE_NAMESPACE}) + export(EXPORT simplnxTargets NAMESPACE ${SIMPLNX_PACKAGE_NAMESPACE}) include(CMakePackageConfigHelpers) - set(COMPLEX_INSTALL_CMAKE_PREFIX "lib/cmake") + set(SIMPLNX_INSTALL_CMAKE_PREFIX "lib/cmake") - set(COMPLEX_CONFIG_FILE ${complex_BINARY_DIR}/complexConfig.cmake) - set(COMPLEX_VERSION_FILE ${complex_BINARY_DIR}/complexConfigVersion.cmake) + set(SIMPLNX_CONFIG_FILE ${simplnx_BINARY_DIR}/simplnxConfig.cmake) + set(SIMPLNX_VERSION_FILE ${simplnx_BINARY_DIR}/simplnxConfigVersion.cmake) - configure_package_config_file(${complex_SOURCE_DIR}/cmake/complexConfig.cmake.in ${COMPLEX_CONFIG_FILE} - INSTALL_DESTINATION ${COMPLEX_INSTALL_CMAKE_PREFIX} + configure_package_config_file(${simplnx_SOURCE_DIR}/cmake/simplnxConfig.cmake.in ${SIMPLNX_CONFIG_FILE} + INSTALL_DESTINATION ${SIMPLNX_INSTALL_CMAKE_PREFIX} ) - write_basic_package_version_file(${COMPLEX_VERSION_FILE} + write_basic_package_version_file(${SIMPLNX_VERSION_FILE} COMPATIBILITY SameMajorVersion ) - install(FILES ${COMPLEX_CONFIG_FILE} ${COMPLEX_VERSION_FILE} - DESTINATION ${COMPLEX_INSTALL_CMAKE_PREFIX} + install(FILES ${SIMPLNX_CONFIG_FILE} ${SIMPLNX_VERSION_FILE} + DESTINATION ${SIMPLNX_INSTALL_CMAKE_PREFIX} COMPONENT develop ) include(GNUInstallDirs) - install(TARGETS complex + install(TARGETS simplnx RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime @@ -933,28 +933,28 @@ if(COMPLEX_ENABLE_INSTALL) COMPONENT develop ) - install(EXPORT complexTargets - NAMESPACE ${COMPLEX_PACKAGE_NAMESPACE} - DESTINATION ${COMPLEX_INSTALL_CMAKE_PREFIX} + install(EXPORT simplnxTargets + NAMESPACE ${SIMPLNX_PACKAGE_NAMESPACE} + DESTINATION ${SIMPLNX_INSTALL_CMAKE_PREFIX} ) - install_with_directory(FILES ${COMPLEX_HDRS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/complex + install_with_directory(FILES ${SIMPLNX_HDRS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simplnx COMPONENT develop - BASE_DIR ${COMPLEX_SOURCE_DIR} + BASE_DIR ${SIMPLNX_SOURCE_DIR} ) - install_with_directory(FILES ${COMPLEX_GENERATED_HEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/complex + install_with_directory(FILES ${SIMPLNX_GENERATED_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simplnx COMPONENT develop - BASE_DIR ${COMPLEX_GENERATED_HEADER_DIR} + BASE_DIR ${SIMPLNX_GENERATED_HEADER_DIR} ) - include(${complex_SOURCE_DIR}/cmake/Utility.cmake) + include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) endif() -option(COMPLEX_ENABLE_PACKAGING "Enables COMPLEX packaging" ON) -if(COMPLEX_ENABLE_PACKAGING) +option(SIMPLNX_ENABLE_PACKAGING "Enablespackaging" ON) +if(SIMPLNX_ENABLE_PACKAGING) if(WIN32) set(CPACK_GENERATOR ZIP) else() @@ -963,22 +963,22 @@ if(COMPLEX_ENABLE_PACKAGING) include(CPack) endif() -if(COMPLEX_BUILD_TESTS) +if(SIMPLNX_BUILD_TESTS) include(CTest) add_subdirectory(test) endif() -if(COMPLEX_BUILD_PYTHON) +if(SIMPLNX_BUILD_PYTHON) add_subdirectory(wrapping/python) endif() -option(COMPLEX_BUILD_DOCS "Enables building COMPLEX documentation" OFF) +option(SIMPLNX_BUILD_DOCS "Enables buildingdocumentation" OFF) -if(COMPLEX_BUILD_DOCS) +if(SIMPLNX_BUILD_DOCS) add_subdirectory(docs) endif() # ------------------------------------------------------------------------------ # Print Summary Information # ------------------------------------------------------------------------------ -include(${complex_SOURCE_DIR}/cmake/Summary.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Summary.cmake) diff --git a/CMakePresets.json b/CMakePresets.json index fcb3e81af7..effc983a05 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -21,19 +21,19 @@ "type": "STRING", "value": "Release" }, - "COMPLEX_BUILD_TESTS": { + "SIMPLNX_BUILD_TESTS": { "type": "BOOL", "value": "ON" }, - "COMPLEX_BUILD_DOCS": { + "SIMPLNX_BUILD_DOCS": { "type": "BOOL", "value": "OFF" }, - "COMPLEX_BUILD_PYTHON": { + "SIMPLNX_BUILD_PYTHON": { "type": "BOOL", "value": "ON" }, - "COMPLEX_EMBED_PYTHON": { + "SIMPLNX_EMBED_PYTHON": { "type": "BOOL", "value": "OFF" }, @@ -167,43 +167,43 @@ "type": "STRING", "value": "Release" }, - "COMPLEX_BUILD_TESTS": { + "SIMPLNX_BUILD_TESTS": { "type": "BOOL", "value": "OFF" }, - "COMPLEX_BUILD_DOCS": { + "SIMPLNX_BUILD_DOCS": { "type": "BOOL", "value": "OFF" }, - "COMPLEX_BUILD_PYTHON": { + "SIMPLNX_BUILD_PYTHON": { "type": "BOOL", "value": "ON" }, - "COMPLEX_EMBED_PYTHON": { + "SIMPLNX_EMBED_PYTHON": { "type": "BOOL", "value": "ON" }, - "COMPLEX_DOWNLOAD_TEST_FILES": { + "SIMPLNX_DOWNLOAD_TEST_FILES": { "type": "BOOL", "value": "OFF" }, - "COMPLEX_CONDA_BUILD": { + "SIMPLNX_CONDA_BUILD": { "type": "BOOL", "value": "ON" }, - "COMPLEX_ENABLE_INSTALL": { + "SIMPLNX_ENABLE_INSTALL": { "type": "BOOL", "value": "ON" }, - "COMPLEX_PY_ENABLE_INSTALL": { + "SIMPLNX_PY_ENABLE_INSTALL": { "type": "BOOL", "value": "ON" }, - "COMPLEX_PY_INSTALL_DIR": { + "SIMPLNX_PY_INSTALL_DIR": { "type": "PATH", "value": "$env{SP_DIR}" }, - "COMPLEX_PY_GENERATE_PYI": { + "SIMPLNX_PY_GENERATE_PYI": { "type": "BOOL", "value": "ON" }, @@ -215,7 +215,7 @@ "type": "BOOL", "value": "OFF" }, - "ComplexCore_INSTALL_PIPELINES": { + "SimplnxCore_INSTALL_PIPELINES": { "type": "BOOL", "value": "OFF" }, @@ -275,7 +275,7 @@ "name": "conda-osx", "inherits": "conda-unix", "cacheVariables": { - "COMPLEX_PY_DISABLE_HIDDEN_VISIBILITY": { + "SIMPLNX_PY_DISABLE_HIDDEN_VISIBILITY": { "type": "BOOL", "value": "ON" } diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1f25931c6d..678d94e557 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,4 @@ -# Code of Conduct for complex +# Code of Conduct for simplnx ## 1. Introduction diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5323724a9a..505e641d3a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing Guide -Thank you for considering contributing to complex. Your involvement helps make complex a valuable tool for the global scientific community. +Thank you for considering contributing to simplnx. Your involvement helps make simplnx a valuable tool for the global scientific community. This repository needs many different kinds of contribution not all of which require coding knowledge. Here are some of the different options: @@ -14,18 +14,18 @@ This repository needs many different kinds of contribution not all of which requ - Answer questions from fellow users in [DREAM3DNX-Issues discussions](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues/discussions) - **For Python Developers:** - Create new examples of use cases and as a Jupyter Notebook or sdd to documentation - - Create filters for complex from new papers and dissertations + - Create filters for simplnx from new papers and dissertations - Fix bugs in filters or the python bindings - Update exisitng filters to expand functionality or optimize - **For Operating System Power Users and CyberSecurity Experts:** - Report security vulnerabilities in [DREAM3DNX-Issues](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues) - Add CMake presets for compiling on unique operating systems not already supported - - Create packages of DREAM3DNX and/or complex (with the nxrunner cli) and submit them to your favorite package manager (AUR, Flatpak, etc.) - - Create ways to run complex (with the nxrunner cli) in containers (such as Docker container) + - Create packages of DREAM3DNX and/or simplnx (with the nxrunner cli) and submit them to your favorite package manager (AUR, Flatpak, etc.) + - Create ways to run simplnx (with the nxrunner cli) in containers (such as Docker container) - **For C++ Developers:** - - Create new filters for complex from new papers and dissertations - - Port old SIMPL filters to the updated complex framework [porting filters guidelines](/docs/Porting_Filters.md) - - Handle bugs and feature requests: [issue tracker](https://github.com/bluequartzsoftware/complex/issues) + - Create new filters for simplnx from new papers and dissertations + - Port old SIMPL filters to the updated simplnx framework [porting filters guidelines](/docs/Porting_Filters.md) + - Handle bugs and feature requests: [issue tracker](https://github.com/bluequartzsoftware/simplnx/issues) - Create new test cases to improve the reliability and robustness of the filters - Update nxrunner cli to offer the same functionality as our GUI interface - Optimize existing filter algorithms @@ -40,11 +40,11 @@ For instructions on building from source see our [Guide to Building From Source] ## Getting Started 1. Fork the repository to your GitHub account. -2. Clone the repository to your local machine: `git clone https://github.com/YOUR_USERNAME/complex.git` +2. Clone the repository to your local machine: `git clone https://github.com/YOUR_USERNAME/simplnx.git` 3. Create a new branch: `git checkout -b NAME_YOUR_BRANCH` 4. Make your changes and commit them: `git commit -m 'Add some feature or fix some issue'` 5. Push your changes to your fork: `git push origin NAME_YOUR_BRANCH` -6. Create a pull request from your branch to the complex `main` or `master` branch. +6. Create a pull request from your branch to the simplnx `main` or `master` branch. ## Code of Conduct @@ -56,17 +56,17 @@ If you experience or witness unacceptable behavior—or have any other concerns ### Reporting Bugs -1. Check the [issue tracker](https://github.com/bluequartzsoftware/complex/issues) to ensure the bug hasn't already been reported. +1. Check the [issue tracker](https://github.com/bluequartzsoftware/simplnx/issues) to ensure the bug hasn't already been reported. 2. If the bug hasn't been reported, create a new issue. Provide a clear description of the problem, including steps to reproduce. ### Suggesting Enhancements -1. Check the [issue tracker](https://github.com/bluequartzsoftware/complex/issues) to ensure the enhancement hasn't already been suggested. +1. Check the [issue tracker](https://github.com/bluequartzsoftware/simplnx/issues) to ensure the enhancement hasn't already been suggested. 2. If not, create a new issue. Provide a clear description of the enhancement. ### Handling Issues with Help Wanted Tag -1. Check the [issue tracker](https://github.com/bluequartzsoftware/complex/issues) and sort by Help Wanted to see issues that aren't actively being handled internally. +1. Check the [issue tracker](https://github.com/bluequartzsoftware/simplnx/issues) and sort by Help Wanted to see issues that aren't actively being handled internally. 2. Once you select an issue, check for existing comments containing an "In Progress" title. 3. If there is not an exitisting _In Progress_ comment proceed to step 4, else do the following: - Check the _Description of Planned Changes_ in the comment to see if the part of they are already handling the change you want to make. If not continue to step 4 @@ -117,9 +117,9 @@ Willing to Collaborate with Other Contributors on These Changes: Y/N For information about our specifc naming conventions and styling see our [coding style guide](/docs/Code_Style_Guide.md). -For the basic code styling complex uses `clang-format`, the formatting file is included at the root level in the repository. +For the basic code styling simplnx uses `clang-format`, the formatting file is included at the root level in the repository. -`clang-format` is a tool to automatically format C++ code. You should run 'clang-format' on your code before opening a Pull Request to make sure it passes the _clang-format pr_ check. You can install `clang-format` and `git-clang-format` with `npm install -g clang-format`. To automatically format a file according to a project's C++ code style, run `clang-format -i path/to/complex/file`, which is supported on macOS/Linux/Windows. If you want to run `clang-format` on all the changed code on your latest git commit (HEAD), you can run `git-clang-format HEAD~1`. Run `git-clang-format -h` for extra help. +`clang-format` is a tool to automatically format C++ code. You should run 'clang-format' on your code before opening a Pull Request to make sure it passes the _clang-format pr_ check. You can install `clang-format` and `git-clang-format` with `npm install -g clang-format`. To automatically format a file according to a project's C++ code style, run `clang-format -i path/to/simplnx/file`, which is supported on macOS/Linux/Windows. If you want to run `clang-format` on all the changed code on your latest git commit (HEAD), you can run `git-clang-format HEAD~1`. Run `git-clang-format -h` for extra help. ### Documentation Styleguide diff --git a/PortingFilters.md b/PortingFilters.md index 7f2a2b267b..da600be4b7 100644 --- a/PortingFilters.md +++ b/PortingFilters.md @@ -34,10 +34,10 @@ Some nuances to note for this are as follows:
  • The path to the plugin should be .../PluginName/ NOT .../PluginName/src/PluginName/
  • The slash at the end of the filepath is necessary to work properly ie [.../PluginName/ NOT .../PluginName]
    • -
  • The name of the filter should be the SIMPL name not what you want the complex name to be
    • +
  • The name of the filter should be the SIMPL name not what you want the simplnx name to be
-You will need to update the various CMake files inside the target complex plugin in order to start compiling the new filter code inside of a complex build. +You will need to update the various CMake files inside the target simplnx plugin in order to start compiling the new filter code inside of a simplnx build. ## SECTION 2 : Porting stubs from existing folder to ***Filters Folder*** @@ -91,18 +91,18 @@ Files from current SIMPL DREAM3D should have the prefix "6_6_" which denotes the These will be used to verify changes in the file and look for updates. -> Go to the complex GitHub repo and update with the tar.gz file +> Go to the simplnx GitHub repo and update with the tar.gz file -GitHub Repo : +GitHub Repo : **Be Sure to Save the Release** -> Go to the complex CMakeLists.txt file and update sha 512 +> Go to the simplnx CMakeLists.txt file and update sha 512 -Located at line 579 in the CMakeLists.text file in the ***complex*** repo, one must update the table accordingly. +Located at line 579 in the CMakeLists.text file in the ***simplnx*** repo, one must update the table accordingly. ### Working with filters outside the current plugin -There will be times you may have to call upon filters from another repo. Typically this occurs in ***complex_plugins***. In order to do this one must create an application instance which is done so by wrapping it in a struct that gets nested in a shared pointer to make sure it cleans itself up after each test case. Here is the syntax for doing so: +There will be times you may have to call upon filters from another repo. Typically this occurs in ***simplnx_plugins***. In order to do this one must create an application instance which is done so by wrapping it in a struct that gets nested in a shared pointer to make sure it cleans itself up after each test case. Here is the syntax for doing so: > std::shared_ptr app = std::make_shared(); > app->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -110,7 +110,7 @@ There will be times you may have to call upon filters from another repo. Typical To use make_shared_enabler you must include: -> #include "complex/UnitTest/UnitTestCommon.hpp" +> #include "simplnx/UnitTest/UnitTestCommon.hpp" The syntax for use of ***filterList*** is as follows: @@ -200,7 +200,7 @@ The number at the start is an arbitrary value save for the fact it must be negat ## SECTION 6 : Utilizing API's to the fullest -This section aims to tackle ***complex*** convenience functions from major API's: +This section aims to tackle ***simplnx*** convenience functions from major API's: ### Utilizing the ExecuteDataFunction diff --git a/README.md b/README.md index 6daf4d27c0..23dbd92932 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -# complex +# simplnx -[![windows](https://github.com/BlueQuartzSoftware/complex/actions/workflows/windows.yml/badge.svg)](https://github.com/BlueQuartzSoftware/complex/actions/workflows/windows.yml) [![linux](https://github.com/BlueQuartzSoftware/complex/actions/workflows/linux.yml/badge.svg)](https://github.com/BlueQuartzSoftware/complex/actions/workflows/linux.yml) [![macos](https://github.com/BlueQuartzSoftware/complex/actions/workflows/macos.yml/badge.svg)](https://github.com/BlueQuartzSoftware/complex/actions/workflows/macos.yml) [![clang-format](https://github.com/BlueQuartzSoftware/complex/actions/workflows/format_push.yml/badge.svg)](https://github.com/BlueQuartzSoftware/complex/actions/workflows/format_push.yml) [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com) [![All Contributors](https://img.shields.io/github/all-contributors/BlueQuartzSoftware/complex?color=ee8449&style=flat-square)](#contributors) +[![windows](https://github.com/bluequartzsoftware/simplnx/actions/workflows/windows.yml/badge.svg)](https://github.com/bluequartzsoftware/simplnx/actions/workflows/windows.yml) [![linux](https://github.com/bluequartzsoftware/simplnx/actions/workflows/linux.yml/badge.svg)](https://github.com/bluequartzsoftware/simplnx/actions/workflows/linux.yml) [![macos](https://github.com/bluequartzsoftware/simplnx/actions/workflows/macos.yml/badge.svg)](https://github.com/bluequartzsoftware/simplnx/actions/workflows/macos.yml) [![clang-format](https://github.com/bluequartzsoftware/simplnx/actions/workflows/format_push.yml/badge.svg)](https://github.com/bluequartzsoftware/simplnx/actions/workflows/format_push.yml) [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com) [![All Contributors](https://img.shields.io/github/all-contributors/bluequartzsoftware/?color=ee8449&style=flat-square)](#contributors) ## Multilanguage README -| Language | [English](https://github.com/BlueQuartzSoftware/complex/blob/develop/README.md) | PlaceHolder | +| Language | [English](https://github.com/bluequartzsoftware/simplnx/blob/develop/README.md) | PlaceHolder | | -------- | ------------------------------------------------------------------------------- | ----------- | ## Introduction -DREAM3D-NX is a user-friendly and versatile desktop application that leverages the open-source ‘complex’ software library to enable users to manipulate, analyze, and visualize multidimensional, multimodal data with ease. With its advanced reconstruction, quantification, meshing, data organization, and visualization capabilities, DREAM3D-NX has emerged as a go-to tool for the materials science community to reconstruct and quantify 3D microstructures. Its flexibility and adaptability make it suitable for a broad range of multidimensional data analysis applications beyond materials science and engineering domain. +DREAM3D-NX is a user-friendly and versatile desktop application that leverages the open-source ‘simplnx’ software library to enable users to manipulate, analyze, and visualize multidimensional, multimodal data with ease. With its advanced reconstruction, quantification, meshing, data organization, and visualization capabilities, DREAM3D-NX has emerged as a go-to tool for the materials science community to reconstruct and quantify 3D microstructures. Its flexibility and adaptability make it suitable for a broad range of multidimensional data analysis applications beyond materials science and engineering domain. -`complex` is a rewrite of the [SIMPL](https://www.github.com/bluequartzsoftware/simpl) library upon which [DREAM3D](https://www.github.com/bluequartzsoftware/dream3d) is written. This library aims to be fully C++17 compliant, removes the need for Qt5 at the library level and brings more flexible data organization and grouping options. The library is under active development by BlueQuartz Software at the current time. +`simplnx` is a rewrite of the [SIMPL](https://www.github.com/bluequartzsoftware/simpl) library upon which [DREAM3D](https://www.github.com/bluequartzsoftware/dream3d) is written. This library aims to be fully C++17 compliant, removes the need for Qt5 at the library level and brings more flexible data organization and grouping options. The library is under active development by BlueQuartz Software at the current time. ## Project Vision -When the [DREAM3D](https://www.github.com/bluequartzsoftware/dream3d) project began in 2009, it was created with the goal of integrating the many disperate software codes in existance at the time under a single software framework. This software framework would allow these codes to define their requirements for input data, output data and required parameters in a common structure and thus enable the existing codes to ingest data from a previous code algorithm and produce output that the other code algorithms can readily utilize. By 2013 DREAM.3D had matured into a flexible desktop application that could peform a wide variety of materials science related processing. Over time, DREAM.3D’s capabilities expanded to include more generic data processing algorithms and image processing algorithms. The United States Government funded the entire development cycle for DREAM.3D and was gracious to allow the main project to be open sourced to allow it to penetrate into as many institutions as possible. In recent years the whole of DREAM3D and SIMPL were completely rewritten into DREAM3D-NX and the `complex` library. This new version focused on developing both maintainable and expandable software that enables a lower barrier to entry for contributions. +When the [DREAM3D](https://www.github.com/bluequartzsoftware/dream3d) project began in 2009, it was created with the goal of integrating the many disperate software codes in existance at the time under a single software framework. This software framework would allow these codes to define their requirements for input data, output data and required parameters in a common structure and thus enable the existing codes to ingest data from a previous code algorithm and produce output that the other code algorithms can readily utilize. By 2013 DREAM.3D had matured into a flexible desktop application that could peform a wide variety of materials science related processing. Over time, DREAM.3D’s capabilities expanded to include more generic data processing algorithms and image processing algorithms. The United States Government funded the entire development cycle for DREAM.3D and was gracious to allow the main project to be open sourced to allow it to penetrate into as many institutions as possible. In recent years the whole of DREAM3D and SIMPL were completely rewritten into DREAM3D-NX and the `simplnx` library. This new version focused on developing both maintainable and expandable software that enables a lower barrier to entry for contributions. The vision for the DREAM.3D project is to produce accessible software tools that are professionally developed, relentlessly tested, and maintained into the future thus accelerating current and future R&D efforts by building upon the contributors to the DREAM3D project. @@ -69,9 +69,9 @@ See our [Support File](/SUPPORT.md) for more ways to contact us! ## Contribute -Thanks so much for your interest in contributing to `complex`! +Thanks so much for your interest in contributing to `simplnx`! -The `complex` project needs all sorts of contributions, so don't be discouraged if you are unfamiliar with C++. We have all sorts of tasks that can be done without any prior coding knowledge. We need have non-coding tasks, computer power user tasks, security research tasks, Python tasks, and C++ tasks, all of which are outlined in our [Contributing Guide](/CONTRIBUTING.md). +The `simplnx` project needs all sorts of contributions, so don't be discouraged if you are unfamiliar with C++. We have all sorts of tasks that can be done without any prior coding knowledge. We need have non-coding tasks, computer power user tasks, security research tasks, Python tasks, and C++ tasks, all of which are outlined in our [Contributing Guide](/CONTRIBUTING.md). We also understand the struggle involved with getting started on a new project and the frustration that can come with learning a new codebase. To help cut down on the stress of this we set up a discussion section specifically for [Contributor Questions](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues/discussions/categories/contributor-questions) where you can quickly get a response directly from maintainers. @@ -89,17 +89,17 @@ Huge thanks go to these wonderful people ([emoji key](https://allcontributors.or - - - - - - - + + + + + + + - - + + diff --git a/cmake/Plugin.cmake b/cmake/Plugin.cmake index 36ba7eee74..0df076b9c0 100644 --- a/cmake/Plugin.cmake +++ b/cmake/Plugin.cmake @@ -3,19 +3,19 @@ include(GNUInstallDirs) # -------------------------------------------------------------------- # This function optionally compiles a named plugin when compiling sandbox -# This function will add in an Option "COMPLEX_PLUGIN_ENABLE_${NAME} which +# This function will add in an Option "SIMPLNX_PLUGIN_ENABLE_${NAME} which # the programmer can use to enable/disable the compiling of specific plugins # Arguments: # PLUGIN_NAME The name of the Plugin # PLUGIN_SOURCE_DIR The source directory for the plugin -function(complex_COMPILE_PLUGIN) +function(simplnx_COMPILE_PLUGIN) set(options) set(oneValueArgs PLUGIN_NAME PLUGIN_SOURCE_DIR DOC_CHECK) cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - option(COMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME} "Build the ${ARGS_PLUGIN_NAME}" ON) + option(SIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME} "Build the ${ARGS_PLUGIN_NAME}" ON) - if(COMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}) + if(SIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}) add_subdirectory(${ARGS_PLUGIN_SOURCE_DIR} ${PROJECT_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}) get_property(PluginNumFilters GLOBAL PROPERTY ${ARGS_PLUGIN_NAME}_filter_count) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/test_output) @@ -24,79 +24,79 @@ function(complex_COMPILE_PLUGIN) #- Now set up the dependency between the main application and each of the plugins so that #- things like Visual Studio are forced to rebuild the plugins when launching #- the sandbox application - if(COMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME} AND TARGET complex::complex AND TARGET ${ARGS_PLUGIN_NAME}) - add_dependencies(${ARGS_PLUGIN_NAME} complex::complex) + if(SIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME} AND TARGET simplnx::simplnx AND TARGET ${ARGS_PLUGIN_NAME}) + add_dependencies(${ARGS_PLUGIN_NAME} simplnx::simplnx) endif() else() - message(STATUS "${ARGS_PLUGIN_NAME} [DISABLED]: Use -DCOMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}=ON to Enable Plugin") + message(STATUS "${ARGS_PLUGIN_NAME} [DISABLED]: Use -DSIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}=ON to Enable Plugin") endif() endfunction() # ----------------------------------------------------------------------------- -# This function will search through the COMPLEX_PLUGIN_SEARCH_DIRS variable and +# This function will search through the SIMPLNX_PLUGIN_SEARCH_DIRS variable and # look for a directory with the name that holds a CMakeLists.txt file. # Arguments: # PLUGIN_NAME The name of the Plugin -function(complex_add_plugin) +function(simplnx_add_plugin) set(options ) set(oneValueArgs PLUGIN_NAME) cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - set(COMPLEX_PLUGIN_SEARCH_DIRS_2 ${COMPLEX_PLUGIN_SEARCH_DIRS} - ${complex_SOURCE_DIR}/src/Plugins - ${complex_SOURCE_DIR}/../complex_plugins - ${complex_SOURCE_DIR}/../DREAM3D_Plugins + set(SIMPLNX_PLUGIN_SEARCH_DIRS_2 ${SIMPLNX_PLUGIN_SEARCH_DIRS} + ${simplnx_SOURCE_DIR}/src/Plugins + ${simplnx_SOURCE_DIR}/../simplnx_plugins + ${simplnx_SOURCE_DIR}/../DREAM3D_Plugins ) - #message(STATUS "complex_add_plugin: ${ARGS_PLUGIN_NAME}") - #message(STATUS "COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR: ${COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") - if(NOT DEFINED COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR OR NOT EXISTS "${COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") - #message(STATUS "COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR was NOT Defined. Searching for Plugins in 'COMPLEX_PLUGIN_SEARCH_DIRS_2'") - foreach(pluginSearchDir ${COMPLEX_PLUGIN_SEARCH_DIRS_2}) + #message(STATUS "simplnx_add_plugin: ${ARGS_PLUGIN_NAME}") + #message(STATUS "SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR: ${SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") + if(NOT DEFINED SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR OR NOT EXISTS "${SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") + #message(STATUS "SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR was NOT Defined. Searching for Plugins in 'SIMPLNX_PLUGIN_SEARCH_DIRS_2'") + foreach(pluginSearchDir ${SIMPLNX_PLUGIN_SEARCH_DIRS_2}) #message(STATUS "|-Searching:${pluginSearchDir} ") if(EXISTS ${pluginSearchDir}/${ARGS_PLUGIN_NAME}/CMakeLists.txt) - set(COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR ${pluginSearchDir}/${ARGS_PLUGIN_NAME} CACHE PATH "") - #message(STATUS " |-Plugin: Defining COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR to ${COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") + set(SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR ${pluginSearchDir}/${ARGS_PLUGIN_NAME} CACHE PATH "") + #message(STATUS " |-Plugin: Defining SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR to ${SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") break() endif() endforeach() endif() # Mark these variables as advanced - mark_as_advanced(COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR) + mark_as_advanced(SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR) # Now that we have defined where the user's plugin directory is at we # need to make sure it has a CMakeLists.txt file in it - if(EXISTS ${COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}/CMakeLists.txt) - set(${ARGS_PLUGIN_NAME}_IMPORT_FILE COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR/CMakeLists.txt) + if(EXISTS ${SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}/CMakeLists.txt) + set(${ARGS_PLUGIN_NAME}_IMPORT_FILE SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR/CMakeLists.txt) endif() # By this point we should have everything defined and ready to go... - if(DEFINED COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR AND DEFINED ${ARGS_PLUGIN_NAME}_IMPORT_FILE) - #message(STATUS "Plugin: Adding Plugin ${COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") + if(DEFINED SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR AND DEFINED ${ARGS_PLUGIN_NAME}_IMPORT_FILE) + #message(STATUS "Plugin: Adding Plugin ${SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR}") - set(COMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME} ON CACHE BOOL "Enable ${ARGS_PLUGIN_NAME} Plugin") - if(COMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}) + set(SIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME} ON CACHE BOOL "Enable ${ARGS_PLUGIN_NAME} Plugin") + if(SIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}) #message(STATUS "${PLUGIN_NAME} ENABLED") - complex_COMPILE_PLUGIN(PLUGIN_NAME ${ARGS_PLUGIN_NAME} - PLUGIN_SOURCE_DIR ${COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR} + simplnx_COMPILE_PLUGIN(PLUGIN_NAME ${ARGS_PLUGIN_NAME} + PLUGIN_SOURCE_DIR ${SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR} ) # Increment the plugin count only if it is enabled - get_property(PLUGIN_COUNT GLOBAL PROPERTY COMPLEX_PLUGIN_COUNT) + get_property(PLUGIN_COUNT GLOBAL PROPERTY SIMPLNX_PLUGIN_COUNT) math(EXPR PLUGIN_COUNT "${PLUGIN_COUNT}+1") - set_property(GLOBAL PROPERTY COMPLEX_PLUGIN_COUNT ${PLUGIN_COUNT}) + set_property(GLOBAL PROPERTY SIMPLNX_PLUGIN_COUNT ${PLUGIN_COUNT}) else() - message(STATUS "${ARGS_PLUGIN_NAME} [DISABLED]: Use '-DCOMPLEX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}=ON' to enable this plugin") + message(STATUS "${ARGS_PLUGIN_NAME} [DISABLED]: Use '-DSIMPLNX_PLUGIN_ENABLE_${ARGS_PLUGIN_NAME}=ON' to enable this plugin") endif() else() - set(COMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR ${pluginSearchDir} CACHE PATH "" FORCE) - message(STATUS "${ARGS_PLUGIN_NAME} [DISABLED]. Missing Source Directory. Use -DCOMPLEX_${ARGS_PLUGIN_NAME}_SOURCE_DIR=/Path/To/PluginDir") + set(SIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR ${pluginSearchDir} CACHE PATH "" FORCE) + message(STATUS "${ARGS_PLUGIN_NAME} [DISABLED]. Missing Source Directory. Use -DSIMPLNX_${ARGS_PLUGIN_NAME}_SOURCE_DIR=/Path/To/PluginDir") endif() endfunction() # ----------------------------------------------------------------------------- -# This function will search through the COMPLEX_PLUGIN_SEARCH_DIRS variable and +# This function will search through the SIMPLNX_PLUGIN_SEARCH_DIRS variable and # look for a directory with the name that holds a CMakeLists.txt file. # Arguments: # NAME The name of the Plugin @@ -104,7 +104,7 @@ endfunction() # VERSION The version of the plugin, used in the "project(...)" call # FILTER_LIST the list of filters to compile # ACTION_LIST -function(create_complex_plugin) +function(create_simplnx_plugin) set(options DOC_CHECK ADD_TO_GLOBAL_LIST) set(oneValueArgs NAME DESCRIPTION VERSION) set(multiValueArgs FILTER_LIST ACTION_LIST ALGORITHM_LIST) @@ -161,7 +161,7 @@ function(create_complex_plugin) ) string(APPEND Public_Filter_Registration_Code - " filters.push_back([]() -> complex::IFilter::UniquePointer { return std::make_unique(); });\n" + " filters.push_back([]() -> nx::core::IFilter::UniquePointer { return std::make_unique(); });\n" ) endforeach() @@ -185,34 +185,34 @@ function(create_complex_plugin) ) endforeach() - configure_file( ${complex_SOURCE_DIR}/cmake/plugin_filter_registration.h.in + configure_file( ${simplnx_SOURCE_DIR}/cmake/plugin_filter_registration.h.in ${ARGS_GENERATED_HEADER_DIR}/${ARGS_NAME}_filter_registration.hpp ) add_library(${ARGS_NAME} SHARED) - add_library(complex::${ARGS_NAME} ALIAS ${ARGS_NAME}) + add_library(simplnx::${ARGS_NAME} ALIAS ${ARGS_NAME}) - set_property(TARGET ${ARGS_NAME} PROPERTY COMPLEX_FILTER_LIST ${ARGS_FILTER_LIST}) + set_property(TARGET ${ARGS_NAME} PROPERTY SIMPLNX_FILTER_LIST ${ARGS_FILTER_LIST}) #------------------------------------------------------------------------------ # Add the plugin to the global list of plugins. This is needed for installation. #------------------------------------------------------------------------------ if(${ARGS_ADD_TO_GLOBAL_LIST}) - get_property(ComplexPluginTargets GLOBAL PROPERTY ComplexPluginTargets) - set(ComplexPluginTargets ${ComplexPluginTargets} ${ARGS_NAME}) - set_property(GLOBAL PROPERTY ComplexPluginTargets ${ComplexPluginTargets}) + get_property(simplnxPluginTargets GLOBAL PROPERTY simplnxPluginTargets) + set(simplnxPluginTargets ${simplnxPluginTargets} ${ARGS_NAME}) + set_property(GLOBAL PROPERTY simplnxPluginTargets ${simplnxPluginTargets}) endif() #------------------------------------------------------------------------------ # Add a global property that stores the filters that are in this plugin #------------------------------------------------------------------------------ - get_property(COMPLEX_DEBUG_POSTFIX GLOBAL PROPERTY COMPLEX_DEBUG_POSTFIX) + get_property(SIMPLNX_DEBUG_POSTFIX GLOBAL PROPERTY SIMPLNX_DEBUG_POSTFIX) set_property(GLOBAL PROPERTY ${ARGS_NAME}_FILTER_LIST ${ARGS_FILTER_LIST}) - get_property(COMPLEX_DEBUG_POSTFIX GLOBAL PROPERTY COMPLEX_DEBUG_POSTFIX) + get_property(SIMPLNX_DEBUG_POSTFIX GLOBAL PROPERTY SIMPLNX_DEBUG_POSTFIX) set_target_properties(${ARGS_NAME} PROPERTIES FOLDER "Plugins/${ARGS_NAME}" - SUFFIX ".complex" - DEBUG_POSTFIX "${COMPLEX_DEBUG_POSTFIX}" + SUFFIX ".simplnx" + DEBUG_POSTFIX "${SIMPLNX_DEBUG_POSTFIX}" ) #------------------------------------------------------------------------------ @@ -230,24 +230,24 @@ function(create_complex_plugin) #------------------------------------------------------------------------------ # Where are the plugins going to be placed during the build, unless overridden - # by the global property COMPLEX_ARGS_OUTPUT_DIR - get_property(COMPLEX_ARGS_OUTPUT_DIR GLOBAL PROPERTY COMPLEX_ARGS_OUTPUT_DIR) - if("${COMPLEX_ARGS_OUTPUT_DIR}" STREQUAL "") + # by the global property SIMPLNX_ARGS_OUTPUT_DIR + get_property(SIMPLNX_ARGS_OUTPUT_DIR GLOBAL PROPERTY SIMPLNX_ARGS_OUTPUT_DIR) + if("${SIMPLNX_ARGS_OUTPUT_DIR}" STREQUAL "") set_target_properties(${ARGS_NAME} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY $ - RUNTIME_OUTPUT_DIRECTORY $ + LIBRARY_OUTPUT_DIRECTORY $ + RUNTIME_OUTPUT_DIRECTORY $ ) else() set_target_properties(${ARGS_NAME} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${COMPLEX_ARGS_OUTPUT_DIR} - RUNTIME_OUTPUT_DIRECTORY ${COMPLEX_ARGS_OUTPUT_DIR} + LIBRARY_OUTPUT_DIRECTORY ${SIMPLNX_ARGS_OUTPUT_DIR} + RUNTIME_OUTPUT_DIRECTORY ${SIMPLNX_ARGS_OUTPUT_DIR} ) endif() - target_link_libraries(${ARGS_NAME} PUBLIC complex) + target_link_libraries(${ARGS_NAME} PUBLIC simplnx) - include(${complex_SOURCE_DIR}/cmake/Utility.cmake) - complex_enable_warnings(TARGET ${ARGS_NAME}) + include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) + simplnx_enable_warnings(TARGET ${ARGS_NAME}) if(MSVC) target_compile_options(${ARGS_NAME} @@ -283,7 +283,7 @@ function(create_complex_plugin) $ ) - if(COMPLEX_ENABLE_INSTALL) + if(SIMPLNX_ENABLE_INSTALL) install(TARGETS ${ARGS_NAME} PUBLIC_HEADER DESTINATION include/${ARGS_NAME} @@ -307,7 +307,7 @@ endfunction() # Arguments: # PLUGIN_NAME The name of the Plugin # FILTER_LIST The list of sources to compile. -function(create_complex_plugin_unit_test) +function(create_simplnx_plugin_unit_test) set(options) set(oneValueArgs PLUGIN_NAME) set(multiValueArgs FILTER_LIST) @@ -320,9 +320,9 @@ function(create_complex_plugin_unit_test) find_package(Catch2 CONFIG REQUIRED) include(Catch) - get_filename_component(complexProj_PARENT ${complex_SOURCE_DIR} DIRECTORY CACHE) + get_filename_component(simplnxProj_PARENT ${simplnx_SOURCE_DIR} DIRECTORY CACHE) if("${DREAM3D_DATA_DIR}" STREQUAL "") - set(DREAM3D_DATA_DIR "${complexProj_PARENT}/DREAM3D_Data/" CACHE PATH "The directory where to find test data files") + set(DREAM3D_DATA_DIR "${simplnxProj_PARENT}/DREAM3D_Data/" CACHE PATH "The directory where to find test data files") endif() if(NOT EXISTS "${DREAM3D_DATA_DIR}") @@ -336,37 +336,37 @@ function(create_complex_plugin_unit_test) #------------------------------------------------------------------------------ # Convert the native path to a path that will be compatible with C++ source codes file(TO_CMAKE_PATH "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}" PLUGIN_SOURCE_DIR_NORM) - file(TO_CMAKE_PATH "${complex_SOURCE_DIR}" COMPLEX_SOURCE_DIR_NORM) + file(TO_CMAKE_PATH "${simplnx_SOURCE_DIR}" SIMPLNX_SOURCE_DIR_NORM) #------------------------------------------------------------------------------ # Set the generated directory in the build folder, set the path to the generated # header, and finally configure the header file - set(${ARGS_PLUGIN_NAME}_GENERATED_DIR ${complex_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/generated) - set(COMPLEX_TEST_DIRS_HEADER ${${ARGS_PLUGIN_NAME}_GENERATED_DIR}/${ARGS_PLUGIN_NAME}/${ARGS_PLUGIN_NAME}_test_dirs.hpp) - configure_file(${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/test/test_dirs.hpp.in ${COMPLEX_TEST_DIRS_HEADER} @ONLY) + set(${ARGS_PLUGIN_NAME}_GENERATED_DIR ${simplnx_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/generated) + set(SIMPLNX_TEST_DIRS_HEADER ${${ARGS_PLUGIN_NAME}_GENERATED_DIR}/${ARGS_PLUGIN_NAME}/${ARGS_PLUGIN_NAME}_test_dirs.hpp) + configure_file(${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/test/test_dirs.hpp.in ${SIMPLNX_TEST_DIRS_HEADER} @ONLY) file(MAKE_DIRECTORY "${${ARGS_PLUGIN_NAME}_BINARY_DIR}/test_output/") #------------------------------------------------------------------------------ # Create the unit test executable add_executable(${UNIT_TEST_TARGET} - ${COMPLEX_TEST_DIRS_HEADER} + ${SIMPLNX_TEST_DIRS_HEADER} ${ARGS_PLUGIN_NAME}_test_main.cpp ${${ARGS_PLUGIN_NAME}UnitTest_SRCS} ) target_link_libraries(${UNIT_TEST_TARGET} PRIVATE - complex + simplnx ${ARGS_PLUGIN_NAME} Catch2::Catch2 - complex::UnitTestCommon + simplnx::UnitTestCommon ) source_group("test" FILES ${${ARGS_PLUGIN_NAME}UnitTest_SRCS} ${ARGS_PLUGIN_NAME}_test_main.cpp) - source_group("Generated" FILES ${COMPLEX_TEST_DIRS_HEADER} ) + source_group("Generated" FILES ${SIMPLNX_TEST_DIRS_HEADER} ) - include(${complex_SOURCE_DIR}/cmake/Utility.cmake) - complex_enable_warnings(TARGET ${UNIT_TEST_TARGET}) + include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) + simplnx_enable_warnings(TARGET ${UNIT_TEST_TARGET}) #------------------------------------------------------------------------------ # Require that the test plugins are built before tests because some tests @@ -375,13 +375,13 @@ function(create_complex_plugin_unit_test) set_target_properties(${UNIT_TEST_TARGET} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY $ + RUNTIME_OUTPUT_DIRECTORY $ FOLDER "Plugins/${ARGS_PLUGIN_NAME}" ) target_compile_definitions(${UNIT_TEST_TARGET} PRIVATE - COMPLEX_BUILD_DIR="$" + SIMPLNX_BUILD_DIR="$" ) target_compile_options(${UNIT_TEST_TARGET} diff --git a/cmake/ComplexVersion.cpp.in b/cmake/SIMPLNXVersion.cpp.in similarity index 99% rename from cmake/ComplexVersion.cpp.in rename to cmake/SIMPLNXVersion.cpp.in index 868f394172..3446b0b21e 100644 --- a/cmake/ComplexVersion.cpp.in +++ b/cmake/SIMPLNXVersion.cpp.in @@ -5,7 +5,7 @@ * edit the original file NOT THIS FILE. * --------------------------------------------------------------------------*/ -#include "ComplexVersion.hpp" +#include "SIMPLNXVersion.hpp" // ----------------------------------------------------------------------------- @GVS_STRING_CLASS@ @VERSION_GEN_NAMESPACE@::Version::ApplicationName() diff --git a/cmake/ComplexVersion.hpp b/cmake/SIMPLNXVersion.hpp similarity index 54% rename from cmake/ComplexVersion.hpp rename to cmake/SIMPLNXVersion.hpp index 4ec8d54e7f..79e09df931 100644 --- a/cmake/ComplexVersion.hpp +++ b/cmake/SIMPLNXVersion.hpp @@ -1,25 +1,25 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex::Version +namespace nx::core::Version { -COMPLEX_EXPORT std::string ApplicationName(); -COMPLEX_EXPORT std::string Complete(); -COMPLEX_EXPORT std::string Major(); -COMPLEX_EXPORT std::string Minor(); -COMPLEX_EXPORT std::string Patch(); -COMPLEX_EXPORT std::string Suffix(); -COMPLEX_EXPORT std::string Package(); -COMPLEX_EXPORT std::string PackageComplete(); -COMPLEX_EXPORT std::string BuildDate(); -COMPLEX_EXPORT std::string GitHashShort(); -COMPLEX_EXPORT std::string GitHash(); - -class COMPLEX_EXPORT AppVersion +SIMPLNX_EXPORT std::string ApplicationName(); +SIMPLNX_EXPORT std::string Complete(); +SIMPLNX_EXPORT std::string Major(); +SIMPLNX_EXPORT std::string Minor(); +SIMPLNX_EXPORT std::string Patch(); +SIMPLNX_EXPORT std::string Suffix(); +SIMPLNX_EXPORT std::string Package(); +SIMPLNX_EXPORT std::string PackageComplete(); +SIMPLNX_EXPORT std::string BuildDate(); +SIMPLNX_EXPORT std::string GitHashShort(); +SIMPLNX_EXPORT std::string GitHash(); + +class SIMPLNX_EXPORT AppVersion { public: AppVersion(); @@ -49,4 +49,4 @@ class COMPLEX_EXPORT AppVersion int m_MinorNum = -1; int m_PatchNum = -1; }; -} // namespace complex::Version +} // namespace nx::core::Version diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 8243950b49..4dc0ef69dc 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -36,15 +36,15 @@ endfunction() #------------------------------------------------------------------------------------ # Print out a Summary Section: -message(STATUS "* ============= COMPLEX Configuration Summary ===============") -set(ALL_PROJECTS complex) +message(STATUS "* =============Configuration Summary ===============") +set(ALL_PROJECTS simplnx) foreach(proj ${ALL_PROJECTS}) # cmpGitRevisionString(PROJECT_NAME ${proj}) get_property(githash GLOBAL PROPERTY ${proj}_GIT_HASH) message(STATUS "* ${proj}: ${${proj}_SOURCE_DIR} Git Hash: ${githash}") endforeach() message(STATUS "* BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -message(STATUS "* COMPLEX: ${complex_VERSION}") +message(STATUS "* COMPLEX: ${simplnx_VERSION}") OSInformation() message(STATUS "* -------------- Dependent Libraries -------------------------------------------") message(STATUS "* Eigen (${Eigen3_VERSION}) ${Eigen3_DIR}") @@ -61,37 +61,37 @@ message(STATUS "* nod (${nod_VERSION}) ${nod_DIR}") message(STATUS "* reproc++ (${reproc_VERSION}) ${reproc++_DIR}") message(STATUS "* -------------- Complex Configuration Options -------------------------------------") -message(STATUS "* COMPLEX_BUILD_TESTS: ${COMPLEX_BUILD_TESTS}") -message(STATUS "* COMPLEX_ENABLE_MULTICORE: ${COMPLEX_ENABLE_MULTICORE}") -message(STATUS "* COMPLEX_ENABLE_COMPRESSORS: ${COMPLEX_ENABLE_COMPRESSORS}") -message(STATUS "* COMPLEX_DOWNLOAD_TEST_FILES: ${COMPLEX_DOWNLOAD_TEST_FILES}") -message(STATUS "* COMPLEX_WRITE_TEST_OUTPUT: ${COMPLEX_WRITE_TEST_OUTPUT}") -message(STATUS "* COMPLEX_ENABLE_LINK_FILESYSTEM: ${COMPLEX_ENABLE_LINK_FILESYSTEM}") -message(STATUS "* COMPLEX_ENABLE_INSTALL: ${COMPLEX_ENABLE_INSTALL}") -message(STATUS "* COMPLEX_ENABLE_PACKAGING: ${COMPLEX_ENABLE_PACKAGING}") -message(STATUS "* COMPLEX_BUILD_DOCS: ${COMPLEX_BUILD_DOCS}") +message(STATUS "* SIMPLNX_BUILD_TESTS: ${SIMPLNX_BUILD_TESTS}") +message(STATUS "* SIMPLNX_ENABLE_MULTICORE: ${SIMPLNX_ENABLE_MULTICORE}") +message(STATUS "* SIMPLNX_ENABLE_COMPRESSORS: ${SIMPLNX_ENABLE_COMPRESSORS}") +message(STATUS "* SIMPLNX_DOWNLOAD_TEST_FILES: ${SIMPLNX_DOWNLOAD_TEST_FILES}") +message(STATUS "* SIMPLNX_WRITE_TEST_OUTPUT: ${SIMPLNX_WRITE_TEST_OUTPUT}") +message(STATUS "* SIMPLNX_ENABLE_LINK_FILESYSTEM: ${SIMPLNX_ENABLE_LINK_FILESYSTEM}") +message(STATUS "* SIMPLNX_ENABLE_INSTALL: ${SIMPLNX_ENABLE_INSTALL}") +message(STATUS "* SIMPLNX_ENABLE_PACKAGING: ${SIMPLNX_ENABLE_PACKAGING}") +message(STATUS "* SIMPLNX_BUILD_DOCS: ${SIMPLNX_BUILD_DOCS}") message(STATUS "* DREAM3D_DATA_DIR: ${DREAM3D_DATA_DIR}") message(STATUS "* -------------- Complex Python Configuration Options -------------------------------------") message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}") -message(STATUS "* COMPLEX_BUILD_PYTHON: ${COMPLEX_BUILD_PYTHON}") -message(STATUS "* COMPLEX_EMBED_PYTHON: ${COMPLEX_EMBED_PYTHON}") -message(STATUS "* COMPLEX_ENABLE_SPHINX_DOCS: ${COMPLEX_ENABLE_SPHINX_DOCS}") -message(STATUS "* COMPLEX_CONDA_BUILD: ${COMPLEX_CONDA_BUILD}") +message(STATUS "* SIMPLNX_BUILD_PYTHON: ${SIMPLNX_BUILD_PYTHON}") +message(STATUS "* SIMPLNX_EMBED_PYTHON: ${SIMPLNX_EMBED_PYTHON}") +message(STATUS "* SIMPLNX_ENABLE_SPHINX_DOCS: ${SIMPLNX_ENABLE_SPHINX_DOCS}") +message(STATUS "* SIMPLNX_CONDA_BUILD: ${SIMPLNX_CONDA_BUILD}") # message(STATUS "* -------------- Known Plugins ------------------------------------------------------") -# foreach(plugin ${COMPLEX_PLUGIN_LIST}) -# message(STATUS "* COMPLEX_PLUGIN_ENABLE_${plugin}: ${COMPLEX_PLUGIN_ENABLE_${plugin}}") +# foreach(plugin ${SIMPLNX_PLUGIN_LIST}) +# message(STATUS "* SIMPLNX_PLUGIN_ENABLE_${plugin}: ${SIMPLNX_PLUGIN_ENABLE_${plugin}}") # endforeach() message(STATUS "* -------------- Plugins ------------------------------------------------------") -get_property(ComplexPluginTargets GLOBAL PROPERTY ComplexPluginTargets) -foreach(d3dPlugin ${COMPLEX_PLUGIN_LIST}) +get_property(simplnxPluginTargets GLOBAL PROPERTY simplnxPluginTargets) +foreach(d3dPlugin ${SIMPLNX_PLUGIN_LIST}) get_property(PluginNumFilters GLOBAL PROPERTY ${d3dPlugin}_filter_count) get_property(PluginGitHash GLOBAL PROPERTY ${d3dPlugin}_GIT_HASH) get_property(PluginCommitDate GLOBAL PROPERTY ${d3dPlugin}_GIT_COMMIT_DATE) get_property(PluginDocsEnabled GLOBAL PROPERTY ${d3dPlugin}_docs_enabled) - message(STATUS "* ${d3dPlugin}: [${COMPLEX_PLUGIN_ENABLE_${d3dPlugin}}] ${PluginNumFilters} Filters") + message(STATUS "* ${d3dPlugin}: [${SIMPLNX_PLUGIN_ENABLE_${d3dPlugin}}] ${PluginNumFilters} Filters") endforeach() diff --git a/cmake/Utility.cmake b/cmake/Utility.cmake index e3eeb42f2c..4b86bfc06e 100644 --- a/cmake/Utility.cmake +++ b/cmake/Utility.cmake @@ -38,14 +38,14 @@ endfunction() #------------------------------------------------------------------------------ # #------------------------------------------------------------------------------ -function(complex_enable_warnings) +function(simplnx_enable_warnings) set(optionsArgs) set(oneValueArgs TARGET) set(multiValueArgs) cmake_parse_arguments(ARG "${optionsArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(NOT TARGET ${ARG_TARGET}) - message(FATAL_ERROR "complex_enable_warnings must be called with the argument TARGET set to a valid target") + message(FATAL_ERROR "simplnx_enable_warnings must be called with the argument TARGET set to a valid target") endif() if(MSVC) @@ -97,14 +97,14 @@ function(download_test_data) set(multiValueArgs FILES) cmake_parse_arguments(ARGS "${optionsArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(NOT COMPLEX_DOWNLOAD_TEST_FILES) + if(NOT SIMPLNX_DOWNLOAD_TEST_FILES) return() endif() get_property(FETCH_FILE_PATH GLOBAL PROPERTY FETCH_FILE_PATH) get_filename_component(archive_base_name ${ARGS_ARCHIVE_NAME} NAME_WE) - file(TO_CMAKE_PATH "${complex_BINARY_DIR}/TestFiles" test_files_dir) + file(TO_CMAKE_PATH "${simplnx_BINARY_DIR}/TestFiles" test_files_dir) file(TO_CMAKE_PATH "${ARGS_DREAM3D_DATA_DIR}" ARGS_DREAM3D_DATA_DIR) #---------------------------------------------------------------------------- # Create the custom CMake File for this archive file @@ -121,7 +121,7 @@ function(download_test_data) # Strip off the .tar.gz extension string(REPLACE ".tar.gz" "" ARCHIVE_BASE_NAME "${ARGS_ARCHIVE_NAME}") - configure_file(${complex_SOURCE_DIR}/cmake/FetchDataFile.cmake.in + configure_file(${simplnx_SOURCE_DIR}/cmake/FetchDataFile.cmake.in ${fetch_data_file} @ONLY ) @@ -132,7 +132,7 @@ function(download_test_data) file(REMOVE "${fetch_data_file}") # Remove the temporary file if(ARGS_COPY_DATA) - configure_file(${complex_SOURCE_DIR}/cmake/CopyDataFile.cmake.in + configure_file(${simplnx_SOURCE_DIR}/cmake/CopyDataFile.cmake.in ${fetch_data_file} @ONLY ) @@ -150,7 +150,7 @@ function(download_test_data) if(ARGS_INSTALL) # If we did NOT already copy the data, then do that now during the build if(NOT ARGS_COPY_DATA) - configure_file(${complex_SOURCE_DIR}/cmake/CopyDataFile.cmake.in + configure_file(${simplnx_SOURCE_DIR}/cmake/CopyDataFile.cmake.in ${fetch_data_file} @ONLY ) @@ -213,14 +213,14 @@ function(create_data_copy_rules) ${ARGS_DREAM3D_DATA_DIR}/Data/Models ) - set(COMPLEX_DATA_INSTALL_DIR "Data") + set(SIMPLNX_DATA_INSTALL_DIR "Data") # NOTE: If we are creating an Anaconda install the install directory WILL be different foreach(data_dir ${DREAM3D_DATA_DIRECTORIES}) if(EXISTS ${data_dir}) install(DIRECTORY ${data_dir} - DESTINATION ${COMPLEX_DATA_INSTALL_DIR} + DESTINATION ${SIMPLNX_DATA_INSTALL_DIR} COMPONENT Applications ) endif() diff --git a/cmake/complex_export_extra.hpp b/cmake/complex_export_extra.hpp deleted file mode 100644 index 381b3e0703..0000000000 --- a/cmake/complex_export_extra.hpp +++ /dev/null @@ -1,6 +0,0 @@ - -#if defined(_MSC_VER) || defined(__APPLE__) -#define COMPLEX_TEMPLATE_EXPORT COMPLEX_EXPORT -#else -#define COMPLEX_TEMPLATE_EXPORT -#endif diff --git a/cmake/plugin_filter_registration.h.in b/cmake/plugin_filter_registration.h.in index f891b38fe8..d586d6a74f 100644 --- a/cmake/plugin_filter_registration.h.in +++ b/cmake/plugin_filter_registration.h.in @@ -3,7 +3,7 @@ * @CMAKE_CURRENT_LIST_FILE@ */ -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/IFilter.hpp" @Filter_Registration_Include_String@ @@ -12,9 +12,9 @@ namespace { -std::vector GetPluginFilterList() +std::vector GetPluginFilterList() { - std::vector filters; + std::vector filters; @Public_Filter_Registration_Code@ return filters; } diff --git a/cmake/complexConfig.cmake.in b/cmake/simplnxConfig.cmake.in similarity index 73% rename from cmake/complexConfig.cmake.in rename to cmake/simplnxConfig.cmake.in index c30a2ab743..b11db71035 100644 --- a/cmake/complexConfig.cmake.in +++ b/cmake/simplnxConfig.cmake.in @@ -6,6 +6,6 @@ find_dependency(fmt @fmt_VERSION@ EXACT CONFIG REQUIRED) find_dependency(nlohmann_json @nlohmann_json_VERSION@ EXACT CONFIG REQUIRED) find_dependency(expected-lite @expected-lite_VERSION@ EXACT CONFIG REQUIRED) -include("${CMAKE_CURRENT_LIST_DIR}/complexTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/simplnxTargets.cmake") -check_required_components(complex) +check_required_components(simplnx) diff --git a/cmake/simplnx_export_extra.hpp b/cmake/simplnx_export_extra.hpp new file mode 100644 index 0000000000..795da6d377 --- /dev/null +++ b/cmake/simplnx_export_extra.hpp @@ -0,0 +1,6 @@ + +#if defined(_MSC_VER) || defined(__APPLE__) +#define SIMPLNX_TEMPLATE_EXPORT SIMPLNX_EXPORT +#else +#define SIMPLNX_TEMPLATE_EXPORT +#endif diff --git a/conda/bld.bat b/conda/bld.bat index 7afdf68ba7..f1c2979375 100644 --- a/conda/bld.bat +++ b/conda/bld.bat @@ -1,7 +1,7 @@ :: **************************************************************************** :: This script file builds the necessary dependencies that are not found as :: part of a python environment but are needed to ultimately build the -:: complex python bindings. +:: simplnx python bindings. :: **************************************************************************** mkdir sdk @@ -151,13 +151,13 @@ if errorlevel 1 exit 1 cd .. :: **************************************************************************** -:: Build the complex library +:: Build the simplnx library :: **************************************************************************** mkdir build cd build -cmake --preset conda-win ../complex +cmake --preset conda-win ../simplnx if errorlevel 1 exit 1 cmake --build . --target all diff --git a/conda/build.sh b/conda/build.sh index 57067b5d5d..a0c2a68639 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -108,12 +108,12 @@ cmake --build . --target install cd .. -# "complex" +# "simplnx" mkdir build cd build -cmake --preset $COMPLEX_CMAKE_PRESET ../complex $CMAKE_ARGS -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0" +cmake --preset $SIMPLNX_CMAKE_PRESET ../simplnx $CMAKE_ARGS -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0" cmake --build . --target all diff --git a/conda/meta.yaml b/conda/meta.yaml index 35af5d184e..c95f3071e0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,4 +1,4 @@ -{% set name = "complex" %} +{% set name = "simplnx" %} {% set version = "1.2.1" %} package: @@ -7,7 +7,7 @@ package: source: - path: ../ - folder: complex + folder: simplnx - git_url: https://github.com/BlueQuartzSoftware/EbsdLib git_rev: v1.0.26 folder: EbsdLib @@ -23,14 +23,14 @@ source: - git_url: https://github.com/martinmoene/span-lite git_rev: v0.10.3 folder: span-lite - - url: https://raw.githubusercontent.com/BlueQuartzSoftware/complex-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt + - url: https://raw.githubusercontent.com/BlueQuartzSoftware/simplnx-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt folder: nod build: number: 0 script_env: - - COMPLEX_CMAKE_PRESET=conda-linux # [linux] - - COMPLEX_CMAKE_PRESET=conda-osx # [osx] + - SIMPLNX_CMAKE_PRESET=conda-linux # [linux] + - SIMPLNX_CMAKE_PRESET=conda-osx # [osx] requirements: build: @@ -70,9 +70,9 @@ requirements: test: imports: - - complex + - simplnx about: - home: http://dream3d.bluequartz.net/ + home: https://www.dream3d.io/ license: BSD - summary: DREAM.3D consists of data analysis tools (Filters) that allow for the construction of customized workflows (Pipelines) to analyze data. + summary: DREAM3D-NX consists of data analysis tools (Filters) that allow for the construction of customized workflows (Pipelines) to analyze data. diff --git a/conda/recipe.yaml b/conda/recipe.yaml index 78c9c5a7e6..0a355947b6 100644 --- a/conda/recipe.yaml +++ b/conda/recipe.yaml @@ -1,6 +1,6 @@ context: version: "1.2.1" - name: complex + name: simplnx package: name: "{{ name }}" @@ -8,7 +8,7 @@ package: source: - path: ../ - folder: complex + folder: simplnx - git_url: https://github.com/BlueQuartzSoftware/EbsdLib git_rev: v1.0.26 folder: EbsdLib @@ -24,16 +24,16 @@ source: - git_url: https://github.com/martinmoene/span-lite git_rev: v0.10.3 folder: span-lite - - url: https://raw.githubusercontent.com/BlueQuartzSoftware/complex-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt + - url: https://raw.githubusercontent.com/bluequartzsoftware/simplnx-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt folder: nod build: number: 0 script_env: sel(linux): - COMPLEX_CMAKE_PRESET: "conda-linux" + SIMPLNX_CMAKE_PRESET: "conda-linux" sel(osx): - COMPLEX_CMAKE_PRESET: "conda-osx" + SIMPLNX_CMAKE_PRESET: "conda-osx" requirements: build: @@ -73,7 +73,7 @@ requirements: test: imports: - - complex + - simplnx about: home: http://dream3d.bluequartz.net/ diff --git a/docs/Build_From_Source.md b/docs/Build_From_Source.md index 2ca7eee45d..5b256d2916 100644 --- a/docs/Build_From_Source.md +++ b/docs/Build_From_Source.md @@ -22,7 +22,7 @@ ## Prerequisites ## -In order to compile `complex` you will need a C++17 compiler suite installed on your computer. +In order to compile `simplnx` you will need a C++17 compiler suite installed on your computer. + Compiler + Windows Visual Studio 2019 v142 toolset @@ -31,7 +31,7 @@ In order to compile `complex` you will need a C++17 compiler suite installed on ## Install vcpkg ## -The `complex` project uses the [vcpkg](https://www.github.com/microsoft/vcpkg) to manage it's dependent libraries. If this is not already installed on your system then you will need to download and compile it. +The `simplnx` project uses the [vcpkg](https://www.github.com/microsoft/vcpkg) to manage it's dependent libraries. If this is not already installed on your system then you will need to download and compile it. ### Windows ### @@ -46,31 +46,31 @@ The `bootstrap-vcpkg.bat` file should be run automatically by CMake the first ti ## Clone Appropriate Repositories ## -Within the folder DREAM3D-Dev clone both the `complex` and `DREAM3D_Data` repositories. The `DREAM3D_Data` repo is optional but does contain testing data. +Within the folder DREAM3D-Dev clone both the `simplnx` and `DREAM3D_Data` repositories. The `DREAM3D_Data` repo is optional but does contain testing data. -Create a location to keep the `complex` repositories and make builds. You can do either in-source our out-of-source builds. +Create a location to keep the `simplnx` repositories and make builds. You can do either in-source our out-of-source builds. ```shell -git clone --recursive https://github.com/bluequartzsoftware/complex +git clone --recursive https://github.com/bluequartzsoftware/simplnx ``` -## Configure complex with CMake ## +## Configure simplnx with CMake ## For this example we are going to do an "in-source" build. By default git will ignore some basic names for build directories such as `Debug, Release, x64`. CMake can generate lots of project files from ninja, to nmake to Visual Studio. For this example we are going to use the `ninja` generator so we will need to keep the Debug and Release builds separated. -The first time `complex` is configured with CMake, VCPKG will download, build and install the needed dependent libraries. This can take a few minutes so be patient. After `complex` is configured you can build it using your IDE (Visual Studio) or ninja (QtCreator, CLion) or cmake itself. +The first time `simplnx` is configured with CMake, VCPKG will download, build and install the needed dependent libraries. This can take a few minutes so be patient. After `simplnx` is configured you can build it using your IDE (Visual Studio) or ninja (QtCreator, CLion) or cmake itself. ### Windows with Visual Studio IDE ### -This example shows how to configure complex to build using Visual Studio IDE +This example shows how to configure simplnx to build using Visual Studio IDE ```shell set BUILD_DIR=VisualStudio set VCPKG_INSTALL_ROOT=C:/Appications/vcpkg -cd complex +cd simplnx mkdir %BUILD_DIR% cd %BUILD_DIR% -cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALL_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=%BUILD_DIR% -DVCPKG_MANIFEST_FEATURES="tests;parallel" -DDREAM3D_Data_Dir=../../DREAM3D_Data ../complex +cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALL_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=%BUILD_DIR% -DVCPKG_MANIFEST_FEATURES="tests;parallel" -DDREAM3D_Data_Dir=../../DREAM3D_Data ../simplnx ``` ### Windows with Ninja and IDE of choice (QtCreator, CLion, command line) ### @@ -84,10 +84,10 @@ set NINJA_INSTALL=C:/Applications/ninja-win set PATH=%PATH%:%NINJA_INSTALL% set BUILD_DIR=Release set VCPKG_INSTALL_ROOT=C:/Appications/vcpkg -cd complex +cd simplnx mkdir %BUILD_DIR% cd %BUILD_DIR% -cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALL_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=%BUILD_DIR% -DVCPKG_MANIFEST_FEATURES="tests;parallel" -DDREAM3D_Data_Dir=../../DREAM3D_Data ../complex +cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALL_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=%BUILD_DIR% -DVCPKG_MANIFEST_FEATURES="tests;parallel" -DDREAM3D_Data_Dir=../../DREAM3D_Data ../simplnx ``` ### macOS ARM64/M1 Compile and IDE of choice (QtCreator, CLion, command line) ### @@ -101,10 +101,10 @@ export VCPKG_INSTALL_ROOT=/opt/local/vcpkg export VCPKG_TARGET_TRIPLET=arm64-osx-dynamic # This is used for Intel x64 export VCPKG_TARGET_TRIPLET=x64-osx-dynamic -cd complex +cd simplnx mkdir $BUILD_DIR cd $BUILD_DIR -cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALL_ROOT/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=$BUILD_DIR -DVCPKG_MANIFEST_FEATURES="tests;parallel" -DDREAM3D_DATA_DIR=$HOME/Workspace1/DREAM3D_Data -DVCPKG_TARGET_TRIPLET:STRING=$VCPKG_TARGET_TRIPLET ../complex +cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALL_ROOT/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=$BUILD_DIR -DVCPKG_MANIFEST_FEATURES="tests;parallel" -DDREAM3D_DATA_DIR=$HOME/Workspace1/DREAM3D_Data -DVCPKG_TARGET_TRIPLET:STRING=$VCPKG_TARGET_TRIPLET ../simplnx ``` ## Required CMake Arguments ## @@ -122,22 +122,22 @@ cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALL_ROOT/scripts/buildsystems/v ## Adding Plugins ## -By default the **only** plugin that is compiled is the `ComplexCore` plugin. If you would like to build any of the additional plugins you can provide additional arguments to the configuration command. **NOTE** For the `COMPLEX_EXTRA_PLUGINS` CMake argument, if you have multiple plugins separate each with a `;` character (which is why we double quote the value for the COMPLEX_EXTRA_PLUGINS variable.) +By default the **only** plugin that is compiled is the `SimplnxCore` plugin. If you would like to build any of the additional plugins you can provide additional arguments to the configuration command. **NOTE** For the `SIMPLNX_EXTRA_PLUGINS` CMake argument, if you have multiple plugins separate each with a `;` character (which is why we double quote the value for the SIMPLNX_EXTRA_PLUGINS variable.) ### ITKImageProcessing ### -This plugin gives complex access to the ability to read/write images and use the **ITK** library to process images. +This plugin gives simplnx access to the ability to read/write images and use the **ITK** library to process images. There are 2 arguments that need to be added to the CMake configuration command -+ `-DCOMPLEX_EXTRA_PLUGINS="ITKImageProcessing"` ++ `-DSIMPLNX_EXTRA_PLUGINS="ITKImageProcessing"` + `-DVCPKG_MANIFEST_FEATURES="tests;parallel;itk"` ### OrientationAnalysis ### -This plugin gives complex the ability to process typical EBSD style of data. +This plugin gives simplnx the ability to process typical EBSD style of data. -+ `-DCOMPLEX_EXTRA_PLUGINS="OrientationAnalysis"` ++ `-DSIMPLNX_EXTRA_PLUGINS="OrientationAnalysis"` + `-DVCPKG_MANIFEST_FEATURES="tests;parallel;ebsd"` ## VCPKG Options ## @@ -162,16 +162,16 @@ Complex and its plugins require test files to be able to perform the unit tests. The developer can also turn off the downloading of any test data with the following: -+ `-DCOMPLEX_DOWNLOAD_TEST_FILES=OFF` ++ `-DSIMPLNX_DOWNLOAD_TEST_FILES=OFF` ## Python Bindings ## -Python bindings are available for complex. To install them, please use an Anaconda virtual environment like the following: +Python bindings are available for simplnx. To install them, please use an Anaconda virtual environment like the following: ```shell conda config --add channels conda-forge conda config --set channel_priority strict conda create -n cxpython python=3.8 conda activate cxpython -conda install -c bluequartzsoftware complex +conda install -c bluequartzsoftware simplnx ``` diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 86190e6cbf..3120261ef9 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,15 +1,15 @@ -option(COMPLEX_BUILD_SPHINX_DOCS "Use Sphinx to build COMPLEX documentation" OFF) +option(SIMPLNX_BUILD_SPHINX_DOCS "Use Sphinx to builddocumentation" OFF) find_package(Doxygen REQUIRED) -set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/src/complex) +set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/src/simplnx) set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/docs/doxygen) set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html) set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in) set(DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) set(DOXYGEN_STRIP_PATH ${PROJECT_SOURCE_DIR}/src) -if(COMPLEX_BUILD_SPHINX_DOCS) +if(SIMPLNX_BUILD_SPHINX_DOCS) set(DOXYGEN_GENERATE_XML YES) else() set(DOXYGEN_GENERATE_XML NO) @@ -20,35 +20,35 @@ configure_file(${DOXYFILE_IN} ${DOXYFILE_OUT} @ONLY) file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR}) add_custom_command(OUTPUT ${DOXYGEN_INDEX_FILE} - DEPENDS ${COMPLEX_HDRS} + DEPENDS ${SIMPLNX_HDRS} COMMAND Doxygen::doxygen ${DOXYFILE_OUT} MAIN_DEPENDENCY ${DOXYFILE_IN} ${DOXYFILE_OUT} COMMENT "Generating ${PROJECT_NAME} docs with Doxygen" VERBATIM ) -option(COMPLEX_DOXYGEN_EXCLUDE_FROM_ALL "Exclude the Doxygen generation from the default target" OFF) -mark_as_advanced(COMPLEX_DOXYGEN_EXCLUDE_FROM_ALL) +option(SIMPLNX_DOXYGEN_EXCLUDE_FROM_ALL "Exclude the Doxygen generation from the default target" OFF) +mark_as_advanced(SIMPLNX_DOXYGEN_EXCLUDE_FROM_ALL) -if(COMPLEX_SPHINX_EXCLUDE_FROM_ALL) +if(SIMPLNX_SPHINX_EXCLUDE_FROM_ALL) set(doxygen_default) else() set(doxygen_default ALL) endif() -add_custom_target(complex_doxygen ${doxygen_default} DEPENDS ${DOXYGEN_INDEX_FILE}) +add_custom_target(simplnx_doxygen ${doxygen_default} DEPENDS ${DOXYGEN_INDEX_FILE}) -option(COMPLEX_INSTALL_DOXYGEN_DOCS "Enable install for COMPLEX Doxygen docs" OFF) +option(SIMPLNX_INSTALL_DOXYGEN_DOCS "Enable install forDoxygen docs" OFF) include(GNUInstallDirs) -if(COMPLEX_INSTALL_DOXYGEN_DOCS) +if(SIMPLNX_INSTALL_DOXYGEN_DOCS) install(DIRECTORY ${DOXYGEN_OUTPUT_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} ) endif() -if(COMPLEX_BUILD_SPHINX_DOCS) +if(SIMPLNX_BUILD_SPHINX_DOCS) find_package(Sphinx REQUIRED) set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}) @@ -70,19 +70,19 @@ if(COMPLEX_BUILD_SPHINX_DOCS) VERBATIM ) - option(COMPLEX_SPHINX_EXCLUDE_FROM_ALL "Exclude the Sphinx generation from the default target" OFF) - mark_as_advanced(COMPLEX_SPHINX_EXCLUDE_FROM_ALL) + option(SIMPLNX_SPHINX_EXCLUDE_FROM_ALL "Exclude the Sphinx generation from the default target" OFF) + mark_as_advanced(SIMPLNX_SPHINX_EXCLUDE_FROM_ALL) - if(COMPLEX_SPHINX_EXCLUDE_FROM_ALL) + if(SIMPLNX_SPHINX_EXCLUDE_FROM_ALL) set(sphinx_default) else() set(sphinx_default ALL) endif() - add_custom_target(complex_sphinx ${sphinx_default} DEPENDS ${SPHINX_INDEX_FILE}) + add_custom_target(simplnx_sphinx ${sphinx_default} DEPENDS ${SPHINX_INDEX_FILE}) - option(COMPLEX_INSTALL_SPHINX_DOCS "Enable install for COMPLEX Sphinx docs" OFF) - if(COMPLEX_INSTALL_SPHINX_DOCS) + option(SIMPLNX_INSTALL_SPHINX_DOCS "Enable install forSphinx docs" OFF) + if(SIMPLNX_INSTALL_SPHINX_DOCS) install(DIRECTORY ${SPHINX_BUILD} DESTINATION ${CMAKE_INSTALL_DOCDIR} ) diff --git a/docs/Code_Style_Guide.md b/docs/Code_Style_Guide.md index 75a75ea82d..e820f5f48e 100644 --- a/docs/Code_Style_Guide.md +++ b/docs/Code_Style_Guide.md @@ -1,6 +1,6 @@ # Code Style Guide -This is the style guide for the COMPLEX library. When contributing sources to the complex repository we ask that all contributions follow this style guide. These general rules have been developed over the years in an effort to allow efficient coding practices. +This is the style guide for the COMPLEX library. When contributing sources to the simplnx repository we ask that all contributions follow this style guide. These general rules have been developed over the years in an effort to allow efficient coding practices. ## Source Code Line Endings @@ -105,4 +105,4 @@ Using this type of approach allows for quicker code updates when constant values ## Clang Formatting -`clang-format` is a tool to automatically format C++ code. You should run 'clang-format' on your code before opening a Pull Request to make sure it passes the *clang-format pr* check. You can install `clang-format` and `git-clang-format` with `npm install -g clang-format`. To automatically format a file according to a project's C++ code style, run `clang-format -i path/to/complex/file`, which is supported on macOS/Linux/Windows. If you want to run `clang-format` on all the changed code on your latest git commit (HEAD), you can run `git-clang-format HEAD~1`. Run `git-clang-format -h` for extra help. +`clang-format` is a tool to automatically format C++ code. You should run 'clang-format' on your code before opening a Pull Request to make sure it passes the *clang-format pr* check. You can install `clang-format` and `git-clang-format` with `npm install -g clang-format`. To automatically format a file according to a project's C++ code style, run `clang-format -i path/to/simplnx/file`, which is supported on macOS/Linux/Windows. If you want to run `clang-format` on all the changed code on your latest git commit (HEAD), you can run `git-clang-format HEAD~1`. Run `git-clang-format -h` for extra help. diff --git a/docs/Porting_Filters.md b/docs/Porting_Filters.md index 88d2cf12f1..31546a0057 100644 --- a/docs/Porting_Filters.md +++ b/docs/Porting_Filters.md @@ -28,13 +28,13 @@ static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type"; SIMPL ```cpp - setErrorCondition(complex::StlConstants::k_ErrorOpeningFile, "Error opening STL file"); + setErrorCondition(nx::core::StlConstants::k_ErrorOpeningFile, "Error opening STL file"); ``` COMPLEX ```cpp - Result<> result = MakeErrorResult(complex::StlConstants::k_ErrorOpeningFile, "Error opening STL file") + Result<> result = MakeErrorResult(nx::core::StlConstants::k_ErrorOpeningFile, "Error opening STL file") ``` then you can optionally return the `result` variable if needed @@ -45,7 +45,7 @@ There are some substitutions for the QString operations. See [https://en.cppreference.com/w/cpp/string/basic_string](https://en.cppreference.com/w/cpp/string/basic_string) for more information about std::string -There is a file `complex/Utilities/StringUtilities.hpp` that has some QString functionality that is needed. +There is a file `simplnx/Utilities/StringUtilities.hpp` that has some QString functionality that is needed. ## Getting a Geometry from the DataStructure @@ -152,7 +152,7 @@ of how to perform this transfer of data. There are several classes that can be used to help the developer write parallel algorithms. -`complex/Utilities/ParallelAlgorithm` and `complex/Utilties/ParallelTaskAlgorithm` are the two main classes depending +`simplnx/Utilities/ParallelAlgorithm` and `simplnx/Utilties/ParallelTaskAlgorithm` are the two main classes depending on the situation. `AlignSections.cpp` and `CropImageGeoemtry.cpp` both use a task based parallelism. `RotateSampleRefFrameFilter.cpp` shows an example of using ParallelData3DAlgorithm. @@ -160,13 +160,13 @@ of using ParallelData3DAlgorithm. ## Constants for Pi and Others ```cpp - #include "complex/Common/Numbers.hpp" + #include "simplnx/Common/Numbers.hpp" ``` and use it this way: ```cpp - double foo = complex::numbers::k_180OverPi * 232.0; + double foo = nx::core::numbers::k_180OverPi * 232.0; ``` ## MessageHandler @@ -204,7 +204,7 @@ You have code that does this: EXECUTE_FUNCTION_TEMPLATE(this, Detail::ExecuteTemplate, m_InArrayPtr.lock(), this, m_InArrayPtr.lock()); ``` -and now you are porting that to `complex`. The old `Detail::ExecuteTemplate` needs to be converted into a "struct" based +and now you are porting that to `simplnx`. The old `Detail::ExecuteTemplate` needs to be converted into a "struct" based functor like the following: ```cpp diff --git a/docs/conf.py b/docs/conf.py index e208bb9108..791bb15b05 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -17,7 +17,7 @@ # -- Project information ----------------------------------------------------- -project = 'complex' +project = 'simplnx' copyright = '2021, BlueQuartz Software' author = 'BlueQuartz Software' @@ -53,4 +53,4 @@ html_static_path = ['_static'] # Breathe Configuration -breathe_default_project = 'complex' +breathe_default_project = 'simplnx' diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline index 5b3132acea..6920e3b55d 100644 --- a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline +++ b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -76,7 +76,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -102,7 +102,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -123,7 +123,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -138,7 +138,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -152,7 +152,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -173,7 +173,7 @@ }, "comments": "", "filter": { - "name": "complex::CAxisSegmentFeaturesFilter", + "name": "simplnx::CAxisSegmentFeaturesFilter", "uuid": "9fe07e17-aef1-4bf1-834c-d3a73dafc27d" }, "isDisabled": false @@ -189,7 +189,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgCAxesFilter", + "name": "simplnx::FindAvgCAxesFilter", "uuid": "453cdb58-7bbb-4576-ad5e-f75a1c54d348" }, "isDisabled": false @@ -208,7 +208,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureReferenceCAxisMisorientationsFilter", + "name": "simplnx::FindFeatureReferenceCAxisMisorientationsFilter", "uuid": "16c487d2-8f99-4fb5-a4df-d3f70a8e6b25" }, "isDisabled": false @@ -222,7 +222,7 @@ }, "comments": "", "filter": { - "name": "complex::FindCAxisLocationsFilter", + "name": "simplnx::FindCAxisLocationsFilter", "uuid": "a51c257a-ddc1-499a-9b21-f2d25a19d098" }, "isDisabled": false @@ -268,7 +268,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateColorTableFilter", + "name": "simplnx::GenerateColorTableFilter", "uuid": "d1731177-4d70-41c0-9334-566a0b482796" }, "isDisabled": false @@ -294,7 +294,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -310,7 +310,7 @@ }, "comments": "", "filter": { - "name": "complex::ConditionalSetValue", + "name": "simplnx::ConditionalSetValue", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -325,7 +325,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -339,7 +339,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -356,7 +356,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -376,7 +376,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -393,7 +393,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureNeighborCAxisMisalignmentsFilter", + "name": "simplnx::FindFeatureNeighborCAxisMisalignmentsFilter", "uuid": "636ee030-9f07-4f16-a4f3-592eff8ef1ee" }, "isDisabled": false @@ -405,7 +405,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/pipelines/PorosityAnalysis.d3dpipeline b/pipelines/PorosityAnalysis.d3dpipeline index be39249a71..ec3d8ee1d3 100644 --- a/pipelines/PorosityAnalysis.d3dpipeline +++ b/pipelines/PorosityAnalysis.d3dpipeline @@ -33,7 +33,7 @@ }, "comments": "This example pipeline shows how to read in a 3D stack of images, segment them and perform some basic size statistics on the segmented features. Since this data set is from an image there is no phase data which is created in a filter and phase data is also generated during the pipeline. Note the technique for accomplishing this as it is handy to do for other pipelines.", "filter": { - "name": "complex::ITKImportImageStack", + "name": "simplnx::ITKImportImageStack", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -78,7 +78,7 @@ }, "comments": "", "filter": { - "name": "complex::ScalarSegmentFeaturesFilter", + "name": "simplnx::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false @@ -95,7 +95,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -108,7 +108,7 @@ }, "comments": "", "filter": { - "name": "complex::CopyFeatureArrayToElementArray", + "name": "simplnx::CopyFeatureArrayToElementArray", "uuid": "4c8c976a-993d-438b-bd8e-99f71114b9a1" }, "isDisabled": false @@ -129,7 +129,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -144,7 +144,7 @@ }, "comments": "", "filter": { - "name": "complex::ConditionalSetValue", + "name": "simplnx::ConditionalSetValue", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -158,7 +158,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -172,7 +172,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -198,7 +198,7 @@ }, "comments": "We only need the phase names array for this ensemble data so we will be immediately deleting the crystal structures and phase types arrays after this filter.", "filter": { - "name": "complex::CreateEnsembleInfoFilter", + "name": "simplnx::CreateEnsembleInfoFilter", "uuid": "8ce3d70c-49fe-4812-a1eb-7ce4c962a59d" }, "isDisabled": false @@ -212,7 +212,7 @@ }, "comments": "", "filter": { - "name": "complex::DeleteData", + "name": "simplnx::DeleteData", "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" }, "isDisabled": false @@ -236,7 +236,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureClusteringFilter", + "name": "simplnx::FindFeatureClusteringFilter", "uuid": "d6e01678-3a03-433f-89ad-4e9adf1f9a45" }, "isDisabled": false @@ -248,7 +248,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/scripts/filter.cpp.in b/scripts/filter.cpp.in index 648bf258ff..be68121a82 100644 --- a/scripts/filter.cpp.in +++ b/scripts/filter.cpp.in @@ -1,11 +1,11 @@ #include "@FILTER_NAME@.hpp" -//#include "complex/Common/StringLiteral.hpp" +//#include "simplnx/Common/StringLiteral.hpp" // INSERT YOUR PARAMETER HEADERS -//#include "complex/Parameters/BoolParameter.hpp" -//#include "complex/Parameters/NumberParameter.hpp" +//#include "simplnx/Parameters/BoolParameter.hpp" +//#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -14,7 +14,7 @@ namespace // constexpr StringLiteral k_Param2Key = "param2"; } // namespace -namespace complex +namespace nx::core { std::string @FILTER_NAME@::name() const { @@ -67,4 +67,4 @@ Result<> @FILTER_NAME@::executeImpl(DataStructure& data, const Arguments& args) return {}; } -} // namespace complex +} // namespace nx::core diff --git a/scripts/filter.hpp.in b/scripts/filter.hpp.in index e615d7df4e..7ab4a4d810 100644 --- a/scripts/filter.hpp.in +++ b/scripts/filter.hpp.in @@ -1,12 +1,12 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT @FILTER_NAME@ : public IFilter +class SIMPLNX_EXPORT @FILTER_NAME@ : public IFilter { public: @FILTER_NAME@() = default; @@ -65,6 +65,6 @@ protected: */ Result<> executeImpl(DataStructure& data, const Arguments& args) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, @FILTER_NAME@, "@UUID@"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, @FILTER_NAME@, "@UUID@"); diff --git a/scripts/generate_simpl_conversion_code.py b/scripts/generate_simpl_conversion_code.py index bef2de7195..6c84272fe6 100644 --- a/scripts/generate_simpl_conversion_code.py +++ b/scripts/generate_simpl_conversion_code.py @@ -54,7 +54,7 @@ def create_filter_conversion(simpl_filter: SIMPLFilterInfo, complex_filter_name: for param in simpl_filter.parameters: if param.type == SEPERATOR_PARAMETER_TYPE: continue - converter_code.append(f' results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_{param.name}Key, "@COMPLEX_PARAMETER_KEY@"));\n') + converter_code.append(f' results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_{param.name}Key, "@SIMPLNX_PARAMETER_KEY@"));\n') converter_code.append('\n') converter_code.append(' Result<> conversionResult = MergeResults(std::move(results));\n') @@ -67,7 +67,7 @@ def create_filter_conversion(simpl_filter: SIMPLFilterInfo, complex_filter_name: def create_includes() -> List[str]: lines: List[str] = [] lines.append('\n') - lines.append('#include "complex/Utilities/SIMPLConversion.hpp"\n') + lines.append('#include "simplnx/Utilities/SIMPLConversion.hpp"\n') lines.append('\n') return lines @@ -75,7 +75,7 @@ def create_function_decl() -> List[str]: lines: List[str] = [] lines.append('\n') lines.append(' /**\n') - lines.append(' * @brief Reads SIMPL json and converts it complex Arguments.\n') + lines.append(' * @brief Reads SIMPL json and converts it simplnx Arguments.\n') lines.append(' * @param json\n') lines.append(' * @return Result\n') lines.append(' */\n') @@ -106,18 +106,18 @@ def find_mapping_line(lines: List[str], simpl_uuid: str) -> int: def read_mapping_file(filepath: Path) -> Dict[str, str]: with open(filepath, 'r') as file: file_content = file.read() - matches = re.findall(r'{complex::Uuid::FromString\("(.*?)"\).value\(\), {complex::FilterTraits<(.*?)>::uuid, {}}},', file_content) + matches = re.findall(r'{nx::core::Uuid::FromString\("(.*?)"\).value\(\), {nx::core::FilterTraits<(.*?)>::uuid, {}}},', file_content) return dict(matches) def get_plugin_mapping_file_path_from_plugin_dir(plugin_dir: Path, plugin_name: str) -> Path: return plugin_dir / f'src/{plugin_name}/{plugin_name}LegacyUUIDMapping.hpp' -def get_plugin_mapping_file_path_from_root_dir(complex_source_dir: Path, plugin_name: str) -> Path: - return get_plugin_mapping_file_path_from_plugin_dir(complex_source_dir / f'src/Plugins/{plugin_name}', plugin_name) +def get_plugin_mapping_file_path_from_root_dir(simplnx_source_dir: Path, plugin_name: str) -> Path: + return get_plugin_mapping_file_path_from_plugin_dir(simplnx_source_dir / f'src/Plugins/{plugin_name}', plugin_name) -def get_plugin_mappings(complex_source_dir: Path) -> Dict[str, Dict[str, str]]: +def get_plugin_mappings(simplnx_source_dir: Path) -> Dict[str, Dict[str, str]]: mappings: Dict[str, Dict[str, str]] = {} - plugins_dir = complex_source_dir / 'src/Plugins' + plugins_dir = simplnx_source_dir / 'src/Plugins' ignored_plugins = ['TestOne', 'TestTwo'] for child in plugins_dir.iterdir(): if not child.is_dir(): @@ -136,14 +136,14 @@ def find_filter(mappings: Dict[str, Dict[str, str]], filter_uuid: str) -> Tuple[ return (plugin_name, plugin_mapping[filter_uuid]) raise RuntimeError(f'{filter_uuid} not found') -def get_filter_base_path(complex_source_dir: Path, plugin_name: str, complex_filter: str) -> Path: - return complex_source_dir / f'src/Plugins/{plugin_name}/src/{plugin_name}/Filters/{complex_filter}' +def get_filter_base_path(simplnx_source_dir: Path, plugin_name: str, complex_filter: str) -> Path: + return simplnx_source_dir / f'src/Plugins/{plugin_name}/src/{plugin_name}/Filters/{complex_filter}' -def get_filter_hpp_path(complex_source_dir: Path, plugin_name: str, complex_filter: str) -> Path: - return get_filter_base_path(complex_source_dir, plugin_name, complex_filter).with_suffix('.hpp') +def get_filter_hpp_path(simplnx_source_dir: Path, plugin_name: str, complex_filter: str) -> Path: + return get_filter_base_path(simplnx_source_dir, plugin_name, complex_filter).with_suffix('.hpp') -def get_filter_cpp_path(complex_source_dir: Path, plugin_name: str, complex_filter: str) -> Path: - return get_filter_base_path(complex_source_dir, plugin_name, complex_filter).with_suffix('.cpp') +def get_filter_cpp_path(simplnx_source_dir: Path, plugin_name: str, complex_filter: str) -> Path: + return get_filter_base_path(simplnx_source_dir, plugin_name, complex_filter).with_suffix('.cpp') def read_simpl_json(path: Path) -> Dict[str, SIMPLFilterInfo]: with open(path, 'r') as file: @@ -204,16 +204,16 @@ def update_mapping_file(mapping_file_path: Path, simpl_uuid: str, complex_filter with open(mapping_file_path, 'w') as output_file: output_file.writelines(lines) -def generate_converter_code(complex_source_dir: Path, simpl_json_path: Path, simpl_filters: List[str]) -> None: - mappings = get_plugin_mappings(complex_source_dir) +def generate_converter_code(simplnx_source_dir: Path, simpl_json_path: Path, simpl_filters: List[str]) -> None: + mappings = get_plugin_mappings(simplnx_source_dir) simpl_filters_info = read_simpl_json(simpl_json_path) for simpl_filter_uuid in simpl_filters: if simpl_filter_uuid not in simpl_filters_info: raise RuntimeError(f'SIMPL filter json does not contain {simpl_filter_uuid}') plugin_name, complex_filter_name = find_filter(mappings, simpl_filter_uuid) - mapping_file_path = get_plugin_mapping_file_path_from_root_dir(complex_source_dir, plugin_name) - complex_filter_hpp_path = get_filter_hpp_path(complex_source_dir, plugin_name, complex_filter_name) - complex_filter_cpp_path = get_filter_cpp_path(complex_source_dir, plugin_name, complex_filter_name) + mapping_file_path = get_plugin_mapping_file_path_from_root_dir(simplnx_source_dir, plugin_name) + complex_filter_hpp_path = get_filter_hpp_path(simplnx_source_dir, plugin_name, complex_filter_name) + complex_filter_cpp_path = get_filter_cpp_path(simplnx_source_dir, plugin_name, complex_filter_name) update_filter_hpp(complex_filter_hpp_path) update_filter_cpp(complex_filter_cpp_path, simpl_filters_info[simpl_filter_uuid], complex_filter_name) update_mapping_file(mapping_file_path, simpl_filter_uuid, complex_filter_name) @@ -223,17 +223,17 @@ def generate_converter_code(complex_source_dir: Path, simpl_json_path: Path, sim def main() -> None: parser = argparse.ArgumentParser() - parser.add_argument('complex_source_dir', type=Path) + parser.add_argument('simplnx_source_dir', type=Path) parser.add_argument('--simpl-json', type=Path, default=Path('./simpl_filters.json')) parser.add_argument('--simpl-filters', nargs='+') args = parser.parse_args() - complex_source_dir: Path = args.complex_source_dir + simplnx_source_dir: Path = args.simplnx_source_dir simpl_json: Path = args.simpl_json simpl_filters: List[str] = args.simpl_filters - generate_converter_code(complex_source_dir.absolute(), simpl_json.absolute(), simpl_filters) + generate_converter_code(simplnx_source_dir.absolute(), simpl_json.absolute(), simpl_filters) if __name__ == '__main__': main() diff --git a/scripts/make_filter.py b/scripts/make_filter.py index c15a0671cd..9337c4cca7 100644 --- a/scripts/make_filter.py +++ b/scripts/make_filter.py @@ -31,7 +31,7 @@ def make_filter(output_dir: Path, name: str, template_dir: Path) -> None: print(f'===================================================================') def main() -> None: - parser = argparse.ArgumentParser(description='Creates complex filter header and implementation skeleton codes') + parser = argparse.ArgumentParser(description='Creates simplnx filter header and implementation skeleton codes') parser.add_argument('-o', '--output_dir', type=Path, help='Input directory where files will be created') parser.add_argument('-n', '--name', type=str, help='Name of filter') parser.add_argument('-t', '--template_dir', type=Path, help='Location of template files') diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp deleted file mode 100644 index 0fe10a7b82..0000000000 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp +++ /dev/null @@ -1,248 +0,0 @@ -#pragma once - -#include "complex/Plugin/AbstractPlugin.hpp" - -#include - -#include -#include - -// clang-format off -#include "ComplexCore/Filters/AlignGeometries.hpp" -#include "ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.hpp" -#include "ComplexCore/Filters/AlignSectionsListFilter.hpp" -#include "ComplexCore/Filters/ApplyTransformationToGeometryFilter.hpp" -#include "ComplexCore/Filters/ApproximatePointCloudHull.hpp" -#include "ComplexCore/Filters/ArrayCalculatorFilter.hpp" -#include "ComplexCore/Filters/CalculateArrayHistogramFilter.hpp" -#include "ComplexCore/Filters/CalculateFeatureSizesFilter.hpp" -#include "ComplexCore/Filters/CalculateTriangleAreasFilter.hpp" -#include "ComplexCore/Filters/ChangeAngleRepresentation.hpp" -#include "ComplexCore/Filters/CombineAttributeArraysFilter.hpp" -#include "ComplexCore/Filters/ConditionalSetValue.hpp" -#include "ComplexCore/Filters/ConvertColorToGrayScaleFilter.hpp" -#include "ComplexCore/Filters/ConvertDataFilter.hpp" -#include "ComplexCore/Filters/CopyDataObjectFilter.hpp" -#include "ComplexCore/Filters/CopyFeatureArrayToElementArray.hpp" -#include "ComplexCore/Filters/CreateAttributeMatrixFilter.hpp" -#include "ComplexCore/Filters/CreateDataArray.hpp" -#include "ComplexCore/Filters/CreateDataGroup.hpp" -#include "ComplexCore/Filters/CreateFeatureArrayFromElementArray.hpp" -#include "ComplexCore/Filters/CreateImageGeometry.hpp" -#include "ComplexCore/Filters/CropImageGeometry.hpp" -#include "ComplexCore/Filters/CropVertexGeometry.hpp" -#include "ComplexCore/Filters/DeleteData.hpp" -#include "ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.hpp" -#include "ComplexCore/Filters/ErodeDilateMaskFilter.hpp" -#include "ComplexCore/Filters/ErodeDilateBadDataFilter.hpp" -#include "ComplexCore/Filters/ExecuteProcessFilter.hpp" -#include "ComplexCore/Filters/WriteDREAM3DFilter.hpp" -#include "ComplexCore/Filters/ExtractComponentAsArrayFilter.hpp" -#include "ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp" -#include "ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp" -#include "ComplexCore/Filters/FillBadDataFilter.hpp" -#include "ComplexCore/Filters/FindArrayStatisticsFilter.hpp" -#include "ComplexCore/Filters/FindBoundaryCellsFilter.hpp" -#include "ComplexCore/Filters/FindBiasedFeaturesFilter.hpp" -#include "ComplexCore/Filters/FindDifferencesMap.hpp" -#include "ComplexCore/Filters/FindEuclideanDistMapFilter.hpp" -#include "ComplexCore/Filters/FindFeatureCentroidsFilter.hpp" -#include "ComplexCore/Filters/FindFeaturePhasesFilter.hpp" -#include "ComplexCore/Filters/FindFeaturePhasesBinaryFilter.hpp" -#include "ComplexCore/Filters/FindNeighborhoodsFilter.hpp" -#include "ComplexCore/Filters/FindNeighborListStatistics.hpp" -#include "ComplexCore/Filters/FindNeighbors.hpp" -#include "ComplexCore/Filters/FindNumFeaturesFilter.hpp" -#include "ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.hpp" -#include "ComplexCore/Filters/FindSurfaceFeatures.hpp" -#include "ComplexCore/Filters/FindVolFractionsFilter.hpp" -#include "ComplexCore/Filters/GenerateColorTableFilter.hpp" -#include "ComplexCore/Filters/IdentifySample.hpp" -#include "ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp" -#include "ComplexCore/Filters/ReadCSVFileFilter.hpp" -#include "ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp" -#include "ComplexCore/Filters/ReadDREAM3DFilter.hpp" -#include "ComplexCore/Filters/ReadHDF5Dataset.hpp" -#include "ComplexCore/Filters/ReadTextDataArrayFilter.hpp" -#include "ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp" -#include "ComplexCore/Filters/InitializeImageGeomCellData.hpp" -#include "ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp" -#include "ComplexCore/Filters/IterativeClosestPointFilter.hpp" -#include "ComplexCore/Filters/LaplacianSmoothingFilter.hpp" -#include "ComplexCore/Filters/MapPointCloudToRegularGridFilter.hpp" -#include "ComplexCore/Filters/MinNeighbors.hpp" -#include "ComplexCore/Filters/MoveData.hpp" -#include "ComplexCore/Filters/MultiThresholdObjects.hpp" -#include "ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp" -#include "ComplexCore/Filters/QuickSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" -#include "ComplexCore/Filters/RemoveFlaggedVertices.hpp" -#include "ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp" -#include "ComplexCore/Filters/RenameDataObject.hpp" -#include "ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp" -#include "ComplexCore/Filters/ResampleImageGeomFilter.hpp" -#include "ComplexCore/Filters/RobustAutomaticThreshold.hpp" -#include "ComplexCore/Filters/RotateSampleRefFrameFilter.hpp" -#include "ComplexCore/Filters/ScalarSegmentFeaturesFilter.hpp" -#include "ComplexCore/Filters/SetImageGeomOriginScalingFilter.hpp" -#include "ComplexCore/Filters/SplitAttributeArrayFilter.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" -#include "ComplexCore/Filters/TriangleCentroidFilter.hpp" -#include "ComplexCore/Filters/TriangleDihedralAngleFilter.hpp" -#include "ComplexCore/Filters/TriangleNormalFilter.hpp" -#include "ComplexCore/Filters/WriteASCIIDataFilter.hpp" -#include "ComplexCore/Filters/RemoveFlaggedFeaturesFilter.hpp" -#include "ComplexCore/Filters/ComputeMomentInvariants2DFilter.hpp" -#include "ComplexCore/Filters/ExecuteProcessFilter.hpp" -#include "ComplexCore/Filters/FindVertexToTriangleDistancesFilter.hpp" -#include "ComplexCore/Filters/ApplyTransformationToGeometryFilter.hpp" -#include "ComplexCore/Filters/ComputeFeatureRectFilter.hpp" -#include "ComplexCore/Filters/FindLargestCrossSectionsFilter.hpp" -#include "ComplexCore/Filters/WriteStlFileFilter.hpp" -#include "ComplexCore/Filters/AddBadDataFilter.hpp" -#include "ComplexCore/Filters/AppendImageGeometryZSliceFilter.hpp" -#include "ComplexCore/Filters/FindFeatureClusteringFilter.hpp" -#include "ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp" -#include "ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp" -#include "ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp" -#include "ComplexCore/Filters/CombineStlFilesFilter.hpp" -#include "ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" -#include "ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" -#include "ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp" -#include "ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/FindBoundaryElementFractionsFilter.hpp" -#include "ComplexCore/Filters/ReverseTriangleWindingFilter.hpp" -#include "ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp" -#include "ComplexCore/Filters/GenerateVectorColorsFilter.hpp" -#include "ComplexCore/Filters/KMedoidsFilter.hpp" -#include "ComplexCore/Filters/KMeansFilter.hpp" -#include "ComplexCore/Filters/SilhouetteFilter.hpp" -// @@__HEADER__TOKEN__DO__NOT__DELETE__@@ - -namespace complex -{ - static const AbstractPlugin::SIMPLMapType k_SIMPL_to_ComplexCore - { - // syntax std::make_pair {Dream3d UUID , Dream3dnx UUID, {}}}, // dream3d-class-name - {complex::Uuid::FromString("886f8b46-51b6-5682-a289-6febd10b7ef0").value(), {complex::FilterTraits::uuid, &AlignSectionsFeatureCentroidFilter::FromSIMPLJson}}, // AlignSectionsFeatureCentroid - {complex::Uuid::FromString("ce1ee404-0336-536c-8aad-f9641c9458be").value(), {complex::FilterTraits::uuid, &AlignGeometries::FromSIMPLJson}}, // AlignGeometries - {complex::Uuid::FromString("accf8f6c-0551-5da3-9a3d-e4be41c3985c").value(), {complex::FilterTraits::uuid, &AlignSectionsListFilter::FromSIMPLJson}}, // AlignSectionsListFilter - {complex::Uuid::FromString("7ff0ebb3-7b0d-5ff7-b9d8-5147031aca10").value(), {complex::FilterTraits::uuid, &ArrayCalculatorFilter::FromSIMPLJson}}, // ArrayCalculatorFilter - {complex::Uuid::FromString("c681caf4-22f2-5885-bbc9-a0476abc72eb").value(), {complex::FilterTraits::uuid, &ApplyTransformationToGeometryFilter::FromSIMPLJson}}, // ApplyTransformationToGeometry - {complex::Uuid::FromString("fab669ad-66c6-5a39-bdb7-fc47b94311ed").value(), {complex::FilterTraits::uuid, &ApproximatePointCloudHull::FromSIMPLJson}}, // ApproximatePointCloudHull - {complex::Uuid::FromString("289f0d8c-29ab-5fbc-91bd-08aac01e37c5").value(), {complex::FilterTraits::uuid, &CalculateArrayHistogramFilter::FromSIMPLJson}}, // CalculateArrayHistogram - {complex::Uuid::FromString("656f144c-a120-5c3b-bee5-06deab438588").value(), {complex::FilterTraits::uuid, &CalculateFeatureSizesFilter::FromSIMPLJson}}, // FindSizes - {complex::Uuid::FromString("a9900cc3-169e-5a1b-bcf4-7569e1950d41").value(), {complex::FilterTraits::uuid, &CalculateTriangleAreasFilter::FromSIMPLJson}}, // TriangleAreaFilter - {complex::Uuid::FromString("f7bc0e1e-0f50-5fe0-a9e7-510b6ed83792").value(), {complex::FilterTraits::uuid, &ChangeAngleRepresentation::FromSIMPLJson}}, // ChangeAngleRepresentation - {complex::Uuid::FromString("a6b50fb0-eb7c-5d9b-9691-825d6a4fe772").value(), {complex::FilterTraits::uuid, &CombineAttributeArraysFilter::FromSIMPLJson}}, // CombineAttributeArrays - //{complex::Uuid::FromString("47cafe63-83cc-5826-9521-4fb5bea684ef").value(), {complex::FilterTraits::uuid, &ConditionalSetValue::FromSIMPLJson}}, // ConditionalSetValue - {complex::Uuid::FromString("eb5a89c4-4e71-59b1-9719-d10a652d961e").value(), {complex::FilterTraits::uuid, &ConvertColorToGrayScaleFilter::FromSIMPLJson}}, // ConvertColorToGrayScale - {complex::Uuid::FromString("f4ba5fa4-bb5c-5dd1-9429-0dd86d0ecb37").value(), {complex::FilterTraits::uuid, &ConvertDataFilter::FromSIMPLJson}}, // ConvertData - {complex::Uuid::FromString("a37f2e24-7400-5005-b9a7-b2224570cbe9").value(), {complex::FilterTraits::uuid, &ConditionalSetValue::FromSIMPLJson}}, // ReplaceValueInArray - {complex::Uuid::FromString("99836b75-144b-5126-b261-b411133b5e8a").value(), {complex::FilterTraits::uuid, &CopyFeatureArrayToElementArray::FromSIMPLJson}}, // CopyFeatureArrayToElementArray - {complex::Uuid::FromString("93375ef0-7367-5372-addc-baa019b1b341").value(), {complex::FilterTraits::uuid, &CreateAttributeMatrixFilter::FromSIMPLJson}}, // CreateAttributeMatrix - {complex::Uuid::FromString("77f392fb-c1eb-57da-a1b1-e7acf9239fb8").value(), {complex::FilterTraits::uuid, &CreateDataArray::FromSIMPLJson}}, // CreateDataArray - {complex::Uuid::FromString("816fbe6b-7c38-581b-b149-3f839fb65b93").value(), {complex::FilterTraits::uuid, &CreateDataGroup::FromSIMPLJson}}, // CreateDataContainer - {complex::Uuid::FromString("94438019-21bb-5b61-a7c3-66974b9a34dc").value(), {complex::FilterTraits::uuid, &CreateFeatureArrayFromElementArray::FromSIMPLJson}}, // CreateFeatureArrayFromElementArray - {complex::Uuid::FromString("f2132744-3abb-5d66-9cd9-c9a233b5c4aa").value(), {complex::FilterTraits::uuid, &CreateImageGeometry::FromSIMPLJson}}, // CreateImageGeometry - {complex::Uuid::FromString("baa4b7fe-31e5-5e63-a2cb-0bb9d844cfaf").value(), {complex::FilterTraits::uuid, &CropImageGeometry::FromSIMPLJson}}, // CropImageGeometry - {complex::Uuid::FromString("f28cbf07-f15a-53ca-8c7f-b41a11dae6cc").value(), {complex::FilterTraits::uuid, &CropVertexGeometry::FromSIMPLJson}}, // CropVertexGeometry - {complex::Uuid::FromString("7b1c8f46-90dd-584a-b3ba-34e16958a7d0").value(), {complex::FilterTraits::uuid, &DeleteData::FromSIMPLJson}}, // RemoveArrays - {complex::Uuid::FromString("3fcd4c43-9d75-5b86-aad4-4441bc914f37").value(), {complex::FilterTraits::uuid, &WriteDREAM3DFilter::FromSIMPLJson}}, // DataContainerWriter - {complex::Uuid::FromString("52a069b4-6a46-5810-b0ec-e0693c636034").value(), {complex::FilterTraits::uuid, &ExtractInternalSurfacesFromTriangleGeometry::FromSIMPLJson}}, // ExtractInternalSurfacesFromTriangleGeometry - {complex::Uuid::FromString("737b8d5a-8622-50f9-9a8a-bfdb57608891").value(), {complex::FilterTraits::uuid, &WriteFeatureDataCSVFilter::FromSIMPLJson}}, // FeatureDataCSVWriter - {complex::Uuid::FromString("bf35f515-294b-55ed-8c69-211b7e69cb56").value(), {complex::FilterTraits::uuid, &FindArrayStatisticsFilter::FromSIMPLJson}}, // FindArrayStatistics - {complex::Uuid::FromString("8a1106d4-c67f-5e09-a02a-b2e9b99d031e").value(), {complex::FilterTraits::uuid, &FindBoundaryCellsFilter::FromSIMPLJson}}, // FindBoundaryCellsFilter - {complex::Uuid::FromString("450c2f00-9ddf-56e1-b4c1-0e74e7ad2349").value(), {complex::FilterTraits::uuid, &FindBiasedFeaturesFilter::FromSIMPLJson}}, // FindBiasedFeaturesFilter - {complex::Uuid::FromString("29086169-20ce-52dc-b13e-824694d759aa").value(), {complex::FilterTraits::uuid, &FindDifferencesMap::FromSIMPLJson}}, // FindDifferenceMap - {complex::Uuid::FromString("933e4b2d-dd61-51c3-98be-00548ba783a3").value(), {complex::FilterTraits::uuid, &FindEuclideanDistMapFilter::FromSIMPLJson}}, // FindEuclideanDistMap - {complex::Uuid::FromString("6f8ca36f-2995-5bd3-8672-6b0b80d5b2ca").value(), {complex::FilterTraits::uuid, &FindFeatureCentroidsFilter::FromSIMPLJson}}, // FindFeatureCentroids - {complex::Uuid::FromString("6334ce16-cea5-5643-83b5-9573805873fa").value(), {complex::FilterTraits::uuid, &FindFeaturePhasesFilter::FromSIMPLJson}}, // FindFeaturePhases - {complex::Uuid::FromString("64d20c7b-697c-5ff1-9d1d-8a27b071f363").value(), {complex::FilterTraits::uuid, &FindFeaturePhasesBinaryFilter::FromSIMPLJson}}, // FindFeaturePhasesBinary - {complex::Uuid::FromString("697ed3de-db33-5dd1-a64b-04fb71e7d63e").value(), {complex::FilterTraits::uuid, &FindNeighborhoodsFilter::FromSIMPLJson}}, // FindNeighborhoods - {complex::Uuid::FromString("73ee33b6-7622-5004-8b88-4d145514fb6a").value(), {complex::FilterTraits::uuid, &FindNeighborListStatistics::FromSIMPLJson}}, // FindNeighborListStatistics - {complex::Uuid::FromString("97cf66f8-7a9b-5ec2-83eb-f8c4c8a17bac").value(), {complex::FilterTraits::uuid, &FindNeighbors::FromSIMPLJson}}, // FindNeighbors - {complex::Uuid::FromString("529743cf-d5d5-5d5a-a79f-95c84a5ddbb5").value(), {complex::FilterTraits::uuid, &FindNumFeaturesFilter::FromSIMPLJson}}, // FindNumFeatures - {complex::Uuid::FromString("5d586366-6b59-566e-8de1-57aa9ae8a91c").value(), {complex::FilterTraits::uuid, &FindSurfaceAreaToVolumeFilter::FromSIMPLJson}}, // FindSurfaceAreaToVolume - {complex::Uuid::FromString("d2b0ae3d-686a-5dc0-a844-66bc0dc8f3cb").value(), {complex::FilterTraits::uuid, &FindSurfaceFeatures::FromSIMPLJson}}, // FindSurfaceFeatures - {complex::Uuid::FromString("68246a67-7f32-5c80-815a-bec82008d7bc").value(), {complex::FilterTraits::uuid, &FindVolFractionsFilter::FromSIMPLJson}}, // FindVolFractions - {complex::Uuid::FromString("0d0a6535-6565-51c5-a3fc-fbc00008606d").value(), {complex::FilterTraits::uuid, &GenerateColorTableFilter::FromSIMPLJson}}, // GenerateColorTable - {complex::Uuid::FromString("0e8c0818-a3fb-57d4-a5c8-7cb8ae54a40a").value(), {complex::FilterTraits::uuid, &IdentifySample::FromSIMPLJson}}, // IdentifySample - {complex::Uuid::FromString("f2259481-5011-5f22-9fcb-c92fb6f8be10").value(), {complex::FilterTraits::uuid, &ReadBinaryCTNorthstarFilter::FromSIMPLJson}}, // ImportBinaryCTNorthstarFilter - {complex::Uuid::FromString("bdb978bc-96bf-5498-972c-b509c38b8d50").value(), {complex::FilterTraits::uuid, &ReadCSVFileFilter::FromSIMPLJson}}, // ReadASCIIData - {complex::Uuid::FromString("043cbde5-3878-5718-958f-ae75714df0df").value(), {complex::FilterTraits::uuid, &ReadDREAM3DFilter::FromSIMPLJson}}, // DataContainerReader - {complex::Uuid::FromString("9e98c3b0-5707-5a3b-b8b5-23ef83b02896").value(), {complex::FilterTraits::uuid, &ReadHDF5Dataset::FromSIMPLJson}}, // ImportHDF5Dataset - {complex::Uuid::FromString("a7007472-29e5-5d0a-89a6-1aed11b603f8").value(), {complex::FilterTraits::uuid, &ReadTextDataArrayFilter::FromSIMPLJson}}, // ImportAsciDataArray - {complex::Uuid::FromString("5fa10d81-94b4-582b-833f-8eabe659069e").value(), {complex::FilterTraits::uuid, &ReadVolumeGraphicsFileFilter::FromSIMPLJson}}, // ImportVolumeGraphicsFileFilter - {complex::Uuid::FromString("dfab9921-fea3-521c-99ba-48db98e43ff8").value(), {complex::FilterTraits::uuid, &InitializeImageGeomCellData::FromSIMPLJson}}, // InitializeData - {complex::Uuid::FromString("4b551c15-418d-5081-be3f-d3aeb62408e5").value(), {complex::FilterTraits::uuid, &InterpolatePointCloudToRegularGridFilter::FromSIMPLJson}}, // InterpolatePointCloudToRegularGrid - {complex::Uuid::FromString("6c8fb24b-5b12-551c-ba6d-ae2fa7724764").value(), {complex::FilterTraits::uuid, &IterativeClosestPointFilter::FromSIMPLJson}}, // IterativeClosestPoint - {complex::Uuid::FromString("601c4885-c218-5da6-9fc7-519d85d241ad").value(), {complex::FilterTraits::uuid, &LaplacianSmoothingFilter::FromSIMPLJson}}, // LaplacianSmoothing - {complex::Uuid::FromString("9fe34deb-99e1-5f3a-a9cc-e90c655b47ee").value(), {complex::FilterTraits::uuid, &MapPointCloudToRegularGridFilter::FromSIMPLJson}}, // MapPointCloudToRegularGrid - {complex::Uuid::FromString("dab5de3c-5f81-5bb5-8490-73521e1183ea").value(), {complex::FilterTraits::uuid, &MinNeighbors::FromSIMPLJson}}, // MinNeighbors - {complex::Uuid::FromString("fe2cbe09-8ae1-5bea-9397-fd5741091fdb").value(), {complex::FilterTraits::uuid, &MoveData::FromSIMPLJson}}, // MoveData - {complex::Uuid::FromString("014b7300-cf36-5ede-a751-5faf9b119dae").value(), {complex::FilterTraits::uuid, &MultiThresholdObjects::FromSIMPLJson}}, // MultiThresholdObjects - {complex::Uuid::FromString("686d5393-2b02-5c86-b887-dd81a8ae80f2").value(), {complex::FilterTraits::uuid, &MultiThresholdObjects::FromSIMPLJson}}, // MultiThresholdObjects2 - {complex::Uuid::FromString("119861c5-e303-537e-b210-2e62936222e9").value(), {complex::FilterTraits::uuid, &PointSampleTriangleGeometryFilter::FromSIMPLJson}}, // PointSampleTriangleGeometry - {complex::Uuid::FromString("07b49e30-3900-5c34-862a-f1fb48bad568").value(), {complex::FilterTraits::uuid, &QuickSurfaceMeshFilter::FromSIMPLJson}}, // QuickSurfaceMesh - {complex::Uuid::FromString("0791f556-3d73-5b1e-b275-db3f7bb6850d").value(), {complex::FilterTraits::uuid, &ReadRawBinaryFilter::FromSIMPLJson}}, // RawBinaryReader - {complex::Uuid::FromString("379ccc67-16dd-530a-984f-177db2314bac").value(), {complex::FilterTraits::uuid, &RemoveFlaggedVertices::FromSIMPLJson}}, // RemoveFlaggedVertices - {complex::Uuid::FromString("53ac1638-8934-57b8-b8e5-4b91cdda23ec").value(), {complex::FilterTraits::uuid, &RemoveMinimumSizeFeaturesFilter::FromSIMPLJson}}, // MinSize - {complex::Uuid::FromString("53a5f731-2858-5e3e-bd43-8f2cf45d90ec").value(), {complex::FilterTraits::uuid, &RenameDataObject::FromSIMPLJson}}, // RenameAttributeArray - {complex::Uuid::FromString("ee29e6d6-1f59-551b-9350-a696523261d5").value(), {complex::FilterTraits::uuid, &RenameDataObject::FromSIMPLJson}}, // RenameAttributeMatrix - {complex::Uuid::FromString("d53c808f-004d-5fac-b125-0fffc8cc78d6").value(), {complex::FilterTraits::uuid, &RenameDataObject::FromSIMPLJson}}, // RenameDataContainer - {complex::Uuid::FromString("3062fc2c-76b2-5c50-92b7-edbbb424c41d").value(), {complex::FilterTraits::uuid, &RobustAutomaticThreshold::FromSIMPLJson}}, // RobustAutomaticThreshold - {complex::Uuid::FromString("2c5edebf-95d8-511f-b787-90ee2adf485c").value(), {complex::FilterTraits::uuid, &ScalarSegmentFeaturesFilter::FromSIMPLJson}}, // ScalarSegmentFeatures - {complex::Uuid::FromString("6d3a3852-6251-5d2e-b749-6257fd0d8951").value(), {complex::FilterTraits::uuid, &SetImageGeomOriginScalingFilter::FromSIMPLJson}}, // SetOriginResolutionImageGeom - {complex::Uuid::FromString("5ecf77f4-a38a-52ab-b4f6-0fb8a9c5cb9c").value(), {complex::FilterTraits::uuid, &SplitAttributeArrayFilter::FromSIMPLJson}}, // SplitAttributeArray - {complex::Uuid::FromString("980c7bfd-20b2-5711-bc3b-0190b9096c34").value(), {complex::FilterTraits::uuid, &ReadStlFileFilter::FromSIMPLJson}}, // ReadStlFile - {complex::Uuid::FromString("5fbf9204-2c6c-597b-856a-f4612adbac38").value(), {complex::FilterTraits::uuid, &WriteASCIIDataFilter::FromSIMPLJson}}, // WriteASCIIData - {complex::Uuid::FromString("0541c5eb-1976-5797-9468-be50a93d44e2").value(), {complex::FilterTraits::uuid, &TriangleDihedralAngleFilter::FromSIMPLJson}}, // TriangleDihedralAngleFilter - {complex::Uuid::FromString("928154f6-e4bc-5a10-a9dd-1abb6a6c0f6b").value(), {complex::FilterTraits::uuid, &TriangleNormalFilter::FromSIMPLJson}}, // TriangleNormalFilter - {complex::Uuid::FromString("088ef69b-ca98-51a9-97ac-369862015d71").value(), {complex::FilterTraits::uuid, &CopyDataObjectFilter::FromSIMPLJson}}, // CopyObject - {complex::Uuid::FromString("79d59b85-01e8-5c4a-a6e1-3fd3e2ceffb4").value(), {complex::FilterTraits::uuid, &ExtractComponentAsArrayFilter::FromSIMPLJson}}, // ExtractComponentAsArray - {complex::Uuid::FromString("8a2308ec-86cd-5636-9a0a-6c7d383e9e7f").value(), {complex::FilterTraits::uuid, &ExecuteProcessFilter::FromSIMPLJson}}, // ExecuteProcessFilter - {complex::Uuid::FromString("1b4b9941-62e4-52f2-9918-15d48147ab88").value(), {complex::FilterTraits::uuid, &ExtractComponentAsArrayFilter::FromSIMPLJson}}, // RemoveComponentFromArray - {complex::Uuid::FromString("7aa33007-4186-5d7f-ba9d-d0a561b3351d").value(), {complex::FilterTraits::uuid, &TriangleCentroidFilter::FromSIMPLJson}}, // TriangleCentroid - {complex::Uuid::FromString("1966e540-759c-5798-ae26-0c6a3abc65c0").value(), {complex::FilterTraits::uuid, &ResampleImageGeomFilter::FromSIMPLJson}}, // ResampleImageGeom - {complex::Uuid::FromString("e25d9b4c-2b37-578c-b1de-cf7032b5ef19").value(), {complex::FilterTraits::uuid, &RotateSampleRefFrameFilter::FromSIMPLJson}}, // RotateSampleRefFrame - {complex::Uuid::FromString("30ae0a1e-3d94-5dab-b279-c5727ab5d7ff").value(), {complex::FilterTraits::uuid, &FillBadDataFilter::FromSIMPLJson}}, // FillBadData - {complex::Uuid::FromString("7aa33007-4186-5d7f-ba9d-d0a561b3351d").value(), {complex::FilterTraits::uuid, {}}}, // TriangleCentroid - {complex::Uuid::FromString("17410178-4e5f-58b9-900e-8194c69200ab").value(), {complex::FilterTraits::uuid, &ReplaceElementAttributesWithNeighborValuesFilter::FromSIMPLJson}}, // ReplaceElementAttributesWithNeighborValues - {complex::Uuid::FromString("4fff1aa6-4f62-56c4-8ee9-8e28ec2fcbba").value(), {complex::FilterTraits::uuid, &ErodeDilateMaskFilter::FromSIMPLJson}}, // ErodeDilateMask - {complex::Uuid::FromString("d26e85ff-7e52-53ae-b095-b1d969c9e73c").value(), {complex::FilterTraits::uuid, &ErodeDilateCoordinationNumberFilter::FromSIMPLJson}}, // ErodeDilateCoordinationNumber - {complex::Uuid::FromString("3adfe077-c3c9-5cd0-ad74-cf5f8ff3d254").value(), {complex::FilterTraits::uuid, &ErodeDilateBadDataFilter::FromSIMPLJson}}, // ErodeDilateBadData - {complex::Uuid::FromString("a8463056-3fa7-530b-847f-7f4cb78b8602").value(), {complex::FilterTraits::uuid, &RemoveFlaggedFeaturesFilter::FromSIMPLJson}}, // RemoveFlaggedFeatures - {complex::Uuid::FromString("e0555de5-bdc6-5bea-ba2f-aacfbec0a022").value(), {complex::FilterTraits::uuid, &RemoveFlaggedFeaturesFilter::FromSIMPLJson}}, // ExtractFlaggedFeatures - {complex::Uuid::FromString("27a132b2-a592-519a-8cb7-38599a7f28ec").value(), {complex::FilterTraits::uuid, &ComputeMomentInvariants2DFilter::FromSIMPLJson}}, // ComputeMomentInvariants2D - {complex::Uuid::FromString("fcdde553-36b4-5731-bc88-fc499806cb4e").value(), {complex::FilterTraits::uuid, &FindVertexToTriangleDistancesFilter::FromSIMPLJson}}, // FindVertexToTriangleDistances - {complex::Uuid::FromString("c681caf4-22f2-5885-bbc9-a0476abc72eb").value(), {complex::FilterTraits::uuid, {}}}, // ApplyTransformationToGeometry - {complex::Uuid::FromString("6eda8dbf-dbd8-562a-ae1a-f2904157c189").value(), {complex::FilterTraits::uuid, &ComputeFeatureRectFilter::FromSIMPLJson}}, // ComputeFeatureRect - {complex::Uuid::FromString("9f77b4a9-6416-5220-a688-115f4e14c90d").value(), {complex::FilterTraits::uuid, &FindLargestCrossSectionsFilter::FromSIMPLJson}}, // FindLargestCrossSections - {complex::Uuid::FromString("b9134758-d5e5-59dd-9907-28d23e0e0143").value(), {complex::FilterTraits::uuid, &WriteStlFileFilter::FromSIMPLJson}}, // WriteStlFile - {complex::Uuid::FromString("ac99b706-d1e0-5f78-9246-fbbe1efd93d2").value(), {complex::FilterTraits::uuid, &AddBadDataFilter::FromSIMPLJson}}, // AddBadData - {complex::Uuid::FromString("52b2918a-4fb5-57aa-97d4-ccc084b89572").value(), {complex::FilterTraits::uuid, &AppendImageGeometryZSliceFilter::FromSIMPLJson}}, // AppendImageGeometryZSlice - {complex::Uuid::FromString("a1e9cf6d-2d1b-573e-98b8-0314c993d2b6").value(), {complex::FilterTraits::uuid, &FindFeatureClusteringFilter::FromSIMPLJson}}, // FindFeatureClustering - {complex::Uuid::FromString("0559aa37-c5ad-549a-82d4-bff4bfcb6cc6").value(), {complex::FilterTraits::uuid, &WriteAbaqusHexahedronFilter::FromSIMPLJson}}, // AbaqusHexahedronWriter - {complex::Uuid::FromString("cbaf9e68-5ded-560c-9440-509289100ea8").value(), {complex::FilterTraits::uuid, &NearestPointFuseRegularGridsFilter::FromSIMPLJson}}, // NearestPointFuseRegularGrids - {complex::Uuid::FromString("77befd69-4536-5856-9f81-02996d038f73").value(), {complex::FilterTraits::uuid, &ResampleRectGridToImageGeomFilter::FromSIMPLJson}}, // ResampleRectGridToImageGeom - {complex::Uuid::FromString("71d46128-1d2d-58fd-9924-1714695768c3").value(), {complex::FilterTraits::uuid, &CombineStlFilesFilter::FromSIMPLJson}}, // CombineStlFiles - {complex::Uuid::FromString("339f1349-9236-5023-9a56-c82fb8eafd12").value(), {complex::FilterTraits::uuid, &WriteAvizoUniformCoordinateFilter::FromSIMPLJson}}, // AvizoUniformCoordinateWriter - {complex::Uuid::FromString("2861f4b4-8d50-5e69-9575-68c9d35f1256").value(), {complex::FilterTraits::uuid, &WriteAvizoRectilinearCoordinateFilter::FromSIMPLJson}}, // AvizoRectilinearCoordinateWriter - {complex::Uuid::FromString("a043bd66-2681-5126-82e1-5fdc46694bf4").value(), {complex::FilterTraits::uuid, &WriteVtkRectilinearGridFilter::FromSIMPLJson}}, // VtkRectilinearGridWriter - {complex::Uuid::FromString("0df3da89-9106-538e-b1a9-6bbf1cf0aa92").value(), {complex::FilterTraits::uuid, &RegularGridSampleSurfaceMeshFilter::FromSIMPLJson}}, // RegularGridSampleSurfaceMesh - {complex::Uuid::FromString("75cfeb9b-cd4b-5a20-a344-4170b39bbfaf").value(), {complex::FilterTraits::uuid, &UncertainRegularGridSampleSurfaceMeshFilter::FromSIMPLJson}}, // UncertainRegularGridSampleSurfaceMesh - {complex::Uuid::FromString("6357243e-41a6-52c4-be2d-2f6894c39fcc").value(), {complex::FilterTraits::uuid, &FindBoundaryElementFractionsFilter::FromSIMPLJson}}, // FindBoundaryElementFractions - {complex::Uuid::FromString("9b9fb9e1-074d-54b6-a6ce-0be21ab4496d").value(), {complex::FilterTraits::uuid, &ReverseTriangleWindingFilter::FromSIMPLJson}}, // ReverseTriangleWinding - {complex::Uuid::FromString("158ebe9e-f772-57e2-ac1b-71ff213cf890").value(), {complex::FilterTraits::uuid, &WriteLosAlamosFFTFilter::FromSIMPLJson}}, // LosAlamosFFTWriter - {complex::Uuid::FromString("ef28de7e-5bdd-57c2-9318-60ba0dfaf7bc").value(), {complex::FilterTraits::uuid, &GenerateVectorColorsFilter::FromSIMPLJson}}, // GenerateVectorColors - {complex::Uuid::FromString("3c6337da-e232-4420-a5ca-451496748d88").value(), {complex::FilterTraits::uuid, &ReadDeformKeyFileV12Filter::FromSIMPLJson}}, // ImportDeformKeyFileV12Filter - {complex::Uuid::FromString("f7486aa6-3049-5be7-8511-ae772b70c90b").value(), {complex::FilterTraits::uuid, &KMedoidsFilter::FromSIMPLJson}}, // KMedoids - {complex::Uuid::FromString("b56a04de-0ca0-509d-809f-52219fca9c98").value(), {complex::FilterTraits::uuid, &KMeansFilter::FromSIMPLJson}}, // KMeans - {complex::Uuid::FromString("f84d4d69-9ea5-54b6-a71c-df76d76d50cf").value(), {complex::FilterTraits::uuid, &SilhouetteFilter::FromSIMPLJson}}, // Silhouette - // @@__MAP__UPDATE__TOKEN__DO__NOT__DELETE__@@ - }; - -} // namespace complex -// clang-format on diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.cpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.cpp deleted file mode 100644 index d93cbbc09f..0000000000 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "ComplexCorePlugin.hpp" -#include "ComplexCoreLegacyUUIDMapping.hpp" - -#include "ComplexCore/ComplexCore_filter_registration.hpp" - -using namespace complex; - -namespace -{ -constexpr AbstractPlugin::IdType k_ID = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); -} // namespace - -ComplexCorePlugin::ComplexCorePlugin() -: AbstractPlugin(k_ID, "ComplexCore", "Description", "BlueQuartz Software") -{ - std::vector filterFuncs = ::GetPluginFilterList(); - for(const auto& filterFunc : filterFuncs) - { - addFilter(filterFunc); - } -} - -ComplexCorePlugin::~ComplexCorePlugin() = default; - -AbstractPlugin::SIMPLMapType ComplexCorePlugin::getSimplToComplexMap() const -{ - return complex::k_SIMPL_to_ComplexCore; -} - -COMPLEX_DEF_PLUGIN(ComplexCorePlugin) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.hpp deleted file mode 100644 index b1d07b17e2..0000000000 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCorePlugin.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/Plugin/AbstractPlugin.hpp" - -class COMPLEXCORE_EXPORT ComplexCorePlugin : public complex::AbstractPlugin -{ -public: - ComplexCorePlugin(); - ~ComplexCorePlugin() override; - - ComplexCorePlugin(const ComplexCorePlugin&) = delete; - ComplexCorePlugin(ComplexCorePlugin&&) = delete; - - ComplexCorePlugin& operator=(const ComplexCorePlugin&) = delete; - ComplexCorePlugin& operator=(ComplexCorePlugin&&) = delete; - - /** - * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to - * their complex counterpart - * @return SIMPLMapType - */ - SIMPLMapType getSimplToComplexMap() const override; -}; diff --git a/src/Plugins/ComplexCore/test/test_dirs.hpp.in b/src/Plugins/ComplexCore/test/test_dirs.hpp.in deleted file mode 100644 index 316418fcaa..0000000000 --- a/src/Plugins/ComplexCore/test/test_dirs.hpp.in +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "complex/Common/StringLiteral.hpp" - -#cmakedefine COMPLEX_WRITE_TEST_OUTPUT - - -namespace complex::unit_test -{ -inline constexpr StringLiteral k_ComplexSourceDir = "@COMPLEX_SOURCE_DIR_NORM@"; -inline constexpr StringLiteral k_ComplexTestSourceDir = "@COMPLEX_SOURCE_DIR_NORM@/test"; -inline constexpr StringLiteral k_ComplexTestDataSourceDir = "@COMPLEX_SOURCE_DIR_NORM@/test/Data"; -inline constexpr StringLiteral k_SourceDir = "@PLUGIN_SOURCE_DIR_NORM@"; -inline constexpr StringLiteral k_TestDataSourceDir = "@PLUGIN_SOURCE_DIR_NORM@/data"; -inline constexpr StringLiteral k_BinaryDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; -inline constexpr StringLiteral k_BinaryTestOutputDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@/test_output"; -inline constexpr StringLiteral k_BuildDir = COMPLEX_BUILD_DIR; -inline constexpr StringLiteral k_DREAM3DDataDir = "@DREAM3D_DATA_DIR_NORM@"; -inline constexpr StringLiteral k_TestFilesDir = "@DREAM3D_DATA_DIR_NORM@/TestFiles"; -inline constexpr StringLiteral k_CMakeExecutable = "@CMAKE_COMMAND_NORM@"; -} // namespace complex::unit_test diff --git a/src/Plugins/ITKImageProcessing/CMakeLists.txt b/src/Plugins/ITKImageProcessing/CMakeLists.txt index 73a4d4d633..78ef5afce8 100644 --- a/src/Plugins/ITKImageProcessing/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/CMakeLists.txt @@ -49,13 +49,13 @@ if(NOT GENERATOR_IS_MULTI_CONFIG) get_target_property(ITKCOMMON_PATH ITKCommon IMPORTED_LOCATION_${TYPE_UPPER}) get_filename_component(ITK_LIB_DIR ${ITKCOMMON_PATH} DIRECTORY CACHE) - get_property(COMPLEX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS) - set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${ITK_LIB_DIR}) + get_property(SIMPLNX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS) + set_property(GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS ${SIMPLNX_EXTRA_LIBRARY_DIRS} ${ITK_LIB_DIR}) endif() message(STATUS "* ITK (${ITK_VERSION}) ${ITK_DIR}") -include("${complex_SOURCE_DIR}/cmake/Plugin.cmake") +include("${simplnx_SOURCE_DIR}/cmake/Plugin.cmake") set(PLUGIN_NAME "ITKImageProcessing") set(${PLUGIN_NAME}_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) @@ -78,7 +78,7 @@ set(FilterList set(AlgorithmList ) -if(NOT COMPLEX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) +if(NOT SIMPLNX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) list(APPEND FilterList ITKBinaryContourImage ITKBinaryOpeningByReconstructionImage @@ -244,7 +244,7 @@ list(SORT FilterList ORDER ASCENDING) # These are filters that need to be compiled but not exposed to a user # ----------------------------------------------------------------------------- -create_complex_plugin(NAME ${PLUGIN_NAME} +create_simplnx_plugin(NAME ${PLUGIN_NAME} FILTER_LIST ${FilterList} ALGORITHM_LIST ${AlgorithmList} DESCRIPTION "${PLUGIN_NAME} Plugin" @@ -271,8 +271,8 @@ set(${PLUGIN_NAME}_Common_Srcs ${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/Common/ReadImageUtils.cpp ) -set(${PLUGIN_NAME}_GENERATED_DIR ${complex_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/generated) -set(${PLUGIN_NAME}_GENERATED_HEADER_DIR ${complex_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/generated/ITKImageProcessing) +set(${PLUGIN_NAME}_GENERATED_DIR ${simplnx_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/generated) +set(${PLUGIN_NAME}_GENERATED_HEADER_DIR ${simplnx_BINARY_DIR}/Plugins/${ARGS_PLUGIN_NAME}/generated/ITKImageProcessing) set(${PLUGIN_NAME}_GENERATED_CONFIG_HEADER ${${PLUGIN_NAME}_GENERATED_HEADER_DIR}/ITKImageProcessingConfig.hpp) @@ -303,7 +303,7 @@ source_group(TREE "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}" PREFIX ${PLU # ------------------------------------------------------------------------------ # Add in the unit tests for the filters included in this plugin -if(COMPLEX_BUILD_TESTS) +if(SIMPLNX_BUILD_TESTS) enable_testing() add_subdirectory(${${PLUGIN_NAME}_SOURCE_DIR}/test) endif() @@ -312,10 +312,10 @@ endif() # Add in the install rules for ITK Libraries # ------------------------------------------------------------------------------ get_filename_component(ITKImageProcessing_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY CACHE) -get_filename_component(COMPLEX_PLUGINS_SOURCE_DIR ${ITKImageProcessing_SOURCE_DIR} DIRECTORY CACHE) +get_filename_component(SIMPLNX_PLUGINS_SOURCE_DIR ${ITKImageProcessing_SOURCE_DIR} DIRECTORY CACHE) # message(STATUS "ITKImageProcessing_SOURCE_DIR: ${ITKImageProcessing_SOURCE_DIR}") -include(${complex_SOURCE_DIR}/cmake/ITKInstall.cmake) +include(${simplnx_SOURCE_DIR}/cmake/ITKInstall.cmake) AddItkCopyInstallRules(LIBS ${ItkComponents}) if(CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -364,17 +364,17 @@ endif() # ----------------------------------------------------------------------- # Download Example Data Files # ----------------------------------------------------------------------- -include(${complex_SOURCE_DIR}/cmake/Utility.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) set(DATA_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CX_CONFIG_DIR}/Data") file(TO_CMAKE_PATH "${DREAM3D_DATA_DIR}" DREAM3D_DATA_DIR_NORM) # ----------------------------------------------------------------------- -# These data files are pulled from the 'complex data archive' on github, +# These data files are pulled from the 'simplnx data archive' on github, # decompressed and then copied to the build folder. Install rules are also # generated for each of the data sets. # ----------------------------------------------------------------------- -if(EXISTS "${DREAM3D_DATA_DIR}" AND COMPLEX_DOWNLOAD_TEST_FILES) +if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) if(NOT EXISTS ${DREAM3D_DATA_DIR}/TestFiles/) file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") endif() diff --git a/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in b/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in index 9624e694ab..8ad8b492a6 100644 --- a/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in +++ b/src/Plugins/ITKImageProcessing/cmake/ITKImageProcessingConfig.hpp.in @@ -2,4 +2,4 @@ #cmakedefine ITKIMAGEPROCESSING_LEAN_AND_MEAN -#cmakedefine COMPLEX_CONDA_BUILD +#cmakedefine SIMPLNX_CONDA_BUILD diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index ee4e1d5a98..82d103c9ab 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline @@ -33,7 +33,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImportImageStack", + "name": "simplnx::ITKImportImageStack", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -78,7 +78,7 @@ }, "comments": "", "filter": { - "name": "complex::ScalarSegmentFeaturesFilter", + "name": "simplnx::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false @@ -95,7 +95,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -108,7 +108,7 @@ }, "comments": "", "filter": { - "name": "complex::CopyFeatureArrayToElementArray", + "name": "simplnx::CopyFeatureArrayToElementArray", "uuid": "4c8c976a-993d-438b-bd8e-99f71114b9a1" }, "isDisabled": false @@ -131,7 +131,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -146,7 +146,7 @@ }, "comments": "", "filter": { - "name": "complex::ConditionalSetValue", + "name": "simplnx::ConditionalSetValue", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -160,7 +160,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -174,7 +174,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -190,7 +190,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateAttributeMatrixFilter", + "name": "simplnx::CreateAttributeMatrixFilter", "uuid": "a6a28355-ee69-4874-bcac-76ed427423ed" }, "isDisabled": false @@ -202,7 +202,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline index 58ba09fcb1..f5fba88d0b 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline @@ -33,7 +33,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImportImageStack", + "name": "simplnx::ITKImportImageStack", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -78,7 +78,7 @@ }, "comments": "", "filter": { - "name": "complex::ScalarSegmentFeaturesFilter", + "name": "simplnx::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false @@ -99,7 +99,7 @@ }, "comments": "", "filter": { - "name": "complex::QuickSurfaceMeshFilter", + "name": "simplnx::QuickSurfaceMeshFilter", "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" }, "isDisabled": false @@ -120,7 +120,7 @@ }, "comments": "", "filter": { - "name": "complex::LaplacianSmoothingFilter", + "name": "simplnx::LaplacianSmoothingFilter", "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" }, "isDisabled": false @@ -139,7 +139,7 @@ }, "comments": "", "filter": { - "name": "complex::SplitAttributeArrayFilter", + "name": "simplnx::SplitAttributeArrayFilter", "uuid": "55da791f-4d1c-4413-8673-742f27d2b22b" }, "isDisabled": false @@ -165,7 +165,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -191,7 +191,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -206,7 +206,7 @@ }, "comments": "", "filter": { - "name": "complex::ConditionalSetValue", + "name": "simplnx::ConditionalSetValue", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -221,7 +221,7 @@ }, "comments": "", "filter": { - "name": "complex::ConditionalSetValue", + "name": "simplnx::ConditionalSetValue", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -238,7 +238,7 @@ }, "comments": "", "filter": { - "name": "complex::CombineAttributeArraysFilter", + "name": "simplnx::CombineAttributeArraysFilter", "uuid": "2436b614-e96d-47f0-9f6f-41d6fe97acd4" }, "isDisabled": false @@ -250,7 +250,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.cpp index 6dbfc1a061..707fe34b05 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.cpp @@ -1,10 +1,10 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" -#include "complex/Common/TypesUtility.hpp" +#include "simplnx/Common/TypesUtility.hpp" #include -using namespace complex; +using namespace nx::core; bool ITK::DoTuplesMatch(const IDataStore& dataStore, const ImageGeom& imageGeom) { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.hpp index 36d505f83f..18ac1d102f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKArrayHelper.hpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp" #include "ITKImageProcessing/Common/ITKProgressObserver.hpp" -#include "complex/Common/Result.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/IDataStore.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Output.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Output.hpp" #include #include @@ -26,7 +26,7 @@ #include #include -namespace complex +namespace nx::core { namespace ITK { @@ -53,28 +53,28 @@ struct ImageGeomData inline const std::set& GetScalarPixelAllowedTypes() { - static const std::set dataTypes = {complex::DataType::int8, complex::DataType::uint8, complex::DataType::int16, complex::DataType::uint16, complex::DataType::int32, - complex::DataType::uint32, complex::DataType::int64, complex::DataType::uint64, complex::DataType::float32, complex::DataType::float64}; + static const std::set dataTypes = {nx::core::DataType::int8, nx::core::DataType::uint8, nx::core::DataType::int16, nx::core::DataType::uint16, nx::core::DataType::int32, + nx::core::DataType::uint32, nx::core::DataType::int64, nx::core::DataType::uint64, nx::core::DataType::float32, nx::core::DataType::float64}; return dataTypes; } inline const std::set& GetIntegerScalarPixelAllowedTypes() { - static const std::set dataTypes = {complex::DataType::int8, complex::DataType::uint8, complex::DataType::int16, complex::DataType::uint16, - complex::DataType::int32, complex::DataType::uint32, complex::DataType::int64, complex::DataType::uint64}; + static const std::set dataTypes = {nx::core::DataType::int8, nx::core::DataType::uint8, nx::core::DataType::int16, nx::core::DataType::uint16, + nx::core::DataType::int32, nx::core::DataType::uint32, nx::core::DataType::int64, nx::core::DataType::uint64}; return dataTypes; } inline const std::set& GetFloatingScalarPixelAllowedTypes() { - static const std::set dataTypes = {complex::DataType::float32, complex::DataType::float64}; + static const std::set dataTypes = {nx::core::DataType::float32, nx::core::DataType::float64}; return dataTypes; } inline const std::set& GetNonLabelPixelAllowedTypes() { - static const std::set dataTypes = {complex::DataType::int8, complex::DataType::uint8, complex::DataType::int16, complex::DataType::uint16, complex::DataType::int32, - complex::DataType::uint32, complex::DataType::int64, complex::DataType::uint64, complex::DataType::float32, complex::DataType::float64}; + static const std::set dataTypes = {nx::core::DataType::int8, nx::core::DataType::uint8, nx::core::DataType::int16, nx::core::DataType::uint16, nx::core::DataType::int32, + nx::core::DataType::uint32, nx::core::DataType::int64, nx::core::DataType::uint64, nx::core::DataType::float32, nx::core::DataType::float64}; return dataTypes; } @@ -86,17 +86,17 @@ inline const std::set& GetScalarVectorPixelAllowedTypes() inline const std::set& GetFloatingVectorPixelAllowedTypes() { - static const std::set dataTypes = {complex::DataType::float32, complex::DataType::float64}; + static const std::set dataTypes = {nx::core::DataType::float32, nx::core::DataType::float64}; return dataTypes; } inline const std::set& GetSignedIntegerScalarPixelAllowedTypes() { static const std::set dataTypes = { - complex::DataType::int8, - complex::DataType::int16, - complex::DataType::int32, - complex::DataType::int64, + nx::core::DataType::int8, + nx::core::DataType::int16, + nx::core::DataType::int32, + nx::core::DataType::int64, }; return dataTypes; } @@ -125,7 +125,7 @@ bool DoTuplesMatch(const IDataStore& dataStore, const ImageGeom& imageGeom); bool DoDimensionsMatch(const IDataStore& dataStore, const ImageGeom& imageGeom); /** - * @brief Attempts to convert itk::IOComponentEnum to complex::NumericType + * @brief Attempts to convert itk::IOComponentEnum to nx::core::NumericType * @param component * @return */ @@ -172,7 +172,7 @@ inline constexpr std::optional ConvertIOComponentToNumericType(itk: } /** - * @brief Attempts to convert itk::IOComponentEnum to complex::DataType + * @brief Attempts to convert itk::IOComponentEnum to nx::core::DataType * @param component * @return */ @@ -268,10 +268,10 @@ typename itk::Image::Pointer WrapDataStoreInImage(DataStore< { using T = ITK::UnderlyingType_t; - static_assert(std::is_standard_layout_v, "complex::ITK::WrapDataStoreInImage: PixelT must be standard layout"); - // static_assert(std::is_trivial_v, "complex::ITK::WrapDataStoreInImage: PixelT must be trivial"); - static_assert(std::is_arithmetic_v, "complex::ITK::WrapDataStoreInImage: The underlying type T of PixelT must be arithmetic"); - static_assert(sizeof(PixelT) % sizeof(T) == 0, "complex::ITK::WrapDataStoreInImage: The size of PixelT must be evenly divisible by T"); + static_assert(std::is_standard_layout_v, "nx::core::ITK::WrapDataStoreInImage: PixelT must be standard layout"); + // static_assert(std::is_trivial_v, "nx::core::ITK::WrapDataStoreInImage: PixelT must be trivial"); + static_assert(std::is_arithmetic_v, "nx::core::ITK::WrapDataStoreInImage: The underlying type T of PixelT must be arithmetic"); + static_assert(sizeof(PixelT) % sizeof(T) == 0, "nx::core::ITK::WrapDataStoreInImage: The size of PixelT must be evenly divisible by T"); using FilterType = itk::ImportImageFilter; @@ -496,14 +496,14 @@ Result DataCheckImpl(const DataStructure& dataStructure, const Da const IDataStore& dataStore = dataArray.getIDataStoreRef(); - if(!complex::ITK::DoDimensionsMatch(dataStore, imageGeom) && !complex::ITK::DoTuplesMatch(dataStore, imageGeom)) + if(!nx::core::ITK::DoDimensionsMatch(dataStore, imageGeom) && !nx::core::ITK::DoTuplesMatch(dataStore, imageGeom)) { std::string errMessage = fmt::format("DataArray '{}' tuple dimensions '{}' do not match Image Geometry '{}' with dimensions 'XYZ={}' and the total number of ImageGeometry Cells {} does not match " "the total number of DataArray tuples {}.", inputArrayPath.toString(), fmt::join(dataStore.getTupleShape(), ", "), imageGeomPath.toString(), fmt::join(imageGeom.getDimensions(), ", "), imageGeom.getNumberOfCells(), dataStore.getNumberOfTuples()); - return MakeErrorResult(complex::ITK::Constants::k_ImageGeometryDimensionMismatch, errMessage); + return MakeErrorResult(nx::core::ITK::Constants::k_ImageGeometryDimensionMismatch, errMessage); } std::vector cDims = dataStore.getComponentShape(); @@ -513,7 +513,7 @@ Result DataCheckImpl(const DataStructure& dataStructure, const Da { const std::string errMessage = fmt::format("DataArray component dimensions of '{}' do not match output image component dimensions of '{}'", fmt::join(inputPixelDims, ", "), fmt::join(cDims, ", ")); - return MakeErrorResult(complex::ITK::Constants::k_ImageComponentDimensionMismatch, errMessage); + return MakeErrorResult(nx::core::ITK::Constants::k_ImageComponentDimensionMismatch, errMessage); } OutputActions outputActions; @@ -733,4 +733,4 @@ Result> Execute(DataStr } } } // namespace ITK -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp index e0dfe28624..28f837e151 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp @@ -12,7 +12,7 @@ #include #include -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/IFilter.hpp" namespace itk { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp index 338e706378..66da392c62 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp @@ -4,7 +4,7 @@ #include -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "itkCommand.h" #include "itkMacro.h" @@ -22,7 +22,7 @@ class ProgressObserver : public itk::Command using Pointer = SmartPointer; /** Method for creation through the object factory. */ - static Pointer New(const complex::IFilter::MessageHandler& messageHandler) + static Pointer New(const nx::core::IFilter::MessageHandler& messageHandler) { Pointer smartPtr = ::itk::ObjectFactory::Create(); if(smartPtr == nullptr) @@ -70,7 +70,7 @@ class ProgressObserver : public itk::Command ss = fmt::format("{} : {}", m_MessagePrefix, progressStr); } - m_MessageHandler(complex::IFilter::Message::Type::Info, ss); + m_MessageHandler(nx::core::IFilter::Message::Type::Info, ss); m_StartTime = std::chrono::steady_clock::now(); } } @@ -82,7 +82,7 @@ class ProgressObserver : public itk::Command protected: ProgressObserver() = delete; - ProgressObserver(const complex::IFilter::MessageHandler& m) + ProgressObserver(const nx::core::IFilter::MessageHandler& m) : m_MessageHandler(m) , m_StartTime(std::chrono::steady_clock::now()) { @@ -90,7 +90,7 @@ class ProgressObserver : public itk::Command ~ProgressObserver() override = default; private: - const complex::IFilter::MessageHandler& m_MessageHandler; + const nx::core::IFilter::MessageHandler& m_MessageHandler; std::string m_MessagePrefix; std::chrono::steady_clock::time_point m_StartTime; }; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp index 8cc322aa91..ea30f54105 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ReadImageUtils.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxItkImageReader { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp index d85971b546..7e24a32bd4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/sitkCommon.hpp @@ -4,7 +4,7 @@ /** * @brief On MSVC the above header (itkFlatStructuringelement.h) eventually brings in * `fileapi.h` which then defines 'CreateFile' as a macro. This interferes with - * API in the `complex` library for reading HDF5 files. So we are going to `undef` + * API in the `simplnx` library for reading HDF5 files. So we are going to `undef` * that macro here. */ #if defined(_MSC_VER) && defined(CreateFile) diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.cpp index a44b355642..321fa82710 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.cpp @@ -4,27 +4,27 @@ #include "ITKImageProcessing/Common/ReadImageUtils.hpp" #include "ITKImageProcessing/Filters/ITKImageReader.hpp" -#include "complex/Common/Array.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { -const Uuid k_ComplexCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); +const Uuid k_SimplnxCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); const Uuid k_ColorToGrayScaleFilterId = *Uuid::FromString("d938a2aa-fee2-4db9-aa2f-2c34a9736580"); -const FilterHandle k_ColorToGrayScaleFilterHandle(k_ColorToGrayScaleFilterId, k_ComplexCorePluginId); +const FilterHandle k_ColorToGrayScaleFilterHandle(k_ColorToGrayScaleFilterId, k_SimplnxCorePluginId); template class IOHandler @@ -226,9 +226,9 @@ class IOHandler // Check if we need to convert to grayscale if(m_InputValues->convertToGrayScale) { - if(!filterListPtr->containsPlugin(k_ComplexCorePluginId)) + if(!filterListPtr->containsPlugin(k_SimplnxCorePluginId)) { - return MakeErrorResult(-18542, "ComplexCore was not instantiated in this instance, so color to grayscale is not a valid option."); + return MakeErrorResult(-18542, "SimplnxCore was not instantiated in this instance, so color to grayscale is not a valid option."); } auto grayScaleFilter = filterListPtr->createFilter(k_ColorToGrayScaleFilterHandle); if(nullptr == grayScaleFilter.get()) diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.hpp index e67a3810d7..0a6ea33d17 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/Algorithms/ITKImportFijiMontage.hpp @@ -2,15 +2,15 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { struct ITKIMAGEPROCESSING_EXPORT ITKImportFijiMontageInputValues { @@ -114,4 +114,4 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportFijiMontage const IFilter::MessageHandler& m_MessageHandler; FijiCache& m_Cache; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp index 24164a450e..bac89c5ddc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKAbsImage { @@ -30,7 +30,7 @@ struct ITKAbsImageFunctor }; } // namespace cxITKAbsImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKAbsImage::name() const @@ -71,7 +71,7 @@ Parameters ITKAbsImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKAbsImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp index 63b173a2e5..cbc3f055c4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKAbsImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKAbsImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKAbsImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKAbsImage, "e9dd12bc-f7fa-4ba2-98b0-fec3326bf620"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKAbsImage, "e9dd12bc-f7fa-4ba2-98b0-fec3326bf620"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp index 4fe3f08de9..008807804e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKAcosImage { @@ -30,7 +30,7 @@ struct ITKAcosImageFunctor }; } // namespace cxITKAcosImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKAcosImage::name() const @@ -71,7 +71,7 @@ Parameters ITKAcosImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKAcosImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp index f94e00b3ce..4ebeabfc7e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKAcosImage @@ -53,7 +53,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKAcosImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -126,6 +126,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKAcosImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKAcosImage, "e7411c44-95ab-4623-8bf4-59b63d2d08c5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKAcosImage, "e7411c44-95ab-4623-8bf4-59b63d2d08c5"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp index ae75abe59a..bf61a00da8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKAdaptiveHistogramEqualizationImage { @@ -45,7 +45,7 @@ struct ITKAdaptiveHistogramEqualizationImageFunctor }; } // namespace cxITKAdaptiveHistogramEqualizationImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKAdaptiveHistogramEqualizationImage::name() const @@ -94,7 +94,7 @@ Parameters ITKAdaptiveHistogramEqualizationImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -148,7 +148,7 @@ Result<> ITKAdaptiveHistogramEqualizationImage::executeImpl(DataStructure& dataS return ITK::Execute(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath, itkFunctor, shouldCancel); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp index a6caa6c369..ab86d66901 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKAdaptiveHistogramEqualizationImage @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKAdaptiveHistogramEqualizationImage : public I static inline constexpr StringLiteral k_Beta_Key = "beta"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -125,6 +125,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKAdaptiveHistogramEqualizationImage : public I Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKAdaptiveHistogramEqualizationImage, "ea3e7439-8327-4190-8ff7-49ecc321718f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKAdaptiveHistogramEqualizationImage, "ea3e7439-8327-4190-8ff7-49ecc321718f"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp index 5c9545fa87..10acb950b2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKAsinImage { @@ -30,7 +30,7 @@ struct ITKAsinImageFunctor }; } // namespace cxITKAsinImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKAsinImage::name() const @@ -71,7 +71,7 @@ Parameters ITKAsinImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKAsinImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp index 3139ab23cd..79eb64752d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKAsinImage @@ -53,7 +53,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKAsinImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -126,6 +126,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKAsinImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKAsinImage, "1b463492-041f-4680-abb1-0b94a3019063"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKAsinImage, "1b463492-041f-4680-abb1-0b94a3019063"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp index 02af0a59a8..8887f5c265 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKAtanImage { @@ -30,7 +30,7 @@ struct ITKAtanImageFunctor }; } // namespace cxITKAtanImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKAtanImage::name() const @@ -71,7 +71,7 @@ Parameters ITKAtanImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKAtanImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp index 1022868434..4bc85a3740 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKAtanImage @@ -49,7 +49,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKAtanImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -122,6 +122,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKAtanImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKAtanImage, "39933f50-088c-46ac-a421-d238f1b178fd"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKAtanImage, "39933f50-088c-46ac-a421-d238f1b178fd"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp index afe9044823..0db4f22b1f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryContourImage { @@ -38,7 +38,7 @@ struct ITKBinaryContourImageFunctor }; } // namespace cxITKBinaryContourImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryContourImage::name() const @@ -86,7 +86,7 @@ Parameters ITKBinaryContourImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -168,4 +168,4 @@ Result ITKBinaryContourImage::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp index b95afb4a6d..f5295e2b4a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryContourImage @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryContourImage : public IFilter static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -120,6 +120,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryContourImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryContourImage, "ed214e76-6954-49b4-817b-13f92315e722"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryContourImage, "ed214e76-6954-49b4-817b-13f92315e722"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp index 3f7980d33f..a30ba832ba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.cpp @@ -3,19 +3,19 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryDilateImage { @@ -44,7 +44,7 @@ struct ITKBinaryDilateImageFunctor }; } // namespace cxITKBinaryDilateImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryDilateImage::name() const @@ -93,7 +93,7 @@ Parameters ITKBinaryDilateImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -183,4 +183,4 @@ Result ITKBinaryDilateImage::FromSIMPLJson(const nlohmann::json& json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp index cecc2a19a0..0d38838331 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryDilateImage @@ -58,7 +58,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryDilateImage : public IFilter static inline constexpr StringLiteral k_BoundaryToForeground_Key = "boundary_to_foreground"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -131,6 +131,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryDilateImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryDilateImage, "d4e973cb-c501-4c64-af26-fcf791c0f36d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryDilateImage, "d4e973cb-c501-4c64-af26-fcf791c0f36d"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp index 7214000b81..23c8a5d886 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.cpp @@ -3,19 +3,19 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryErodeImage { @@ -44,7 +44,7 @@ struct ITKBinaryErodeImageFunctor }; } // namespace cxITKBinaryErodeImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryErodeImage::name() const @@ -93,7 +93,7 @@ Parameters ITKBinaryErodeImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -183,4 +183,4 @@ Result ITKBinaryErodeImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp index 327618bbea..e9359caeda 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryErodeImage @@ -58,7 +58,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryErodeImage : public IFilter static inline constexpr StringLiteral k_BoundaryToForeground_Key = "boundary_to_foreground"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -131,6 +131,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryErodeImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryErodeImage, "243dd30b-d1f0-42ad-8b47-77d57f9fc262"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryErodeImage, "243dd30b-d1f0-42ad-8b47-77d57f9fc262"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp index 82bb65e816..6d9b5bd3b4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryMorphologicalClosingImage { @@ -40,7 +40,7 @@ struct ITKBinaryMorphologicalClosingImageFunctor }; } // namespace cxITKBinaryMorphologicalClosingImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryMorphologicalClosingImage::name() const @@ -89,7 +89,7 @@ Parameters ITKBinaryMorphologicalClosingImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -143,4 +143,4 @@ Result<> ITKBinaryMorphologicalClosingImage::executeImpl(DataStructure& dataStru return ITK::Execute(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath, itkFunctor, shouldCancel); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp index 25cd4d2772..b6a305cdca 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryMorphologicalClosingImage @@ -114,6 +114,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalClosingImage : public IFil Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryMorphologicalClosingImage, "abb27e0c-b049-4f60-8355-178d86bb1de4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryMorphologicalClosingImage, "abb27e0c-b049-4f60-8355-178d86bb1de4"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp index 149cf82382..913b01d7e0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryMorphologicalOpeningImage { @@ -41,7 +41,7 @@ struct ITKBinaryMorphologicalOpeningImageFunctor }; } // namespace cxITKBinaryMorphologicalOpeningImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryMorphologicalOpeningImage::name() const @@ -89,7 +89,7 @@ Parameters ITKBinaryMorphologicalOpeningImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -175,4 +175,4 @@ Result ITKBinaryMorphologicalOpeningImage::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp index cbf011192c..efad2f5d01 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryMorphologicalOpeningImage @@ -48,7 +48,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalOpeningImage : public IFil static inline constexpr StringLiteral k_ForegroundValue_Key = "foreground_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -121,6 +121,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryMorphologicalOpeningImage : public IFil Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryMorphologicalOpeningImage, "861ccb46-dbce-41bf-a66f-25cc18cd1073"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryMorphologicalOpeningImage, "861ccb46-dbce-41bf-a66f-25cc18cd1073"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp index 7aeba4be71..72d9fe711b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.cpp @@ -3,19 +3,19 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryOpeningByReconstructionImage { @@ -44,7 +44,7 @@ struct ITKBinaryOpeningByReconstructionImageFunctor }; } // namespace cxITKBinaryOpeningByReconstructionImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryOpeningByReconstructionImage::name() const @@ -96,7 +96,7 @@ Parameters ITKBinaryOpeningByReconstructionImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -186,4 +186,4 @@ Result ITKBinaryOpeningByReconstructionImage::FromSIMPLJson(const nlo return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp index 196332f9ff..29d1587b9f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryOpeningByReconstructionImage @@ -48,7 +48,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryOpeningByReconstructionImage : public I static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -121,6 +121,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryOpeningByReconstructionImage : public I Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryOpeningByReconstructionImage, "02c15392-382c-406d-a174-07ea6fa11b67"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryOpeningByReconstructionImage, "02c15392-382c-406d-a174-07ea6fa11b67"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp index 5be98b5338..11ea213a2e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryProjectionImage { @@ -37,7 +37,7 @@ struct ITKBinaryProjectionImageFunctor }; } // namespace cxITKBinaryProjectionImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryProjectionImage::name() const @@ -87,7 +87,7 @@ Parameters ITKBinaryProjectionImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -169,4 +169,4 @@ Result ITKBinaryProjectionImage::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp index bb5ba7b157..4d81e22340 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryProjectionImage @@ -63,7 +63,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryProjectionImage : public IFilter static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -136,6 +136,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryProjectionImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryProjectionImage, "04ea495e-2cf0-4dba-8d29-cf33a38c094d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryProjectionImage, "04ea495e-2cf0-4dba-8d29-cf33a38c094d"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp index 3e3ace4660..6feffc7cc5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryThinningImage { @@ -29,7 +29,7 @@ struct ITKBinaryThinningImageFunctor }; } // namespace cxITKBinaryThinningImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryThinningImage::name() const @@ -70,7 +70,7 @@ Parameters ITKBinaryThinningImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKBinaryThinningImage::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp index aa7fdab2ca..b68a579d21 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryThinningImage @@ -46,7 +46,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThinningImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -119,6 +119,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThinningImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryThinningImage, "8fcd24cb-769d-400f-97cf-9b4dad1b8cd2"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryThinningImage, "8fcd24cb-769d-400f-97cf-9b4dad1b8cd2"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp index 31ba47c6e6..43092faac4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBinaryThresholdImage { @@ -41,7 +41,7 @@ struct ITKBinaryThresholdImageFunctor }; } // namespace cxITKBinaryThresholdImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBinaryThresholdImage::name() const @@ -87,7 +87,7 @@ Parameters ITKBinaryThresholdImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -175,4 +175,4 @@ Result ITKBinaryThresholdImage::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp index 6a0614088f..9d8b72023f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBinaryThresholdImage @@ -48,7 +48,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThresholdImage : public IFilter static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -121,6 +121,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBinaryThresholdImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBinaryThresholdImage, "ba2494b0-c4f0-43ff-9d08-900395900e0c"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBinaryThresholdImage, "ba2494b0-c4f0-43ff-9d08-900395900e0c"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp index 04721fe913..a5338f56d7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKBlackTopHatImage { @@ -39,7 +39,7 @@ struct ITKBlackTopHatImageFunctor }; } // namespace cxITKBlackTopHatImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKBlackTopHatImage::name() const @@ -86,7 +86,7 @@ Parameters ITKBlackTopHatImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -168,4 +168,4 @@ Result ITKBlackTopHatImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp index e3d3cb7c34..cd70055a2a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKBlackTopHatImage @@ -42,7 +42,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKBlackTopHatImage : public IFilter static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -115,6 +115,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKBlackTopHatImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKBlackTopHatImage, "b7471b64-2282-449b-82b4-3ce359e9dda0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKBlackTopHatImage, "b7471b64-2282-449b-82b4-3ce359e9dda0"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp index 03d5c02d63..30f6cabb6b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKClosingByReconstructionImage { @@ -41,7 +41,7 @@ struct ITKClosingByReconstructionImageFunctor }; } // namespace cxITKClosingByReconstructionImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKClosingByReconstructionImage::name() const @@ -94,7 +94,7 @@ Parameters ITKClosingByReconstructionImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -180,4 +180,4 @@ Result ITKClosingByReconstructionImage::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp index 460f72ae2e..f3f4a5d4bb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKClosingByReconstructionImage @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKClosingByReconstructionImage : public IFilter static inline constexpr StringLiteral k_PreserveIntensities_Key = "preserve_intensities"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -125,6 +125,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKClosingByReconstructionImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKClosingByReconstructionImage, "b5ff32a8-e799-4f72-8d13-e2581f748562"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKClosingByReconstructionImage, "b5ff32a8-e799-4f72-8d13-e2581f748562"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp index 4dd60c660e..521481648c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKCosImage { @@ -30,7 +30,7 @@ struct ITKCosImageFunctor }; } // namespace cxITKCosImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKCosImage::name() const @@ -71,7 +71,7 @@ Parameters ITKCosImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKCosImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp index e92ff4f2f9..db4dc5f98e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKCosImage @@ -53,7 +53,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKCosImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -126,6 +126,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKCosImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKCosImage, "6fe37f77-ceae-4839-9cf6-3ca7a70e14d0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKCosImage, "6fe37f77-ceae-4839-9cf6-3ca7a70e14d0"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp index 5031f3a3bf..8884a0895e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKDilateObjectMorphologyImage { @@ -39,7 +39,7 @@ struct ITKDilateObjectMorphologyImageFunctor }; } // namespace cxITKDilateObjectMorphologyImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKDilateObjectMorphologyImage::name() const @@ -86,7 +86,7 @@ Parameters ITKDilateObjectMorphologyImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -168,4 +168,4 @@ Result ITKDilateObjectMorphologyImage::FromSIMPLJson(const nlohmann:: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp index dc6abb96c9..94cfbc481f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKDilateObjectMorphologyImage @@ -46,7 +46,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDilateObjectMorphologyImage : public IFilter static inline constexpr StringLiteral k_ObjectValue_Key = "object_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -119,6 +119,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKDilateObjectMorphologyImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKDilateObjectMorphologyImage, "e3f7c642-4c16-47f6-ac5c-cd276d61bfa6"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKDilateObjectMorphologyImage, "e3f7c642-4c16-47f6-ac5c-cd276d61bfa6"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp index 2cfbe14838..147aa82de1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKDiscreteGaussianImage { @@ -43,7 +43,7 @@ struct ITKDiscreteGaussianImageFunctor }; } // namespace cxITKDiscreteGaussianImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKDiscreteGaussianImage::name() const @@ -97,7 +97,7 @@ Parameters ITKDiscreteGaussianImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -187,4 +187,4 @@ Result ITKDiscreteGaussianImage::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp index 443ab5a8f7..bf5e92e49f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKDiscreteGaussianImage @@ -58,7 +58,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKDiscreteGaussianImage : public IFilter static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -131,6 +131,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKDiscreteGaussianImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKDiscreteGaussianImage, "025edc1a-986d-4005-92d1-545dfdc13abd"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKDiscreteGaussianImage, "025edc1a-986d-4005-92d1-545dfdc13abd"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp index ea49815a67..b7e06c3e92 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKErodeObjectMorphologyImage { @@ -41,7 +41,7 @@ struct ITKErodeObjectMorphologyImageFunctor }; } // namespace cxITKErodeObjectMorphologyImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKErodeObjectMorphologyImage::name() const @@ -89,7 +89,7 @@ Parameters ITKErodeObjectMorphologyImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -175,4 +175,4 @@ Result ITKErodeObjectMorphologyImage::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp index 519903d2af..487d92b48a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKErodeObjectMorphologyImage @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKErodeObjectMorphologyImage : public IFilter static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -120,6 +120,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKErodeObjectMorphologyImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKErodeObjectMorphologyImage, "db3fe379-6ce4-4be3-baca-1cbff00aca6a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKErodeObjectMorphologyImage, "db3fe379-6ce4-4be3-baca-1cbff00aca6a"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp index 782044f424..02562f098b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKExpImage { @@ -30,7 +30,7 @@ struct ITKExpImageFunctor }; } // namespace cxITKExpImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKExpImage::name() const @@ -71,7 +71,7 @@ Parameters ITKExpImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKExpImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp index d9e3914196..ed47035824 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKExpImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKExpImage, "264977e7-cc0d-4d2b-ba9c-a30765b498b2"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKExpImage, "264977e7-cc0d-4d2b-ba9c-a30765b498b2"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp index 9e88ec69ed..8c47a66ffa 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKExpNegativeImage { @@ -30,7 +30,7 @@ struct ITKExpNegativeImageFunctor }; } // namespace cxITKExpNegativeImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKExpNegativeImage::name() const @@ -71,7 +71,7 @@ Parameters ITKExpNegativeImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -140,4 +140,4 @@ Result ITKExpNegativeImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp index d448ca7ad2..195f75e578 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKExpNegativeImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpNegativeImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKExpNegativeImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKExpNegativeImage, "2c84cc7c-01ab-4550-9ba5-b9fa58b74599"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKExpNegativeImage, "2c84cc7c-01ab-4550-9ba5-b9fa58b74599"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp index d9688f6e4a..4269dc837e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGradientMagnitudeImage { @@ -35,7 +35,7 @@ struct ITKGradientMagnitudeImageFunctor }; } // namespace cxITKGradientMagnitudeImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGradientMagnitudeImage::name() const @@ -81,7 +81,7 @@ Parameters ITKGradientMagnitudeImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -157,4 +157,4 @@ Result ITKGradientMagnitudeImage::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp index b1c489e4b0..e616b4f443 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGradientMagnitudeImage @@ -44,7 +44,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeImage : public IFilter static inline constexpr StringLiteral k_UseImageSpacing_Key = "use_image_spacing"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -117,6 +117,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGradientMagnitudeImage, "719df7b2-8db2-43eb-a40c-a015982eec08"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGradientMagnitudeImage, "719df7b2-8db2-43eb-a40c-a015982eec08"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp index ed5dcb2849..44b6c0e43a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.cpp @@ -9,23 +9,23 @@ * float */ #define ITK_BASIC_PIXEL_ID_TYPE_LIST 1 -#define COMPLEX_ITK_ARRAY_HELPER_USE_Scalar 1 +#define SIMPLNX_ITK_ARRAY_HELPER_USE_Scalar 1 #define ITK_ARRAY_HELPER_NAMESPACE GradientMagnitudeRecursiveGaussianImage #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -51,7 +51,7 @@ struct ITKGradientMagnitudeRecursiveGaussianImageCreationFunctor }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGradientMagnitudeRecursiveGaussianImage::name() const @@ -128,14 +128,14 @@ IFilter::PreflightResult ITKGradientMagnitudeRecursiveGaussianImage::preflightIm PreflightResult preflightResult; std::vector preflightUpdatedValues; - complex::Result resultOutputActions = ITK::DataCheck(dataStructure, pSelectedInputArray, pImageGeomPath, pOutputArrayPath); + nx::core::Result resultOutputActions = ITK::DataCheck(dataStructure, pSelectedInputArray, pImageGeomPath, pOutputArrayPath); // If the filter needs to pass back some updated values via a key:value string:string set of values // you can declare and update that string here. // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -182,4 +182,4 @@ Result<> ITKGradientMagnitudeRecursiveGaussianImage::executeImpl(DataStructure& ***************************************************************************/ return ITK::Execute(dataStructure, pSelectedInputArray, pImageGeomPath, pOutputArrayPath, itkFunctor); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp index 71f9419840..db8592413b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGradientMagnitudeRecursiveGaussianImage @@ -101,6 +101,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGradientMagnitudeRecursiveGaussianImage : pub */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGradientMagnitudeRecursiveGaussianImage, "0ac5ed47-963e-4c54-b33d-967e0aa6a621"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGradientMagnitudeRecursiveGaussianImage, "0ac5ed47-963e-4c54-b33d-967e0aa6a621"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp index 5620208547..a92d536baf 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGrayscaleDilateImage { @@ -36,7 +36,7 @@ struct ITKGrayscaleDilateImageFunctor }; } // namespace cxITKGrayscaleDilateImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGrayscaleDilateImage::name() const @@ -82,7 +82,7 @@ Parameters ITKGrayscaleDilateImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -160,4 +160,4 @@ Result ITKGrayscaleDilateImage::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp index b003b74c68..725bdb3779 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGrayscaleDilateImage @@ -40,7 +40,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleDilateImage : public IFilter static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -113,6 +113,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleDilateImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGrayscaleDilateImage, "944f4d1a-adb1-401a-9c0f-e2085ef2f6dc"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGrayscaleDilateImage, "944f4d1a-adb1-401a-9c0f-e2085ef2f6dc"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp index f17e48a7d8..12844c3fa5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGrayscaleErodeImage { @@ -36,7 +36,7 @@ struct ITKGrayscaleErodeImageFunctor }; } // namespace cxITKGrayscaleErodeImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGrayscaleErodeImage::name() const @@ -82,7 +82,7 @@ Parameters ITKGrayscaleErodeImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -160,4 +160,4 @@ Result ITKGrayscaleErodeImage::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp index b0b9f4e25a..8fcdcbbf66 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGrayscaleErodeImage @@ -40,7 +40,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleErodeImage : public IFilter static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -113,6 +113,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleErodeImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGrayscaleErodeImage, "3ceb1e6f-f4a4-4d8f-82d5-ecd20d4fc285"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGrayscaleErodeImage, "3ceb1e6f-f4a4-4d8f-82d5-ecd20d4fc285"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp index 78446620d2..17f39548e5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGrayscaleFillholeImage { @@ -33,7 +33,7 @@ struct ITKGrayscaleFillholeImageFunctor }; } // namespace cxITKGrayscaleFillholeImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGrayscaleFillholeImage::name() const @@ -79,7 +79,7 @@ Parameters ITKGrayscaleFillholeImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -153,4 +153,4 @@ Result ITKGrayscaleFillholeImage::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp index f30d90eec8..77a9ff9098 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGrayscaleFillholeImage @@ -50,7 +50,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleFillholeImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -123,6 +123,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleFillholeImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGrayscaleFillholeImage, "1f1dd9e4-d361-432b-a22b-5535664ee545"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGrayscaleFillholeImage, "1f1dd9e4-d361-432b-a22b-5535664ee545"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp index 1bb17423db..45ef97057d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGrayscaleGrindPeakImage { @@ -33,7 +33,7 @@ struct ITKGrayscaleGrindPeakImageFunctor }; } // namespace cxITKGrayscaleGrindPeakImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGrayscaleGrindPeakImage::name() const @@ -79,7 +79,7 @@ Parameters ITKGrayscaleGrindPeakImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -153,4 +153,4 @@ Result ITKGrayscaleGrindPeakImage::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp index f160f415dd..ef280dbce7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGrayscaleGrindPeakImage @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleGrindPeakImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -125,6 +125,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleGrindPeakImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGrayscaleGrindPeakImage, "6aa5b193-c290-4fe3-a409-7759a62d48ea"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGrayscaleGrindPeakImage, "6aa5b193-c290-4fe3-a409-7759a62d48ea"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp index 286e3d5836..974153dd2f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGrayscaleMorphologicalClosingImage { @@ -39,7 +39,7 @@ struct ITKGrayscaleMorphologicalClosingImageFunctor }; } // namespace cxITKGrayscaleMorphologicalClosingImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGrayscaleMorphologicalClosingImage::name() const @@ -86,7 +86,7 @@ Parameters ITKGrayscaleMorphologicalClosingImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -168,4 +168,4 @@ Result ITKGrayscaleMorphologicalClosingImage::FromSIMPLJson(const nlo return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp index ab55cc1abc..c28c3de9a1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGrayscaleMorphologicalClosingImage @@ -41,7 +41,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalClosingImage : public I static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -114,6 +114,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalClosingImage : public I Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGrayscaleMorphologicalClosingImage, "8b859b54-93d4-4341-8fbf-85e1e461d5b5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGrayscaleMorphologicalClosingImage, "8b859b54-93d4-4341-8fbf-85e1e461d5b5"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp index a250dfc5b6..87e18906e1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKGrayscaleMorphologicalOpeningImage { @@ -39,7 +39,7 @@ struct ITKGrayscaleMorphologicalOpeningImageFunctor }; } // namespace cxITKGrayscaleMorphologicalOpeningImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKGrayscaleMorphologicalOpeningImage::name() const @@ -86,7 +86,7 @@ Parameters ITKGrayscaleMorphologicalOpeningImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -168,4 +168,4 @@ Result ITKGrayscaleMorphologicalOpeningImage::FromSIMPLJson(const nlo return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp index e745c4a966..29d1e04c4e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKGrayscaleMorphologicalOpeningImage @@ -41,7 +41,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalOpeningImage : public I static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -114,6 +114,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKGrayscaleMorphologicalOpeningImage : public I Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKGrayscaleMorphologicalOpeningImage, "54433e92-fb7d-40f4-95bf-eb3db76d5caa"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKGrayscaleMorphologicalOpeningImage, "54433e92-fb7d-40f4-95bf-eb3db76d5caa"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp index 1c67109a77..4d221ac313 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKHConvexImage { @@ -36,7 +36,7 @@ struct ITKHConvexImageFunctor }; } // namespace cxITKHConvexImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKHConvexImage::name() const @@ -86,7 +86,7 @@ Parameters ITKHConvexImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -164,4 +164,4 @@ Result ITKHConvexImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp index 2940b84e45..72224f4212 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKHConvexImage @@ -47,7 +47,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKHConvexImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -120,6 +120,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKHConvexImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKHConvexImage, "620240a1-0b04-4bc7-a4c3-531917de4bc0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKHConvexImage, "620240a1-0b04-4bc7-a4c3-531917de4bc0"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp index f7920821dc..91d7125e84 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKHMaximaImage { @@ -33,7 +33,7 @@ struct ITKHMaximaImageFunctor }; } // namespace cxITKHMaximaImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKHMaximaImage::name() const @@ -79,7 +79,7 @@ Parameters ITKHMaximaImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -153,4 +153,4 @@ Result ITKHMaximaImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp index 68754b087e..cd296e8bc7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKHMaximaImage @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMaximaImage : public IFilter static inline constexpr StringLiteral k_Height_Key = "height"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -125,6 +125,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMaximaImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKHMaximaImage, "40039f72-30b0-4a3f-8ea4-2f76c5f65bc1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKHMaximaImage, "40039f72-30b0-4a3f-8ea4-2f76c5f65bc1"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp index 78b0b95500..f2b633a120 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKHMinimaImage { @@ -36,7 +36,7 @@ struct ITKHMinimaImageFunctor }; } // namespace cxITKHMinimaImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKHMinimaImage::name() const @@ -86,7 +86,7 @@ Parameters ITKHMinimaImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -164,4 +164,4 @@ Result ITKHMinimaImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp index c47872c873..05e8fcadf4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKHMinimaImage @@ -50,7 +50,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMinimaImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -123,6 +123,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKHMinimaImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKHMinimaImage, "9b2eb24b-90e5-41c0-9230-1044170ee8ea"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKHMinimaImage, "9b2eb24b-90e5-41c0-9230-1044170ee8ea"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp index 3c042ef849..928b385ebb 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp @@ -1,27 +1,27 @@ #include "ITKImageReader.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/ReadImageUtils.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKImageReader::name() const @@ -147,4 +147,4 @@ Result ITKImageReader::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp index ca6a8087dc..e58a66fef4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKImageReader @@ -30,7 +30,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageReader : public IFilter static inline constexpr StringLiteral k_CellDataName_Key = "cell_data_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageReader : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKImageReader, "d72eaf98-9b1d-44c9-88f2-a5c3cf57b4f2"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKImageReader, "d72eaf98-9b1d-44c9-88f2-a5c3cf57b4f2"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp index 518ae53a59..13f0e40c9d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp @@ -1,15 +1,15 @@ #include "ITKImageWriter.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" @@ -27,13 +27,13 @@ #include #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace cxITKImageWriter { @@ -247,7 +247,7 @@ Result<> SaveImageData(const fs::path& filePath, IDataStore& sliceData, const IT } } // namespace cxITKImageWriter -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKImageWriter::name() const @@ -295,7 +295,7 @@ Parameters ITKImageWriter::parameters() const params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_ImageArrayPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); return params; } @@ -470,4 +470,4 @@ Result ITKImageWriter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp index d2b853f235..4be7e2df82 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKImageWriter @@ -31,7 +31,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageWriter : public IFilter static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,6 +105,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageWriter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKImageWriter, "a181ee3e-1678-4133-b9c5-a9dd7bfec62f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKImageWriter, "a181ee3e-1678-4133-b9c5-a9dd7bfec62f"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp index 39207a3061..7d6737d123 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp @@ -4,32 +4,32 @@ #include "ITKImageProcessing/Filters/ITKImageReader.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Filter/Actions/UpdateImageGeomAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/MontageUtilities.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Filter/Actions/UpdateImageGeomAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/MontageUtilities.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { -const Uuid k_ComplexCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); +const Uuid k_SimplnxCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); const Uuid k_ColorToGrayScaleFilterId = *Uuid::FromString("d938a2aa-fee2-4db9-aa2f-2c34a9736580"); -const FilterHandle k_ColorToGrayScaleFilterHandle(k_ColorToGrayScaleFilterId, k_ComplexCorePluginId); +const FilterHandle k_ColorToGrayScaleFilterHandle(k_ColorToGrayScaleFilterId, k_SimplnxCorePluginId); std::atomic_int32_t s_InstanceId = 0; std::map s_HeaderCache; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ ITKImportFijiMontageFilter::ITKImportFijiMontageFilter() @@ -122,7 +122,7 @@ IFilter::PreflightResult ITKImportFijiMontageFilter::preflightImpl(const DataStr auto pImageDataArrayNameValue = filterArgs.value(k_ImageDataArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions = {}; + nx::core::Result resultOutputActions = {}; std::vector preflightUpdatedValues; ITKImportFijiMontageInputValues inputValues; @@ -190,9 +190,9 @@ IFilter::PreflightResult ITKImportFijiMontageFilter::preflightImpl(const DataStr if(pConvertToGrayScaleValue) { - if(!filterListPtr->containsPlugin(k_ComplexCorePluginId)) + if(!filterListPtr->containsPlugin(k_SimplnxCorePluginId)) { - return MakePreflightErrorResult(-18540, "ComplexCore was not instantiated in this instance, so color to grayscale is not a valid option."); + return MakePreflightErrorResult(-18540, "SimplnxCore was not instantiated in this instance, so color to grayscale is not a valid option."); } auto grayScaleFilter = filterListPtr->createFilter(k_ColorToGrayScaleFilterHandle); if(nullptr == grayScaleFilter.get()) @@ -235,4 +235,4 @@ Result<> ITKImportFijiMontageFilter::executeImpl(DataStructure& dataStructure, c return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp index 0763f66cbf..3368299ea5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp @@ -2,15 +2,15 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { /** * @class ITKImportImageStack @@ -108,6 +108,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportFijiMontageFilter : public IFilter private: int32 m_InstanceId; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKImportFijiMontageFilter, "4c48ea16-13ef-4281-89cf-315be5fb857d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKImportFijiMontageFilter, "4c48ea16-13ef-4281-89cf-315be5fb857d"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp index 2b8df26305..f5dd353e35 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp @@ -3,41 +3,41 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Filters/ITKImageReader.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace RotateSampleRefFrame { // Parameter Keys -static inline constexpr complex::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; -static inline constexpr complex::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; -static inline constexpr complex::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; -static inline constexpr complex::StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; -static inline constexpr complex::StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; -static inline constexpr complex::StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; -static inline constexpr complex::StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; +static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; +static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; +static inline constexpr nx::core::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; +static inline constexpr nx::core::StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; +static inline constexpr nx::core::StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; +static inline constexpr nx::core::StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; +static inline constexpr nx::core::StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; -// static inline constexpr complex::StringLiteral k_RotatedGeometryName = ".RotatedGeometry"; +// static inline constexpr nx::core::StringLiteral k_RotatedGeometryName = ".RotatedGeometry"; enum class RotationRepresentation : uint64_t { @@ -54,9 +54,9 @@ const ChoicesParameter::ValueType k_NoImageTransform = 0; const ChoicesParameter::ValueType k_FlipAboutXAxis = 1; const ChoicesParameter::ValueType k_FlipAboutYAxis = 2; -const Uuid k_ComplexCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); +const Uuid k_SimplnxCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); const Uuid k_RotateSampleRefFrameFilterId = *Uuid::FromString("d2451dc1-a5a1-4ac2-a64d-7991669dcffc"); -const FilterHandle k_RotateSampleRefFrameFilterHandle(k_RotateSampleRefFrameFilterId, k_ComplexCorePluginId); +const FilterHandle k_RotateSampleRefFrameFilterHandle(k_RotateSampleRefFrameFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the RotateSampleRefFrame Filter std::unique_ptr CreateRotateSampleRefFrameFilter() @@ -214,7 +214,7 @@ Result<> ReadImageStack(DataStructure& dataStructure, const DataPath& imageGeomP } } // namespace cxITKImportImageStack -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -463,4 +463,4 @@ Result ITKImportImageStack::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp index cff5621acd..0f0b56fc6b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKImportImageStack @@ -33,7 +33,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportImageStack : public IFilter static inline constexpr StringLiteral k_ImageTransformChoice_Key = "image_transform_choice"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKImportImageStack : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKImportImageStack, "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKImportImageStack, "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp index 3794adb316..4138659961 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKIntensityWindowingImage { @@ -39,7 +39,7 @@ struct ITKIntensityWindowingImageFunctor }; } // namespace cxITKIntensityWindowingImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKIntensityWindowingImage::name() const @@ -85,7 +85,7 @@ Parameters ITKIntensityWindowingImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -171,4 +171,4 @@ Result ITKIntensityWindowingImage::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp index c9636722a9..b218dc653d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKIntensityWindowingImage @@ -45,7 +45,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKIntensityWindowingImage : public IFilter static inline constexpr StringLiteral k_OutputMaximum_Key = "output_maximum"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -118,6 +118,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKIntensityWindowingImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKIntensityWindowingImage, "ee317bf6-79aa-4dcc-b59e-b0246dc3fcfa"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKIntensityWindowingImage, "ee317bf6-79aa-4dcc-b59e-b0246dc3fcfa"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp index ee495a4c11..f7df59b115 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKInvertIntensityImage { @@ -34,7 +34,7 @@ struct ITKInvertIntensityImageFunctor }; } // namespace cxITKInvertIntensityImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKInvertIntensityImage::name() const @@ -77,7 +77,7 @@ Parameters ITKInvertIntensityImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -151,4 +151,4 @@ Result ITKInvertIntensityImage::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp index bfa273ec43..1481222e63 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKInvertIntensityImage @@ -41,7 +41,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKInvertIntensityImage : public IFilter static inline constexpr StringLiteral k_Maximum_Key = "maximum"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -114,6 +114,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKInvertIntensityImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKInvertIntensityImage, "9958d587-5698-4ea5-b8ea-fb71428b5d02"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKInvertIntensityImage, "9958d587-5698-4ea5-b8ea-fb71428b5d02"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp index 502d67d994..9730bb6549 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKLabelContourImage { @@ -36,7 +36,7 @@ struct ITKLabelContourImageFunctor }; } // namespace cxITKLabelContourImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKLabelContourImage::name() const @@ -84,7 +84,7 @@ Parameters ITKLabelContourImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -162,4 +162,4 @@ Result ITKLabelContourImage::FromSIMPLJson(const nlohmann::json& json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp index 1afe96760b..c0d1c3236a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKLabelContourImage @@ -46,7 +46,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKLabelContourImage : public IFilter static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -119,6 +119,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKLabelContourImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKLabelContourImage, "b64ff45d-3661-4926-9e87-5dd7b379b261"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKLabelContourImage, "b64ff45d-3661-4926-9e87-5dd7b379b261"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp index 44859e4127..f14cec8577 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKLog10Image { @@ -30,7 +30,7 @@ struct ITKLog10ImageFunctor }; } // namespace cxITKLog10Image -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKLog10Image::name() const @@ -71,7 +71,7 @@ Parameters ITKLog10Image::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKLog10Image::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp index 1c8bf2bbd1..7890e90c9f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10Image.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKLog10Image @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKLog10Image : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,6 +106,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKLog10Image : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKLog10Image, "900ca377-e79d-4b54-b298-33d518238099"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKLog10Image, "900ca377-e79d-4b54-b298-33d518238099"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp index a21036941a..7668e7977b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKLogImage { @@ -30,7 +30,7 @@ struct ITKLogImageFunctor }; } // namespace cxITKLogImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKLogImage::name() const @@ -71,7 +71,7 @@ Parameters ITKLogImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKLogImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp index 17b9663bc0..6d959e9b93 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKLogImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKLogImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKLogImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKLogImage, "4b6655ad-4e6c-4e68-a771-55ca0ae40915"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKLogImage, "4b6655ad-4e6c-4e68-a771-55ca0ae40915"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp index 8e6266098b..0e958e7bbe 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.cpp @@ -2,22 +2,22 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" #include #include #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKMaskImage { @@ -107,7 +107,7 @@ struct ITKMaskImageFunctor }; } // namespace cxITKMaskImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKMaskImage::name() const @@ -151,9 +151,9 @@ Parameters ITKMaskImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_MaskImageDataPath_Key, "MaskImage", "The path to the image data to be used as the mask (should be the same size as the input image)", - DataPath{}, complex::GetAllDataTypes())); + DataPath{}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); params.insert( @@ -211,7 +211,7 @@ Result<> ITKMaskImage::executeImpl(DataStructure& dataStructure, const Arguments return ITK::Execute(dataStructure, selectedInputArray, imageGeomPath, outputArrayPath, itkFunctor, shouldCancel); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp index 2166fb5dc0..c584bda85e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKMaskImage @@ -59,7 +59,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMaskImage : public IFilter static inline constexpr StringLiteral k_MaskImageDataPath_Key = "mask_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -131,6 +131,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKMaskImage : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKMaskImage, "d3138266-3f34-4d6e-8e21-904c94351293"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKMaskImage, "d3138266-3f34-4d6e-8e21-904c94351293"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp index 37f68a672c..503b11c87b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKMedianImage { @@ -41,7 +41,7 @@ struct ITKMedianImageFunctor }; } // namespace cxITKMedianImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKMedianImage::name() const @@ -84,7 +84,7 @@ Parameters ITKMedianImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -159,4 +159,4 @@ Result ITKMedianImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp index 44a5bed099..ff0a2217a0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKMedianImage @@ -50,7 +50,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMedianImage : public IFilter static inline constexpr StringLiteral k_Radius_Key = "radius"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -123,6 +123,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKMedianImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKMedianImage, "a60ca165-59ac-486b-b4b4-0f0c24d80af8"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKMedianImage, "a60ca165-59ac-486b-b4b4-0f0c24d80af8"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp index 066237fdf5..5b7706381d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.cpp @@ -6,43 +6,43 @@ #include "ITKImageProcessing/Filters/ITKImageReader.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { -const Uuid k_ComplexCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); +const Uuid k_SimplnxCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); const Uuid k_ApplyTransformationToGeometryFilterId = *Uuid::FromString("f5bbc16b-3426-4ae0-b27b-ba7862dc40fe"); -const FilterHandle k_ApplyTransformationToGeometryFilterHandle(k_ApplyTransformationToGeometryFilterId, k_ComplexCorePluginId); +const FilterHandle k_ApplyTransformationToGeometryFilterHandle(k_ApplyTransformationToGeometryFilterId, k_SimplnxCorePluginId); inline constexpr StringLiteral k_SelectedImageGeometryKey = "selected_image_geometry"; inline constexpr StringLiteral k_CellAttributeMatrixPathKey = "cell_attribute_matrix_path"; inline constexpr StringLiteral k_TransformationTypeKey = "transformation_type"; inline constexpr StringLiteral k_ManualTransformationMatrixKey = "manual_transformation_matrix"; inline constexpr StringLiteral k_InterpolationTypeKey = "interpolation_type"; -const complex::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; +const nx::core::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; const std::string k_NearestNeighborInterpolation("Nearest Neighbor"); const std::string k_LinearInterpolation("Linear Interpolation"); -const complex::ChoicesParameter::Choices k_InterpolationChoices = {k_NearestNeighborInterpolation, k_LinearInterpolation}; +const nx::core::ChoicesParameter::Choices k_InterpolationChoices = {k_NearestNeighborInterpolation, k_LinearInterpolation}; -const complex::ChoicesParameter::ValueType k_NearestNeighborInterpolationIdx = 0ULL; -const complex::ChoicesParameter::ValueType k_LinearInterpolationIdx = 1ULL; +const nx::core::ChoicesParameter::ValueType k_NearestNeighborInterpolationIdx = 0ULL; +const nx::core::ChoicesParameter::ValueType k_LinearInterpolationIdx = 1ULL; Result> readTransformMatrix(const std::string& filePath) { @@ -172,7 +172,7 @@ struct CopyImageDataFunctor }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKMhaFileReader::name() const @@ -302,7 +302,7 @@ IFilter::PreflightResult ITKMhaFileReader::preflightImpl(const DataStructure& da if(saveImageTransformationAsArray) { - auto createArrayAction = std::make_unique(complex::DataType::float32, std::vector{1}, std::vector{transformMatrix.size()}, transformationMatrixDataArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, std::vector{1}, std::vector{transformMatrix.size()}, transformationMatrixDataArrayPath); preflightResult.outputActions.value().appendAction(std::move(createArrayAction)); } } @@ -407,4 +407,4 @@ Result<> ITKMhaFileReader::executeImpl(DataStructure& dataStructure, const Argum return mainResult; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp index 47e646a134..7adba869f8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReader.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -namespace complex +namespace nx::core { class ITKIMAGEPROCESSING_EXPORT ITKMhaFileReader : public IFilter { @@ -88,6 +88,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKMhaFileReader : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKMhaFileReader, "41c33a08-0052-4915-8d53-d503f85f30d9"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKMhaFileReader, "41c33a08-0052-4915-8d53-d503f85f30d9"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp index 8e44378615..020ad432cc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKMorphologicalGradientImage { @@ -36,7 +36,7 @@ struct ITKMorphologicalGradientImageFunctor }; } // namespace cxITKMorphologicalGradientImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKMorphologicalGradientImage::name() const @@ -82,7 +82,7 @@ Parameters ITKMorphologicalGradientImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -160,4 +160,4 @@ Result ITKMorphologicalGradientImage::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp index 7d45b956b7..8bd4c42372 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKMorphologicalGradientImage @@ -38,7 +38,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalGradientImage : public IFilter static inline constexpr StringLiteral k_KernelType_Key = "kernel_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -111,6 +111,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalGradientImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKMorphologicalGradientImage, "9103009a-8884-4097-8c34-aec7019589ea"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKMorphologicalGradientImage, "9103009a-8884-4097-8c34-aec7019589ea"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp index 66fe5e9d50..a049c5a08b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKMorphologicalWatershedImage { @@ -40,7 +40,7 @@ struct ITKMorphologicalWatershedImageFunctor }; } // namespace cxITKMorphologicalWatershedImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKMorphologicalWatershedImage::name() const @@ -90,7 +90,7 @@ Parameters ITKMorphologicalWatershedImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -174,4 +174,4 @@ Result ITKMorphologicalWatershedImage::FromSIMPLJson(const nlohmann:: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp index 4a7e078034..44131e5a18 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKMorphologicalWatershedImage @@ -49,7 +49,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -122,6 +122,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKMorphologicalWatershedImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKMorphologicalWatershedImage, "f70337e5-4435-41f7-aecc-d79b4b1faccd"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKMorphologicalWatershedImage, "f70337e5-4435-41f7-aecc-d79b4b1faccd"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp index 39a075783d..75ec4740c1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKNormalizeImage { @@ -32,7 +32,7 @@ struct ITKNormalizeImageFunctor }; } // namespace cxITKNormalizeImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKNormalizeImage::name() const @@ -73,7 +73,7 @@ Parameters ITKNormalizeImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -143,4 +143,4 @@ Result ITKNormalizeImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp index 038a0dfb5e..4fcb31cbae 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKNormalizeImage @@ -40,7 +40,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -113,6 +113,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKNormalizeImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKNormalizeImage, "9d8ce30e-c75e-4ca8-b6be-0b11baa7e6ce"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKNormalizeImage, "9d8ce30e-c75e-4ca8-b6be-0b11baa7e6ce"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp index a82b9cd278..947acf6fb8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKNotImage { @@ -29,7 +29,7 @@ struct ITKNotImageFunctor }; } // namespace cxITKNotImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKNotImage::name() const @@ -70,7 +70,7 @@ Parameters ITKNotImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -138,4 +138,4 @@ Result ITKNotImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp index 363c325934..2e6abe31be 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKNotImage @@ -55,7 +55,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKNotImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -128,6 +128,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKNotImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKNotImage, "6d67ad50-7e89-4678-85db-0b3247a2cfb9"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKNotImage, "6d67ad50-7e89-4678-85db-0b3247a2cfb9"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp index 3b3a8335fb..8f989bbf3f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKOpeningByReconstructionImage { @@ -41,7 +41,7 @@ struct ITKOpeningByReconstructionImageFunctor }; } // namespace cxITKOpeningByReconstructionImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKOpeningByReconstructionImage::name() const @@ -94,7 +94,7 @@ Parameters ITKOpeningByReconstructionImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -180,4 +180,4 @@ Result ITKOpeningByReconstructionImage::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp index d18b194d6e..e14fb28337 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKOpeningByReconstructionImage @@ -52,7 +52,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKOpeningByReconstructionImage : public IFilter static inline constexpr StringLiteral k_PreserveIntensities_Key = "preserve_intensities"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -125,6 +125,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKOpeningByReconstructionImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKOpeningByReconstructionImage, "c4225a23-0b23-4782-b509-296fb39a672b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKOpeningByReconstructionImage, "c4225a23-0b23-4782-b509-296fb39a672b"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp index bb4481b3b4..b01683f848 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKOtsuMultipleThresholdsImage { @@ -44,7 +44,7 @@ struct ITKOtsuMultipleThresholdsImageFunctor }; } // namespace cxITKOtsuMultipleThresholdsImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKOtsuMultipleThresholdsImage::name() const @@ -92,7 +92,7 @@ Parameters ITKOtsuMultipleThresholdsImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -182,4 +182,4 @@ Result ITKOtsuMultipleThresholdsImage::FromSIMPLJson(const nlohmann:: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp index d45e8b8fbb..aaf6d84807 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKOtsuMultipleThresholdsImage @@ -53,7 +53,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKOtsuMultipleThresholdsImage : public IFilter static inline constexpr StringLiteral k_ReturnBinMidpoint_Key = "return_bin_midpoint"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -126,6 +126,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKOtsuMultipleThresholdsImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKOtsuMultipleThresholdsImage, "30f37bcd-701f-4e64-aa9d-1181469d3fb5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKOtsuMultipleThresholdsImage, "30f37bcd-701f-4e64-aa9d-1181469d3fb5"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp index 617aff5e32..d2b7fb280b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKRelabelComponentImage { @@ -36,7 +36,7 @@ struct ITKRelabelComponentImageFunctor }; } // namespace cxITKRelabelComponentImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKRelabelComponentImage::name() const @@ -84,7 +84,7 @@ Parameters ITKRelabelComponentImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -162,4 +162,4 @@ Result ITKRelabelComponentImage::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp index 45904cad73..a3c2aeaf2c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKRelabelComponentImage @@ -54,7 +54,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKRelabelComponentImage : public IFilter static inline constexpr StringLiteral k_SortByObjectSize_Key = "sort_by_object_size"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -127,6 +127,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKRelabelComponentImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKRelabelComponentImage, "37e29d16-1020-478c-a506-c121e8f670ad"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKRelabelComponentImage, "37e29d16-1020-478c-a506-c121e8f670ad"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp index 459a96ea65..c4875991f1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKRescaleIntensityImage { @@ -36,7 +36,7 @@ struct ITKRescaleIntensityImageFunctor }; } // namespace cxITKRescaleIntensityImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKRescaleIntensityImage::name() const @@ -80,7 +80,7 @@ Parameters ITKRescaleIntensityImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -160,4 +160,4 @@ Result ITKRescaleIntensityImage::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp index 83653f2e73..8289af9a57 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKRescaleIntensityImage @@ -51,7 +51,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKRescaleIntensityImage : public IFilter static inline constexpr StringLiteral k_OutputMaximum_Key = "output_maximum"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -124,6 +124,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKRescaleIntensityImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKRescaleIntensityImage, "f08ea34d-9ad8-456c-a81b-9b3790b29379"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKRescaleIntensityImage, "f08ea34d-9ad8-456c-a81b-9b3790b29379"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp index c8213afb00..35376539b7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKSigmoidImage { @@ -39,7 +39,7 @@ struct ITKSigmoidImageFunctor }; } // namespace cxITKSigmoidImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKSigmoidImage::name() const @@ -85,7 +85,7 @@ Parameters ITKSigmoidImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -171,4 +171,4 @@ Result ITKSigmoidImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp index 876e674be3..2444c00f7d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKSigmoidImage @@ -42,7 +42,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSigmoidImage : public IFilter static inline constexpr StringLiteral k_OutputMinimum_Key = "output_minimum"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -115,6 +115,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKSigmoidImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKSigmoidImage, "cb9ec2b6-80d9-42e6-807b-d908bea6daea"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKSigmoidImage, "cb9ec2b6-80d9-42e6-807b-d908bea6daea"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp index daed2130ba..f75c992cc2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKSignedMaurerDistanceMapImage { @@ -42,7 +42,7 @@ struct ITKSignedMaurerDistanceMapImageFunctor }; } // namespace cxITKSignedMaurerDistanceMapImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKSignedMaurerDistanceMapImage::name() const @@ -89,7 +89,7 @@ Parameters ITKSignedMaurerDistanceMapImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetIntegerScalarPixelAllowedTypes())); + nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -177,4 +177,4 @@ Result ITKSignedMaurerDistanceMapImage::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp index 8bd0ff83f0..367755d4a7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKSignedMaurerDistanceMapImage @@ -54,7 +54,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedMaurerDistanceMapImage : public IFilter static inline constexpr StringLiteral k_BackgroundValue_Key = "background_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -127,6 +127,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKSignedMaurerDistanceMapImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKSignedMaurerDistanceMapImage, "e81f72d3-e806-4afe-ab4c-795c6a3f526f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKSignedMaurerDistanceMapImage, "e81f72d3-e806-4afe-ab4c-795c6a3f526f"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp index 2b0637e977..8fc8de858e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKSinImage { @@ -30,7 +30,7 @@ struct ITKSinImageFunctor }; } // namespace cxITKSinImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKSinImage::name() const @@ -71,7 +71,7 @@ Parameters ITKSinImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKSinImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp index 3702fe18bd..25058a8d87 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKSinImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSinImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKSinImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKSinImage, "06c76c7a-c384-44be-bd01-6fd58070cd65"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKSinImage, "06c76c7a-c384-44be-bd01-6fd58070cd65"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp index 2d83eb5c0f..720b3b551e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKSqrtImage { @@ -30,7 +30,7 @@ struct ITKSqrtImageFunctor }; } // namespace cxITKSqrtImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKSqrtImage::name() const @@ -71,7 +71,7 @@ Parameters ITKSqrtImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKSqrtImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp index 58af8bfc0f..306da35f69 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKSqrtImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSqrtImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKSqrtImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKSqrtImage, "05c7c812-4e33-4e9a-bf27-d4c17f5dff68"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKSqrtImage, "05c7c812-4e33-4e9a-bf27-d4c17f5dff68"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp index 372a235e12..de39745163 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKSquareImage { @@ -30,7 +30,7 @@ struct ITKSquareImageFunctor }; } // namespace cxITKSquareImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKSquareImage::name() const @@ -71,7 +71,7 @@ Parameters ITKSquareImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -140,4 +140,4 @@ Result ITKSquareImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp index 1f5d728cad..10499f4d6d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKSquareImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKSquareImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKSquareImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKSquareImage, "385ca853-626c-43bb-ae86-db8d8b72693b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKSquareImage, "385ca853-626c-43bb-ae86-db8d8b72693b"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp index f324323abf..978dc8dc8a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.cpp @@ -3,15 +3,15 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKTanImage { @@ -30,7 +30,7 @@ struct ITKTanImageFunctor }; } // namespace cxITKTanImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKTanImage::name() const @@ -71,7 +71,7 @@ Parameters ITKTanImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -139,4 +139,4 @@ Result ITKTanImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp index d74bf281eb..953f7fa99e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKTanImage @@ -34,7 +34,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKTanImage : public IFilter static inline constexpr StringLiteral k_OutputImageDataPath_Key = "output_image_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKTanImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKTanImage, "7cf3c08e-1af1-4540-aa08-4488a74923fc"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKTanImage, "7cf3c08e-1af1-4540-aa08-4488a74923fc"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp index b9219871db..d1f55e04e2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKThresholdImage { @@ -37,7 +37,7 @@ struct ITKThresholdImageFunctor }; } // namespace cxITKThresholdImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKThresholdImage::name() const @@ -83,7 +83,7 @@ Parameters ITKThresholdImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -165,4 +165,4 @@ Result ITKThresholdImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp index d0cafdb461..c9b34b4d4e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKThresholdImage @@ -49,7 +49,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdImage : public IFilter static inline constexpr StringLiteral k_OutsideValue_Key = "outside_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -122,6 +122,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKThresholdImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKThresholdImage, "ddf222f3-4af2-4583-967d-3eb9b86e77b4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKThresholdImage, "ddf222f3-4af2-4583-967d-3eb9b86e77b4"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp index 8644b93c22..c23d3cb76c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKValuedRegionalMaximaImage { @@ -33,7 +33,7 @@ struct ITKValuedRegionalMaximaImageFunctor }; } // namespace cxITKValuedRegionalMaximaImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKValuedRegionalMaximaImage::name() const @@ -79,7 +79,7 @@ Parameters ITKValuedRegionalMaximaImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -153,4 +153,4 @@ Result ITKValuedRegionalMaximaImage::FromSIMPLJson(const nlohmann::js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp index 8f3ac94ae1..877c557fef 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKValuedRegionalMaximaImage @@ -48,7 +48,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMaximaImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -121,6 +121,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMaximaImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKValuedRegionalMaximaImage, "2c0bb4f6-69fe-4c43-a32e-21b4b11efcff"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKValuedRegionalMaximaImage, "2c0bb4f6-69fe-4c43-a32e-21b4b11efcff"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp index a5936a1b28..267073e3c4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKValuedRegionalMinimaImage { @@ -33,7 +33,7 @@ struct ITKValuedRegionalMinimaImageFunctor }; } // namespace cxITKValuedRegionalMinimaImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKValuedRegionalMinimaImage::name() const @@ -79,7 +79,7 @@ Parameters ITKValuedRegionalMinimaImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -153,4 +153,4 @@ Result ITKValuedRegionalMinimaImage::FromSIMPLJson(const nlohmann::js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp index d7ce675bf6..dd4be487b0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKValuedRegionalMinimaImage @@ -45,7 +45,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMinimaImage : public IFilter static inline constexpr StringLiteral k_FullyConnected_Key = "fully_connected"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -118,6 +118,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKValuedRegionalMinimaImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKValuedRegionalMinimaImage, "38548e01-6a3c-49fb-b7b6-489f965cc61e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKValuedRegionalMinimaImage, "38548e01-6a3c-49fb-b7b6-489f965cc61e"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp index e3bf6daf9e..8e2a611e95 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.cpp @@ -3,18 +3,18 @@ #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" #include "ITKImageProcessing/Common/sitkCommon.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace cxITKWhiteTopHatImage { @@ -39,7 +39,7 @@ struct ITKWhiteTopHatImageFunctor }; } // namespace cxITKWhiteTopHatImage -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKWhiteTopHatImage::name() const @@ -86,7 +86,7 @@ Parameters ITKWhiteTopHatImage::parameters() const params.insert(std::make_unique(k_SelectedImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, - complex::ITK::GetScalarPixelAllowedTypes())); + nx::core::ITK::GetScalarPixelAllowedTypes())); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert( @@ -168,4 +168,4 @@ Result ITKWhiteTopHatImage::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp index 2a144c84d0..8ce8b36006 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImage.hpp @@ -2,10 +2,10 @@ #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ITKWhiteTopHatImage @@ -39,7 +39,7 @@ class ITKIMAGEPROCESSING_EXPORT ITKWhiteTopHatImage : public IFilter static inline constexpr StringLiteral k_SafeBorder_Key = "safe_border"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -112,6 +112,6 @@ class ITKIMAGEPROCESSING_EXPORT ITKWhiteTopHatImage : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ITKWhiteTopHatImage, "2f377682-d0a8-4dea-8c68-60c2c523a074"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ITKWhiteTopHatImage, "2f377682-d0a8-4dea-8c68-60c2c523a074"); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportFijiMontage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportFijiMontage.cpp index 97cb7898d3..97beca5588 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportFijiMontage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportFijiMontage.cpp @@ -1,21 +1,21 @@ #include "ITKImportFijiMontage.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKImportFijiMontage::name() const @@ -106,7 +106,7 @@ IFilter::PreflightResult ITKImportFijiMontage::preflightImpl(const DataStructure PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -119,7 +119,7 @@ IFilter::PreflightResult ITKImportFijiMontage::preflightImpl(const DataStructure // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -170,4 +170,4 @@ Result<> ITKImportFijiMontage::executeImpl(DataStructure& dataStructure, const A return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportRoboMetMontage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportRoboMetMontage.cpp index be2fbf4190..c4e159267e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportRoboMetMontage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ITKImportRoboMetMontage.cpp @@ -1,21 +1,21 @@ #include "ITKImportRoboMetMontage.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ITKImportRoboMetMontage::name() const @@ -117,7 +117,7 @@ IFilter::PreflightResult ITKImportRoboMetMontage::preflightImpl(const DataStruct PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -130,7 +130,7 @@ IFilter::PreflightResult ITKImportRoboMetMontage::preflightImpl(const DataStruct // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -186,4 +186,4 @@ Result<> ITKImportRoboMetMontage::executeImpl(DataStructure& dataStructure, cons return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/IlluminationCorrection.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/IlluminationCorrection.cpp index 85f0037882..bebe9c3653 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/IlluminationCorrection.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/IlluminationCorrection.cpp @@ -1,23 +1,23 @@ #include "IlluminationCorrection.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/MontageSelectionFilterParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/MontageSelectionFilterParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include namespace fs = std::filesystem; #include "ITKImageProcessing/Common/ITKArrayHelper.hpp" -using namespace complex; +using namespace nx::core; #include namespace @@ -34,7 +34,7 @@ struct ITKIlluminationCorrectionFilterCreationFunctor }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string IlluminationCorrection::name() const @@ -132,7 +132,7 @@ IFilter::PreflightResult IlluminationCorrection::preflightImpl(const DataStructu PreflightResult preflightResult; std::vector preflightUpdatedValues; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; resultOutputActions = ITK::DataCheck(dataStructure, pSelectedCellArrayPath, pImageGeomPath, pOutputArrayPath); @@ -142,7 +142,7 @@ IFilter::PreflightResult IlluminationCorrection::preflightImpl(const DataStructu // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -163,7 +163,7 @@ IFilter::PreflightResult IlluminationCorrection::preflightImpl(const DataStructu } // This block is commented out because it needs some variables to be filled in. { - // auto createArrayAction = std::make_unique(complex::NumericType::FILL_ME_IN, std::vector{NUM_TUPLES_VALUE}, NUM_COMPONENTS, pBackgroundImageArrayPathValue); + // auto createArrayAction = std::make_unique(nx::core::NumericType::FILL_ME_IN, std::vector{NUM_TUPLES_VALUE}, NUM_COMPONENTS, pBackgroundImageArrayPathValue); // resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -204,4 +204,4 @@ Result<> IlluminationCorrection::executeImpl(DataStructure& dataStructure, const return ITK::Execute(dataStructure, pSelectedCellArrayPath, pImageGeomPath, pOutputArrayPath, IlluminationCorrectionFilterCreationFunctor{}); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportAxioVisionV4Montage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportAxioVisionV4Montage.cpp index 653f4e1c38..09789c498f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportAxioVisionV4Montage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportAxioVisionV4Montage.cpp @@ -1,19 +1,19 @@ #include "ImportAxioVisionV4Montage.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ImportAxioVisionV4Montage::name() const @@ -111,7 +111,7 @@ IFilter::PreflightResult ImportAxioVisionV4Montage::preflightImpl(const DataStru PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -124,7 +124,7 @@ IFilter::PreflightResult ImportAxioVisionV4Montage::preflightImpl(const DataStru // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -178,4 +178,4 @@ Result<> ImportAxioVisionV4Montage::executeImpl(DataStructure& dataStructure, co return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp index 0b0ed2340b..3c4e709ec1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp @@ -1,16 +1,16 @@ #include "ImportVectorImageStack.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/ImportVectorImageStackFilterParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/ImportVectorImageStackFilterParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ImportVectorImageStack::name() const @@ -88,7 +88,7 @@ IFilter::PreflightResult ImportVectorImageStack::preflightImpl(const DataStructu PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -98,7 +98,7 @@ IFilter::PreflightResult ImportVectorImageStack::preflightImpl(const DataStructu // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -143,4 +143,4 @@ Result<> ImportVectorImageStack::executeImpl(DataStructure& dataStructure, const return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportZenInfoMontage.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportZenInfoMontage.cpp index 3fca504bb6..236f80ceba 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportZenInfoMontage.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportZenInfoMontage.cpp @@ -1,21 +1,21 @@ #include "ImportZenInfoMontage.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ImportZenInfoMontage::name() const @@ -106,7 +106,7 @@ IFilter::PreflightResult ImportZenInfoMontage::preflightImpl(const DataStructure PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -119,7 +119,7 @@ IFilter::PreflightResult ImportZenInfoMontage::preflightImpl(const DataStructure // If this filter makes changes to the DataStructure in the form of // creating/deleting/moving/renaming DataGroups, Geometries, DataArrays then you - // will need to use one of the `*Actions` classes located in complex/Filter/Actions + // will need to use one of the `*Actions` classes located in simplnx/Filter/Actions // to relay that information to the preflight and execute methods. This is done by // creating an instance of the Action class and then storing it in the resultOutputActions variable. // This is done through a `push_back()` method combined with a `std::move()`. For the @@ -170,4 +170,4 @@ Result<> ImportZenInfoMontage::executeImpl(DataStructure& dataStructure, const A return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp index f8f736ffde..d55f8ac872 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingLegacyUUIDMapping.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" #include @@ -18,7 +18,7 @@ // clang-format off #ifndef ITKIMAGEPROCESSING_LEAN_AND_MEAN -#ifndef COMPLEX_CONDA_BUILD +#ifndef SIMPLNX_CONDA_BUILD #include "ITKImageProcessing/Filters/ITKBinaryContourImage.hpp" #include "ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImage.hpp" #include "ITKImageProcessing/Filters/ITKClosingByReconstructionImage.hpp" @@ -76,79 +76,79 @@ // @@__HEADER__TOKEN__DO__NOT__DELETE__@@ #endif -namespace complex +namespace nx::core { static const AbstractPlugin::SIMPLMapType k_SIMPL_to_ITKImageProcessing { // syntax std::make_pair {Dream3d UUID , Dream3dnx UUID}, // dream3d-class-name - {complex::Uuid::FromString("53df5340-f632-598f-8a9b-802296b3a95c").value(), {complex::FilterTraits::uuid, &ITKDiscreteGaussianImage::FromSIMPLJson}}, // ITKDiscreteGaussianImage - {complex::Uuid::FromString("653b7b5c-03cb-5b32-8c3e-3637745e5ff6").value(), {complex::FilterTraits::uuid, &ITKImageReader::FromSIMPLJson}}, // ITKImageReader - {complex::Uuid::FromString("11473711-f94d-5d96-b749-ec36a81ad338").value(), {complex::FilterTraits::uuid, &ITKImageWriter::FromSIMPLJson}}, // ITKImageWriter - {complex::Uuid::FromString("cf7d7497-9573-5102-bedd-38f86a6cdfd4").value(), {complex::FilterTraits::uuid, &ITKImportImageStack::FromSIMPLJson}}, // ITKImportImageStack - {complex::Uuid::FromString("cc27ee9a-9946-56ad-afd4-6e98b71f417d").value(), {complex::FilterTraits::uuid, &ITKMedianImage::FromSIMPLJson}}, // ITKMedianImage - {complex::Uuid::FromString("77bf2192-851d-5127-9add-634c1ef4f67f").value(), {complex::FilterTraits::uuid, &ITKRescaleIntensityImage::FromSIMPLJson}}, // ITKRescaleIntensityImage + {nx::core::Uuid::FromString("53df5340-f632-598f-8a9b-802296b3a95c").value(), {nx::core::FilterTraits::uuid, &ITKDiscreteGaussianImage::FromSIMPLJson}}, // ITKDiscreteGaussianImage + {nx::core::Uuid::FromString("653b7b5c-03cb-5b32-8c3e-3637745e5ff6").value(), {nx::core::FilterTraits::uuid, &ITKImageReader::FromSIMPLJson}}, // ITKImageReader + {nx::core::Uuid::FromString("11473711-f94d-5d96-b749-ec36a81ad338").value(), {nx::core::FilterTraits::uuid, &ITKImageWriter::FromSIMPLJson}}, // ITKImageWriter + {nx::core::Uuid::FromString("cf7d7497-9573-5102-bedd-38f86a6cdfd4").value(), {nx::core::FilterTraits::uuid, &ITKImportImageStack::FromSIMPLJson}}, // ITKImportImageStack + {nx::core::Uuid::FromString("cc27ee9a-9946-56ad-afd4-6e98b71f417d").value(), {nx::core::FilterTraits::uuid, &ITKMedianImage::FromSIMPLJson}}, // ITKMedianImage + {nx::core::Uuid::FromString("77bf2192-851d-5127-9add-634c1ef4f67f").value(), {nx::core::FilterTraits::uuid, &ITKRescaleIntensityImage::FromSIMPLJson}}, // ITKRescaleIntensityImage #ifndef ITKIMAGEPROCESSING_LEAN_AND_MEAN -#ifndef COMPLEX_CONDA_BUILD - {complex::Uuid::FromString("3c451ac9-bfef-5e41-bae9-3957a0fc26a1").value(), {complex::FilterTraits::uuid, &ITKBinaryContourImage::FromSIMPLJson}}, // ITKBinaryContourImage - {complex::Uuid::FromString("bd1c2353-0a39-52c0-902b-ee64721994c7").value(), {complex::FilterTraits::uuid, &ITKBinaryOpeningByReconstructionImage::FromSIMPLJson}}, // ITKBinaryOpeningByReconstructionImage - {complex::Uuid::FromString("99a7aa3c-f945-5e77-875a-23b5231ab3f4").value(), {complex::FilterTraits::uuid, &ITKClosingByReconstructionImage::FromSIMPLJson}}, // ITKClosingByReconstructionImage - {complex::Uuid::FromString("54c8dd45-88c4-5d4b-8a39-e3cc595e1cf8").value(), {complex::FilterTraits::uuid, &ITKGrayscaleFillholeImage::FromSIMPLJson}}, // ITKGrayscaleFillholeImage - {complex::Uuid::FromString("d910551f-4eec-55c9-b0ce-69c2277e61bd").value(), {complex::FilterTraits::uuid, &ITKGrayscaleGrindPeakImage::FromSIMPLJson}}, // ITKGrayscaleGrindPeakImage - {complex::Uuid::FromString("8bc34707-04c0-5e83-8583-48ee19306a1d").value(), {complex::FilterTraits::uuid, &ITKHConvexImage::FromSIMPLJson}}, // ITKHConvexImage - {complex::Uuid::FromString("932a6df4-212e-53a1-a2ab-c29bd376bb7b").value(), {complex::FilterTraits::uuid, &ITKHMaximaImage::FromSIMPLJson}}, // ITKHMaximaImage - {complex::Uuid::FromString("f1d7cf59-9b7c-53cb-b71a-76cf91c86e8f").value(), {complex::FilterTraits::uuid, &ITKHMinimaImage::FromSIMPLJson}}, // ITKHMinimaImage - {complex::Uuid::FromString("668f0b90-b504-5fba-b648-7c9677e1f452").value(), {complex::FilterTraits::uuid, &ITKLabelContourImage::FromSIMPLJson}}, // ITKLabelContourImage - {complex::Uuid::FromString("12c83608-c4c5-5c72-b22f-a7696e3f5448").value(), {complex::FilterTraits::uuid, &ITKMorphologicalGradientImage::FromSIMPLJson}}, // ITKMorphologicalGradientImage - {complex::Uuid::FromString("b2248340-a371-5899-90a2-86047950f0a2").value(), {complex::FilterTraits::uuid, &ITKMorphologicalWatershedImage::FromSIMPLJson}}, // ITKMorphologicalWatershedImage - {complex::Uuid::FromString("ca04004f-fb11-588d-9f77-d00b3ee9ad2a").value(), {complex::FilterTraits::uuid, &ITKOpeningByReconstructionImage::FromSIMPLJson}}, // ITKOpeningByReconstructionImage - {complex::Uuid::FromString("bb15d42a-3077-582a-be1a-76b2bae172e9").value(), {complex::FilterTraits::uuid, &ITKSignedMaurerDistanceMapImage::FromSIMPLJson}}, // ITKSignedMaurerDistanceMapImage - {complex::Uuid::FromString("10aff542-81c5-5f09-9797-c7171c40b6a0").value(), {complex::FilterTraits::uuid, &ITKValuedRegionalMaximaImage::FromSIMPLJson}}, // ITKValuedRegionalMaximaImage - {complex::Uuid::FromString("739a0908-cb60-50f7-a484-b2157d023093").value(), {complex::FilterTraits::uuid, &ITKValuedRegionalMinimaImage::FromSIMPLJson}}, // ITKValuedRegionalMinimaImage +#ifndef SIMPLNX_CONDA_BUILD + {nx::core::Uuid::FromString("3c451ac9-bfef-5e41-bae9-3957a0fc26a1").value(), {nx::core::FilterTraits::uuid, &ITKBinaryContourImage::FromSIMPLJson}}, // ITKBinaryContourImage + {nx::core::Uuid::FromString("bd1c2353-0a39-52c0-902b-ee64721994c7").value(), {nx::core::FilterTraits::uuid, &ITKBinaryOpeningByReconstructionImage::FromSIMPLJson}}, // ITKBinaryOpeningByReconstructionImage + {nx::core::Uuid::FromString("99a7aa3c-f945-5e77-875a-23b5231ab3f4").value(), {nx::core::FilterTraits::uuid, &ITKClosingByReconstructionImage::FromSIMPLJson}}, // ITKClosingByReconstructionImage + {nx::core::Uuid::FromString("54c8dd45-88c4-5d4b-8a39-e3cc595e1cf8").value(), {nx::core::FilterTraits::uuid, &ITKGrayscaleFillholeImage::FromSIMPLJson}}, // ITKGrayscaleFillholeImage + {nx::core::Uuid::FromString("d910551f-4eec-55c9-b0ce-69c2277e61bd").value(), {nx::core::FilterTraits::uuid, &ITKGrayscaleGrindPeakImage::FromSIMPLJson}}, // ITKGrayscaleGrindPeakImage + {nx::core::Uuid::FromString("8bc34707-04c0-5e83-8583-48ee19306a1d").value(), {nx::core::FilterTraits::uuid, &ITKHConvexImage::FromSIMPLJson}}, // ITKHConvexImage + {nx::core::Uuid::FromString("932a6df4-212e-53a1-a2ab-c29bd376bb7b").value(), {nx::core::FilterTraits::uuid, &ITKHMaximaImage::FromSIMPLJson}}, // ITKHMaximaImage + {nx::core::Uuid::FromString("f1d7cf59-9b7c-53cb-b71a-76cf91c86e8f").value(), {nx::core::FilterTraits::uuid, &ITKHMinimaImage::FromSIMPLJson}}, // ITKHMinimaImage + {nx::core::Uuid::FromString("668f0b90-b504-5fba-b648-7c9677e1f452").value(), {nx::core::FilterTraits::uuid, &ITKLabelContourImage::FromSIMPLJson}}, // ITKLabelContourImage + {nx::core::Uuid::FromString("12c83608-c4c5-5c72-b22f-a7696e3f5448").value(), {nx::core::FilterTraits::uuid, &ITKMorphologicalGradientImage::FromSIMPLJson}}, // ITKMorphologicalGradientImage + {nx::core::Uuid::FromString("b2248340-a371-5899-90a2-86047950f0a2").value(), {nx::core::FilterTraits::uuid, &ITKMorphologicalWatershedImage::FromSIMPLJson}}, // ITKMorphologicalWatershedImage + {nx::core::Uuid::FromString("ca04004f-fb11-588d-9f77-d00b3ee9ad2a").value(), {nx::core::FilterTraits::uuid, &ITKOpeningByReconstructionImage::FromSIMPLJson}}, // ITKOpeningByReconstructionImage + {nx::core::Uuid::FromString("bb15d42a-3077-582a-be1a-76b2bae172e9").value(), {nx::core::FilterTraits::uuid, &ITKSignedMaurerDistanceMapImage::FromSIMPLJson}}, // ITKSignedMaurerDistanceMapImage + {nx::core::Uuid::FromString("10aff542-81c5-5f09-9797-c7171c40b6a0").value(), {nx::core::FilterTraits::uuid, &ITKValuedRegionalMaximaImage::FromSIMPLJson}}, // ITKValuedRegionalMaximaImage + {nx::core::Uuid::FromString("739a0908-cb60-50f7-a484-b2157d023093").value(), {nx::core::FilterTraits::uuid, &ITKValuedRegionalMinimaImage::FromSIMPLJson}}, // ITKValuedRegionalMinimaImage #endif - {complex::Uuid::FromString("09f45c29-1cfb-566c-b3ae-d832b4f95905").value(), {complex::FilterTraits::uuid, &ITKAbsImage::FromSIMPLJson}}, // ITKAbsImage - {complex::Uuid::FromString("b09ec654-87a5-5dfa-9949-aa69f1fbfdd1").value(), {complex::FilterTraits::uuid, &ITKAcosImage::FromSIMPLJson}}, // ITKAcosImage - {complex::Uuid::FromString("2d5a7599-5e01-5489-a107-23b704d2b5eb").value(), {complex::FilterTraits::uuid, &ITKAdaptiveHistogramEqualizationImage::FromSIMPLJson}}, // ITKAdaptiveHistogramEqualizationImage - {complex::Uuid::FromString("79509ab1-24e1-50e4-9351-c5ce7cd87a72").value(), {complex::FilterTraits::uuid, &ITKAsinImage::FromSIMPLJson}}, // ITKAsinImage - {complex::Uuid::FromString("e938569d-3644-5d00-a4e0-ab327937457d").value(), {complex::FilterTraits::uuid, &ITKAtanImage::FromSIMPLJson}}, // ITKAtanImage - {complex::Uuid::FromString("ba8a3f2e-3963-57c0-a8da-239e25de0526").value(), {complex::FilterTraits::uuid, &ITKBinaryThresholdImage::FromSIMPLJson}}, // ITKBinaryThresholdImage - {complex::Uuid::FromString("2c2d7bf6-1e78-52e6-80aa-58b504ce0912").value(), {complex::FilterTraits::uuid, &ITKCosImage::FromSIMPLJson}}, // ITKCosImage - {complex::Uuid::FromString("3aa99151-e722-51a0-90ba-71e93347ab09").value(), {complex::FilterTraits::uuid, &ITKGradientMagnitudeImage::FromSIMPLJson}}, // ITKGradientMagnitudeImage - {complex::Uuid::FromString("c6e10fa5-5462-546b-b34b-0f0ea75a7e43").value(), {complex::FilterTraits::uuid, &ITKInvertIntensityImage::FromSIMPLJson}}, // ITKInvertIntensityImage - {complex::Uuid::FromString("dbfd1a57-2a17-572d-93a7-8fd2f8e92eb0").value(), {complex::FilterTraits::uuid, &ITKLog10Image::FromSIMPLJson}}, // ITKLog10Image - {complex::Uuid::FromString("69aba77c-9a35-5251-a18a-e3728ddd2963").value(), {complex::FilterTraits::uuid, &ITKLogImage::FromSIMPLJson}}, // ITKLogImage - {complex::Uuid::FromString("97102d65-9c32-576a-9177-c59d958bad10").value(), {complex::FilterTraits::uuid, &ITKMaskImage::FromSIMPLJson}}, // ITKMaskImage - {complex::Uuid::FromString("5b905619-c46b-5690-b6fa-8e97cf4537b8").value(), {complex::FilterTraits::uuid, &ITKNormalizeImage::FromSIMPLJson}}, // ITKNormalizeImage - {complex::Uuid::FromString("6e66563a-edcf-5e11-bc1d-ceed36d8493f").value(), {complex::FilterTraits::uuid, &ITKOtsuMultipleThresholdsImage::FromSIMPLJson}}, // ITKOtsuMultipleThresholdsImage - {complex::Uuid::FromString("1eb4b4f7-1704-58e4-9f78-8726a5c8c302").value(), {complex::FilterTraits::uuid, &ITKSinImage::FromSIMPLJson}}, // ITKSinImage - {complex::Uuid::FromString("8087dcad-68f2-598b-9670-d0f57647a445").value(), {complex::FilterTraits::uuid, &ITKSqrtImage::FromSIMPLJson}}, // ITKSqrtImage - {complex::Uuid::FromString("672810d9-5ec0-59c1-a209-8fb56c7a018a").value(), {complex::FilterTraits::uuid, &ITKTanImage::FromSIMPLJson}}, // ITKTanImage - {complex::Uuid::FromString("f86167ad-a1a1-557b-97ea-92a3618baa8f").value(), {complex::FilterTraits::uuid, &ITKBinaryDilateImage::FromSIMPLJson}}, // ITKBinaryDilateImage - {complex::Uuid::FromString("522c5249-c048-579a-98dd-f7aadafc5578").value(), {complex::FilterTraits::uuid, &ITKBinaryErodeImage::FromSIMPLJson}}, // ITKBinaryErodeImage - {complex::Uuid::FromString("704c801a-7549-54c4-9def-c4bb58d07fd1").value(), {complex::FilterTraits::uuid, &ITKBinaryMorphologicalOpeningImage::FromSIMPLJson}}, // ITKBinaryMorphologicalOpeningImage - {complex::Uuid::FromString("606c3700-f793-5852-9a0f-3123bd212447").value(), {complex::FilterTraits::uuid, &ITKBinaryProjectionImage::FromSIMPLJson}}, // ITKBinaryProjectionImage - {complex::Uuid::FromString("dcceeb50-5924-5eae-88ea-34793cf545a9").value(), {complex::FilterTraits::uuid, &ITKBinaryThinningImage::FromSIMPLJson}}, // ITKBinaryThinningImage - {complex::Uuid::FromString("e26e7359-f72c-5924-b42e-dd5dd454a794").value(), {complex::FilterTraits::uuid, &ITKBlackTopHatImage::FromSIMPLJson}}, // ITKBlackTopHatImage - {complex::Uuid::FromString("dbf29c6d-461c-55e7-a6c4-56477d9da55b").value(), {complex::FilterTraits::uuid, &ITKDilateObjectMorphologyImage::FromSIMPLJson}}, // ITKDilateObjectMorphologyImage - {complex::Uuid::FromString("caea0698-4253-518b-ab3f-8ebc140d92ea").value(), {complex::FilterTraits::uuid, &ITKErodeObjectMorphologyImage::FromSIMPLJson}}, // ITKErodeObjectMorphologyImage - {complex::Uuid::FromString("a6fb3f3a-6c7a-5dfc-a4f1-75ff1d62c32f").value(), {complex::FilterTraits::uuid, &ITKExpImage::FromSIMPLJson}}, // ITKExpImage - {complex::Uuid::FromString("634c2306-c1ee-5a45-a55c-f8286e36999a").value(), {complex::FilterTraits::uuid, &ITKExpNegativeImage::FromSIMPLJson}}, // ITKExpNegativeImage - {complex::Uuid::FromString("66cec151-2950-51f8-8a02-47d3516d8721").value(), {complex::FilterTraits::uuid, &ITKGrayscaleDilateImage::FromSIMPLJson}}, // ITKGrayscaleDilateImage - {complex::Uuid::FromString("aef4e804-3f7a-5dc0-911c-b1f16a393a69").value(), {complex::FilterTraits::uuid, &ITKGrayscaleErodeImage::FromSIMPLJson}}, // ITKGrayscaleErodeImage - {complex::Uuid::FromString("849a1903-5595-5029-bbde-6f4b68b2a25c").value(), {complex::FilterTraits::uuid, &ITKGrayscaleMorphologicalClosingImage::FromSIMPLJson}}, // ITKGrayscaleMorphologicalClosingImage - {complex::Uuid::FromString("c88ac42b-9477-5088-9ec0-862af1e0bb56").value(), {complex::FilterTraits::uuid, &ITKGrayscaleMorphologicalOpeningImage::FromSIMPLJson}}, // ITKGrayscaleMorphologicalOpeningImage - {complex::Uuid::FromString("4faf4c59-6f29-53af-bc78-5aecffce0e37").value(), {complex::FilterTraits::uuid, &ITKIntensityWindowingImage::FromSIMPLJson}}, // ITKIntensityWindowingImage - {complex::Uuid::FromString("c8362fb9-d3ab-55c0-902b-274cc27d9bb8").value(), {complex::FilterTraits::uuid, &ITKNotImage::FromSIMPLJson}}, // ITKNotImage - {complex::Uuid::FromString("4398d76d-c9aa-5161-bb48-92dd9daaa352").value(), {complex::FilterTraits::uuid, &ITKRelabelComponentImage::FromSIMPLJson}}, // ITKRelabelComponentImage - {complex::Uuid::FromString("e6675be7-e98d-5e0f-a088-ba15cc301038").value(), {complex::FilterTraits::uuid, &ITKSigmoidImage::FromSIMPLJson}}, // ITKSigmoidImage - {complex::Uuid::FromString("f092420e-14a0-5dc0-91f8-de0082103aef").value(), {complex::FilterTraits::uuid, &ITKSquareImage::FromSIMPLJson}}, // ITKSquareImage - {complex::Uuid::FromString("5845ee06-5c8a-5a74-80fb-c820bd8dfb75").value(), {complex::FilterTraits::uuid, &ITKThresholdImage::FromSIMPLJson}}, // ITKThresholdImage - {complex::Uuid::FromString("02e059f7-8055-52b4-9d48-915b67d1e39a").value(), {complex::FilterTraits::uuid, &ITKWhiteTopHatImage::FromSIMPLJson}}, // ITKWhiteTopHatImage + {nx::core::Uuid::FromString("09f45c29-1cfb-566c-b3ae-d832b4f95905").value(), {nx::core::FilterTraits::uuid, &ITKAbsImage::FromSIMPLJson}}, // ITKAbsImage + {nx::core::Uuid::FromString("b09ec654-87a5-5dfa-9949-aa69f1fbfdd1").value(), {nx::core::FilterTraits::uuid, &ITKAcosImage::FromSIMPLJson}}, // ITKAcosImage + {nx::core::Uuid::FromString("2d5a7599-5e01-5489-a107-23b704d2b5eb").value(), {nx::core::FilterTraits::uuid, &ITKAdaptiveHistogramEqualizationImage::FromSIMPLJson}}, // ITKAdaptiveHistogramEqualizationImage + {nx::core::Uuid::FromString("79509ab1-24e1-50e4-9351-c5ce7cd87a72").value(), {nx::core::FilterTraits::uuid, &ITKAsinImage::FromSIMPLJson}}, // ITKAsinImage + {nx::core::Uuid::FromString("e938569d-3644-5d00-a4e0-ab327937457d").value(), {nx::core::FilterTraits::uuid, &ITKAtanImage::FromSIMPLJson}}, // ITKAtanImage + {nx::core::Uuid::FromString("ba8a3f2e-3963-57c0-a8da-239e25de0526").value(), {nx::core::FilterTraits::uuid, &ITKBinaryThresholdImage::FromSIMPLJson}}, // ITKBinaryThresholdImage + {nx::core::Uuid::FromString("2c2d7bf6-1e78-52e6-80aa-58b504ce0912").value(), {nx::core::FilterTraits::uuid, &ITKCosImage::FromSIMPLJson}}, // ITKCosImage + {nx::core::Uuid::FromString("3aa99151-e722-51a0-90ba-71e93347ab09").value(), {nx::core::FilterTraits::uuid, &ITKGradientMagnitudeImage::FromSIMPLJson}}, // ITKGradientMagnitudeImage + {nx::core::Uuid::FromString("c6e10fa5-5462-546b-b34b-0f0ea75a7e43").value(), {nx::core::FilterTraits::uuid, &ITKInvertIntensityImage::FromSIMPLJson}}, // ITKInvertIntensityImage + {nx::core::Uuid::FromString("dbfd1a57-2a17-572d-93a7-8fd2f8e92eb0").value(), {nx::core::FilterTraits::uuid, &ITKLog10Image::FromSIMPLJson}}, // ITKLog10Image + {nx::core::Uuid::FromString("69aba77c-9a35-5251-a18a-e3728ddd2963").value(), {nx::core::FilterTraits::uuid, &ITKLogImage::FromSIMPLJson}}, // ITKLogImage + {nx::core::Uuid::FromString("97102d65-9c32-576a-9177-c59d958bad10").value(), {nx::core::FilterTraits::uuid, &ITKMaskImage::FromSIMPLJson}}, // ITKMaskImage + {nx::core::Uuid::FromString("5b905619-c46b-5690-b6fa-8e97cf4537b8").value(), {nx::core::FilterTraits::uuid, &ITKNormalizeImage::FromSIMPLJson}}, // ITKNormalizeImage + {nx::core::Uuid::FromString("6e66563a-edcf-5e11-bc1d-ceed36d8493f").value(), {nx::core::FilterTraits::uuid, &ITKOtsuMultipleThresholdsImage::FromSIMPLJson}}, // ITKOtsuMultipleThresholdsImage + {nx::core::Uuid::FromString("1eb4b4f7-1704-58e4-9f78-8726a5c8c302").value(), {nx::core::FilterTraits::uuid, &ITKSinImage::FromSIMPLJson}}, // ITKSinImage + {nx::core::Uuid::FromString("8087dcad-68f2-598b-9670-d0f57647a445").value(), {nx::core::FilterTraits::uuid, &ITKSqrtImage::FromSIMPLJson}}, // ITKSqrtImage + {nx::core::Uuid::FromString("672810d9-5ec0-59c1-a209-8fb56c7a018a").value(), {nx::core::FilterTraits::uuid, &ITKTanImage::FromSIMPLJson}}, // ITKTanImage + {nx::core::Uuid::FromString("f86167ad-a1a1-557b-97ea-92a3618baa8f").value(), {nx::core::FilterTraits::uuid, &ITKBinaryDilateImage::FromSIMPLJson}}, // ITKBinaryDilateImage + {nx::core::Uuid::FromString("522c5249-c048-579a-98dd-f7aadafc5578").value(), {nx::core::FilterTraits::uuid, &ITKBinaryErodeImage::FromSIMPLJson}}, // ITKBinaryErodeImage + {nx::core::Uuid::FromString("704c801a-7549-54c4-9def-c4bb58d07fd1").value(), {nx::core::FilterTraits::uuid, &ITKBinaryMorphologicalOpeningImage::FromSIMPLJson}}, // ITKBinaryMorphologicalOpeningImage + {nx::core::Uuid::FromString("606c3700-f793-5852-9a0f-3123bd212447").value(), {nx::core::FilterTraits::uuid, &ITKBinaryProjectionImage::FromSIMPLJson}}, // ITKBinaryProjectionImage + {nx::core::Uuid::FromString("dcceeb50-5924-5eae-88ea-34793cf545a9").value(), {nx::core::FilterTraits::uuid, &ITKBinaryThinningImage::FromSIMPLJson}}, // ITKBinaryThinningImage + {nx::core::Uuid::FromString("e26e7359-f72c-5924-b42e-dd5dd454a794").value(), {nx::core::FilterTraits::uuid, &ITKBlackTopHatImage::FromSIMPLJson}}, // ITKBlackTopHatImage + {nx::core::Uuid::FromString("dbf29c6d-461c-55e7-a6c4-56477d9da55b").value(), {nx::core::FilterTraits::uuid, &ITKDilateObjectMorphologyImage::FromSIMPLJson}}, // ITKDilateObjectMorphologyImage + {nx::core::Uuid::FromString("caea0698-4253-518b-ab3f-8ebc140d92ea").value(), {nx::core::FilterTraits::uuid, &ITKErodeObjectMorphologyImage::FromSIMPLJson}}, // ITKErodeObjectMorphologyImage + {nx::core::Uuid::FromString("a6fb3f3a-6c7a-5dfc-a4f1-75ff1d62c32f").value(), {nx::core::FilterTraits::uuid, &ITKExpImage::FromSIMPLJson}}, // ITKExpImage + {nx::core::Uuid::FromString("634c2306-c1ee-5a45-a55c-f8286e36999a").value(), {nx::core::FilterTraits::uuid, &ITKExpNegativeImage::FromSIMPLJson}}, // ITKExpNegativeImage + {nx::core::Uuid::FromString("66cec151-2950-51f8-8a02-47d3516d8721").value(), {nx::core::FilterTraits::uuid, &ITKGrayscaleDilateImage::FromSIMPLJson}}, // ITKGrayscaleDilateImage + {nx::core::Uuid::FromString("aef4e804-3f7a-5dc0-911c-b1f16a393a69").value(), {nx::core::FilterTraits::uuid, &ITKGrayscaleErodeImage::FromSIMPLJson}}, // ITKGrayscaleErodeImage + {nx::core::Uuid::FromString("849a1903-5595-5029-bbde-6f4b68b2a25c").value(), {nx::core::FilterTraits::uuid, &ITKGrayscaleMorphologicalClosingImage::FromSIMPLJson}}, // ITKGrayscaleMorphologicalClosingImage + {nx::core::Uuid::FromString("c88ac42b-9477-5088-9ec0-862af1e0bb56").value(), {nx::core::FilterTraits::uuid, &ITKGrayscaleMorphologicalOpeningImage::FromSIMPLJson}}, // ITKGrayscaleMorphologicalOpeningImage + {nx::core::Uuid::FromString("4faf4c59-6f29-53af-bc78-5aecffce0e37").value(), {nx::core::FilterTraits::uuid, &ITKIntensityWindowingImage::FromSIMPLJson}}, // ITKIntensityWindowingImage + {nx::core::Uuid::FromString("c8362fb9-d3ab-55c0-902b-274cc27d9bb8").value(), {nx::core::FilterTraits::uuid, &ITKNotImage::FromSIMPLJson}}, // ITKNotImage + {nx::core::Uuid::FromString("4398d76d-c9aa-5161-bb48-92dd9daaa352").value(), {nx::core::FilterTraits::uuid, &ITKRelabelComponentImage::FromSIMPLJson}}, // ITKRelabelComponentImage + {nx::core::Uuid::FromString("e6675be7-e98d-5e0f-a088-ba15cc301038").value(), {nx::core::FilterTraits::uuid, &ITKSigmoidImage::FromSIMPLJson}}, // ITKSigmoidImage + {nx::core::Uuid::FromString("f092420e-14a0-5dc0-91f8-de0082103aef").value(), {nx::core::FilterTraits::uuid, &ITKSquareImage::FromSIMPLJson}}, // ITKSquareImage + {nx::core::Uuid::FromString("5845ee06-5c8a-5a74-80fb-c820bd8dfb75").value(), {nx::core::FilterTraits::uuid, &ITKThresholdImage::FromSIMPLJson}}, // ITKThresholdImage + {nx::core::Uuid::FromString("02e059f7-8055-52b4-9d48-915b67d1e39a").value(), {nx::core::FilterTraits::uuid, &ITKWhiteTopHatImage::FromSIMPLJson}}, // ITKWhiteTopHatImage // @@__MAP__UPDATE__TOKEN__DO__NOT__DELETE__@@ #endif }; -} // namespace complex +} // namespace nx::core // clang-format on diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.cpp index c38c35bb6c..9bce440ab9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.cpp @@ -18,7 +18,7 @@ #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -58,9 +58,9 @@ void ITKImageProcessingPlugin::RegisterITKImageIO() itk::MRCImageIOFactory::RegisterOneFactory(); } -AbstractPlugin::SIMPLMapType ITKImageProcessingPlugin::getSimplToComplexMap() const +AbstractPlugin::SIMPLMapType ITKImageProcessingPlugin::getSimplToSimplnxMap() const { - return complex::k_SIMPL_to_ITKImageProcessing; + return nx::core::k_SIMPL_to_ITKImageProcessing; } std::vector ITKImageProcessingPlugin::GetList2DSupportedFileExtensions() @@ -68,4 +68,4 @@ std::vector ITKImageProcessingPlugin::GetList2DSupportedFileExtensi return {".png", ".tif", ".jpg", ".jpeg", ".bmp", ".mha"}; } -COMPLEX_DEF_PLUGIN(ITKImageProcessingPlugin) +SIMPLNX_DEF_PLUGIN(ITKImageProcessingPlugin) diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.hpp index 2bbb42cbd5..61d2abafb7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/ITKImageProcessingPlugin.hpp @@ -2,11 +2,11 @@ #include -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" #include "ITKImageProcessing/ITKImageProcessing_export.hpp" -class ITKIMAGEPROCESSING_EXPORT ITKImageProcessingPlugin : public complex::AbstractPlugin +class ITKIMAGEPROCESSING_EXPORT ITKImageProcessingPlugin : public nx::core::AbstractPlugin { public: ITKImageProcessingPlugin(); @@ -22,10 +22,10 @@ class ITKIMAGEPROCESSING_EXPORT ITKImageProcessingPlugin : public complex::Abstr /** * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to - * their complex counterpart - * @return std::map + * their simplnx counterpart + * @return std::map */ - SIMPLMapType getSimplToComplexMap() const override; + SIMPLMapType getSimplToSimplnxMap() const override; static std::vector GetList2DSupportedFileExtensions(); }; diff --git a/src/Plugins/ITKImageProcessing/test/CMakeLists.txt b/src/Plugins/ITKImageProcessing/test/CMakeLists.txt index c85800a92e..4c0f1e142a 100644 --- a/src/Plugins/ITKImageProcessing/test/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/test/CMakeLists.txt @@ -9,7 +9,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS ITKMhaFileReaderTest.cpp ITKRescaleIntensityImageTest.cpp ) -if(NOT COMPLEX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) +if(NOT SIMPLNX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) list(APPEND ${PLUGIN_NAME}UnitTest_SRCS ITKBinaryContourImageTest.cpp ITKBinaryOpeningByReconstructionImageTest.cpp @@ -74,7 +74,7 @@ if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) ) endif() -create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} +create_simplnx_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} FILTER_LIST "" ) @@ -89,7 +89,7 @@ target_sources(${PLUGIN_NAME}UnitTest # ----------------------------------------------------------------------------- # Include any example pipelines into the unit testing # ----------------------------------------------------------------------------- -include(${complex_SOURCE_DIR}/cmake/Utility.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) # These should be relative to the set(PREBUILT_PIPELINE_NAMES @@ -102,13 +102,13 @@ set(PREBUILT_PIPELINE_NAMES # Here we are going to setup to download and decompress the test files. In order # to add your own test files you will need to tar.gz the test file, compute the # SHA 512 Hash of the file and then upload the file to -# https://github.com/BlueQuartzSoftware/complex/releases/tag/Data_Archive. +# https://github.com/bluequartzsoftware/simplnx/releases/tag/Data_Archive. # # Go to the web site above, "edit" the release, add the filename and SHA 512 to # the table and then upload your compressed file. # Save the release so that the repo is updated # ----------------------------------------------------------------------------- -if(EXISTS "${DREAM3D_DATA_DIR}" AND COMPLEX_DOWNLOAD_TEST_FILES) +if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) if(NOT EXISTS ${DREAM3D_DATA_DIR}/TestFiles/) file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") endif() diff --git a/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp index 302f040c7b..551a224fdd 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAbsImageTest.cpp @@ -5,14 +5,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(float)", "[ITKImageProcessing][ITKAbsImage][float]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(float)", "[ITKImageProcessing][ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,18 +38,18 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(float)", "[ITKImageProcessing][ args.insertOrAssign(ITKAbsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AbsImageFilter_float.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AbsImageFilter_float.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(short)", "[ITKImageProcessing][ITKAbsImage][short]") @@ -67,7 +67,7 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(short)", "[ITKImageProcessing][ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -76,16 +76,16 @@ TEST_CASE("ITKImageProcessing::ITKAbsImageFilter(short)", "[ITKImageProcessing][ args.insertOrAssign(ITKAbsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AbsImageFilter_short.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AbsImageFilter_short.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp index 6e674a26d4..941fb8ca39 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAcosImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKAcosImageFilter(defaults)", "[ITKImageProcessing][ITKAcosImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKAcosImageFilter(defaults)", "[ITKImageProcessi { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,16 +37,16 @@ TEST_CASE("ITKImageProcessing::ITKAcosImageFilter(defaults)", "[ITKImageProcessi args.insertOrAssign(ITKAcosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AcosImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AcosImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp index e50f21c2c4..9a9878bd32 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp @@ -1,17 +1,17 @@ #include -#include "complex/Core/Application.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include "ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImage.hpp" #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" @@ -19,7 +19,7 @@ namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace ITKImageProcessingUnitTest { @@ -39,7 +39,7 @@ void InitApplicationAndPlugins() DataPath ConvertColorToGrayScale(DataStructure& dataStructure, const DataPath& inputGeometryPath, DataPath inputDataPath) { const Uuid k_ColorToGrayScaleFilterId = *Uuid::FromString("d938a2aa-fee2-4db9-aa2f-2c34a9736580"); - const FilterHandle k_ColorToGrayScaleFilterHandle(k_ColorToGrayScaleFilterId, k_ComplexCorePluginId); + const FilterHandle k_ColorToGrayScaleFilterHandle(k_ColorToGrayScaleFilterId, k_SimplnxCorePluginId); // Parameter Keys constexpr StringLiteral k_ConversionAlgorithm_Key = "conversion_algorithm"; @@ -60,10 +60,10 @@ DataPath ConvertColorToGrayScale(DataStructure& dataStructure, const DataPath& i args.insertOrAssign(k_OutputArrayPrefix_Key, std::make_any("GrayScale_")); auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) return inputGeometryPath.createChildPath(fmt::format("GrayScale_{}", ITKTestBase::k_InputDataPath)); } @@ -86,7 +86,7 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(defau const fs::path inputFilePath = fs::path(unit_test::k_DataDir.view()) / "JSONFilters" / "Input/sf4.png"; REQUIRE(fs::exists(inputFilePath)); Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // convert color image to grayscale image @@ -105,18 +105,18 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(defau args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{10, 19, 10})); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters/ITKAdaptiveHistogramEqualizationFilterTest.png"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters/ITKAdaptiveHistogramEqualizationFilterTest.png"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); const Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 2e-3); - // COMPLEX_RESULT_REQUIRE_VALID(compareResult) + // SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } } @@ -134,7 +134,7 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(histo { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/sf4.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope // convert color image to grayscale image @@ -153,24 +153,24 @@ TEST_CASE("ITKImageProcessing::ITKAdaptiveHistogramEqualizationImageFilter(histo args.insertOrAssign(ITKAdaptiveHistogramEqualizationImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{10, 10, 10})); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters/ITKAdaptiveHistogramEqualizationFilterTest2.png"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters/ITKAdaptiveHistogramEqualizationFilterTest2.png"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); const Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 1e-5); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } { - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/itk_adaptive_align_histograms.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/itk_adaptive_align_histograms.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5) + SIMPLNX_RESULT_REQUIRE_VALID(resultH5) } } diff --git a/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp index c176ba9a45..1b76cd3ab8 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAsinImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKAsinImageFilter(defaults)", "[ITKImageProcessing][ITKAsinImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKAsinImageFilter(defaults)", "[ITKImageProcessi { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,16 +37,16 @@ TEST_CASE("ITKImageProcessing::ITKAsinImageFilter(defaults)", "[ITKImageProcessi args.insertOrAssign(ITKAsinImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AsinImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AsinImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp index 4bc0ab93fe..ecd608c448 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKAtanImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKAtanImageFilter(defaults)", "[ITKImageProcessing][ITKAtanImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKAtanImageFilter(defaults)", "[ITKImageProcessi { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,16 +37,16 @@ TEST_CASE("ITKImageProcessing::ITKAtanImageFilter(defaults)", "[ITKImageProcessi args.insertOrAssign(ITKAtanImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AtanImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_AtanImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp index f6de0139e0..7ef2591b03 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryContourImageTest.cpp @@ -2,20 +2,20 @@ #include "ITKImageProcessing/Filters/ITKBinaryContourImage.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(default)", "[ITKImageProcessing][ITKBinaryContourImage][default]") { @@ -32,7 +32,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(default)", "[ITKImage { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/WhiteDots.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,10 +42,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(default)", "[ITKImage args.insertOrAssign(ITKBinaryContourImage::k_ForegroundValue_Key, std::make_any(255.0)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "3921141f21fcb41e6d4af197e48ffbb5"); @@ -66,7 +66,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(custom)", "[ITKImageP { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -77,10 +77,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryContourImageFilter(custom)", "[ITKImageP args.insertOrAssign(ITKBinaryContourImage::k_FullyConnected_Key, std::make_any(true)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "09212e4d204a0ed90a445dc832047b22"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp index 9ed8b7e63e..f1fcf58a88 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryDilateImageTest.cpp @@ -5,19 +5,19 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilate)", "[ITKImageProcessing][ITKBinaryDilateImage][BinaryDilate]") { @@ -34,7 +34,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilate)", "[ITKI { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -46,10 +46,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilate)", "[ITKI args.insertOrAssign(ITKBinaryDilateImage::k_ForegroundValue_Key, std::make_any(255.0)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "9eef659f21dab5eb49e0f715a5d9a21b"); @@ -70,7 +70,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilateVectorRadi { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -82,10 +82,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryDilateImageFilter(BinaryDilateVectorRadi args.insertOrAssign(ITKBinaryDilateImage::k_ForegroundValue_Key, std::make_any(255)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "99108c735fe9727bca09ca28a42827d3"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp index c4df284155..682822e657 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryErodeImageTest.cpp @@ -5,19 +5,19 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBinaryErodeImageFilter(BinaryErode)", "[ITKImageProcessing][ITKBinaryErodeImage][BinaryErode]") { @@ -32,7 +32,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryErodeImageFilter(BinaryErode)", "[ITKIma { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -44,10 +44,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryErodeImageFilter(BinaryErode)", "[ITKIma args.insertOrAssign(ITKBinaryErodeImage::k_ForegroundValue_Key, std::make_any(255)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "9e37516c795d7f25847851666ef53ef9"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp index 12198e1102..337ac65b1f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalClosingImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMorphologicalClosing)", "[ITKImageProcessing][ITKBinaryMorphologicalClosingImage][BinaryMorphologicalClosing]") { @@ -31,7 +31,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,10 +42,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "095f00a68a84df4396914fa758f34dcc"); @@ -65,7 +65,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/WhiteDots.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -78,10 +78,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalClosingImageFilter(BinaryMo args.insertOrAssign(ITKBinaryMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "506d365dd92db16c2ade264fca46890c"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp index bcc28bce1a..edb0b9fbef 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryMorphologicalOpeningImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalOpeningImageFilter(BinaryMorphologicalOpening)", "[ITKImageProcessing][ITKBinaryMorphologicalOpeningImage][BinaryMorphologicalOpening]") { @@ -31,7 +31,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalOpeningImageFilter(BinaryMo { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -43,10 +43,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryMorphologicalOpeningImageFilter(BinaryMo args.insertOrAssign(ITKBinaryMorphologicalOpeningImage::k_ForegroundValue_Key, std::make_any(255)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "bc97d7cbf9d3779070373f7a28b932a2"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp index ed4e0554ee..933aec2266 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryOpeningByReconstructionImageTest.cpp @@ -5,19 +5,19 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBinaryOpeningByReconstructionImageFilter(BinaryOpeningByReconstruction)", "[ITKImageProcessing][ITKBinaryOpeningByReconstructionImage][BinaryOpeningByReconstruction]") @@ -33,7 +33,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryOpeningByReconstructionImageFilter(Binar { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -45,10 +45,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryOpeningByReconstructionImageFilter(Binar args.insertOrAssign(ITKBinaryOpeningByReconstructionImage::k_ForegroundValue_Key, std::make_any(200)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "2dff38c9c5d2f516e7435f3e2291d6c1"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp index 3f9d71c879..05822323ac 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryProjectionImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(defaults)", "[ITKImageProcessing][ITKBinaryProjectionImage][defaults]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(defaults)", "[ITKI { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.mha"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(defaults)", "[ITKI args.insertOrAssign(ITKBinaryProjectionImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "3fc3603b27bf51df592190227d6cd6ed"); @@ -60,7 +60,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(another_dimension) { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/WhiteDots.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -71,10 +71,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryProjectionImageFilter(another_dimension) args.insertOrAssign(ITKBinaryProjectionImage::k_ForegroundValue_Key, std::make_any(255)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "827f263ef9fb63d05499d14fcef32f60"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp index 35b00561b6..8d82afba2f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryThinningImageTest.cpp @@ -5,15 +5,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBinaryThinningImageFilter(BinaryThinning)", "[ITKImageProcessing][ITKBinaryThinningImage][BinaryThinning]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThinningImageFilter(BinaryThinning)", "[ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/BlackDots.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,10 +37,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThinningImageFilter(BinaryThinning)", "[ args.insertOrAssign(ITKBinaryThinningImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "153ad0b2f3658dee3b14ad93d0cfe550"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp index da877ee349..7b20218f25 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBinaryThresholdImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(default)", "[ITKImageProcessing][ITKBinaryThresholdImage][default]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(default)", "[ITKIma fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -34,10 +34,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(default)", "[ITKIma args.insertOrAssign(ITKBinaryThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "dbd0ea7d6f16bb93e9c688cb0f1bfd85"); @@ -55,7 +55,7 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(NarrowThreshold)", fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKBinaryThresholdImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -67,10 +67,10 @@ TEST_CASE("ITKImageProcessing::ITKBinaryThresholdImageFilter(NarrowThreshold)", args.insertOrAssign(ITKBinaryThresholdImage::k_OutsideValue_Key, std::make_any(0)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "fc4ce029c088096a69d033ccc5bc1ae2"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp index 8296ae74ee..fcfe4494a3 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKBlackTopHatImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKBlackTopHatImageFilter(BlackTopHapErode)", "[ITKImageProcessing][ITKBlackTopHatImage][BlackTopHapErode]") { @@ -31,7 +31,7 @@ TEST_CASE("ITKImageProcessing::ITKBlackTopHatImageFilter(BlackTopHapErode)", "[I { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,10 +42,10 @@ TEST_CASE("ITKImageProcessing::ITKBlackTopHatImageFilter(BlackTopHapErode)", "[I args.insertOrAssign(ITKBlackTopHatImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "445a5da6221f6d976d169b70c5538614"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp index bf449811ce..084bd27853 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKClosingByReconstructionImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKClosingByReconstructionImageFilter(ClosingByReconstruction)", "[ITKImageProcessing][ITKClosingByReconstructionImage][ClosingByReconstruction]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKClosingByReconstructionImageFilter(ClosingByRe { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -41,10 +41,10 @@ TEST_CASE("ITKImageProcessing::ITKClosingByReconstructionImageFilter(ClosingByRe args.insertOrAssign(ITKClosingByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "095f00a68a84df4396914fa758f34dcc"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp index 109d3f96f2..841d91cfc6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKCosImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKCosImageFilter(float)", "[ITKImageProcessing][ITKCosImage][float]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(float)", "[ITKImageProcessing][ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -35,18 +35,18 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(float)", "[ITKImageProcessing][ args.insertOrAssign(ITKCosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_CosImageFilter_float.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_CosImageFilter_float.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } TEST_CASE("ITKImageProcessing::ITKCosImageFilter(short)", "[ITKImageProcessing][ITKCosImage][short]") @@ -62,7 +62,7 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(short)", "[ITKImageProcessing][ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -71,16 +71,16 @@ TEST_CASE("ITKImageProcessing::ITKCosImageFilter(short)", "[ITKImageProcessing][ args.insertOrAssign(ITKCosImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_CosImageFilter_short.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_CosImageFilter_short.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp index 7a63a40c38..cb262734db 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDilateObjectMorphologyImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(float)", "[ITKImageProcessing][ITKDilateObjectMorphologyImage][float]") { @@ -31,7 +31,7 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(float)", "[I { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,18 +42,18 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(float)", "[I args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DilateObjectMorphologyImageFilter_float.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DilateObjectMorphologyImageFilter_float.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(short)", "[ITKImageProcessing][ITKDilateObjectMorphologyImage][short]") @@ -69,7 +69,7 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(short)", "[I { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -80,16 +80,16 @@ TEST_CASE("ITKImageProcessing::ITKDilateObjectMorphologyImageFilter(short)", "[I args.insertOrAssign(ITKDilateObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DilateObjectMorphologyImageFilter_short.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DilateObjectMorphologyImageFilter_short.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp index 4e6e25f3d6..5ec6283a5e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKDiscreteGaussianImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(float)", "[ITKImageProcessing][ITKDiscreteGaussianImage][float]") { @@ -33,7 +33,7 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(float)", "[ITKImag { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,18 +42,18 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(float)", "[ITKImag args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DiscreteGaussianImageFilter_float.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DiscreteGaussianImageFilter_float.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.0001); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(short)", "[ITKImageProcessing][ITKDiscreteGaussianImage][short]") @@ -71,7 +71,7 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(short)", "[ITKImag { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -80,18 +80,18 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(short)", "[ITKImag args.insertOrAssign(ITKDiscreteGaussianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DiscreteGaussianImageFilter_short.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_DiscreteGaussianImageFilter_short.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 1.0); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(bigG)", "[ITKImageProcessing][ITKDiscreteGaussianImage][bigG]") @@ -109,7 +109,7 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(bigG)", "[ITKImage { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/WhiteDots.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -124,10 +124,10 @@ TEST_CASE("ITKImageProcessing::ITKDiscreteGaussianImageFilter(bigG)", "[ITKImage args.insertOrAssign(ITKDiscreteGaussianImage::k_MaximumKernelWidth_Key, std::make_any(64)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "f2f002ec76313284a4cff24c3e5eb577"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp index ec6a1fb32d..a58430804e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKErodeObjectMorphologyImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(float)", "[ITKImageProcessing][ITKErodeObjectMorphologyImage][float]") { @@ -31,7 +31,7 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(float)", "[IT { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,18 +42,18 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(float)", "[IT args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ErodeObjectMorphologyImageFilter_float.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ErodeObjectMorphologyImageFilter_float.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(short)", "[ITKImageProcessing][ITKErodeObjectMorphologyImage][short]") @@ -69,7 +69,7 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(short)", "[IT { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -80,16 +80,16 @@ TEST_CASE("ITKImageProcessing::ITKErodeObjectMorphologyImageFilter(short)", "[IT args.insertOrAssign(ITKErodeObjectMorphologyImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ErodeObjectMorphologyImageFilter_short.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ErodeObjectMorphologyImageFilter_short.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp index 6dde152046..c4e9c682bc 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKExpImageTest.cpp @@ -5,15 +5,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKExpImageFilter(defaults)", "[ITKImageProcessing][ITKExpImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKExpImageFilter(defaults)", "[ITKImageProcessin { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,16 +37,16 @@ TEST_CASE("ITKImageProcessing::ITKExpImageFilter(defaults)", "[ITKImageProcessin args.insertOrAssign(ITKExpImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ExpImageFilter_defaults.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ExpImageFilter_defaults.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp index da67377d63..3612845431 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKExpNegativeImageTest.cpp @@ -5,15 +5,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKExpNegativeImageFilter(defaults)", "[ITKImageProcessing][ITKExpNegativeImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKExpNegativeImageFilter(defaults)", "[ITKImageP { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,16 +37,16 @@ TEST_CASE("ITKImageProcessing::ITKExpNegativeImageFilter(defaults)", "[ITKImageP args.insertOrAssign(ITKExpNegativeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ExpNegativeImageFilter_defaults.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_ExpNegativeImageFilter_defaults.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp index f385c9f7fa..5cffcb9b6d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGradientMagnitudeImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKGradientMagnitudeImageFilter(default)", "[ITKImageProcessing][ITKGradientMagnitudeImage][default]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKGradientMagnitudeImageFilter(default)", "[ITKI fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKGradientMagnitudeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -34,16 +34,16 @@ TEST_CASE("ITKImageProcessing::ITKGradientMagnitudeImageFilter(default)", "[ITKI args.insertOrAssign(ITKGradientMagnitudeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_GradientMagnitudeImageFilter_default.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_GradientMagnitudeImageFilter_default.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 1e-05); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp index 20f59e6dbb..7141c4aae0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleDilateImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKGrayscaleDilateImageFilter(GrayscaleDilate)", "[ITKImageProcessing][ITKGrayscaleDilateImage][GrayscaleDilate]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleDilateImageFilter(GrayscaleDilate)", { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -41,10 +41,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleDilateImageFilter(GrayscaleDilate)", args.insertOrAssign(ITKGrayscaleDilateImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "cb692559f1eb21e4c932f6bbb3850ad3"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp index e36d58493f..2f13753f41 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleErodeImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKGrayscaleErodeImageFilter(GrayscaleErode)", "[ITKImageProcessing][ITKGrayscaleErodeImage][GrayscaleErode]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleErodeImageFilter(GrayscaleErode)", "[ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -41,10 +41,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleErodeImageFilter(GrayscaleErode)", "[ args.insertOrAssign(ITKGrayscaleErodeImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "cb0f49738a99f3467b575bc95a0ace44"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp index bdd2ec0d18..a7afe520d0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleFillholeImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole1)", "[ITKImageProcessing][ITKGrayscaleFillholeImage][GrayscaleFillhole1]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -34,10 +34,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "e2c49e979bd4c64f0efff67b196b1950"); @@ -55,7 +55,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKGrayscaleFillholeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -63,10 +63,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleFillholeImageFilter(GrayscaleFillhole args.insertOrAssign(ITKGrayscaleFillholeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "e3cd61348a7824d191e83632bf92baae"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp index 73f73f4f97..a5726ad222 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleGrindPeakImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPeak1)", "[ITKImageProcessing][ITKGrayscaleGrindPeakImage][GrayscaleGrindPeak1]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "084cdd1d64664ebfab26c2e0ed382e14"); @@ -60,7 +60,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -69,10 +69,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleGrindPeakImageFilter(GrayscaleGrindPe args.insertOrAssign(ITKGrayscaleGrindPeakImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "b18d75cccb9361c65b40bb5c0d3c6e0d"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp index fe9ef1cccf..4701ab0b81 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalClosingImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalClosingImageFilter(GrayscaleMorphologicalClosing)", "[ITKImageProcessing][ITKGrayscaleMorphologicalClosingImage][GrayscaleMorphologicalClosing]") @@ -32,7 +32,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalClosingImageFilter(Grays { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -43,10 +43,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalClosingImageFilter(Grays args.insertOrAssign(ITKGrayscaleMorphologicalClosingImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "103130cc4caf40d9fb252fbabc531e15"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp index fdfd2516f6..9092a5dfc5 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKGrayscaleMorphologicalOpeningImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(GrayscaleMorphologicalOpening)", "[ITKImageProcessing][ITKGrayscaleMorphologicalOpeningImage][GrayscaleMorphologicalOpening]") @@ -32,7 +32,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -43,10 +43,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "867de5ed8cf49c4657e1545bd57f2c23"); @@ -66,7 +66,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -77,10 +77,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkCross)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "5651a92320cfd9f01be4463131a4e573"); @@ -100,7 +100,7 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -111,10 +111,10 @@ TEST_CASE("ITKImageProcessing::ITKGrayscaleMorphologicalOpeningImageFilter(Grays args.insertOrAssign(ITKGrayscaleMorphologicalOpeningImage::k_KernelType_Key, std::make_any(itk::simple::sitkBox)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "0a5ac0dbca31e1b92eb6d48e990582a7"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp index 320c3cedb8..b71e408993 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHConvexImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKHConvexImageFilter(HConvex)", "[ITKImageProcessing][ITKHConvexImage][HConvex]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKHConvexImageFilter(HConvex)", "[ITKImageProces { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -40,10 +40,10 @@ TEST_CASE("ITKImageProcessing::ITKHConvexImageFilter(HConvex)", "[ITKImageProces args.insertOrAssign(ITKHConvexImage::k_Height_Key, std::make_any(10000)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "f3a7b95a51710d51b3b73e0eb77eb1eb"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp index b5e9d70634..0ae2472e0b 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHMaximaImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKHMaximaImageFilter(HMaxima)", "[ITKImageProcessing][ITKHMaximaImage][HMaxima]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKHMaximaImageFilter(HMaxima)", "[ITKImageProces { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -39,10 +39,10 @@ TEST_CASE("ITKImageProcessing::ITKHMaximaImageFilter(HMaxima)", "[ITKImageProces args.insertOrAssign(ITKHMaximaImage::k_Height_Key, std::make_any(2000)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "b30d403fb1c5948abfb17fa9c346cecd"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp index 50de51fb85..aee95d8e0f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKHMinimaImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKHMinimaImageFilter(HMinima)", "[ITKImageProcessing][ITKHMinimaImage][HMinima]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKHMinimaImageFilter(HMinima)", "[ITKImageProces { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -40,10 +40,10 @@ TEST_CASE("ITKImageProcessing::ITKHMinimaImageFilter(HMinima)", "[ITKImageProces args.insertOrAssign(ITKHMinimaImage::k_Height_Key, std::make_any(2000)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "7778067eeb752b6ac396dd9e362e8346"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKImageReaderTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKImageReaderTest.cpp index e6540b673a..238886cbbc 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKImageReaderTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKImageReaderTest.cpp @@ -3,16 +3,16 @@ #include "ITKImageProcessing/Filters/ITKImageReader.hpp" #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKImageReader: Read PNG", "[ITKImageProcessing][ITKImageReader]") { @@ -28,10 +28,10 @@ TEST_CASE("ITKImageProcessing::ITKImageReader: Read PNG", "[ITKImageProcessing][ args.insertOrAssign(ITKImageReader::k_ImageDataArrayPath_Key, arrayPath); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* imageGeom = dataStructure.getDataAs(imagePath); REQUIRE(imageGeom != nullptr); diff --git a/src/Plugins/ITKImageProcessing/test/ITKImageWriterTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKImageWriterTest.cpp index 94e11dd918..4004f22d3f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKImageWriterTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKImageWriterTest.cpp @@ -4,16 +4,16 @@ #include "ITKImageProcessing/Filters/ITKImportImageStack.hpp" #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -100,10 +100,10 @@ TEST_CASE("ITKImageProcessing::ITKImageWriter: Write Stack", "[ITKImageProcessin args.insertOrAssign(ITKImportImageStack::k_ImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } { @@ -124,10 +124,10 @@ TEST_CASE("ITKImageProcessing::ITKImageWriter: Write Stack", "[ITKImageProcessin args.insertOrAssign(ITKImageWriter::k_Plane_Key, std::make_any(ITKImageWriter::k_XYPlane)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* imageGeom = dataStructure.getDataAs(k_ImageGeomPath); SizeVec3 imageDims = imageGeom->getDimensions(); @@ -153,10 +153,10 @@ TEST_CASE("ITKImageProcessing::ITKImageWriter: Write Stack", "[ITKImageProcessin args.insertOrAssign(ITKImageWriter::k_Plane_Key, std::make_any(ITKImageWriter::k_XZPlane)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* imageGeom = dataStructure.getDataAs(k_ImageGeomPath); SizeVec3 imageDims = imageGeom->getDimensions(); @@ -182,10 +182,10 @@ TEST_CASE("ITKImageProcessing::ITKImageWriter: Write Stack", "[ITKImageProcessin args.insertOrAssign(ITKImageWriter::k_Plane_Key, std::make_any(ITKImageWriter::k_YZPlane)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* imageGeom = dataStructure.getDataAs(k_ImageGeomPath); SizeVec3 imageDims = imageGeom->getDimensions(); diff --git a/src/Plugins/ITKImageProcessing/test/ITKImportFijiMontageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKImportFijiMontageTest.cpp index 94fd850015..084dfb1fe7 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKImportFijiMontageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKImportFijiMontageTest.cpp @@ -3,17 +3,17 @@ #include "ITKImageProcessing/Filters/ITKImportFijiMontageFilter.hpp" #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace fs = std::filesystem; @@ -27,7 +27,7 @@ const DataPath k_DataGroupPath = {{k_DataGroupName}}; TEST_CASE("ITKImageProcessing::ITKImportFijiMontage: Basic 2x2 Grid Montage", "[ITKImageProcessing][ITKImportFijiMontage]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "fiji_montage.tar.gz", "fiji_montage"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "fiji_montage.tar.gz", "fiji_montage"); auto app = Application::GetOrCreateInstance(); app->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -56,11 +56,11 @@ TEST_CASE("ITKImageProcessing::ITKImportFijiMontage: Basic 2x2 Grid Montage", "[ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); std::vector generatedGroup = GetAllChildDataPaths(dataStructure, k_DataGroupPath, DataObject::Type::ImageGeom).value(); std::vector exemplarGroup = GetAllChildDataPaths(exemplarDataStructure, k_DataGroupPath, DataObject::Type::ImageGeom).value(); diff --git a/src/Plugins/ITKImageProcessing/test/ITKImportImageStackTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKImportImageStackTest.cpp index 7f29598db0..bbb45a9d8f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKImportImageStackTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKImportImageStackTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace fs = std::filesystem; @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKImportImageStack: NoInput", "[ITKImageProcessi Arguments args; auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } TEST_CASE("ITKImageProcessing::ITKImportImageStack: NoImageGeometry", "[ITKImageProcessing][ITKImportImageStack]") @@ -45,7 +45,7 @@ TEST_CASE("ITKImageProcessing::ITKImportImageStack: NoImageGeometry", "[ITKImage args.insertOrAssign(ITKImportImageStack::k_InputFileListInfo_Key, std::make_any(fileListInfo)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } TEST_CASE("ITKImageProcessing::ITKImportImageStack: NoFiles", "[ITKImageProcessing][ITKImportImageStack]") @@ -69,7 +69,7 @@ TEST_CASE("ITKImageProcessing::ITKImportImageStack: NoFiles", "[ITKImageProcessi args.insertOrAssign(ITKImportImageStack::k_ImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } TEST_CASE("ITKImageProcessing::ITKImportImageStack: FileDoesNotExist", "[ITKImageProcessing][ITKImportImageStack]") @@ -93,7 +93,7 @@ TEST_CASE("ITKImageProcessing::ITKImportImageStack: FileDoesNotExist", "[ITKImag args.insertOrAssign(ITKImportImageStack::k_ImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } TEST_CASE("ITKImageProcessing::ITKImportImageStack: CompareImage", "[ITKImageProcessing][ITKImportImageStack]") @@ -122,10 +122,10 @@ TEST_CASE("ITKImageProcessing::ITKImportImageStack: CompareImage", "[ITKImagePro args.insertOrAssign(ITKImportImageStack::k_ImageGeometryPath_Key, std::make_any(k_ImageGeomPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* imageGeom = dataStructure.getDataAs(k_ImageGeomPath); REQUIRE(imageGeom != nullptr); diff --git a/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp index fb6607f492..0124382fbb 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKIntensityWindowingImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(2d)", "[ITKImageProcessing][ITKIntensityWindowingImage][2d]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(2d)", "[ITKImage { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(2d)", "[ITKImage args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "095f00a68a84df4396914fa758f34dcc"); @@ -60,7 +60,7 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dFloat)", "[ITK { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -69,10 +69,10 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dFloat)", "[ITK args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "199c966fabac791c758766e14df9974c"); @@ -91,7 +91,7 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dShort)", "[ITK { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -100,10 +100,10 @@ TEST_CASE("ITKImageProcessing::ITKIntensityWindowingImageFilter(3dShort)", "[ITK args.insertOrAssign(ITKIntensityWindowingImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "2790c2bdfeb8610821e9ec8751f95516"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp index 04da67fcd8..490c8f940e 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKInvertIntensityImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKInvertIntensityImageFilter(3d)", "[ITKImageProcessing][ITKInvertIntensityImage][3d]") { @@ -27,7 +27,7 @@ TEST_CASE("ITKImageProcessing::ITKInvertIntensityImageFilter(3d)", "[ITKImagePro { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -36,10 +36,10 @@ TEST_CASE("ITKImageProcessing::ITKInvertIntensityImageFilter(3d)", "[ITKImagePro args.insertOrAssign(ITKInvertIntensityImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "76765a57f26a7979f33efc8ed9801a55"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp index 6e60fd539f..68de70f8d2 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLabelContourImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKLabelContourImageFilter(default)", "[ITKImageProcessing][ITKLabelContourImage][default]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKLabelContourImageFilter(default)", "[ITKImageP { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -39,10 +39,10 @@ TEST_CASE("ITKImageProcessing::ITKLabelContourImageFilter(default)", "[ITKImageP args.insertOrAssign(ITKLabelContourImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "d742c05a8d8aa9b41f58b8d2aad6b5d0"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp index 338521aab8..be34eb3281 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLog10ImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKLog10ImageFilter(defaults)", "[ITKImageProcessing][ITKLog10Image][defaults]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKLog10ImageFilter(defaults)", "[ITKImageProcess { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -35,16 +35,16 @@ TEST_CASE("ITKImageProcessing::ITKLog10ImageFilter(defaults)", "[ITKImageProcess args.insertOrAssign(ITKLog10Image::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_Log10ImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_Log10ImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp index 594d0dd1e9..5a6b809400 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKLogImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKLogImageFilter(defaults)", "[ITKImageProcessing][ITKLogImage][defaults]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKLogImageFilter(defaults)", "[ITKImageProcessin { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -35,16 +35,16 @@ TEST_CASE("ITKImageProcessing::ITKLogImageFilter(defaults)", "[ITKImageProcessin args.insertOrAssign(ITKLogImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_LogImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_LogImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp index e4b468778e..a45b0adb2b 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMaskImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(2d)", "[ITKImageProcessing][ITKMaskImage][2d]") { @@ -30,11 +30,11 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(2d)", "[ITKImageProcessing][IT fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) fs::path maskInputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE2.png"; Result<> maskImageReadResult = ITKTestBase::ReadImage(dataStructure, maskInputFilePath, maskGeometryPath, maskCellDataPath, maskDataPath); - COMPLEX_RESULT_REQUIRE_VALID(maskImageReadResult); + SIMPLNX_RESULT_REQUIRE_VALID(maskImageReadResult); const auto& inputGeom = dataStructure.getDataRefAs(inputGeometryPath); const auto& maskGeom = dataStructure.getDataRefAs(maskGeometryPath); @@ -48,10 +48,10 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(2d)", "[ITKImageProcessing][IT args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "c57d7fda3e42374881c3c3181d15bf90"); @@ -73,11 +73,11 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(cthead1)", "[ITKImageProcessin fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1-Float.mha"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) fs::path maskInputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1-mask.png"; Result<> maskImageReadResult = ITKTestBase::ReadImage(dataStructure, maskInputFilePath, maskGeometryPath, maskCellDataPath, maskDataPath); - COMPLEX_RESULT_REQUIRE_VALID(maskImageReadResult); + SIMPLNX_RESULT_REQUIRE_VALID(maskImageReadResult); const auto& inputGeom = dataStructure.getDataRefAs(inputGeometryPath); const auto& maskGeom = dataStructure.getDataRefAs(maskGeometryPath); @@ -91,10 +91,10 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(cthead1)", "[ITKImageProcessin args.insertOrAssign(ITKMaskImage::k_MaskImageDataPath_Key, std::make_any(maskDataPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "0ef8943803bb4a21b2015b53f0164f1c"); @@ -116,11 +116,11 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(rgb)", "[ITKImageProcessing][I fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/VM1111Shrink-RGB.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) fs::path maskInputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/VM1111Shrink-mask.png"; Result<> maskImageReadResult = ITKTestBase::ReadImage(dataStructure, maskInputFilePath, maskGeometryPath, maskCellDataPath, maskDataPath); - COMPLEX_RESULT_REQUIRE_VALID(maskImageReadResult); + SIMPLNX_RESULT_REQUIRE_VALID(maskImageReadResult); const auto& inputGeom = dataStructure.getDataRefAs(inputGeometryPath); const auto& maskGeom = dataStructure.getDataRefAs(maskGeometryPath); @@ -135,10 +135,10 @@ TEST_CASE("ITKImageProcessing::ITKMaskImageFilter(rgb)", "[ITKImageProcessing][I args.insertOrAssign(ITKMaskImage::k_OutsideValue_Key, std::make_any(10.0)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "3dad4a416a7b6a198a4a916d65d7654f"); @@ -161,11 +161,11 @@ TEST_CASE("ITKMaskImageFilter(cthead1_maskvalue)", "[ITKImageProcessing][ITKMask fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) fs::path maskInputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.mha"; Result<> maskImageReadResult = ITKTestBase::ReadImage(dataStructure, maskInputFilePath, inputGeometryPath, maskDataPath); - COMPLEX_RESULT_REQUIRE_VALID(maskImageReadResult); + SIMPLNX_RESULT_REQUIRE_VALID(maskImageReadResult); const auto& inputGeom = dataStructure.getDataRefAs(inputGeometryPath); const auto& maskGeom = dataStructure.getDataRefAs(maskGeometryPath); @@ -180,10 +180,10 @@ TEST_CASE("ITKMaskImageFilter(cthead1_maskvalue)", "[ITKImageProcessing][ITKMask args.insertOrAssign(ITKMaskImage::k_MaskingValue_Key, std::make_any(100.0)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "3eb703113d03f38e7b8db4b180079a39"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp index f98eecbd70..75b6f28963 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMedianImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; /* * The original file paths (now commented out) were from the SimpleITK json; @@ -34,7 +34,7 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(defaults)", "[ITKImageProces // fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/VM1111Shrink-RGBFloat.nrrd"; fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKMedianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -42,10 +42,10 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(defaults)", "[ITKImageProces args.insertOrAssign(ITKMedianImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); // REQUIRE(md5Hash == "3d91602f6080b45a5431b80d1f78c0a0"); @@ -65,7 +65,7 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(by23)", "[ITKImageProcessing // fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/VM1111Shrink-RGB.png"; fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKMedianImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -75,10 +75,10 @@ TEST_CASE("ITKImageProcessing::ITKMedianImageFilter(by23)", "[ITKImageProcessing args.insertOrAssign(ITKMedianImage::k_Radius_Key, std::make_any(VectorUInt32Parameter::ValueType{2, 3, 0})); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); // REQUIRE(md5Hash == "03610a1cb421d145fe985478d4eb9c0a"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMhaFileReaderTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMhaFileReaderTest.cpp index 15c411e25a..90605b9930 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMhaFileReaderTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMhaFileReaderTest.cpp @@ -4,19 +4,19 @@ #include "ITKImageProcessing/Filters/ITKMhaFileReader.hpp" #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKMhaFileReader: Read 2D & 3D Image Data", "[ITKImageProcessing][ITKMhaFileReader]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ITKMhaFileReaderTest_rev2.tar.gz", "ITKMhaFileReaderTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ITKMhaFileReaderTest_rev2.tar.gz", "ITKMhaFileReaderTest"); - // Load plugins (this is needed because ITKMhaFileReader needs access to the ComplexCore plugin) + // Load plugins (this is needed because ITKMhaFileReader needs access to the SimplnxCore plugin) Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); // Test reading 2D & 3D image data @@ -62,10 +62,10 @@ TEST_CASE("ITKImageProcessing::ITKMhaFileReader: Read 2D & 3D Image Data", "[ITK args.insertOrAssign(ITKMhaFileReader::k_TransformationMatrixDataArrayPathKey, tMatrixPath); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* imageGeomPtr = dataStructure.getDataAs(geomPath); REQUIRE(imageGeomPtr != nullptr); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp index f5335762b2..d96d328268 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalGradientImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKMorphologicalGradientImageFilter(MorphologicalGradient)", "[ITKImageProcessing][ITKMorphologicalGradientImage][MorphologicalGradient]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalGradientImageFilter(Morphological { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -41,10 +41,10 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalGradientImageFilter(Morphological args.insertOrAssign(ITKMorphologicalGradientImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "57167a1d86b60fbf9e040d9441676876"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp index d6a1e6272e..22a2ff564f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKMorphologicalWatershedImageTest.cpp @@ -4,16 +4,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(defaults)", "[ITKImageProcessing][ITKMorphologicalWatershedImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(defaults)", { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1-grad-mag.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,10 +37,10 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(defaults)", args.insertOrAssign(ITKMorphologicalWatershedImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "406079d7904d4e9ab0b5f29f7a3a1ea8"); @@ -59,7 +59,7 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(level_1)", " { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1-grad-mag.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -70,10 +70,10 @@ TEST_CASE("ITKImageProcessing::ITKMorphologicalWatershedImageFilter(level_1)", " args.insertOrAssign(ITKMorphologicalWatershedImage::k_MarkWatershedLine_Key, std::make_any(false)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "a204ce7cf8ec4e7bc6538f0515a8910e"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp index aad9428e83..251de43fe5 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKNormalizeImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(defaults)", "[ITKImageProcessing][ITKNormalizeImage][defaults]") { @@ -25,7 +25,7 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(defaults)", "[ITKImagePro fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Up-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKNormalizeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -33,19 +33,19 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(defaults)", "[ITKImagePro args.insertOrAssign(ITKNormalizeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_NormalizeImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_NormalizeImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.0001); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } // This test fails because the filter needs a scalar image. @@ -63,7 +63,7 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(vector)", "[.][ITKImagePr fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/VM1111Shrink-RGB.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKNormalizeImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -71,16 +71,16 @@ TEST_CASE("ITKImageProcessing::ITKNormalizeImageFilter(vector)", "[.][ITKImagePr args.insertOrAssign(ITKNormalizeImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_NormalizeImageFilter_vector.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_NormalizeImageFilter_vector.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.0001); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp index 2836e289b4..5c783582fa 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKNotImageTest.cpp @@ -5,15 +5,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKNotImageFilter(defaults)", "[ITKImageProcessing][ITKNotImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKNotImageFilter(defaults)", "[ITKImageProcessin { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,10 +37,10 @@ TEST_CASE("ITKImageProcessing::ITKNotImageFilter(defaults)", "[ITKImageProcessin args.insertOrAssign(ITKNotImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "2004dccdb2d68b953fd858a5b6a37d35"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp index 2c9b4c8b95..d2fd58ecca 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKOpeningByReconstructionImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKOpeningByReconstructionImageFilter(OpeningByReconstruction)", "[ITKImageProcessing][ITKOpeningByReconstructionImage][OpeningByReconstruction]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKOpeningByReconstructionImageFilter(OpeningByRe { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -41,10 +41,10 @@ TEST_CASE("ITKImageProcessing::ITKOpeningByReconstructionImageFilter(OpeningByRe args.insertOrAssign(ITKOpeningByReconstructionImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "095f00a68a84df4396914fa758f34dcc"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp index 1ca88e4d4f..ac422da4f1 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKOtsuMultipleThresholdsImageTest.cpp @@ -4,16 +4,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(default)", "[ITKImageProcessing][ITKOtsuMultipleThresholdsImage][default]") { @@ -27,7 +27,7 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(default)", " fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -35,10 +35,10 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(default)", " args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "a9c3b0c0971c5cbda12b29db916451c6"); @@ -56,7 +56,7 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(two_on_float fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -66,10 +66,10 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(two_on_float args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "1ab20d3cd9a354b45ac07ec59c0413b3"); @@ -87,7 +87,7 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(three_on)", fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -98,10 +98,10 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(three_on)", args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "b61c3f4e063fcdd24dba76227129ae34"); @@ -119,7 +119,7 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(valley_empha fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) Arguments args; args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_SelectedImageGeomPath_Key, std::make_any(inputGeometryPath)); @@ -130,10 +130,10 @@ TEST_CASE("ITKImageProcessing::ITKOtsuMultipleThresholdsImageFilter(valley_empha args.insertOrAssign(ITKOtsuMultipleThresholdsImage::k_ReturnBinMidpoint_Key, std::make_any(true)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "fb65e730472c8001185f355fb626ca3f"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp index 52eb6feac6..26af37ba5b 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRelabelComponentImageTest.cpp @@ -5,17 +5,17 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(default)", "[ITKImageProcessing][ITKRelabelComponentImage][default]") { @@ -30,7 +30,7 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(default)", "[ITKIm { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -39,10 +39,10 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(default)", "[ITKIm args.insertOrAssign(ITKRelabelComponentImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "58af064e929f08f9d5bacc8be44ed92e"); @@ -61,7 +61,7 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting)", "[IT { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/simple-label-d.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -71,10 +71,10 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting)", "[IT args.insertOrAssign(ITKRelabelComponentImage::k_SortByObjectSize_Key, std::make_any(false)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "0231da8387aa665ddff9c2645e71f213"); @@ -93,7 +93,7 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting2)", "[I { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/simple-label-d.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -104,10 +104,10 @@ TEST_CASE("ITKImageProcessing::ITKRelabelComponentImageFilter(no_sorting2)", "[I args.insertOrAssign(ITKRelabelComponentImage::k_MinimumObjectSize_Key, std::make_any(140)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "4c81464832a0270041334abd744b94b0"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp index 4896d9e4cc..48cef04da4 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKRescaleIntensityImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKRescaleIntensityImageFilter(3d)", "[ITKImageProcessing][ITKRescaleIntensityImage][3d]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKRescaleIntensityImageFilter(3d)", "[ITKImagePr { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,16 +38,16 @@ TEST_CASE("ITKImageProcessing::ITKRescaleIntensityImageFilter(3d)", "[ITKImagePr args.insertOrAssign(ITKRescaleIntensityImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_RescaleIntensityImageFilter_3d.nrrd"; + const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_RescaleIntensityImageFilter_3d.nrrd"; const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 1e-8); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp index 8c9111231d..486aed8c0b 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSigmoidImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKSigmoidImageFilter(defaults)", "[ITKImageProcessing][ITKSigmoidImage][defaults]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKSigmoidImageFilter(defaults)", "[ITKImageProce { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKSigmoidImageFilter(defaults)", "[ITKImageProce args.insertOrAssign(ITKSigmoidImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "c9222b9c9150e0d7a07e9de184c10167"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp index 5097063a77..3e117357a4 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSignedMaurerDistanceMapImageTest.cpp @@ -4,15 +4,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKSignedMaurerDistanceMapImageFilter(default)", "[ITKImageProcessing][ITKSignedMaurerDistanceMapImage][default]") { @@ -27,7 +27,7 @@ TEST_CASE("ITKImageProcessing::ITKSignedMaurerDistanceMapImageFilter(default)", { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/2th_cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -36,16 +36,16 @@ TEST_CASE("ITKImageProcessing::ITKSignedMaurerDistanceMapImageFilter(default)", args.insertOrAssign(ITKSignedMaurerDistanceMapImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_SignedMaurerDistanceMapImageFilter_default.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_SignedMaurerDistanceMapImageFilter_default.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp index 7f94226a49..ebd479ffc6 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSinImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKSinImageFilter(defaults)", "[ITKImageProcessing][ITKSinImage][defaults]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKSinImageFilter(defaults)", "[ITKImageProcessin { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -35,16 +35,16 @@ TEST_CASE("ITKImageProcessing::ITKSinImageFilter(defaults)", "[ITKImageProcessin args.insertOrAssign(ITKSinImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_SinImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_SinImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp index 11f216376a..7882acc33c 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSqrtImageTest.cpp @@ -4,14 +4,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKSqrtImageFilter(defaults)", "[ITKImageProcessing][ITKSqrtImage][defaults]") { @@ -26,7 +26,7 @@ TEST_CASE("ITKImageProcessing::ITKSqrtImageFilter(defaults)", "[ITKImageProcessi { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -35,16 +35,16 @@ TEST_CASE("ITKImageProcessing::ITKSqrtImageFilter(defaults)", "[ITKImageProcessi args.insertOrAssign(ITKSqrtImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_SqrtImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_SqrtImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp index 39afe7fdc0..223fae4777 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKSquareImageTest.cpp @@ -5,15 +5,15 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKSquareImageFilter(defaults)", "[ITKImageProcessing][ITKSquareImage][defaults]") { @@ -28,7 +28,7 @@ TEST_CASE("ITKImageProcessing::ITKSquareImageFilter(defaults)", "[ITKImageProces { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -37,10 +37,10 @@ TEST_CASE("ITKImageProcessing::ITKSquareImageFilter(defaults)", "[ITKImageProces args.insertOrAssign(ITKSquareImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "314065b457b66e102b9cafd7c49be6b3"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp index 4f2dbb1d58..b652cbb88a 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKTanImageTest.cpp @@ -5,14 +5,14 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("ITKImageProcessing::ITKTanImageFilter(defaults)", "[ITKImageProcessing][ITKTanImage][defaults]") { @@ -27,7 +27,7 @@ TEST_CASE("ITKImageProcessing::ITKTanImageFilter(defaults)", "[ITKImageProcessin { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/Ramp-Zero-One-Float.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -36,16 +36,16 @@ TEST_CASE("ITKImageProcessing::ITKTanImageFilter(defaults)", "[ITKImageProcessin args.insertOrAssign(ITKTanImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) - fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_TanImageFilter_defaults.nrrd"; + fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / "JSONFilters/Baseline/BasicFilters_TanImageFilter_defaults.nrrd"; DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath}); DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath); DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath); Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath); Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName), 0.01); - COMPLEX_RESULT_REQUIRE_VALID(compareResult) + SIMPLNX_RESULT_REQUIRE_VALID(compareResult) } diff --git a/src/Plugins/ITKImageProcessing/test/ITKTestBase.cpp b/src/Plugins/ITKImageProcessing/test/ITKTestBase.cpp index 017222a30f..69930e2adb 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKTestBase.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKTestBase.cpp @@ -11,14 +11,14 @@ #include #include -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Types.hpp" #include #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -113,7 +113,7 @@ Result<> CompareImagesTyped(const ImageGeom& inputImageGeom, const IDataArray& o } } // namespace -namespace complex +namespace nx::core { namespace ITKTestBase { @@ -305,4 +305,4 @@ void RemoveFiles(const fs::path& dirPath, const std::string& filePattern) } } } // namespace ITKTestBase -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/test/ITKTestBase.hpp b/src/Plugins/ITKImageProcessing/test/ITKTestBase.hpp index cd077babe6..6898ad683f 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKTestBase.hpp +++ b/src/Plugins/ITKImageProcessing/test/ITKTestBase.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include @@ -16,7 +16,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace ITKTestBase { @@ -54,4 +54,4 @@ void WriteDataSetAsBinary(const fs::path& absolutePath, const DataStore& data std::fclose(file); } } // namespace ITKTestBase -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp index 9c845c64a4..5fee80ecc0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKThresholdImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Default)", "[ITKImageProcessing][ITKThresholdImage][Default]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Default)", "[ITKImageProc { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Short.nrrd"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Default)", "[ITKImageProc args.insertOrAssign(ITKThresholdImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "59071590099d21dd439896592338bf95"); @@ -60,7 +60,7 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold1)", "[ITKImageP { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -71,10 +71,10 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold1)", "[ITKImageP args.insertOrAssign(ITKThresholdImage::k_Upper_Key, std::make_any(65535)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "f70a31938657e0163b82521af4f8e3b0"); @@ -93,7 +93,7 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold2)", "[ITKImageP { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/RA-Slice-Short.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -105,10 +105,10 @@ TEST_CASE("ITKImageProcessing::ITKThresholdImageFilter(Threshold2)", "[ITKImageP args.insertOrAssign(ITKThresholdImage::k_OutsideValue_Key, std::make_any(25000)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "898743e4ec2e75c0169d025fb29b7ead"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp index 265b83fdca..86a843b69d 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMaximaImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKValuedRegionalMaximaImageFilter(defaults)", "[ITKImageProcessing][ITKValuedRegionalMaximaImage][defaults]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMaximaImageFilter(defaults)", "[ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMaximaImageFilter(defaults)", "[ args.insertOrAssign(ITKValuedRegionalMaximaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "c94b3702844c508818e4718a75102472"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp index a095bcf8e4..be935d85d0 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKValuedRegionalMinimaImageTest.cpp @@ -5,16 +5,16 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKValuedRegionalMinimaImageFilter(defaults)", "[ITKImageProcessing][ITKValuedRegionalMinimaImage][defaults]") { @@ -29,7 +29,7 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMinimaImageFilter(defaults)", "[ { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/cthead1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -38,10 +38,10 @@ TEST_CASE("ITKImageProcessing::ITKValuedRegionalMinimaImageFilter(defaults)", "[ args.insertOrAssign(ITKValuedRegionalMinimaImage::k_OutputImageDataPath_Key, std::make_any(outputArrayName)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "8297d018757b1477e31293ab8a8f0db1"); diff --git a/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp b/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp index 35de32fb99..f28f0aed81 100644 --- a/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp +++ b/src/Plugins/ITKImageProcessing/test/ITKWhiteTopHatImageTest.cpp @@ -5,18 +5,18 @@ #include "ITKImageProcessing/ITKImageProcessing_test_dirs.hpp" #include "ITKTestBase.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("ITKImageProcessing::ITKWhiteTopHatImageFilter(WhiteTopHatErode)", "[ITKImageProcessing][ITKWhiteTopHatImage][WhiteTopHatErode]") { @@ -31,7 +31,7 @@ TEST_CASE("ITKImageProcessing::ITKWhiteTopHatImageFilter(WhiteTopHatErode)", "[I { // Start Image Comparison Scope const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / "JSONFilters" / "Input/STAPLE1.png"; Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath); - COMPLEX_RESULT_REQUIRE_VALID(imageReadResult) + SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult) } // End Image Comparison Scope Arguments args; @@ -42,10 +42,10 @@ TEST_CASE("ITKImageProcessing::ITKWhiteTopHatImageFilter(WhiteTopHatErode)", "[I args.insertOrAssign(ITKWhiteTopHatImage::k_KernelType_Key, std::make_any(itk::simple::sitkBall)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName)); REQUIRE(md5Hash == "e784daff43d09a18e20556729afc0c9d"); diff --git a/src/Plugins/ITKImageProcessing/test/test_dirs.hpp.in b/src/Plugins/ITKImageProcessing/test/test_dirs.hpp.in index 48e73f34cf..68550bb705 100644 --- a/src/Plugins/ITKImageProcessing/test/test_dirs.hpp.in +++ b/src/Plugins/ITKImageProcessing/test/test_dirs.hpp.in @@ -5,25 +5,25 @@ */ #pragma once -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/StringLiteral.hpp" -#cmakedefine COMPLEX_WRITE_TEST_OUTPUT +#cmakedefine SIMPLNX_WRITE_TEST_OUTPUT -namespace complex +namespace nx::core { namespace unit_test { -inline constexpr StringLiteral k_ComplexSourceDir = "@COMPLEX_SOURCE_DIR_NORM@"; -inline constexpr StringLiteral k_ComplexTestSourceDir = "@COMPLEX_SOURCE_DIR_NORM@/test"; -inline constexpr StringLiteral k_ComplexTestDataSourceDir = "@COMPLEX_SOURCE_DIR_NORM@/test/Data"; +inline constexpr StringLiteral k_ComplexSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@"; +inline constexpr StringLiteral k_ComplexTestSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@/test"; +inline constexpr StringLiteral k_ComplexTestDataSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@/test/Data"; inline constexpr StringLiteral k_SourceDir = "@PLUGIN_SOURCE_DIR_NORM@"; inline constexpr StringLiteral k_DataDir = "@PLUGIN_SOURCE_DIR_NORM@/data"; inline constexpr StringLiteral k_TestDataSourceDir = "@PLUGIN_SOURCE_DIR_NORM@/data"; -inline constexpr StringLiteral k_BinaryDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; -inline constexpr StringLiteral k_BinaryTestOutputDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@/test_output"; -inline constexpr StringLiteral k_BuildDir = COMPLEX_BUILD_DIR; +inline constexpr StringLiteral k_BinaryDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; +inline constexpr StringLiteral k_BinaryTestOutputDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@/test_output"; +inline constexpr StringLiteral k_BuildDir = SIMPLNX_BUILD_DIR; inline constexpr StringLiteral k_DREAM3DDataDir = "@DREAM3D_DATA_DIR_NORM@"; inline constexpr StringLiteral k_TestFilesDir = "@DREAM3D_DATA_DIR_NORM@/TestFiles"; inline constexpr StringLiteral k_CMakeExecutable = "@CMAKE_COMMAND_NORM@"; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/tools/ReadMe.md b/src/Plugins/ITKImageProcessing/tools/ReadMe.md index 103299662f..cb099dbd6b 100644 --- a/src/Plugins/ITKImageProcessing/tools/ReadMe.md +++ b/src/Plugins/ITKImageProcessing/tools/ReadMe.md @@ -10,7 +10,7 @@ Then you can run the `itk_filter_generator.py` file to generate the filters. An example usage of the python script is this: ```` -python itk_filter_generator.py `pwd` `pwd`/SimpleITK/Code/BasicFilters/json /Users/mjackson/Workspace1/complex/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters /Users/mjackson/Workspace1/complex/src/Plugins/ITKImageProcessing/test +python itk_filter_generator.py `pwd` `pwd`/SimpleITK/Code/BasicFilters/json /Users/mjackson/Workspace1/simplnx/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters /Users/mjackson/Workspace1/simplnx/src/Plugins/ITKImageProcessing/test ```` ## Modification Notes diff --git a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in index 84911eda83..a0cf6fe106 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in @@ -7,7 +7,7 @@ ${PARAMETER_INCLUDES} ${ITK_FILTER_INCLUDE} -using namespace complex; +using namespace nx::core; namespace cx${FILTER_NAME} { @@ -16,7 +16,7 @@ ${OUTPUT_TYPEDEF} ${ITK_FILTER_STRUCT} } // namespace cx${FILTER_NAME} -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ${FILTER_NAME}::name() const @@ -100,4 +100,4 @@ ${LINK_OUTPUT_ARRAY} return ${EXECUTE_DECL}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ITKImageProcessing/tools/filter.hpp.in b/src/Plugins/ITKImageProcessing/tools/filter.hpp.in index 66280f9e48..1bda691ffd 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.hpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.hpp.in @@ -2,10 +2,10 @@ #include "${PLUGIN_NAME}/${PLUGIN_NAME}_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ${FILTER_NAME} @@ -98,6 +98,6 @@ protected: */ Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ${FILTER_NAME}, "${UUID}"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ${FILTER_NAME}, "${UUID}"); diff --git a/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py b/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py index 9293cd2a8d..6b4bc31c3f 100644 --- a/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py +++ b/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py @@ -361,7 +361,7 @@ def write_filter_header(filter_data: FilterData, template: Template, output_dir: 'UUID': filter_uuid, 'PARAMETER_KEYS': parameter_keys_str, } - print(f' {{complex::Uuid::FromString(\"{FILTERS[filter_data.base_name]}\").value(), complex::FilterTraits<{filter_data.filter_name}>::uuid}}, // {filter_data.filter_name}') + print(f' {{simplnx::Uuid::FromString(\"{FILTERS[filter_data.base_name]}\").value(), nx::core::FilterTraits<{filter_data.filter_name}>::uuid}}, // {filter_data.filter_name}') output = template.substitute(substitutions) @@ -369,7 +369,7 @@ def write_filter_header(filter_data: FilterData, template: Template, output_dir: output_file.write(output) def make_include_str(param_name: str) -> str: - return f'#include \"complex/Parameters/{param_name}.hpp\"' + return f'#include \"simplnx/Parameters/{param_name}.hpp\"' def make_parameter_def_str(type_name: str, key_var: str, human_name: str, help_text: str, default: str, extra: str = '') -> str: extra_str = f', {extra}' if extra else '' @@ -576,7 +576,7 @@ def get_type(self) -> str: return 'VectorUInt32Parameter::ValueType' def get_include_str(self) -> str: - return '#include "complex/Parameters/VectorParameter.hpp"' + return '#include "simplnx/Parameters/VectorParameter.hpp"' def get_parameter_def_str(self, prop: PropertyData) -> str: return f' params.insert(std::make_unique(k_Radius_Key, "Radius", "Radius Dimensions XYZ", {prop.default}, std::vector{{"X", "Y", "Z"}}));\n' @@ -612,7 +612,7 @@ def get_type(self) -> str: return 'VectorFloat64Parameter::ValueType' def get_include_str(self) -> str: - return '#include "complex/Parameters/VectorParameter.hpp"' + return '#include "simplnx/Parameters/VectorParameter.hpp"' def get_parameter_def_str(self, prop: PropertyData) -> str: return f' params.insert(std::make_unique(k_{prop.name}_Key, "{prop.name}", "{prop.detaileddescriptionSet}", {prop.default}, std::vector{{"X", "Y", "Z"}}));\n' @@ -671,9 +671,9 @@ def get_parameter_from_name(filter_data: FilterData, name: str) -> Parameter: return get_parameter(next(filter(lambda item: item.name == name, filter_data.members))) def get_default_parameter_includes() -> List[str]: - return ['#include \"complex/Parameters/DataObjectNameParameter.hpp\"', - '#include \"complex/Parameters/ArraySelectionParameter.hpp\"', - '#include \"complex/Parameters/GeometrySelectionParameter.hpp\"' + return ['#include \"simplnx/Parameters/DataObjectNameParameter.hpp\"', + '#include \"simplnx/Parameters/ArraySelectionParameter.hpp\"', + '#include \"simplnx/Parameters/GeometrySelectionParameter.hpp\"' ] def get_parameter_includes(filter_data: FilterData) -> List[str]: @@ -751,14 +751,14 @@ def get_execute_decl(filter_data: FilterData) -> str: } INPUT_PIXEL_TYPES: Dict[str, str] = { - 'BasicPixelIDTypeList': 'complex::ITK::GetScalarPixelAllowedTypes()', - 'ScalarPixelIDTypeList': 'complex::ITK::GetScalarPixelAllowedTypes()', - 'IntegerPixelIDTypeList': 'complex::ITK::GetIntegerScalarPixelAllowedTypes()', - 'RealPixelIDTypeList': 'complex::ITK::GetFloatingScalarPixelAllowedTypes()', - 'NonLabelPixelIDTypeList': 'complex::ITK::GetNonLabelPixelAllowedTypes()', - 'typelist::Append::Type': 'complex::ITK::GetScalarVectorPixelAllowedTypes()', - 'RealVectorPixelIDTypeList': 'complex::ITK::GetFloatingVectorPixelAllowedTypes()', - 'SignedPixelIDTypeList': 'complex::ITK::GetSignedIntegerScalarPixelAllowedTypes()', + 'BasicPixelIDTypeList': 'nx::core::ITK::GetScalarPixelAllowedTypes()', + 'ScalarPixelIDTypeList': 'nx::core::ITK::GetScalarPixelAllowedTypes()', + 'IntegerPixelIDTypeList': 'nx::core::ITK::GetIntegerScalarPixelAllowedTypes()', + 'RealPixelIDTypeList': 'nx::core::ITK::GetFloatingScalarPixelAllowedTypes()', + 'NonLabelPixelIDTypeList': 'nx::core::ITK::GetNonLabelPixelAllowedTypes()', + 'typelist::Append::Type': 'nx::core::ITK::GetScalarVectorPixelAllowedTypes()', + 'RealVectorPixelIDTypeList': 'nx::core::ITK::GetFloatingVectorPixelAllowedTypes()', + 'SignedPixelIDTypeList': 'nx::core::ITK::GetSignedIntegerScalarPixelAllowedTypes()', 'typelist2::append::type': 'UNKNOWN INPUT PIXEL TYPE' } @@ -872,7 +872,7 @@ def get_test_case(filter_data: FilterData, test: TestData) -> List[str]: lines.append(' { // Start Image Comparison Scope\n') lines.append(f' const fs::path inputFilePath = fs::path(unit_test::k_SourceDir.view()) / unit_test::k_DataDir.view() / \"JSONFilters\" / \"{input_str}\";\n') lines.append(f' Result<> imageReadResult = ITKTestBase::ReadImage(dataStructure, inputFilePath, inputGeometryPath, cellDataPath, inputDataPath);\n') - lines.append(' COMPLEX_RESULT_REQUIRE_VALID(imageReadResult)\n') + lines.append(' SIMPLNX_RESULT_REQUIRE_VALID(imageReadResult)\n') lines.append(' } // End Image Comparison Scope\n\n') lines.append(' Arguments args;\n') @@ -886,21 +886,21 @@ def get_test_case(filter_data: FilterData, test: TestData) -> List[str]: lines.append('\n') lines.append(' auto preflightResult = filter.preflight(dataStructure, args);\n') - lines.append(' COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions)\n') + lines.append(' SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions)\n') lines.append('\n') lines.append(' auto executeResult = filter.execute(dataStructure, args);\n') - lines.append(' COMPLEX_RESULT_REQUIRE_VALID(executeResult.result)\n') + lines.append(' SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result)\n') lines.append('\n') if not test.md5hash: - lines.append(f' const fs::path baselineFilePath = fs::path(complex::unit_test::k_DataDir.view()) / \"JSONFilters/Baseline/BasicFilters_{filter_data.name}_{test.tag}.nrrd\";\n') + lines.append(f' const fs::path baselineFilePath = fs::path(nx::core::unit_test::k_DataDir.view()) / \"JSONFilters/Baseline/BasicFilters_{filter_data.name}_{test.tag}.nrrd\";\n') lines.append(' const DataPath baselineGeometryPath({ITKTestBase::k_BaselineGeometryPath});\n') lines.append(' const DataPath baseLineCellDataPath = baselineGeometryPath.createChildPath(ITKTestBase::k_ImageCellDataPath);\n') lines.append(' const DataPath baselineDataPath = baseLineCellDataPath.createChildPath(ITKTestBase::k_BaselineDataPath);\n') lines.append(' const Result<> readBaselineResult = ITKTestBase::ReadImage(dataStructure, baselineFilePath, baselineGeometryPath, baseLineCellDataPath, baselineDataPath);\n') tolerance_str = f', {test.tolerance}' if test.tolerance else '' lines.append(f' Result<> compareResult = ITKTestBase::CompareImages(dataStructure, baselineGeometryPath, baselineDataPath, inputGeometryPath, cellDataPath.createChildPath(outputArrayName){tolerance_str});\n') - lines.append(' COMPLEX_RESULT_REQUIRE_VALID(compareResult)\n') + lines.append(' SIMPLNX_RESULT_REQUIRE_VALID(compareResult)\n') else: lines.append(' const std::string md5Hash = ITKTestBase::ComputeMd5Hash(dataStructure, cellDataPath.createChildPath(outputArrayName));\n') lines.append(f' REQUIRE(md5Hash == \"{test.md5hash}\");\n') @@ -981,9 +981,9 @@ def write_filter_test(filter_data: FilterData, output_dir: Path): output_lines.append('#include \"ITKTestBase.hpp\"') output_lines.append('\n') output_lines.append('\n') - output_lines.append('#include \"complex/Parameters/DataObjectNameParameter.hpp\"') + output_lines.append('#include \"simplnx/Parameters/DataObjectNameParameter.hpp\"') output_lines.append('\n') - output_lines.append('#include \"complex/UnitTest/UnitTestCommon.hpp\"') + output_lines.append('#include \"simplnx/UnitTest/UnitTestCommon.hpp\"') if includes: output_lines.append('\n') for i, item in enumerate(includes): @@ -997,9 +997,9 @@ def write_filter_test(filter_data: FilterData, output_dir: Path): output_lines.append('\n') output_lines.append('namespace fs = std::filesystem;\n') output_lines.append('\n') - output_lines.append('using namespace complex;\n') - output_lines.append('using namespace complex::Constants;\n') - output_lines.append('using namespace complex::UnitTest;\n') + output_lines.append('using namespace nx::core;\n') + output_lines.append('using namespace nx::core::Constants;\n') + output_lines.append('using namespace nx::core::UnitTest;\n') output_lines.append('\n') for i, test in enumerate(filter_data.tests): @@ -1227,7 +1227,7 @@ def main(input_args: Optional[List[str]] = None) -> None: for filter_name in FILTERS: if filter_name not in filters_to_process: continue - #print(f'cp /Users/mjackson/DREAM3D-Dev/DREAM3D_Plugins/ITKImageProcessing/Documentation/ITKImageProcessingFilters/ITK{filter_name}.md /Users/mjackson/Workspace1/complex/src/Plugins/ITKImageProcessing/docs/.') + #print(f'cp /Users/mjackson/DREAM3D-Dev/DREAM3D_Plugins/ITKImageProcessing/Documentation/ITKImageProcessingFilters/ITK{filter_name}.md /Users/mjackson/Workspace1/simplnx/src/Plugins/ITKImageProcessing/docs/.') write_filter(filter_name, json_dir, filter_output_dir, test_output_dir, header_template, source_template, docs_output_dir) # this will print out some code that will need to be included into the ITKImageProcessingPlugin.cpp file diff --git a/src/Plugins/ITKImageProcessing/wrapping/python/itkimageprocessing.cpp b/src/Plugins/ITKImageProcessing/wrapping/python/itkimageprocessing.cpp index 92e43cf5c6..91490816c0 100644 --- a/src/Plugins/ITKImageProcessing/wrapping/python/itkimageprocessing.cpp +++ b/src/Plugins/ITKImageProcessing/wrapping/python/itkimageprocessing.cpp @@ -4,13 +4,13 @@ #include "ITKImageProcessing/ITKImageProcessingFilterBinding.hpp" -using namespace complex; -using namespace complex::CxPybind; +using namespace nx::core; +using namespace nx::core::CxPybind; namespace py = pybind11; PYBIND11_MODULE(itkimageprocessing, mod) { - py::module_::import("complex"); + py::module_::import("simplnx"); auto& internals = Internals::Instance(); diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index 65a6a84c74..ed7cc95110 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -11,14 +11,14 @@ find_package(EbsdLib REQUIRED) get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) #if(NOT GENERATOR_IS_MULTI_CONFIG) - get_property(COMPLEX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS) - set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${EbsdLib_LIB_DIRS}) + get_property(SIMPLNX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS) + set_property(GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS ${SIMPLNX_EXTRA_LIBRARY_DIRS} ${EbsdLib_LIB_DIRS}) #endif() # ------------------------------------------------------------------------------ -# Include the standard complex plugin cmake support codes +# Include the standard simplnx plugin cmake support codes # ------------------------------------------------------------------------------ -include("${complex_SOURCE_DIR}/cmake/Plugin.cmake") +include("${simplnx_SOURCE_DIR}/cmake/Plugin.cmake") set(PLUGIN_NAME "OrientationAnalysis") set(${PLUGIN_NAME}_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) @@ -92,7 +92,7 @@ set(STUB_FILTERS # ImportEbsdMontage # MISSING 1 or more Parameter Implementations ) -create_complex_plugin(NAME ${PLUGIN_NAME} +create_simplnx_plugin(NAME ${PLUGIN_NAME} FILTER_LIST ${FilterList} DESCRIPTION "${PLUGIN_NAME} Plugin" VERSION "0.2.0" @@ -101,20 +101,20 @@ create_complex_plugin(NAME ${PLUGIN_NAME} ) # ------------------------------------------------------------------------------ -# Add any filter parameters to the `complex` target -# This should be integrated with the `create_complex_plugin` function call +# Add any filter parameters to the `simplnx` target +# This should be integrated with the `create_simplnx_plugin` function call # -# The `complex` target will need to know about any dependent libraries and any +# The `simplnx` target will need to know about any dependent libraries and any # include directories that are needed for the parameter. # ------------------------------------------------------------------------------ -set(complex_injected_parameters +set(simplnx_injected_parameters ReadH5EbsdFileParameter OEMEbsdScanSelectionParameter #EbsdToH5EbsdParameter ) -foreach(source ${complex_injected_parameters}) - target_sources(complex PRIVATE +foreach(source ${simplnx_injected_parameters}) + target_sources(simplnx PRIVATE ${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/Parameters/${source}.h ${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/Parameters/${source}.cpp) @@ -123,13 +123,13 @@ foreach(source ${complex_injected_parameters}) ${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/Parameters/${source}.cpp) endforeach() -target_include_directories(complex PUBLIC ) +target_include_directories(simplnx PUBLIC ) # ------------------------------------------------------------------------------ -# Add a link library to complex because it now depends on EbsdLib. Complex will +# Add a link library to simplnx because it now depends on EbsdLib. Complex will # be able to find the include dirs from the CMake EbsdLib target # ------------------------------------------------------------------------------ -target_link_libraries(complex PUBLIC EbsdLib::EbsdLib) +target_link_libraries(simplnx PUBLIC EbsdLib::EbsdLib) # ------------------------------------------------------------------------------ # Include filters that need to be compiled but not available to the general user @@ -155,7 +155,7 @@ endif() # ------------------------------------------------------------------------------ # Algorithms -# This should be integrated with the `create_complex_plugin` function call +# This should be integrated with the `create_simplnx_plugin` function call # ------------------------------------------------------------------------------ set(filter_algorithms AlignSectionsMisorientation @@ -264,7 +264,7 @@ target_include_directories(${PLUGIN_NAME} # ------------------------------------------------------------------------------ # Add in the unit tests for the filters included in this plugin -if(COMPLEX_BUILD_TESTS) +if(SIMPLNX_BUILD_TESTS) enable_testing() add_subdirectory(${${PLUGIN_NAME}_SOURCE_DIR}/test) endif() @@ -305,17 +305,17 @@ endif() # ----------------------------------------------------------------------- # Download Example Data Files # ----------------------------------------------------------------------- -include(${complex_SOURCE_DIR}/cmake/Utility.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) set(DATA_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CX_CONFIG_DIR}/Data") file(TO_CMAKE_PATH "${DREAM3D_DATA_DIR}" DREAM3D_DATA_DIR_NORM) # ----------------------------------------------------------------------- -# These data files are pulled from the 'complex data archive' on github, +# These data files are pulled from the 'simplnx data archive' on github, # decompressed and then copied to the build folder. Install rules are also # generated for each of the data sets. # ----------------------------------------------------------------------- -if(EXISTS "${DREAM3D_DATA_DIR}" AND COMPLEX_DOWNLOAD_TEST_FILES) +if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) if(NOT EXISTS ${DREAM3D_DATA_DIR}/TestFiles/) file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") endif() diff --git a/src/Plugins/OrientationAnalysis/docs/ReadH5EbsdFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadH5EbsdFilter.md index aaf77140f1..02af2dd3c7 100644 --- a/src/Plugins/OrientationAnalysis/docs/ReadH5EbsdFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/ReadH5EbsdFilter.md @@ -22,8 +22,8 @@ The **user** is solely responsible for knowing any sample reference frame transf If the user does not want the **Read H5Ebsd** filter to perform any transformations then the checkbox can be unchecked and the user can manually perform any desired transformations by inserting the appropriate filters into the pipeline. The suggested filters are: + {ref}`Rotate Euler Reference Frame ` -+ {ref}`Rotate Sample Reference Frame ` -+ {ref}`Convert Angles to Degrees or Radians ` ++ {ref}`Rotate Sample Reference Frame ` ++ {ref}`Convert Angles to Degrees or Radians ` An excellant reference for this is the following PDF file: [http://pajarito.materials.cmu.edu/rollett/27750/L17-EBSD-analysis-31Mar16.pdf](http://pajarito.materials.cmu.edu/rollett/27750/L17-EBSD-analysis-31Mar16.pdf) diff --git a/src/Plugins/OrientationAnalysis/docs/ReadH5EspritDataFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadH5EspritDataFilter.md index 5cf3d71b5d..8fa193169c 100644 --- a/src/Plugins/OrientationAnalysis/docs/ReadH5EspritDataFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/ReadH5EspritDataFilter.md @@ -21,18 +21,18 @@ This **Filter** will read a single .h5 file into a new **Image Geometry**, allow The user should be aware that simply reading the file then performing operations that are dependent on the proper crystallographic and sample reference frame will be undefined or simply **wrong**. In order to bring the crystal reference frame and sample reference frame into coincidence, rotations will need to be applied to the data. The recommended filters are: + {ref}`Rotate Euler Reference Frame ` -+ {ref}`Rotate Sample Reference Frame ` ++ {ref}`Rotate Sample Reference Frame ` If the data has come from a TSL acquisition system and the settings of the acquisition software were in the default modes, the following reference frame transformations may need to be performed based on the version of the OIM Analysis software being used to collect the data: + Sample Reference Frame: 180o about the <010> Axis + Crystal Reference Frame: 90o about the <001> Axis -The user also may want to assign un-indexed pixels to be ignored by flagging them as "bad". The {ref}`Threshold Objects ` Filter can be used to define this *mask* by thresholding on values such as *MAD* > xx. +The user also may want to assign un-indexed pixels to be ignored by flagging them as "bad". The {ref}`Threshold Objects ` Filter can be used to define this *mask* by thresholding on values such as *MAD* > xx. + Note: If the X Step or Y Step within the HDF5 file for a scan is ZERO, those values will be set to 1.0 when the filter runs. This is needed as the user has no effective way to fix the HDF5 file. If the user needs a different -spacing value, the user can utilize the {ref}`Set Origin and Spacing` filter. +spacing value, the user can utilize the {ref}`Set Origin and Spacing` filter. % Auto generated parameter table will be inserted here diff --git a/src/Plugins/OrientationAnalysis/docs/ReadH5OimDataFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadH5OimDataFilter.md index e7a7ce7643..41116b7dd3 100644 --- a/src/Plugins/OrientationAnalysis/docs/ReadH5OimDataFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/ReadH5OimDataFilter.md @@ -17,7 +17,7 @@ This **Filter** will read a single .h5 file into a new **Image Geometry**, allow The user should be aware that simply reading the file then performing operations that are dependent on the proper crystallographic and sample reference frame will be undefined or simply **wrong**. In order to bring the crystal reference frame and sample reference frame into coincidence, rotations will need to be applied to the data. The recommended filters are: - {ref}`Rotate Euler Reference Frame ` -- {ref}`Rotate Sample Reference Frame ` +- {ref}`Rotate Sample Reference Frame ` If the data has come from a TSL acquisition system and the settings of the acquisition software were in the default modes, the following reference frame transformations may need to be performed based on the version of the OIM Analysis software being used to collect the data: @@ -31,7 +31,7 @@ the user should **CHECK** the option **ON** for "Perform Slice By Slice Transfor ## Thresholding out Unindexed Scan Points -The user also may want to assign un-indexed pixels to be ignored by flagging them as "bad". The {ref}`Threshold Objects ` **Filter** can be used to define this *mask* by thresholding on values such as *Confidence Index* > xx or *Image Quality* > desired quality. +The user also may want to assign un-indexed pixels to be ignored by flagging them as "bad". The {ref}`Threshold Objects ` **Filter** can be used to define this *mask* by thresholding on values such as *Confidence Index* > xx or *Image Quality* > desired quality. % Auto generated parameter table will be inserted here diff --git a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline index f53dde978b..1a355360ad 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline @@ -28,7 +28,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EbsdFilter", + "name": "simplnx::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -62,7 +62,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -76,7 +76,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -95,7 +95,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsMutualInformationFilter", + "name": "simplnx::AlignSectionsMutualInformationFilter", "uuid": "3cf33ad9-8322-4d40-96de-14bbe40969cc" }, "isDisabled": false @@ -107,7 +107,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline index e7cf60215b..f597c67115 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -29,7 +29,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -67,7 +67,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -93,7 +93,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -109,7 +109,7 @@ }, "comments": "", "filter": { - "name": "complex::ConditionalSetValue", + "name": "simplnx::ConditionalSetValue", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -130,7 +130,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateArrayHistogramFilter", + "name": "simplnx::CalculateArrayHistogramFilter", "uuid": "c6b6d9e5-301d-4767-abf7-530f5ef5007d" }, "isDisabled": false @@ -150,7 +150,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteASCIIDataFilter", + "name": "simplnx::WriteASCIIDataFilter", "uuid": "06c8bfe8-2b42-4956-aca3-580bc0620716" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline index baf4f70204..db7cd06c72 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline @@ -21,7 +21,7 @@ "z_spacing": 0.25 }, "filter": { - "name": "complex::EbsdToH5EbsdFilter", + "name": "simplnx::EbsdToH5EbsdFilter", "uuid": "2d05ca72-0a1b-4aec-b9b0-bc470845c448" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline index 2d92f9338a..09c2e1dd5e 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline @@ -28,7 +28,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EbsdFilter", + "name": "simplnx::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -62,7 +62,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -76,7 +76,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -95,7 +95,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsMisorientationFilter", + "name": "simplnx::AlignSectionsMisorientationFilter", "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" }, "isDisabled": false @@ -108,7 +108,7 @@ }, "comments": "", "filter": { - "name": "complex::IdentifySample", + "name": "simplnx::IdentifySample", "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" }, "isDisabled": false @@ -125,7 +125,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsFeatureCentroidFilter", + "name": "simplnx::AlignSectionsFeatureCentroidFilter", "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" }, "isDisabled": false @@ -142,7 +142,7 @@ }, "comments": "", "filter": { - "name": "complex::BadDataNeighborOrientationCheckFilter", + "name": "simplnx::BadDataNeighborOrientationCheckFilter", "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" }, "isDisabled": false @@ -161,7 +161,7 @@ }, "comments": "", "filter": { - "name": "complex::NeighborOrientationCorrelationFilter", + "name": "simplnx::NeighborOrientationCorrelationFilter", "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" }, "isDisabled": false @@ -182,7 +182,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -196,7 +196,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -213,7 +213,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -233,7 +233,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -256,7 +256,7 @@ }, "comments": "", "filter": { - "name": "complex::MergeTwinsFilter", + "name": "simplnx::MergeTwinsFilter", "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" }, "isDisabled": false @@ -273,7 +273,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -290,7 +290,7 @@ }, "comments": "", "filter": { - "name": "complex::RemoveMinimumSizeFeaturesFilter", + "name": "simplnx::RemoveMinimumSizeFeaturesFilter", "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" }, "isDisabled": false @@ -310,7 +310,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -329,7 +329,7 @@ }, "comments": "", "filter": { - "name": "complex::MinNeighbors", + "name": "simplnx::MinNeighbors", "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" }, "isDisabled": false @@ -346,7 +346,7 @@ }, "comments": "", "filter": { - "name": "complex::FillBadDataFilter", + "name": "simplnx::FillBadDataFilter", "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" }, "isDisabled": false @@ -365,7 +365,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -384,7 +384,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -405,7 +405,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -417,7 +417,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline index 697818eae3..d809694445 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline @@ -42,7 +42,7 @@ } }, "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -55,7 +55,7 @@ "selected_image_geometry": "DataContainer" }, "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -71,7 +71,7 @@ "volumes_path": "Size Volumes" }, "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -88,7 +88,7 @@ "volumes_array_name": "Shape Volumes" }, "filter": { - "name": "complex::FindShapesFilter", + "name": "simplnx::FindShapesFilter", "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" }, "isDisabled": false @@ -107,7 +107,7 @@ "surface_features": "SurfaceFeatures" }, "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -123,7 +123,7 @@ "selected_image_geometry_path": "DataContainer" }, "filter": { - "name": "complex::FindNeighborhoodsFilter", + "name": "simplnx::FindNeighborhoodsFilter", "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" }, "isDisabled": false @@ -143,7 +143,7 @@ "t_jdistances_array_name": "TJManhattanDistances" }, "filter": { - "name": "complex::FindEuclideanDistMapFilter", + "name": "simplnx::FindEuclideanDistMapFilter", "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" }, "isDisabled": false @@ -158,7 +158,7 @@ "surface_area_volume_ratio_array_name": "SurfaceAreaVolumeRatio" }, "filter": { - "name": "complex::FindSurfaceAreaToVolumeFilter", + "name": "simplnx::FindSurfaceAreaToVolumeFilter", "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" }, "isDisabled": false @@ -169,7 +169,7 @@ "write_xdmf_file": true }, "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index 07215df18c..f4b0a23bbc 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -115,7 +115,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EbsdFilter", + "name": "simplnx::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -149,7 +149,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -163,7 +163,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -182,7 +182,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsMisorientationFilter", + "name": "simplnx::AlignSectionsMisorientationFilter", "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" }, "isDisabled": false @@ -195,7 +195,7 @@ }, "comments": "", "filter": { - "name": "complex::IdentifySample", + "name": "simplnx::IdentifySample", "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" }, "isDisabled": false @@ -212,7 +212,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsFeatureCentroidFilter", + "name": "simplnx::AlignSectionsFeatureCentroidFilter", "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" }, "isDisabled": false @@ -229,7 +229,7 @@ }, "comments": "", "filter": { - "name": "complex::BadDataNeighborOrientationCheckFilter", + "name": "simplnx::BadDataNeighborOrientationCheckFilter", "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" }, "isDisabled": false @@ -248,7 +248,7 @@ }, "comments": "", "filter": { - "name": "complex::NeighborOrientationCorrelationFilter", + "name": "simplnx::NeighborOrientationCorrelationFilter", "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" }, "isDisabled": false @@ -269,7 +269,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -283,7 +283,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -300,7 +300,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -320,7 +320,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -343,7 +343,7 @@ }, "comments": "", "filter": { - "name": "complex::MergeTwinsFilter", + "name": "simplnx::MergeTwinsFilter", "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" }, "isDisabled": false @@ -360,7 +360,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -377,7 +377,7 @@ }, "comments": "", "filter": { - "name": "complex::RemoveMinimumSizeFeaturesFilter", + "name": "simplnx::RemoveMinimumSizeFeaturesFilter", "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" }, "isDisabled": false @@ -397,7 +397,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -416,7 +416,7 @@ }, "comments": "", "filter": { - "name": "complex::MinNeighbors", + "name": "simplnx::MinNeighbors", "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" }, "isDisabled": false @@ -432,7 +432,7 @@ }, "comments": "", "filter": { - "name": "complex::FillBadDataFilter", + "name": "simplnx::FillBadDataFilter", "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" }, "isDisabled": false @@ -450,7 +450,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -468,7 +468,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -489,7 +489,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -501,7 +501,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -511,7 +511,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -525,7 +525,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -542,7 +542,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -560,7 +560,7 @@ }, "comments": "", "filter": { - "name": "complex::FindShapesFilter", + "name": "simplnx::FindShapesFilter", "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" }, "isDisabled": false @@ -580,7 +580,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -597,7 +597,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighborhoodsFilter", + "name": "simplnx::FindNeighborhoodsFilter", "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" }, "isDisabled": false @@ -618,7 +618,7 @@ }, "comments": "", "filter": { - "name": "complex::FindEuclideanDistMapFilter", + "name": "simplnx::FindEuclideanDistMapFilter", "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" }, "isDisabled": false @@ -634,7 +634,7 @@ }, "comments": "", "filter": { - "name": "complex::FindSurfaceAreaToVolumeFilter", + "name": "simplnx::FindSurfaceAreaToVolumeFilter", "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" }, "isDisabled": false @@ -646,7 +646,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -656,7 +656,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -667,7 +667,7 @@ }, "comments": "", "filter": { - "name": "complex::DeleteData", + "name": "simplnx::DeleteData", "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" }, "isDisabled": true @@ -684,7 +684,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -701,7 +701,7 @@ }, "comments": "", "filter": { - "name": "complex::FindMisorientationsFilter", + "name": "simplnx::FindMisorientationsFilter", "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" }, "isDisabled": false @@ -736,7 +736,7 @@ }, "comments": "", "filter": { - "name": "complex::FindSchmidsFilter", + "name": "simplnx::FindSchmidsFilter", "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" }, "isDisabled": false @@ -756,7 +756,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureReferenceMisorientationsFilter", + "name": "simplnx::FindFeatureReferenceMisorientationsFilter", "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" }, "isDisabled": false @@ -777,7 +777,7 @@ }, "comments": "", "filter": { - "name": "complex::FindKernelAvgMisorientationsFilter", + "name": "simplnx::FindKernelAvgMisorientationsFilter", "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" }, "isDisabled": false @@ -789,7 +789,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline index 46012c3a5d..4951b7059f 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline @@ -67,7 +67,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -94,7 +94,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -106,7 +106,7 @@ }, "comments": "", "filter": { - "name": "complex::MoveData", + "name": "simplnx::MoveData", "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" }, "isDisabled": true @@ -127,7 +127,7 @@ }, "comments": "", "filter": { - "name": "complex::QuickSurfaceMeshFilter", + "name": "simplnx::QuickSurfaceMeshFilter", "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" }, "isDisabled": false @@ -139,7 +139,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline index 09df05cd79..2d0381cce3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline @@ -69,7 +69,7 @@ } }, "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -89,7 +89,7 @@ "use_taubin_smoothing": true }, "filter": { - "name": "complex::LaplacianSmoothingFilter", + "name": "simplnx::LaplacianSmoothingFilter", "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" }, "isDisabled": false @@ -100,7 +100,7 @@ "write_xdmf_file": true }, "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline index 5361608b7b..e4fbac3d34 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline @@ -71,7 +71,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -83,7 +83,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateTriangleAreasFilter", + "name": "simplnx::CalculateTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false @@ -95,7 +95,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleNormalFilter", + "name": "simplnx::TriangleNormalFilter", "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" }, "isDisabled": false @@ -107,7 +107,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleDihedralAngleFilter", + "name": "simplnx::TriangleDihedralAngleFilter", "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" }, "isDisabled": false @@ -123,7 +123,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateFaceIPFColoringFilter", + "name": "simplnx::GenerateFaceIPFColoringFilter", "uuid": "30759600-7c02-4650-b5ca-e7036d6b568e" }, "isDisabled": false @@ -138,7 +138,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateFaceMisorientationColoringFilter", + "name": "simplnx::GenerateFaceMisorientationColoringFilter", "uuid": "f3473af9-db77-43db-bd25-60df7230ea73" }, "isDisabled": false @@ -155,7 +155,7 @@ }, "comments": "", "filter": { - "name": "complex::SharedFeatureFaceFilter", + "name": "simplnx::SharedFeatureFaceFilter", "uuid": "aaf7a258-fc92-48d7-9d06-ba317a3769e8" }, "isDisabled": false @@ -167,7 +167,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline index 782eb50b4a..af17a071c4 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline @@ -74,7 +74,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -94,7 +94,7 @@ }, "comments": "", "filter": { - "name": "complex::FindGBCDFilter", + "name": "simplnx::FindGBCDFilter", "uuid": "0cc592b7-a3d3-4c6a-8894-1533670a31b9" }, "isDisabled": false @@ -117,7 +117,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateGBCDPoleFigureFilter", + "name": "simplnx::GenerateGBCDPoleFigureFilter", "uuid": "eed5183e-5a9c-485b-9e64-579a81f0d301" }, "isDisabled": false @@ -140,7 +140,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateGBCDPoleFigureFilter", + "name": "simplnx::GenerateGBCDPoleFigureFilter", "uuid": "eed5183e-5a9c-485b-9e64-579a81f0d301" }, "isDisabled": false @@ -163,7 +163,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateGBCDPoleFigureFilter", + "name": "simplnx::GenerateGBCDPoleFigureFilter", "uuid": "eed5183e-5a9c-485b-9e64-579a81f0d301" }, "isDisabled": false @@ -183,7 +183,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteGBCDGMTFileFilter", + "name": "simplnx::WriteGBCDGMTFileFilter", "uuid": "31710abf-b8a6-423f-a03f-4b8885bd3633" }, "isDisabled": false @@ -198,7 +198,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteGBCDTriangleDataFilter", + "name": "simplnx::WriteGBCDTriangleDataFilter", "uuid": "6e0da3a1-dc42-4b01-80aa-3af9e8209ee3" }, "isDisabled": false @@ -210,7 +210,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline index 0531558936..63fc59e3f2 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline @@ -74,7 +74,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -90,7 +90,7 @@ }, "comments": "", "filter": { - "name": "complex::SharedFeatureFaceFilter", + "name": "simplnx::SharedFeatureFaceFilter", "uuid": "aaf7a258-fc92-48d7-9d06-ba317a3769e8" }, "isDisabled": false @@ -122,7 +122,7 @@ }, "comments": "", "filter": { - "name": "complex::FindGBCDMetricBasedFilter", + "name": "simplnx::FindGBCDMetricBasedFilter", "uuid": "fc0d695a-e381-4f11-a8fd-26d5b5cda30a" }, "isDisabled": false @@ -134,7 +134,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline index 505859a37d..95c974d867 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -29,7 +29,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -67,7 +67,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -93,7 +93,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -114,7 +114,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -129,7 +129,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index a70c5f1b3b..421be6c196 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateImageGeometry", + "name": "simplnx::CreateImageGeometry", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false @@ -48,7 +48,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadRawBinaryFilter", + "name": "simplnx::ReadRawBinaryFilter", "uuid": "dd159366-5f12-42db-af6d-a33592ae8a89" }, "isDisabled": false @@ -62,7 +62,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -83,7 +83,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -98,7 +98,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadEnsembleInfoFilter", + "name": "simplnx::ReadEnsembleInfoFilter", "uuid": "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a" }, "isDisabled": false @@ -119,7 +119,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -131,7 +131,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index f09a8f1dc5..bc2e8f9088 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -371,7 +371,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EbsdFilter", + "name": "simplnx::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -405,7 +405,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -419,7 +419,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -438,7 +438,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsMisorientationFilter", + "name": "simplnx::AlignSectionsMisorientationFilter", "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" }, "isDisabled": false @@ -451,7 +451,7 @@ }, "comments": "", "filter": { - "name": "complex::IdentifySample", + "name": "simplnx::IdentifySample", "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" }, "isDisabled": false @@ -468,7 +468,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsFeatureCentroidFilter", + "name": "simplnx::AlignSectionsFeatureCentroidFilter", "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" }, "isDisabled": false @@ -485,7 +485,7 @@ }, "comments": "", "filter": { - "name": "complex::BadDataNeighborOrientationCheckFilter", + "name": "simplnx::BadDataNeighborOrientationCheckFilter", "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" }, "isDisabled": false @@ -504,7 +504,7 @@ }, "comments": "", "filter": { - "name": "complex::NeighborOrientationCorrelationFilter", + "name": "simplnx::NeighborOrientationCorrelationFilter", "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" }, "isDisabled": false @@ -525,7 +525,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -539,7 +539,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -556,7 +556,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -576,7 +576,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -599,7 +599,7 @@ }, "comments": "", "filter": { - "name": "complex::MergeTwinsFilter", + "name": "simplnx::MergeTwinsFilter", "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" }, "isDisabled": false @@ -616,7 +616,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -633,7 +633,7 @@ }, "comments": "", "filter": { - "name": "complex::RemoveMinimumSizeFeaturesFilter", + "name": "simplnx::RemoveMinimumSizeFeaturesFilter", "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" }, "isDisabled": false @@ -653,7 +653,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -672,7 +672,7 @@ }, "comments": "", "filter": { - "name": "complex::MinNeighbors", + "name": "simplnx::MinNeighbors", "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" }, "isDisabled": false @@ -688,7 +688,7 @@ }, "comments": "", "filter": { - "name": "complex::FillBadDataFilter", + "name": "simplnx::FillBadDataFilter", "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" }, "isDisabled": false @@ -706,7 +706,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -724,7 +724,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -745,7 +745,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -757,7 +757,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -767,7 +767,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -781,7 +781,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -798,7 +798,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -816,7 +816,7 @@ }, "comments": "", "filter": { - "name": "complex::FindShapesFilter", + "name": "simplnx::FindShapesFilter", "uuid": "036b17d5-23bb-4a24-9187-c4a8dd918792" }, "isDisabled": false @@ -836,7 +836,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -853,7 +853,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighborhoodsFilter", + "name": "simplnx::FindNeighborhoodsFilter", "uuid": "924c10e3-2f39-4c08-9d7a-7fe029f74f6d" }, "isDisabled": false @@ -874,7 +874,7 @@ }, "comments": "", "filter": { - "name": "complex::FindEuclideanDistMapFilter", + "name": "simplnx::FindEuclideanDistMapFilter", "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" }, "isDisabled": false @@ -890,7 +890,7 @@ }, "comments": "", "filter": { - "name": "complex::FindSurfaceAreaToVolumeFilter", + "name": "simplnx::FindSurfaceAreaToVolumeFilter", "uuid": "94e83e4f-797d-4594-b130-3819b7676f01" }, "isDisabled": false @@ -902,7 +902,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -912,7 +912,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -923,7 +923,7 @@ }, "comments": "", "filter": { - "name": "complex::DeleteData", + "name": "simplnx::DeleteData", "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" }, "isDisabled": false @@ -940,7 +940,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -957,7 +957,7 @@ }, "comments": "", "filter": { - "name": "complex::FindMisorientationsFilter", + "name": "simplnx::FindMisorientationsFilter", "uuid": "0b68fe25-b5ef-4805-ae32-20acb8d4e823" }, "isDisabled": false @@ -992,7 +992,7 @@ }, "comments": "", "filter": { - "name": "complex::FindSchmidsFilter", + "name": "simplnx::FindSchmidsFilter", "uuid": "b4681855-0a3d-4237-97f2-5aec509115c4" }, "isDisabled": false @@ -1012,7 +1012,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureReferenceMisorientationsFilter", + "name": "simplnx::FindFeatureReferenceMisorientationsFilter", "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" }, "isDisabled": false @@ -1033,7 +1033,7 @@ }, "comments": "", "filter": { - "name": "complex::FindKernelAvgMisorientationsFilter", + "name": "simplnx::FindKernelAvgMisorientationsFilter", "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" }, "isDisabled": false @@ -1045,7 +1045,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1055,7 +1055,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1082,7 +1082,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -1094,7 +1094,7 @@ }, "comments": "", "filter": { - "name": "complex::MoveData", + "name": "simplnx::MoveData", "uuid": "651e5894-ab7c-4176-b7f0-ea466c521753" }, "isDisabled": false @@ -1115,7 +1115,7 @@ }, "comments": "", "filter": { - "name": "complex::QuickSurfaceMeshFilter", + "name": "simplnx::QuickSurfaceMeshFilter", "uuid": "13dd00bd-ad49-4e04-95eb-3267952fd6e5" }, "isDisabled": false @@ -1127,7 +1127,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1137,7 +1137,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1158,7 +1158,7 @@ }, "comments": "", "filter": { - "name": "complex::LaplacianSmoothingFilter", + "name": "simplnx::LaplacianSmoothingFilter", "uuid": "0dd0916e-9305-4a7b-98cf-a6cfb97cb501" }, "isDisabled": false @@ -1170,7 +1170,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1180,7 +1180,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1192,7 +1192,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateTriangleAreasFilter", + "name": "simplnx::CalculateTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false @@ -1204,7 +1204,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleNormalFilter", + "name": "simplnx::TriangleNormalFilter", "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" }, "isDisabled": false @@ -1216,7 +1216,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleDihedralAngleFilter", + "name": "simplnx::TriangleDihedralAngleFilter", "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" }, "isDisabled": false @@ -1232,7 +1232,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateFaceIPFColoringFilter", + "name": "simplnx::GenerateFaceIPFColoringFilter", "uuid": "30759600-7c02-4650-b5ca-e7036d6b568e" }, "isDisabled": false @@ -1247,7 +1247,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateFaceMisorientationColoringFilter", + "name": "simplnx::GenerateFaceMisorientationColoringFilter", "uuid": "f3473af9-db77-43db-bd25-60df7230ea73" }, "isDisabled": false @@ -1259,7 +1259,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1269,7 +1269,7 @@ }, "comments": "The input for this pipeline requires the output dream3d file from the (03) Small IN100 Mesh Statistics bookmarked pipeline.", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1285,7 +1285,7 @@ }, "comments": "", "filter": { - "name": "complex::SharedFeatureFaceFilter", + "name": "simplnx::SharedFeatureFaceFilter", "uuid": "aaf7a258-fc92-48d7-9d06-ba317a3769e8" }, "isDisabled": false @@ -1317,7 +1317,7 @@ }, "comments": "", "filter": { - "name": "complex::FindGBCDMetricBasedFilter", + "name": "simplnx::FindGBCDMetricBasedFilter", "uuid": "fc0d695a-e381-4f11-a8fd-26d5b5cda30a" }, "isDisabled": false @@ -1343,7 +1343,7 @@ }, "comments": "", "filter": { - "name": "complex::FindGBPDMetricBasedFilter", + "name": "simplnx::FindGBPDMetricBasedFilter", "uuid": "8267878b-d23a-4666-83a0-f1a7711861ce" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline index 175d608775..1870b9ece3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline @@ -26,7 +26,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EspritDataFilter", + "name": "simplnx::ReadH5EspritDataFilter", "uuid": "694a0d54-b492-41bc-993b-ce0f5006e927" }, "isDisabled": false @@ -38,7 +38,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index eb927d7718..89827fb504 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -32,7 +32,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5OimDataFilter", + "name": "simplnx::ReadH5OimDataFilter", "uuid": "4ad3d47c-b1e1-4429-bc65-5e021be62ba0" }, "isDisabled": false @@ -49,7 +49,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -96,7 +96,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -108,7 +108,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline index b7a961cc47..e860c93937 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline @@ -11,7 +11,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -28,7 +28,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -66,7 +66,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -118,7 +118,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline index d8cd20520d..827e8b7d7d 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline @@ -13,7 +13,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCtfDataFilter", + "name": "simplnx::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false @@ -60,7 +60,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -91,7 +91,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -112,7 +112,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline index ff02254d93..44e9d14d03 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline @@ -14,7 +14,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCtfDataFilter", + "name": "simplnx::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false @@ -52,7 +52,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -79,7 +79,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -105,7 +105,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -126,7 +126,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -141,7 +141,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::WritePoleFigureFilter", + "name": "simplnx::WritePoleFigureFilter", "uuid": "00cbb97e-a5c2-43e6-9a35-17a0f9ce26ed" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline index 23a7e8f16c..7fc57520a3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline @@ -14,7 +14,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCtfDataFilter", + "name": "simplnx::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false @@ -52,7 +52,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -79,7 +79,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -105,7 +105,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -126,7 +126,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -141,7 +141,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::WritePoleFigureFilter", + "name": "simplnx::WritePoleFigureFilter", "uuid": "00cbb97e-a5c2-43e6-9a35-17a0f9ce26ed" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline index 0aac2c81e5..be90ba6f75 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline @@ -14,7 +14,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCtfDataFilter", + "name": "simplnx::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false @@ -61,7 +61,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -87,7 +87,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -101,7 +101,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -116,7 +116,7 @@ }, "comments": "", "filter": { - "name": "complex::ReplaceElementAttributesWithNeighborValuesFilter", + "name": "simplnx::ReplaceElementAttributesWithNeighborValuesFilter", "uuid": "65128c53-d3be-4a69-a559-32a48d603884" }, "isDisabled": false @@ -137,7 +137,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -152,7 +152,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -173,7 +173,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -188,7 +188,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -209,7 +209,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -224,7 +224,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -245,7 +245,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -261,7 +261,7 @@ }, "comments": "", "filter": { - "name": "complex::FillBadDataFilter", + "name": "simplnx::FillBadDataFilter", "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" }, "isDisabled": false @@ -278,7 +278,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -295,7 +295,7 @@ }, "comments": "", "filter": { - "name": "complex::RemoveMinimumSizeFeaturesFilter", + "name": "simplnx::RemoveMinimumSizeFeaturesFilter", "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" }, "isDisabled": false @@ -312,7 +312,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -333,7 +333,7 @@ }, "comments": "", "filter": { - "name": "complex::FindKernelAvgMisorientationsFilter", + "name": "simplnx::FindKernelAvgMisorientationsFilter", "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" }, "isDisabled": false @@ -347,7 +347,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -368,7 +368,7 @@ }, "comments": "", "filter": { - "name": "complex::FindEuclideanDistMapFilter", + "name": "simplnx::FindEuclideanDistMapFilter", "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" }, "isDisabled": false @@ -388,7 +388,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureReferenceMisorientationsFilter", + "name": "simplnx::FindFeatureReferenceMisorientationsFilter", "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" }, "isDisabled": false @@ -403,7 +403,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteFeatureDataCSVFilter", + "name": "simplnx::WriteFeatureDataCSVFilter", "uuid": "d734293f-3017-4699-b458-c05aca078b96" }, "isDisabled": false @@ -424,7 +424,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateArrayHistogramFilter", + "name": "simplnx::CalculateArrayHistogramFilter", "uuid": "c6b6d9e5-301d-4767-abf7-530f5ef5007d" }, "isDisabled": false @@ -444,7 +444,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteASCIIDataFilter", + "name": "simplnx::WriteASCIIDataFilter", "uuid": "06c8bfe8-2b42-4956-aca3-580bc0620716" }, "isDisabled": false @@ -456,7 +456,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline index 026afc4961..4842317c81 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline @@ -14,7 +14,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCtfDataFilter", + "name": "simplnx::ReadCtfDataFilter", "uuid": "7751923c-afb9-4032-8372-8078325c69a4" }, "isDisabled": false @@ -61,7 +61,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -87,7 +87,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -101,7 +101,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -116,7 +116,7 @@ }, "comments": "", "filter": { - "name": "complex::ReplaceElementAttributesWithNeighborValuesFilter", + "name": "simplnx::ReplaceElementAttributesWithNeighborValuesFilter", "uuid": "65128c53-d3be-4a69-a559-32a48d603884" }, "isDisabled": false @@ -137,7 +137,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -152,7 +152,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -173,7 +173,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -188,7 +188,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -209,7 +209,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -224,7 +224,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -245,7 +245,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -261,7 +261,7 @@ }, "comments": "", "filter": { - "name": "complex::FillBadDataFilter", + "name": "simplnx::FillBadDataFilter", "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" }, "isDisabled": false @@ -278,7 +278,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -295,7 +295,7 @@ }, "comments": "", "filter": { - "name": "complex::RemoveMinimumSizeFeaturesFilter", + "name": "simplnx::RemoveMinimumSizeFeaturesFilter", "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" }, "isDisabled": false @@ -312,7 +312,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -333,7 +333,7 @@ }, "comments": "", "filter": { - "name": "complex::FindKernelAvgMisorientationsFilter", + "name": "simplnx::FindKernelAvgMisorientationsFilter", "uuid": "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035" }, "isDisabled": false @@ -347,7 +347,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -368,7 +368,7 @@ }, "comments": "", "filter": { - "name": "complex::FindEuclideanDistMapFilter", + "name": "simplnx::FindEuclideanDistMapFilter", "uuid": "ba9ae8f6-443e-41d3-bb45-a08a139325c1" }, "isDisabled": false @@ -388,7 +388,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureReferenceMisorientationsFilter", + "name": "simplnx::FindFeatureReferenceMisorientationsFilter", "uuid": "24b54daf-3bf5-4331-93f6-03a49f719bf1" }, "isDisabled": false @@ -403,7 +403,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteFeatureDataCSVFilter", + "name": "simplnx::WriteFeatureDataCSVFilter", "uuid": "d734293f-3017-4699-b458-c05aca078b96" }, "isDisabled": false @@ -424,7 +424,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateArrayHistogramFilter", + "name": "simplnx::CalculateArrayHistogramFilter", "uuid": "c6b6d9e5-301d-4767-abf7-530f5ef5007d" }, "isDisabled": false @@ -444,7 +444,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteASCIIDataFilter", + "name": "simplnx::WriteASCIIDataFilter", "uuid": "06c8bfe8-2b42-4956-aca3-580bc0620716" }, "isDisabled": false @@ -456,7 +456,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.cpp index bfce9811ae..b958b1d136 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.cpp @@ -1,16 +1,16 @@ #include "AlignSectionsMisorientation.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include "EbsdLib/LaueOps/LaueOps.h" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- AlignSectionsMisorientation::AlignSectionsMisorientation(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -70,7 +70,7 @@ Result<> AlignSectionsMisorientation::findShifts(std::vector& xShifts, } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->goodVoxelsArrayPath.toString()); return MakeErrorResult(-53900, message); } @@ -81,7 +81,7 @@ Result<> AlignSectionsMisorientation::findShifts(std::vector& xShifts, { // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(m_InputValues->alignmentShiftFileName.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(m_InputValues->alignmentShiftFileName.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; @@ -118,7 +118,7 @@ Result<> AlignSectionsMisorientation::findShifts(std::vector& xShifts, const auto halfDim0 = static_cast(dims[0] * 0.5f); const auto halfDim1 = static_cast(dims[1] * 0.5f); - double deg2Rad = (complex::numbers::pi / 180.0); + double deg2Rad = (nx::core::numbers::pi / 180.0); auto start = std::chrono::steady_clock::now(); // Loop over the Z Direction for(int64_t iter = 1; iter < dims[2]; iter++) @@ -129,7 +129,7 @@ Result<> AlignSectionsMisorientation::findShifts(std::vector& xShifts, if(std::chrono::duration_cast(now - start).count() > 1000) { std::string message = fmt::format("Determining Shifts || {}% Complete", progInt); - m_MessageHandler(complex::IFilter::ProgressMessage{complex::IFilter::Message::Type::Info, message, progInt}); + m_MessageHandler(nx::core::IFilter::ProgressMessage{nx::core::IFilter::Message::Type::Info, message, progInt}); start = std::chrono::steady_clock::now(); } if(getCancel()) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.hpp index 9a549af912..c587463233 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/AlignSections.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/AlignSections.hpp" #include -namespace complex +namespace nx::core { /** @@ -58,4 +58,4 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMisorientation : public AlignSecti const IFilter::MessageHandler& m_MessageHandler; Result<> m_Result; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.cpp index b9e4250449..5a97b3339e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.cpp @@ -1,17 +1,17 @@ #include "AlignSectionsMutualInformation.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/LaueOps/LaueOps.h" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- AlignSectionsMutualInformation::AlignSectionsMutualInformation(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -72,7 +72,7 @@ Result<> AlignSectionsMutualInformation::findShifts(std::vector& xShifts, { // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(m_InputValues->AlignmentShiftFileName.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(m_InputValues->AlignmentShiftFileName.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; @@ -253,7 +253,7 @@ void AlignSectionsMutualInformation::formFeaturesSections(std::vector& mi size_t initialVoxelsListSize = 1000; - float misorientationTolerance = m_InputValues->MisorientationTolerance * complex::Constants::k_PiOver180F; + float misorientationTolerance = m_InputValues->MisorientationTolerance * nx::core::Constants::k_PiOver180F; featureCounts.resize(dims[2]); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.hpp index c1eb920b61..5f485b6f0e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/AlignSections.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/AlignSections.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT AlignSectionsMutualInformationInputValues @@ -61,4 +61,4 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMutualInformation : public AlignSe Result<> m_Result = {}; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.cpp index 6ade0a7ccb..79372434f7 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.cpp @@ -1,15 +1,15 @@ #include "BadDataNeighborOrientationCheck.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- BadDataNeighborOrientationCheck::BadDataNeighborOrientationCheck(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -49,7 +49,7 @@ Result<> BadDataNeighborOrientationCheck::operator()() } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->MaskArrayPath.toString()); return MakeErrorResult(-54900, message); } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.hpp index 0edf040a4e..07e7da1269 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.hpp @@ -2,9 +2,9 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" /** * This is example code to put in the Execute Method of the filter. @@ -20,7 +20,7 @@ return BadDataNeighborOrientationCheck(dataStructure, messageHandler, shouldCancel, &inputValues)(); */ -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT BadDataNeighborOrientationCheckInputValues @@ -63,4 +63,4 @@ class ORIENTATIONANALYSIS_EXPORT BadDataNeighborOrientationCheck const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.cpp index e49543cc5e..bee4edd294 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.cpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; // ----------------------------------------------------------------------------- CAxisSegmentFeatures::CAxisSegmentFeatures(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, CAxisSegmentFeaturesInputValues* inputValues) @@ -42,7 +42,7 @@ Result<> CAxisSegmentFeatures::operator()() } catch(const std::out_of_range&) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute return MakeErrorResult(-8362, fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->MaskArrayPath.toString())); } } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.hpp index f2d74bbe98..df57829cdd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/SegmentFeatures.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/SegmentFeatures.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT CAxisSegmentFeaturesInputValues @@ -59,4 +59,4 @@ class ORIENTATIONANALYSIS_EXPORT CAxisSegmentFeatures : public SegmentFeatures Int32Array* m_FeatureIdsArray = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.cpp index 2c1bb52d7c..59e903fbed 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.cpp @@ -1,11 +1,11 @@ #include "ConvertHexGridToSquareGrid.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/FilePathGenerator.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Utilities/FilePathGenerator.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/IO/TSL/AngConstants.h" #include "EbsdLib/IO/TSL/AngReader.h" @@ -13,7 +13,7 @@ #include #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.hpp index fd6df1a825..dd0ee213fa 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.hpp @@ -2,18 +2,18 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" - -namespace complex +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" + +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ConvertHexGridToSquareGridInputValues { @@ -53,4 +53,4 @@ class ORIENTATIONANALYSIS_EXPORT ConvertHexGridToSquareGrid const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.cpp index dc068f94ae..ec9a06b0d1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.cpp @@ -1,11 +1,11 @@ #include "ConvertQuaternion.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.hpp index fe851bb058..b4ff1e6be2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" - -namespace complex +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" + +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ConvertQuaternionInputValues @@ -49,4 +49,4 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternion const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.cpp index c3e0a5d3ba..97c282b951 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.cpp @@ -1,13 +1,13 @@ #include "CreateEnsembleInfo.hpp" #include "OrientationAnalysis/utilities/PhaseType.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/StringArray.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/StringArray.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.hpp index 4d61ef0be5..a968a10fbc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/EnsembleInfoParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/EnsembleInfoParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT CreateEnsembleInfoInputValues @@ -47,4 +47,4 @@ class ORIENTATIONANALYSIS_EXPORT CreateEnsembleInfo const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.cpp index e4663fc758..2623052b4d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.cpp @@ -1,11 +1,11 @@ #include "EBSDSegmentFeatures.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- EBSDSegmentFeatures::EBSDSegmentFeatures(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, EBSDSegmentFeaturesInputValues* inputValues) @@ -33,7 +33,7 @@ Result<> EBSDSegmentFeatures::operator()() } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->goodVoxelsArrayPath.toString()); return MakeErrorResult(-485090, message); } @@ -74,10 +74,10 @@ Result<> EBSDSegmentFeatures::operator()() // ----------------------------------------------------------------------------- int64_t EBSDSegmentFeatures::getSeed(int32 gnum, int64 nextSeed) const { - complex::DataArray::store_type* featureIds = m_FeatureIdsArray->getDataStore(); + nx::core::DataArray::store_type* featureIds = m_FeatureIdsArray->getDataStore(); usize totalPoints = featureIds->getNumberOfTuples(); - complex::AbstractDataStore* cellPhases = m_CellPhases->getDataStore(); + nx::core::AbstractDataStore* cellPhases = m_CellPhases->getDataStore(); int64 seed = -1; // start with the next voxel after the last seed @@ -118,7 +118,7 @@ bool EBSDSegmentFeatures::determineGrouping(int64 referencepoint, int64 neighbor bool group = false; // Get the phases for each voxel - complex::AbstractDataStore* cellPhases = m_CellPhases->getDataStore(); + nx::core::AbstractDataStore* cellPhases = m_CellPhases->getDataStore(); int32_t phase1 = (*m_CrystalStructures)[(*cellPhases)[referencepoint]]; int32_t phase2 = (*m_CrystalStructures)[(*cellPhases)[neighborpoint]]; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.hpp index 2b69d96d1d..7e3bee93ec 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.hpp @@ -2,19 +2,19 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/SegmentFeatures.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/SegmentFeatures.hpp" #include "EbsdLib/LaueOps/LaueOps.h" #include -namespace complex +namespace nx::core { /** @@ -87,4 +87,4 @@ class ORIENTATIONANALYSIS_EXPORT EBSDSegmentFeatures : public SegmentFeatures std::vector m_OrientationOps; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.cpp index 5aefbb3951..744266b5b6 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.cpp @@ -1,9 +1,9 @@ #include "EbsdToH5Ebsd.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/IO/HKL/CtfFields.h" @@ -15,7 +15,7 @@ #include "H5Support/H5ScopedSentinel.h" #include "H5Support/H5Utilities.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- EbsdToH5Ebsd::EbsdToH5Ebsd(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, EbsdToH5EbsdInputValues* inputValues) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.hpp index 3e4e3603a9..09602fc5c3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.hpp @@ -2,22 +2,22 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilePathGenerator.hpp" - -namespace complex +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilePathGenerator.hpp" + +namespace nx::core { namespace EbsdToH5EbsdInputConstants { const ChoicesParameter::Choices k_StackingChoices = {"Low to High", "High To Low"}; -const ChoicesParameter::ValueType k_LowToHigh = static_cast(complex::FilePathGenerator::Ordering::LowToHigh); -const ChoicesParameter::ValueType k_HighToLow = static_cast(complex::FilePathGenerator::Ordering::HighToLow); +const ChoicesParameter::ValueType k_LowToHigh = static_cast(nx::core::FilePathGenerator::Ordering::LowToHigh); +const ChoicesParameter::ValueType k_HighToLow = static_cast(nx::core::FilePathGenerator::Ordering::HighToLow); const ChoicesParameter::Choices k_TransformChoices = {"Edax - TSL", "Oxford - CTF", "No/Unknown Transformation", "HEDM - IceNine"}; const ChoicesParameter::ValueType k_Edax = 0; @@ -79,4 +79,4 @@ class ORIENTATIONANALYSIS_EXPORT EbsdToH5Ebsd const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.cpp index 56bea89f79..c3d377dd6c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.cpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/ImageRotationUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/ImageRotationUtilities.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" #include "EbsdLib/Core/Quaternion.hpp" -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; // ----------------------------------------------------------------------------- FindAvgCAxes::FindAvgCAxes(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindAvgCAxesInputValues* inputValues) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.hpp index f2b5981ae9..c17f7ac907 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindAvgCAxesInputValues @@ -46,4 +46,4 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgCAxes const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.cpp index 2a32096e41..e590b5257a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.cpp @@ -1,12 +1,12 @@ #include "FindAvgOrientations.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindAvgOrientations::FindAvgOrientations(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindAvgOrientationsInputValues* inputValues) @@ -26,14 +26,14 @@ Result<> FindAvgOrientations::operator()() std::vector orientationOps = LaueOps::GetAllOrientationOps(); - complex::Int32Array& featureIds = m_DataStructure.getDataRefAs(m_InputValues->cellFeatureIdsArrayPath); - complex::Int32Array& phases = m_DataStructure.getDataRefAs(m_InputValues->cellPhasesArrayPath); - complex::Float32Array& quats = m_DataStructure.getDataRefAs(m_InputValues->cellQuatsArrayPath); + nx::core::Int32Array& featureIds = m_DataStructure.getDataRefAs(m_InputValues->cellFeatureIdsArrayPath); + nx::core::Int32Array& phases = m_DataStructure.getDataRefAs(m_InputValues->cellPhasesArrayPath); + nx::core::Float32Array& quats = m_DataStructure.getDataRefAs(m_InputValues->cellQuatsArrayPath); - complex::UInt32Array& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->crystalStructuresArrayPath); + nx::core::UInt32Array& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->crystalStructuresArrayPath); - complex::Float32Array& avgQuats = m_DataStructure.getDataRefAs(m_InputValues->avgQuatsArrayPath); - complex::Float32Array& avgEuler = m_DataStructure.getDataRefAs(m_InputValues->avgEulerAnglesArrayPath); + nx::core::Float32Array& avgQuats = m_DataStructure.getDataRefAs(m_InputValues->avgQuatsArrayPath); + nx::core::Float32Array& avgEuler = m_DataStructure.getDataRefAs(m_InputValues->avgEulerAnglesArrayPath); size_t totalPoints = featureIds.getNumberOfTuples(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.hpp index 962a27cfbe..905ab4cd62 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { /** @@ -50,4 +50,4 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgOrientations const FindAvgOrientationsInputValues* m_InputValues = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.cpp index e8c735663e..678c64a179 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.cpp @@ -1,13 +1,13 @@ #include "FindBoundaryStrengths.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" #include "EbsdLib/Core/Quaternion.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindBoundaryStrengths::FindBoundaryStrengths(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.hpp index 52ee29134e..dd4b994aa4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.hpp @@ -2,14 +2,14 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" - -namespace complex +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" + +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindBoundaryStrengthsInputValues @@ -53,4 +53,4 @@ class ORIENTATIONANALYSIS_EXPORT FindBoundaryStrengths const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.cpp index 3dced83a57..50bbadfd75 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.cpp @@ -2,14 +2,14 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataArray.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" #include "EbsdLib/Core/Quaternion.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; // ----------------------------------------------------------------------------- FindCAxisLocations::FindCAxisLocations(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindCAxisLocationsInputValues* inputValues) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.hpp index 57dc0ec6d0..20c74fe2a4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindCAxisLocationsInputValues @@ -45,4 +45,4 @@ class ORIENTATIONANALYSIS_EXPORT FindCAxisLocations const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.cpp index 2f640d041e..32083b1e09 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.cpp @@ -2,16 +2,16 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Utilities/ImageRotationUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Utilities/ImageRotationUtilities.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" #include "EbsdLib/Core/Quaternion.hpp" -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; // ----------------------------------------------------------------------------- FindFeatureNeighborCAxisMisalignments::FindFeatureNeighborCAxisMisalignments(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.hpp index a7ecd6469b..48fca0b510 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindFeatureNeighborCAxisMisalignmentsInputValues @@ -48,4 +48,4 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureNeighborCAxisMisalignments const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.cpp index d0b50a6462..9a946db8dc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.cpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/ImageRotationUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/ImageRotationUtilities.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" @@ -16,8 +16,8 @@ #include #include -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; // ----------------------------------------------------------------------------- FindFeatureReferenceCAxisMisorientations::FindFeatureReferenceCAxisMisorientations(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.hpp index cd1784b349..7f4c2442f8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceCAxisMisorientationsInputValues @@ -52,4 +52,4 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceCAxisMisorientations const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.cpp index b3edd2de4c..395d625e58 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.cpp @@ -1,13 +1,13 @@ #include "FindFeatureReferenceMisorientations.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindFeatureReferenceMisorientations::FindFeatureReferenceMisorientations(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -96,7 +96,7 @@ Result<> FindFeatureReferenceMisorientations::operator()() OrientationD axisAngle = m_OrientationOps[phase1]->calculateMisorientation(q1, q2); - featureReferenceMisorientations[point] = static_cast((180.0 / complex::numbers::pi) * axisAngle[3]); // convert to degrees + featureReferenceMisorientations[point] = static_cast((180.0 / nx::core::numbers::pi) * axisAngle[3]); // convert to degrees int32_t idx = featureIds[point] * 2; avgMiso[idx + 0]++; avgMiso[idx + 1] = avgMiso[idx + 1] + featureReferenceMisorientations[point]; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.hpp index 6cf2cb0912..be43413091 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" /** * This is example code to put in the Execute Method of the filter. @@ -24,7 +24,7 @@ return FindFeatureReferenceMisorientations(dataStructure, messageHandler, shouldCancel, &inputValues)(); */ -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceMisorientationsInputValues @@ -69,4 +69,4 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceMisorientations const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.cpp index c3defc295b..ac820e7a52 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.cpp @@ -1,11 +1,11 @@ #include "FindGBCD.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/TimeUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/TimeUtilities.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" @@ -16,7 +16,7 @@ using LaueOpsShPtrType = std::shared_ptr; using LaueOpsContainerType = std::vector; -using namespace complex; +using namespace nx::core; namespace { const usize k_NumMisoReps = 576 * 4; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.hpp index c81fa49164..5d90a2f668 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCD.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct SizeGBCD @@ -67,4 +67,4 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCD const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.cpp index 1350bd3ea4..35be40d661 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.cpp @@ -2,23 +2,23 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/LaueOps/LaueOps.h" #include -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE #include #endif -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; namespace fs = std::filesystem; using LaueOpsShPtrType = std::shared_ptr; using LaueOpsContainerType = std::vector; @@ -65,7 +65,7 @@ class TrianglesSelector { public: TrianglesSelector(bool excludeTripleLines, const IGeometry::SharedFaceList& triangles, const Int8Array& nodeTypes, -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE tbb::concurrent_vector& selectedTriangles, #else std::vector& selectedTriangles, @@ -220,7 +220,7 @@ class TrianglesSelector const IGeometry::SharedFaceList& m_Triangles; const Int8Array& m_NodeTypes; -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE tbb::concurrent_vector& m_SelectedTriangles; #else std::vector& m_SelectedTriangles; @@ -250,7 +250,7 @@ class ProbeDistribution public: ProbeDistribution(std::vector& distributionValues, std::vector& errorValues, const std::vector& samplePtsX, const std::vector& samplePtsY, const std::vector& samplePtsZ, -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE const tbb::concurrent_vector& selectedTriangles, #else const std::vector& selectedTriangles, @@ -324,7 +324,7 @@ class ProbeDistribution std::vector m_SamplePtsX; std::vector m_SamplePtsY; std::vector m_SamplePtsZ; -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE const tbb::concurrent_vector& m_SelectedTriangles; #else const std::vector& m_SelectedTriangles; @@ -475,7 +475,7 @@ Result<> FindGBCDMetricBased::operator()() const usize numMeshTriangles = faceAreas.getNumberOfTuples(); // --------- find triangles (and equivalent crystallographic parameters) with +- the fixed mis orientation --------- -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE tbb::concurrent_vector selectedTriangles(0); #else std::vector selectedTriangles(0); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.hpp index aea5793084..2e834da89e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.hpp @@ -2,14 +2,14 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindGBCDMetricBasedInputValues @@ -64,4 +64,4 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDMetricBased const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.cpp index 56747c0925..7f82a2bfcf 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.cpp @@ -2,23 +2,23 @@ #include "OrientationAnalysis/utilities/OrientationUtilities.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE #include #endif #include -using namespace complex; -using namespace complex::OrientationUtilities; +using namespace nx::core; +using namespace nx::core::OrientationUtilities; namespace fs = std::filesystem; using LaueOpsShPtrType = std::shared_ptr; using LaueOpsContainerType = std::vector; @@ -66,7 +66,7 @@ class TrianglesSelector { public: TrianglesSelector(bool excludeTripleLines, const IGeometry::SharedFaceList& triangles, const Int8Array& nodeTypes, -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE tbb::concurrent_vector& selectedTriangles, #else std::vector& selectedTriangles, @@ -159,7 +159,7 @@ class TrianglesSelector bool m_ExcludeTripleLines; const IGeometry::SharedFaceList& m_Triangles; const Int8Array& m_NodeTypes; -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE tbb::concurrent_vector& m_SelectedTriangles; #else std::vector& m_SelectedTriangles; @@ -184,7 +184,7 @@ class ProbeDistribution public: ProbeDistribution(std::vector& distributionValues, std::vector& errorValues, const std::vector& samplePtsX, const std::vector& samplePtsY, const std::vector& samplePtsZ, -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE const tbb::concurrent_vector& selectedTriangles, #else const std::vector& selectedTriangles, @@ -277,7 +277,7 @@ class ProbeDistribution std::vector m_SamplePtsX; std::vector m_SamplePtsY; std::vector m_SamplePtsZ; -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE const tbb::concurrent_vector& m_SelectedTriangles; #else const std::vector& m_SelectedTriangles; @@ -575,7 +575,7 @@ Result<> FindGBPDMetricBased::operator()() // --------- find triangles corresponding to Phase of Interests, and their normals in crystal reference frames --------- const usize numMeshTriangles = faceAreas.getNumberOfTuples(); -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE tbb::concurrent_vector selectedTriangles(0); #else std::vector selectedTriangles(0); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.hpp index 31b1f13296..a83b8ec7a8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindGBPDMetricBasedInputValues @@ -61,4 +61,4 @@ class ORIENTATIONANALYSIS_EXPORT FindGBPDMetricBased const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp index c0a41c7762..3fb8d78f5c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp @@ -1,16 +1,16 @@ #include "FindKernelAvgMisorientations.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/ParallelData3DAlgorithm.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/ParallelData3DAlgorithm.hpp" #include "EbsdLib/LaueOps/LaueOps.h" #include -using namespace complex; +using namespace nx::core; namespace { @@ -122,7 +122,7 @@ class FindKernelAvgMisorientationsImpl q2[2] = quats[quatIndex + 2]; q2[3] = quats[quatIndex + 3]; OrientationF axisAngle = m_OrientationOps[phase1]->calculateMisorientation(q1, q2); - totalMisorientation = totalMisorientation + (axisAngle[3] * complex::Constants::k_180OverPiD); + totalMisorientation = totalMisorientation + (axisAngle[3] * nx::core::Constants::k_180OverPiD); numVoxel++; } } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.hpp index c205800602..884bd8d009 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.hpp @@ -2,14 +2,14 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindKernelAvgMisorientationsInputValues @@ -60,4 +60,4 @@ class ORIENTATIONANALYSIS_EXPORT FindKernelAvgMisorientations size_t m_LastProgressInt = 0; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.cpp index ed0acd3957..fa15691021 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.cpp @@ -1,13 +1,13 @@ #include "FindMisorientations.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/NeighborList.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindMisorientations::FindMisorientations(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindMisorientationsInputValues* inputValues) @@ -71,7 +71,7 @@ Result<> FindMisorientations::operator()() { OrientationD axisAngle = orientationOps[xtalType1]->calculateMisorientation(q1, q2); - tempMisorientationLists[i][j] = static_cast(axisAngle[3] * complex::Constants::k_180OverPiF); + tempMisorientationLists[i][j] = static_cast(axisAngle[3] * nx::core::Constants::k_180OverPiF); if(m_InputValues->FindAvgMisors) { (*avgMisorientations)[i] += tempMisorientationLists[i][j]; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.hpp index 73b6a66303..d20910a96f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindMisorientations.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindMisorientationsInputValues @@ -48,4 +48,4 @@ class ORIENTATIONANALYSIS_EXPORT FindMisorientations const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.cpp index 12279530dd..8fd70df85d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.cpp @@ -1,12 +1,12 @@ #include "FindSchmids.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindSchmids::FindSchmids(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindSchmidsInputValues* inputValues) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.hpp index 4f8dd28efe..47a2daefdb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSchmids.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" /** * This is example code to put in the Execute Method of the filter. @@ -28,7 +28,7 @@ return FindSchmids(dataStructure, messageHandler, shouldCancel, &inputValues)(); */ -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindSchmidsInputValues @@ -76,4 +76,4 @@ class ORIENTATIONANALYSIS_EXPORT FindSchmids const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.cpp index 91ca11e3e0..e95e060a9c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.cpp @@ -2,9 +2,9 @@ #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" #include #include @@ -90,7 +90,7 @@ std::array TripletSort(T a, T b, T c, bool lowToHigh) } } // namespace -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindShapes::FindShapes(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindShapesInputValues* inputValues) @@ -606,7 +606,7 @@ void FindShapes::find_axiseulers2D() { if(Ixx > Iyy) { - axisEulerAngles[3 * featureId] = complex::numbers::pi / 180.0F; + axisEulerAngles[3 * featureId] = nx::core::numbers::pi / 180.0F; axisEulerAngles[3 * featureId + 1] = 0.0f; axisEulerAngles[3 * featureId + 2] = 0.0f; continue; @@ -633,9 +633,9 @@ void FindShapes::find_axiseulers2D() n2y = n2y / norm2; double cosine1 = n1x; double ea1 = acos(cosine1); - if(ea1 > complex::numbers::pi) + if(ea1 > nx::core::numbers::pi) { - ea1 = ea1 - complex::numbers::pi; + ea1 = ea1 - nx::core::numbers::pi; } axisEulerAngles[3 * featureId] = static_cast(ea1); axisEulerAngles[3 * featureId + 1] = 0.0f; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.hpp index 098aa14d49..86d0defd4b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindShapes.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindShapesInputValues @@ -87,4 +87,4 @@ class ORIENTATIONANALYSIS_EXPORT FindShapes void find_axiseulers2D(); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.cpp index 665e47c1a7..ed3b7016c8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.cpp @@ -1,12 +1,12 @@ #include "FindSlipTransmissionMetrics.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" #include "EbsdLib/Core/Quaternion.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindSlipTransmissionMetrics::FindSlipTransmissionMetrics(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.hpp index 567acc46da..a268575100 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindSlipTransmissionMetricsInputValues @@ -51,4 +51,4 @@ class ORIENTATIONANALYSIS_EXPORT FindSlipTransmissionMetrics const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.cpp index 48f1aa6514..dfb334d482 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.cpp @@ -1,14 +1,14 @@ #include "FindTriangleGeomShapes.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.hpp index d914f6a8c5..ffb6393d99 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT FindTriangleGeomShapesInputValues @@ -56,4 +56,4 @@ class ORIENTATIONANALYSIS_EXPORT FindTriangleGeomShapes void findAxisEulers(); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.cpp index 6bbfed727f..62c4f3a566 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.cpp @@ -1,9 +1,9 @@ #include "GenerateFaceIPFColoring.hpp" -#include "complex/Common/RgbColor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/RgbColor.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/LaueOps/CubicLowOps.h" @@ -19,7 +19,7 @@ #include "EbsdLib/LaueOps/TrigonalLowOps.h" #include "EbsdLib/LaueOps/TrigonalOps.h" -using namespace complex; +using namespace nx::core; /** * @brief The CalculateNormalsImpl class implements a threaded algorithm that computes the IPF colors for the given list of diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.hpp index e6941eac6b..4e2a9a90d4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT GenerateFaceIPFColoringInputValues @@ -49,4 +49,4 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFaceIPFColoring const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.cpp index cb89c98cbd..4769a27b4e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.cpp @@ -1,9 +1,9 @@ #include "GenerateFaceMisorientationColoring.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/LaueOps/LaueOps.h" @@ -11,7 +11,7 @@ using LaueOpsShPtrType = std::shared_ptr; using LaueOpsContainer = std::vector; -using namespace complex; +using namespace nx::core; /** * @brief The CalculateFaceMisorientationColorsImpl class implements a threaded algorithm that computes the misorientation diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.hpp index 3ed8e215a1..84819f2d67 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT GenerateFaceMisorientationColoringInputValues @@ -49,4 +49,4 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFaceMisorientationColoring const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.cpp index 4101b2e067..ae7edf8a45 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.cpp @@ -1,10 +1,10 @@ #include "GenerateGBCDPoleFigure.hpp" -#include "complex/Common/Bit.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelData2DAlgorithm.hpp" +#include "simplnx/Common/Bit.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelData2DAlgorithm.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" @@ -12,7 +12,7 @@ namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.hpp index 7b02ea4e66..fffc837881 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT GenerateGBCDPoleFigureInputValues @@ -50,4 +50,4 @@ class ORIENTATIONANALYSIS_EXPORT GenerateGBCDPoleFigure const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.cpp index b32a496241..26d42f71ca 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.cpp @@ -1,15 +1,15 @@ #include "GenerateIPFColors.hpp" -#include "complex/Common/RgbColor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/RgbColor.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; using FloatVec3Type = std::vector; @@ -23,8 +23,8 @@ namespace class GenerateIPFColorsImpl { public: - GenerateIPFColorsImpl(GenerateIPFColors* filter, FloatVec3Type referenceDir, complex::Float32Array& eulers, complex::Int32Array& phases, complex::UInt32Array& crystalStructures, int32_t numPhases, - const complex::IDataArray* goodVoxels, complex::UInt8Array& colors) + GenerateIPFColorsImpl(GenerateIPFColors* filter, FloatVec3Type referenceDir, nx::core::Float32Array& eulers, nx::core::Int32Array& phases, nx::core::UInt32Array& crystalStructures, + int32_t numPhases, const nx::core::IDataArray* goodVoxels, nx::core::UInt8Array& colors) : m_Filter(filter) , m_ReferenceDir(referenceDir) , m_CellEulerAngles(eulers.getDataStoreRef()) @@ -81,9 +81,9 @@ class GenerateIPFColorsImpl if(phase < m_NumPhases && calcIPF && m_CrystalStructures[phase] < EbsdLib::CrystalStructure::LaueGroupEnd) { argb = ops[m_CrystalStructures[phase]]->generateIPFColor(dEuler.data(), refDir.data(), false); - m_CellIPFColors.setValue(index, static_cast(complex::RgbColor::dRed(argb))); - m_CellIPFColors.setValue(index + 1, static_cast(complex::RgbColor::dGreen(argb))); - m_CellIPFColors.setValue(index + 2, static_cast(complex::RgbColor::dBlue(argb))); + m_CellIPFColors.setValue(index, static_cast(nx::core::RgbColor::dRed(argb))); + m_CellIPFColors.setValue(index + 1, static_cast(nx::core::RgbColor::dGreen(argb))); + m_CellIPFColors.setValue(index + 2, static_cast(nx::core::RgbColor::dBlue(argb))); } } } @@ -115,12 +115,12 @@ class GenerateIPFColorsImpl private: GenerateIPFColors* m_Filter = nullptr; FloatVec3Type m_ReferenceDir; - complex::Float32AbstractDataStore& m_CellEulerAngles; - complex::Int32AbstractDataStore& m_CellPhases; - complex::UInt32AbstractDataStore& m_CrystalStructures; + nx::core::Float32AbstractDataStore& m_CellEulerAngles; + nx::core::Int32AbstractDataStore& m_CellPhases; + nx::core::UInt32AbstractDataStore& m_CrystalStructures; int32_t m_NumPhases = 0; - const complex::IDataArray* m_GoodVoxels = nullptr; - complex::UInt8AbstractDataStore& m_CellIPFColors; + const nx::core::IDataArray* m_GoodVoxels = nullptr; + nx::core::UInt8AbstractDataStore& m_CellIPFColors; }; } // namespace @@ -142,12 +142,12 @@ Result<> GenerateIPFColors::operator()() std::vector orientationOps = LaueOps::GetAllOrientationOps(); - complex::Float32Array& eulers = m_DataStructure.getDataRefAs(m_InputValues->cellEulerAnglesArrayPath); - complex::Int32Array& phases = m_DataStructure.getDataRefAs(m_InputValues->cellPhasesArrayPath); + nx::core::Float32Array& eulers = m_DataStructure.getDataRefAs(m_InputValues->cellEulerAnglesArrayPath); + nx::core::Int32Array& phases = m_DataStructure.getDataRefAs(m_InputValues->cellPhasesArrayPath); - complex::UInt32Array& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->crystalStructuresArrayPath); + nx::core::UInt32Array& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->crystalStructuresArrayPath); - complex::UInt8Array& ipfColors = m_DataStructure.getDataRefAs(m_InputValues->cellIpfColorsArrayPath); + nx::core::UInt8Array& ipfColors = m_DataStructure.getDataRefAs(m_InputValues->cellIpfColorsArrayPath); m_PhaseWarningCount = 0; size_t totalPoints = eulers.getNumberOfTuples(); @@ -165,7 +165,7 @@ Result<> GenerateIPFColors::operator()() algArrays.push_back(&crystalStructures); algArrays.push_back(&ipfColors); - complex::IDataArray* goodVoxelsArray = nullptr; + nx::core::IDataArray* goodVoxelsArray = nullptr; if(m_InputValues->useGoodVoxels) { goodVoxelsArray = m_DataStructure.getDataAs(m_InputValues->goodVoxelsArrayPath); @@ -185,7 +185,7 @@ Result<> GenerateIPFColors::operator()() This indicates a problem with the input cell phase data. DREAM.3D will give INCORRECT RESULTS.", (numPhases - 1), m_PhaseWarningCount, (numPhases - 1)); - return complex::MakeErrorResult(-48000, message); + return nx::core::MakeErrorResult(-48000, message); } return {}; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.hpp index 0913ba16a7..0f55d690b0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { /** @@ -58,4 +58,4 @@ class ORIENTATIONANALYSIS_EXPORT GenerateIPFColors int32_t m_PhaseWarningCount = 0; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.cpp index 4d9a4f1a65..d13b0a191f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.cpp @@ -1,10 +1,10 @@ #include "GenerateQuaternionConjugate.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.hpp index d4871239f2..ff2e848d99 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" /** * This is example code to put in the Execute Method of the filter. @@ -20,7 +20,7 @@ return GenerateQuaternionConjugate(dataStructure, messageHandler, shouldCancel, &inputValues)(); */ -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT GenerateQuaternionConjugateInputValues @@ -58,4 +58,4 @@ class ORIENTATIONANALYSIS_EXPORT GenerateQuaternionConjugate const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.cpp index aff84df74f..749577b913 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.cpp @@ -1,9 +1,9 @@ #include "GroupFeatures.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- GroupFeatures::GroupFeatures(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, GroupFeaturesInputValues* inputValues) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.hpp index fd81f676f7..341a3828c3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/GroupFeatures.hpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT GroupFeaturesInputValues @@ -54,4 +54,4 @@ class ORIENTATIONANALYSIS_EXPORT GroupFeatures const GroupFeaturesInputValues* m_GroupInputValues = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.cpp index c7053653d0..9e1ef1b907 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.cpp @@ -1,10 +1,10 @@ #include "MergeTwins.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/Core/Orientation.hpp" @@ -13,7 +13,7 @@ #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- MergeTwins::MergeTwins(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, MergeTwinsInputValues* inputValues, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.hpp index 24c6ed8186..f73a89da95 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/MergeTwins.hpp @@ -3,11 +3,11 @@ #include "OrientationAnalysis/Filters/Algorithms/GroupFeatures.hpp" #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT MergeTwinsInputValues @@ -59,4 +59,4 @@ class ORIENTATIONANALYSIS_EXPORT MergeTwins : public GroupFeatures const MergeTwinsInputValues* m_InputValues = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.cpp index b8559257fb..e3d1ac6884 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.cpp @@ -1,13 +1,13 @@ #include "NeighborOrientationCorrelation.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE #define RUN_TASK g->run #else #define RUN_TASK @@ -15,7 +15,7 @@ #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; class NeighborOrientationCorrelationTransferDataImpl { @@ -301,7 +301,7 @@ Result<> NeighborOrientationCorrelation::operator()() } // Build up a list of the DataArrays that we are going to operate on. - std::vector> voxelArrays = complex::GenerateDataArrayList(m_DataStructure, m_InputValues->ConfidenceIndexArrayPath, m_InputValues->IgnoredDataArrayPaths); + std::vector> voxelArrays = nx::core::GenerateDataArrayList(m_DataStructure, m_InputValues->ConfidenceIndexArrayPath, m_InputValues->IgnoredDataArrayPaths); // The idea for this parallel section is to parallelize over each Data Array that // will need it's data adjusted. This should go faster than before by about 2x. // Better speed up could be achieved if we had better data locality. diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.hpp index 79cf61ef9a..557f33e62f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelationInputValues @@ -53,4 +53,4 @@ class ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelation const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp index c54bfca0c4..8f3506f4d0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp @@ -1,15 +1,15 @@ #include "ReadAngData.hpp" -#include "complex/Common/RgbColor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/RgbColor.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/Core/Orientation.hpp" -using namespace complex; +using namespace nx::core; using FloatVec3Type = std::vector; @@ -81,8 +81,8 @@ std::pair ReadAngData::loadMaterialInfo(AngReader* reader) c const int32_t phaseID = phase->getPhaseIndex(); crystalStructures[phaseID] = phase->determineLaueGroup(); std::string materialName = phase->getMaterialName(); - materialName = complex::StringUtilities::replace(materialName, "MaterialName", ""); - materialName = complex::StringUtilities::trimmed(materialName); + materialName = nx::core::StringUtilities::replace(materialName, "MaterialName", ""); + materialName = nx::core::StringUtilities::trimmed(materialName); materialNames[phaseID] = materialName; std::vector lattConst = phase->getLatticeConstants(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.hpp index 7f34737e15..0056164074 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "EbsdLib/IO/TSL/AngReader.h" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ReadAngDataInputValues @@ -88,4 +88,4 @@ class ORIENTATIONANALYSIS_EXPORT ReadAngData void copyRawEbsdData(AngReader* reader) const; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp index 3f661b22ec..261939cd5c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp @@ -1,13 +1,13 @@ #include "ReadCtfData.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" #include "EbsdLib/IO/HKL/CtfConstants.h" #include "EbsdLib/Math/EbsdLibMath.h" -using namespace complex; +using namespace nx::core; using FloatVec3Type = std::vector; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.hpp index 0a217a8f24..5b2e7e0837 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.hpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" #include "EbsdLib/IO/HKL/CtfPhase.h" #include "EbsdLib/IO/HKL/CtfReader.h" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ReadCtfDataInputValues @@ -93,4 +93,4 @@ class ORIENTATIONANALYSIS_EXPORT ReadCtfData void copyRawEbsdData(CtfReader* reader) const; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp index 211a9a8bd5..1a63ab7f52 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp @@ -3,13 +3,13 @@ #include "OrientationAnalysis/utilities/PhaseType.hpp" #include "OrientationAnalysis/utilities/inicpp.h" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp index 1798ffacc8..e762b802e4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoInputValues @@ -52,4 +52,4 @@ class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfo const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp index 2a1e9b2705..de3e52367d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp @@ -2,16 +2,16 @@ #include "OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/Core/EbsdMacros.h" @@ -24,15 +24,15 @@ namespace RotateSampleRefFrame { // Parameter Keys -static inline constexpr complex::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; -static inline constexpr complex::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; -static inline constexpr complex::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; -static inline constexpr complex::StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; -static inline constexpr complex::StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; -static inline constexpr complex::StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; -static inline constexpr complex::StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; +static inline constexpr nx::core::StringLiteral k_RotationRepresentation_Key = "rotation_representation"; +static inline constexpr nx::core::StringLiteral k_RotationAxisAngle_Key = "rotation_axis"; +static inline constexpr nx::core::StringLiteral k_RotationMatrix_Key = "rotation_matrix"; +static inline constexpr nx::core::StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; +static inline constexpr nx::core::StringLiteral k_CreatedImageGeometry_Key = "created_image_geometry"; +static inline constexpr nx::core::StringLiteral k_RotateSliceBySlice_Key = "rotate_slice_by_slice"; +static inline constexpr nx::core::StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; -// static inline constexpr complex::StringLiteral k_RotatedGeometryName = ".RotatedGeometry"; +// static inline constexpr nx::core::StringLiteral k_RotatedGeometryName = ".RotatedGeometry"; enum class RotationRepresentation : uint64_t { @@ -44,13 +44,13 @@ enum class RotationRepresentation : uint64_t namespace RenameDataObject { -static inline constexpr complex::StringLiteral k_DataObject_Key = "data_object"; -static inline constexpr complex::StringLiteral k_NewName_Key = "new_name"; +static inline constexpr nx::core::StringLiteral k_DataObject_Key = "data_object"; +static inline constexpr nx::core::StringLiteral k_NewName_Key = "new_name"; } // namespace RenameDataObject namespace DeleteData { -static inline constexpr complex::StringLiteral k_DataPath_Key = "removed_data_path"; +static inline constexpr nx::core::StringLiteral k_DataPath_Key = "removed_data_path"; } @@ -66,7 +66,7 @@ namespace * @return */ template -complex::Result<> LoadInfo(const complex::ReadH5EbsdInputValues* mInputValues, complex::DataStructure& mDataStructure, std::shared_ptr& reader) +nx::core::Result<> LoadInfo(const nx::core::ReadH5EbsdInputValues* mInputValues, nx::core::DataStructure& mDataStructure, std::shared_ptr& reader) { reader->setFileName(mInputValues->inputFilePath); reader->setSliceStart(mInputValues->startSlice); @@ -75,25 +75,25 @@ complex::Result<> LoadInfo(const complex::ReadH5EbsdInputValues* mInputValues, c std::vector phases = reader->getPhases(); if(phases.size() == 0) { - return {complex::MakeErrorResult(-50027, fmt::format("Error reading phase information from file '{}'.", mInputValues->inputFilePath))}; + return {nx::core::MakeErrorResult(-50027, fmt::format("Error reading phase information from file '{}'.", mInputValues->inputFilePath))}; } // Resize the Ensemble Attribute Matrix to be the correct number of phases. std::vector tDims = {phases.size() + 1}; - complex::DataPath cellEnsembleMatrixPath = mInputValues->cellEnsembleMatrixPath; + nx::core::DataPath cellEnsembleMatrixPath = mInputValues->cellEnsembleMatrixPath; - complex::DataPath xtalDataPath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::CrystalStructures); - complex::UInt32Array& xtalData = mDataStructure.getDataRefAs(xtalDataPath); + nx::core::DataPath xtalDataPath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::CrystalStructures); + nx::core::UInt32Array& xtalData = mDataStructure.getDataRefAs(xtalDataPath); xtalData.getIDataStore()->resizeTuples(tDims); - complex::DataPath latticeDataPath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::LatticeConstants); - complex::Float32Array& latticData = mDataStructure.getDataRefAs(latticeDataPath); + nx::core::DataPath latticeDataPath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::LatticeConstants); + nx::core::Float32Array& latticData = mDataStructure.getDataRefAs(latticeDataPath); latticData.getIDataStore()->resizeTuples(tDims); // Reshape the Material Names here also. - complex::DataPath matNamesDataath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::MaterialName); - complex::StringArray& matNameData = mDataStructure.getDataRefAs(matNamesDataath); + nx::core::DataPath matNamesDataath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::MaterialName); + nx::core::StringArray& matNameData = mDataStructure.getDataRefAs(matNamesDataath); matNameData.resizeTuples(tDims); // Initialize the zero'th element to unknowns. The other elements will @@ -126,16 +126,16 @@ complex::Result<> LoadInfo(const complex::ReadH5EbsdInputValues* mInputValues, c } template -void CopyData(complex::DataStructure& dataStructure, H5EbsdReaderType* ebsdReader, const std::vector& arrayNames, std::set selectedArrayNames, - complex::DataPath cellAttributeMatrixPath, size_t totalPoints) +void CopyData(nx::core::DataStructure& dataStructure, H5EbsdReaderType* ebsdReader, const std::vector& arrayNames, std::set selectedArrayNames, + nx::core::DataPath cellAttributeMatrixPath, size_t totalPoints) { - using DataArrayType = complex::DataArray; + using DataArrayType = nx::core::DataArray; for(const auto& arrayName : arrayNames) { if(selectedArrayNames.find(arrayName) != selectedArrayNames.end()) { T* source = reinterpret_cast(ebsdReader->getPointerByName(arrayName)); - complex::DataPath dataPath = cellAttributeMatrixPath.createChildPath(arrayName); // get the data from the DataStructure + nx::core::DataPath dataPath = cellAttributeMatrixPath.createChildPath(arrayName); // get the data from the DataStructure DataArrayType& destination = dataStructure.getDataRefAs(dataPath); for(size_t tupleIndex = 0; tupleIndex < totalPoints; tupleIndex++) { @@ -158,18 +158,18 @@ void CopyData(complex::DataStructure& dataStructure, H5EbsdReaderType* ebsdReade * @return */ template -complex::Result<> LoadEbsdData(const complex::ReadH5EbsdInputValues* mInputValues, complex::DataStructure& dataStructure, const std::vector& eulerNames, - const complex::IFilter::MessageHandler& mMessageHandler, std::set selectedArrayNames, const std::array& dcDims, - const std::vector& floatArrayNames, const std::vector& intArrayNames) +nx::core::Result<> LoadEbsdData(const nx::core::ReadH5EbsdInputValues* mInputValues, nx::core::DataStructure& dataStructure, const std::vector& eulerNames, + const nx::core::IFilter::MessageHandler& mMessageHandler, std::set selectedArrayNames, const std::array& dcDims, + const std::vector& floatArrayNames, const std::vector& intArrayNames) { int32_t err = 0; std::shared_ptr ebsdReader = std::dynamic_pointer_cast(H5EbsdReaderType::New()); if(nullptr == ebsdReader) { - return {complex::MakeErrorResult(-50006, fmt::format("Error instantiating H5EbsdVolumeReader"))}; + return {nx::core::MakeErrorResult(-50006, fmt::format("Error instantiating H5EbsdVolumeReader"))}; } ebsdReader->setFileName(mInputValues->inputFilePath); - complex::Result<> result = LoadInfo(mInputValues, dataStructure, ebsdReader); + nx::core::Result<> result = LoadInfo(mInputValues, dataStructure, ebsdReader); if(result.invalid()) { return result; @@ -189,7 +189,7 @@ complex::Result<> LoadEbsdData(const complex::ReadH5EbsdInputValues* mInputValue } // Initialize all the arrays with some default values - mMessageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, fmt::format("Reading EBSD Data from file {}", mInputValues->inputFilePath)}); + mMessageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, fmt::format("Reading EBSD Data from file {}", mInputValues->inputFilePath)}); uint32_t mRefFrameZDir = ebsdReader->getStackingOrder(); ebsdReader->setSliceStart(mInputValues->startSlice); @@ -199,27 +199,27 @@ complex::Result<> LoadEbsdData(const complex::ReadH5EbsdInputValues* mInputValue err = ebsdReader->loadData(dcDims[0], dcDims[1], dcDims[2], mRefFrameZDir); if(err < 0) { - return {complex::MakeErrorResult(-50003, fmt::format("Error loading data from H5Ebsd file '{}'", mInputValues->inputFilePath))}; + return {nx::core::MakeErrorResult(-50003, fmt::format("Error loading data from H5Ebsd file '{}'", mInputValues->inputFilePath))}; } - complex::DataPath geometryPath = mInputValues->dataContainerPath; - complex::DataPath cellAttributeMatrixPath = mInputValues->cellAttributeMatrixPath; + nx::core::DataPath geometryPath = mInputValues->dataContainerPath; + nx::core::DataPath cellAttributeMatrixPath = mInputValues->cellAttributeMatrixPath; size_t totalPoints = dcDims[0] * dcDims[1] * dcDims[2]; // Get the Crystal Structure data which should have already been read from the file and copied to the array - complex::DataPath cellEnsembleMatrixPath = mInputValues->cellEnsembleMatrixPath; - complex::DataPath xtalDataPath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::CrystalStructures); - complex::UInt32Array& xtalData = dataStructure.getDataRefAs(xtalDataPath); + nx::core::DataPath cellEnsembleMatrixPath = mInputValues->cellEnsembleMatrixPath; + nx::core::DataPath xtalDataPath = cellEnsembleMatrixPath.createChildPath(EbsdLib::EnsembleData::CrystalStructures); + nx::core::UInt32Array& xtalData = dataStructure.getDataRefAs(xtalDataPath); // Copy the Phase Values from the EBSDReader to the DataStructure - auto* phasePtr = reinterpret_cast(ebsdReader->getPointerByName(eulerNames[3])); // get the phase data from the EbsdReader - complex::DataPath phaseDataPath = cellAttributeMatrixPath.createChildPath(EbsdLib::H5Ebsd::Phases); // get the phase data from the DataStructure - complex::Int32Array* phaseDataArrayPtr = nullptr; + auto* phasePtr = reinterpret_cast(ebsdReader->getPointerByName(eulerNames[3])); // get the phase data from the EbsdReader + nx::core::DataPath phaseDataPath = cellAttributeMatrixPath.createChildPath(EbsdLib::H5Ebsd::Phases); // get the phase data from the DataStructure + nx::core::Int32Array* phaseDataArrayPtr = nullptr; if(selectedArrayNames.find(eulerNames[3]) != selectedArrayNames.end()) { - phaseDataArrayPtr = dataStructure.getDataAs(phaseDataPath); + phaseDataArrayPtr = dataStructure.getDataAs(phaseDataPath); for(size_t tupleIndex = 0; tupleIndex < totalPoints; tupleIndex++) { (*phaseDataArrayPtr)[tupleIndex] = phasePtr[tupleIndex]; @@ -233,13 +233,13 @@ complex::Result<> LoadEbsdData(const complex::ReadH5EbsdInputValues* mInputValue auto* euler1 = reinterpret_cast(ebsdReader->getPointerByName(eulerNames[1])); auto* euler2 = reinterpret_cast(ebsdReader->getPointerByName(eulerNames[2])); // std::vector cDims = {3}; - complex::DataPath eulerDataPath = cellAttributeMatrixPath.createChildPath(EbsdLib::CellData::EulerAngles); // get the Euler data from the DataStructure - auto& eulerData = dataStructure.getDataRefAs(eulerDataPath); + nx::core::DataPath eulerDataPath = cellAttributeMatrixPath.createChildPath(EbsdLib::CellData::EulerAngles); // get the Euler data from the DataStructure + auto& eulerData = dataStructure.getDataRefAs(eulerDataPath); float degToRad = 1.0f; if(mInputValues->eulerRepresentation != EbsdLib::AngleRepresentation::Radians && mInputValues->useRecommendedTransform) { - degToRad = complex::numbers::pi_v / 180.0F; + degToRad = nx::core::numbers::pi_v / 180.0F; } for(size_t elementIndex = 0; elementIndex < totalPoints; elementIndex++) { @@ -269,7 +269,7 @@ complex::Result<> LoadEbsdData(const complex::ReadH5EbsdInputValues* mInputValue } // namespace -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- ReadH5Ebsd::ReadH5Ebsd(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5EbsdInputValues* inputValues) @@ -364,7 +364,7 @@ Result<> ReadH5Ebsd::operator()() args.insertOrAssign(RotateEulerRefFrameFilter::k_RotationAxisAngle_Key, std::make_any(std::vector{eulerTransAxis[0], eulerTransAxis[1], eulerTransAxis[2], eulerTransAngle})); - complex::DataPath eulerDataPath = m_InputValues->cellAttributeMatrixPath.createChildPath(EbsdLib::CellData::EulerAngles); // get the Euler data from the DataStructure + nx::core::DataPath eulerDataPath = m_InputValues->cellAttributeMatrixPath.createChildPath(EbsdLib::CellData::EulerAngles); // get the Euler data from the DataStructure args.insertOrAssign(RotateEulerRefFrameFilter::k_EulerAnglesArrayPath_Key, std::make_any(eulerDataPath)); // Preflight the filter and check result auto preflightResult = rotEuler.preflight(m_DataStructure, args); @@ -386,14 +386,14 @@ Result<> ReadH5Ebsd::operator()() if(sampleTransAngle > 0) { - const Uuid k_ComplexCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); + const Uuid k_SimplnxCorePluginId = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); auto* filterList = Application::Instance()->getFilterList(); /************************************************************************* * Rotate Sample Ref Frame ************************************************************************/ const Uuid k_RotateSampleRefFrameFilterId = *Uuid::FromString("d2451dc1-a5a1-4ac2-a64d-7991669dcffc"); - const FilterHandle k_RotateSampleRefFrameFilterHandle(k_RotateSampleRefFrameFilterId, k_ComplexCorePluginId); + const FilterHandle k_RotateSampleRefFrameFilterHandle(k_RotateSampleRefFrameFilterId, k_SimplnxCorePluginId); auto filter = filterList->createFilter(k_RotateSampleRefFrameFilterHandle); if(nullptr == filter) @@ -411,8 +411,8 @@ Result<> ReadH5Ebsd::operator()() args.insertOrAssign(RotateSampleRefFrame::k_RotateSliceBySlice_Key, std::make_any(true)); // Preflight the filter and check result - m_MessageHandler(complex::IFilter::Message{IFilter::Message::Type::Info, fmt::format("Preflighting {}...", filter->humanName())}); - complex::IFilter::PreflightResult preflightResult = filter->preflight(m_DataStructure, args); + m_MessageHandler(nx::core::IFilter::Message{IFilter::Message::Type::Info, fmt::format("Preflighting {}...", filter->humanName())}); + nx::core::IFilter::PreflightResult preflightResult = filter->preflight(m_DataStructure, args); if(preflightResult.outputActions.invalid()) { for(const auto& error : preflightResult.outputActions.errors()) @@ -423,7 +423,7 @@ Result<> ReadH5Ebsd::operator()() } // Execute the filter and check the result - m_MessageHandler(complex::IFilter::Message{IFilter::Message::Type::Info, fmt::format("Executing {}", filter->humanName())}); + m_MessageHandler(nx::core::IFilter::Message{IFilter::Message::Type::Info, fmt::format("Executing {}", filter->humanName())}); auto executeResult = filter->execute(m_DataStructure, args, nullptr, m_MessageHandler, m_ShouldCancel); if(executeResult.result.invalid()) { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp index 872dae6062..26043680e6 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp @@ -3,9 +3,9 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" #include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" #include #include @@ -24,7 +24,7 @@ inline const std::string MaterialName("MaterialName"); } // namespace EnsembleData } // namespace EbsdLib -namespace complex +namespace nx::core { /** @@ -66,4 +66,4 @@ class ReadH5Ebsd const ReadH5EbsdInputValues* m_InputValues = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp index a5c95d3eef..4243a3fcae 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp @@ -1,10 +1,10 @@ #include "ReadH5EspritData.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- ReadH5EspritData::ReadH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp index 0c0d7b99f7..3a15701875 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp @@ -3,10 +3,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" #include "OrientationAnalysis/utilities/ReadH5Data.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataInputValues @@ -39,4 +39,4 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritData : public ReadH5Data Result<> copyRawEbsdData(int index) override; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.cpp index 6d4b16adb1..c47d239b6b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.cpp @@ -1,10 +1,10 @@ #include "RodriguesConvertor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.hpp index d362f79dab..5e76fa1a5f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.hpp @@ -2,14 +2,14 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" - -namespace complex +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" + +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT RodriguesConvertorInputValues @@ -47,4 +47,4 @@ class ORIENTATIONANALYSIS_EXPORT RodriguesConvertor const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.cpp index dd611131eb..d8f488efc7 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.cpp @@ -1,14 +1,14 @@ #include "RotateEulerRefFrame.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -33,7 +33,7 @@ class RotateEulerRefFrameImpl void convert(size_t start, size_t end) const { float rotMat[3][3] = {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}; - OrientationTransformation::ax2om(OrientationF(m_AxisAngle[0], m_AxisAngle[1], m_AxisAngle[2], m_Angle * complex::numbers::pi / 180.0F)).toGMatrix(rotMat); + OrientationTransformation::ax2om(OrientationF(m_AxisAngle[0], m_AxisAngle[1], m_AxisAngle[2], m_Angle * nx::core::numbers::pi / 180.0F)).toGMatrix(rotMat); float ea1 = 0, ea2 = 0, ea3 = 0; float g[3][3] = {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}; @@ -45,8 +45,8 @@ class RotateEulerRefFrameImpl ea3 = m_CellEulerAngles[3 * i + 2]; OrientationTransformation::eu2om(OrientationF(ea1, ea2, ea3)).toGMatrix(g); - complex::MatrixMath::Multiply3x3with3x3(g, rotMat, gNew); - complex::MatrixMath::Normalize3x3(gNew); + nx::core::MatrixMath::Multiply3x3with3x3(g, rotMat, gNew); + nx::core::MatrixMath::Normalize3x3(gNew); OrientationF eu = OrientationTransformation::om2eu(OrientationF(gNew)); m_CellEulerAngles[3 * i] = eu[0]; @@ -83,7 +83,7 @@ RotateEulerRefFrame::~RotateEulerRefFrame() noexcept = default; // ----------------------------------------------------------------------------- Result<> RotateEulerRefFrame::operator()() { - complex::Float32Array& eulerAngles = m_DataStructure.getDataRefAs(m_InputValues->eulerAngleDataPath); + nx::core::Float32Array& eulerAngles = m_DataStructure.getDataRefAs(m_InputValues->eulerAngleDataPath); size_t m_TotalElements = eulerAngles.getNumberOfTuples(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.hpp index d298037bea..708f1df652 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** @@ -40,4 +40,4 @@ class ORIENTATIONANALYSIS_EXPORT RotateEulerRefFrame const RotateEulerRefFrameInputValues* m_InputValues = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp index 4fc3cd97bb..f53b6b03f0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp @@ -7,18 +7,18 @@ #include "EbsdLib/Core/OrientationTransformation.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -73,7 +73,7 @@ Result<> WriteGBCDGMTFile::operator()() // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(m_InputValues->OutputFile.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(m_InputValues->OutputFile.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp index ec8deb838f..d2ce6a795b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFileInputValues @@ -48,4 +48,4 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFile const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp index ee2da35030..08af004d08 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp @@ -1,9 +1,9 @@ #include "WriteGBCDTriangleData.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- WriteGBCDTriangleData::WriteGBCDTriangleData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp index 9d42e57798..260547d2fc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleDataInputValues @@ -48,4 +48,4 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleData const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp index 84d3fc3def..a5e704118a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp @@ -1,18 +1,18 @@ #include "WriteINLFile.hpp" -#include "complex/ComplexVersion.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/SIMPLNXVersion.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/IO/TSL/AngConstants.h" #include -using namespace complex; +using namespace nx::core; namespace { @@ -75,7 +75,7 @@ Result<> WriteINLFile::operator()() { // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(m_InputValues->OutputFile.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(m_InputValues->OutputFile.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; @@ -105,7 +105,7 @@ Result<> WriteINLFile::operator()() FloatVec3 origin = imageGeom.getOrigin(); // Write the header, Each line starts with a "#" symbol - fout << "# File written from " << complex::Version::PackageComplete() << "\n"; + fout << "# File written from " << nx::core::Version::PackageComplete() << "\n"; fout << "# X_STEP: " << std::fixed << res[0] << "\n"; fout << "# Y_STEP: " << std::fixed << res[1] << "\n"; fout << "# Z_STEP: " << std::fixed << res[2] << "\n"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp index eed3079f9c..5602d219fe 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT WriteINLFileInputValues @@ -51,4 +51,4 @@ class ORIENTATIONANALYSIS_EXPORT WriteINLFile const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp index f6570c2322..b86321b36f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp @@ -6,13 +6,13 @@ #include "OrientationAnalysis/utilities/LatoRegular.hpp" #include "OrientationAnalysis/utilities/TiffWriter.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/Common/RgbColor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/Common/RgbColor.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include "EbsdLib/LaueOps/CubicLowOps.h" @@ -31,7 +31,7 @@ #define CANVAS_ITY_IMPLEMENTATION #include -using namespace complex; +using namespace nx::core; namespace { @@ -225,9 +225,9 @@ void drawScalarBar(canvas_ity::canvas& context, const PoleFigureConfiguration_t& int numColors = config.numColors; // Get all the colors that we will need - std::vector colorTable(numColors); + std::vector colorTable(numColors); std::vector colors(3 * numColors, 0.0); - complex::RgbColor::GetColorTable(numColors, colors); // Generate the color table values + nx::core::RgbColor::GetColorTable(numColors, colors); // Generate the color table values float r = 0.0; float g = 0.0; float b = 0.0; @@ -274,7 +274,7 @@ void drawScalarBar(canvas_ity::canvas& context, const PoleFigureConfiguration_t& // Draw the color bar for(int i = 0; i < numColors; i++) { - const complex::Rgb c = colorTable[numColors - i - 1]; + const nx::core::Rgb c = colorTable[numColors - i - 1]; std::tie(r, g, b) = RgbColor::fRgb(c); const float32 x = position.first + margins; @@ -336,11 +336,11 @@ Result<> WritePoleFigure::operator()() const std::vector orientationOps = LaueOps::GetAllOrientationOps(); - const complex::Float32Array& eulers = m_DataStructure.getDataRefAs(m_InputValues->CellEulerAnglesArrayPath); - complex::Int32Array& phases = m_DataStructure.getDataRefAs(m_InputValues->CellPhasesArrayPath); + const nx::core::Float32Array& eulers = m_DataStructure.getDataRefAs(m_InputValues->CellEulerAnglesArrayPath); + nx::core::Int32Array& phases = m_DataStructure.getDataRefAs(m_InputValues->CellPhasesArrayPath); - complex::UInt32Array& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->CrystalStructuresArrayPath); - complex::StringArray& materialNames = m_DataStructure.getDataRefAs(m_InputValues->MaterialNameArrayPath); + nx::core::UInt32Array& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->CrystalStructuresArrayPath); + nx::core::StringArray& materialNames = m_DataStructure.getDataRefAs(m_InputValues->MaterialNameArrayPath); std::unique_ptr maskCompare = nullptr; if(m_InputValues->UseMask) @@ -351,7 +351,7 @@ Result<> WritePoleFigure::operator()() } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // some other context that is NOT going through the normal complex::IFilter API of Preflight and Execute + // some other context that is NOT going through the normal nx::core::IFilter API of Preflight and Execute return MakeErrorResult(-53900, fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->MaskArrayPath.toString())); } } @@ -371,7 +371,7 @@ Result<> WritePoleFigure::operator()() for(size_t phase = 1; phase < numPhases; ++phase) { auto imageArrayPath = cellAttrMatPath.createChildPath(fmt::format("{}Phase_{}", m_InputValues->ImagePrefix, phase)); - auto arrayCreationResult = complex::CreateArray(m_DataStructure, tupleShape, {4ULL}, imageArrayPath, IDataAction::Mode::Execute); + auto arrayCreationResult = nx::core::CreateArray(m_DataStructure, tupleShape, {4ULL}, imageArrayPath, IDataAction::Mode::Execute); if(arrayCreationResult.invalid()) { return arrayCreationResult; @@ -514,7 +514,7 @@ Result<> WritePoleFigure::operator()() globalImageOrigins[2] = std::make_pair(0.0f, margins + fontPtSize + subCanvasHeight * 2.0f); globalImageOrigins[3] = std::make_pair(0.0f, margins + fontPtSize + subCanvasHeight * 3.0f); } - else if(static_cast(m_InputValues->ImageLayout) == complex::WritePoleFigure::LayoutType::Square) + else if(static_cast(m_InputValues->ImageLayout) == nx::core::WritePoleFigure::LayoutType::Square) { pageWidth = subCanvasWidth * 2.0f; pageHeight = pageHeight + subCanvasHeight * 2.0f; @@ -559,7 +559,7 @@ Result<> WritePoleFigure::operator()() context.set_line_width(3.0f); context.set_color(canvas_ity::stroke_style, 0.0f, 0.0f, 0.0f, 1.0f); context.arc(figureOrigin[0] + margins + m_InputValues->ImageSize / 2.0f, figureOrigin[1] + fontPtSize * 2 + margins * 2 + m_InputValues->ImageSize / 2.0f, m_InputValues->ImageSize / 2.0f, 0, - complex::Constants::k_2Pi); + nx::core::Constants::k_2Pi); context.stroke(); context.close_path(); @@ -602,8 +602,8 @@ Result<> WritePoleFigure::operator()() // Draw the figure subtitle. This is usually the direction or plane family std::string figureSubtitle = figures[i]->getName(); - figureSubtitle = complex::StringUtilities::replace(figureSubtitle, "<", "("); - figureSubtitle = complex::StringUtilities::replace(figureSubtitle, ">", ")"); + figureSubtitle = nx::core::StringUtilities::replace(figureSubtitle, "<", "("); + figureSubtitle = nx::core::StringUtilities::replace(figureSubtitle, ">", ")"); std::string bottomPart; std::array textOrigin = {figureOrigin[0] + margins, figureOrigin[1] + fontPtSize + 2 * margins}; for(size_t idx = 0; idx < figureSubtitle.size(); idx++) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.hpp index bb634c46d3..da97272c4e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.hpp @@ -2,16 +2,16 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" - -namespace complex +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" + +namespace nx::core { namespace write_pole_figure { @@ -98,4 +98,4 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigure std::vector m_LatoBold; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.cpp index 7bb83e8ccf..b4d57d196a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.cpp @@ -1,12 +1,12 @@ #include "WriteStatsGenOdfAngleFile.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" class QFile; -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.hpp index 917d8a0e71..f007c4a258 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -namespace complex +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFileInputValues @@ -54,4 +54,4 @@ class ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFile const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp index 781c3bce9f..10039f3d92 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp @@ -1,38 +1,38 @@ #include "AlignSectionsMisorientationFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/AlignSectionsMisorientation.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { // Error Code constants -constexpr complex::int32 k_InputRepresentationTypeError = -68001; -constexpr complex::int32 k_OutputRepresentationTypeError = -68002; -constexpr complex::int32 k_InputComponentDimensionError = -68003; -constexpr complex::int32 k_InputComponentCountError = -68004; -constexpr complex::int32 k_InconsistentTupleCount = -68063; -constexpr complex::int32 k_OutputFilePathEmpty = -68063; +constexpr nx::core::int32 k_InputRepresentationTypeError = -68001; +constexpr nx::core::int32 k_OutputRepresentationTypeError = -68002; +constexpr nx::core::int32 k_InputComponentDimensionError = -68003; +constexpr nx::core::int32 k_InputComponentCountError = -68004; +constexpr nx::core::int32 k_InconsistentTupleCount = -68063; +constexpr nx::core::int32 k_OutputFilePathEmpty = -68063; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string AlignSectionsMisorientationFilter::name() const @@ -128,7 +128,7 @@ IFilter::PreflightResult AlignSectionsMisorientationFilter::preflightImpl(const PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -173,7 +173,7 @@ IFilter::PreflightResult AlignSectionsMisorientationFilter::preflightImpl(const // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pQuatsArrayPath.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pQuatsArrayPath.getParent(), {}); // Return both the resultOutputActions and the preflightUpdatedValues via std::move() return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -235,4 +235,4 @@ Result AlignSectionsMisorientationFilter::FromSIMPLJson(const nlohman return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp index f13e7ffeb5..1e15181209 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class AlignSectionsMisorientationFilter @@ -38,7 +38,7 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMisorientationFilter : public IFil static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMisorientationFilter : public IFil */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AlignSectionsMisorientationFilter, "8df2135c-7079-49f4-9756-4f3c028a5ced"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AlignSectionsMisorientationFilter, "8df2135c-7079-49f4-9756-4f3c028a5ced"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp index 86c0f7f1a2..1a4f787fc5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp @@ -2,24 +2,24 @@ #include "OrientationAnalysis/Filters/Algorithms/AlignSectionsMutualInformation.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string AlignSectionsMutualInformationFilter::name() const @@ -112,7 +112,7 @@ IFilter::PreflightResult AlignSectionsMutualInformationFilter::preflightImpl(con auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const ImageGeom& imageGeom = dataStructure.getDataRefAs(imageGeometryPath); @@ -136,7 +136,7 @@ IFilter::PreflightResult AlignSectionsMutualInformationFilter::preflightImpl(con // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pQuatsArrayPathValue.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pQuatsArrayPathValue.getParent(), {}); return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; } @@ -197,4 +197,4 @@ Result AlignSectionsMutualInformationFilter::FromSIMPLJson(const nloh return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp index bbdbedafc3..a9a632f310 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class AlignSectionsMutualInformationFilter @@ -36,7 +36,7 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMutualInformationFilter : public I static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,7 +106,7 @@ class ORIENTATIONANALYSIS_EXPORT AlignSectionsMutualInformationFilter : public I */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AlignSectionsMutualInformationFilter, "3cf33ad9-8322-4d40-96de-14bbe40969cc"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AlignSectionsMutualInformationFilter, "3cf33ad9-8322-4d40-96de-14bbe40969cc"); /* LEGACY UUID FOR THIS FILTER 61c5519b-5561-58b8-a522-2ce1324e244d */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp index f93c06c08b..e56da090e8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp @@ -1,18 +1,18 @@ #include "BadDataNeighborOrientationCheckFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/BadDataNeighborOrientationCheck.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -23,7 +23,7 @@ inline constexpr int32 k_InvalidNumTuples = -6803; inline constexpr int32 k_InconsistentTupleCount = -6809; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string BadDataNeighborOrientationCheckFilter::name() const @@ -101,7 +101,7 @@ IFilter::PreflightResult BadDataNeighborOrientationCheckFilter::preflightImpl(co auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -248,4 +248,4 @@ Result BadDataNeighborOrientationCheckFilter::FromSIMPLJson(const nlo return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp index 9a3b31c367..d6c2090dfe 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class BadDataNeighborOrientationCheckFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT BadDataNeighborOrientationCheckFilter : public static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ORIENTATIONANALYSIS_EXPORT BadDataNeighborOrientationCheckFilter : public */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, BadDataNeighborOrientationCheckFilter, "3f342977-aea1-49e1-a9c2-f73760eba0d3"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, BadDataNeighborOrientationCheckFilter, "3f342977-aea1-49e1-a9c2-f73760eba0d3"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp index 2b672b8e00..d6340702f1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp @@ -2,23 +2,23 @@ #include "OrientationAnalysis/Filters/Algorithms/CAxisSegmentFeatures.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CAxisSegmentFeaturesFilter::name() const @@ -208,4 +208,4 @@ Result CAxisSegmentFeaturesFilter::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp index d2f3674eeb..149ef994dd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CAxisSegmentFeaturesFilter @@ -37,7 +37,7 @@ class ORIENTATIONANALYSIS_EXPORT CAxisSegmentFeaturesFilter : public IFilter static inline constexpr StringLiteral k_ActiveArrayName_Key = "active_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,7 +107,7 @@ class ORIENTATIONANALYSIS_EXPORT CAxisSegmentFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CAxisSegmentFeaturesFilter, "9fe07e17-aef1-4bf1-834c-d3a73dafc27d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CAxisSegmentFeaturesFilter, "9fe07e17-aef1-4bf1-834c-d3a73dafc27d"); /* LEGACY UUID FOR THIS FILTER bff6be19-1219-5876-8838-1574ad29d965 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp index 77ad2d9535..3504d80b38 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/Filters/Algorithms/ConvertHexGridToSquareGrid.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include "EbsdLib/IO/HKL/CtfConstants.h" #include "EbsdLib/IO/TSL/AngConstants.h" @@ -16,7 +16,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -31,7 +31,7 @@ std::atomic_int32_t s_InstanceId = 0; std::map s_HeaderCache; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ ConvertHexGridToSquareGridFilter::ConvertHexGridToSquareGridFilter() @@ -117,7 +117,7 @@ IFilter::PreflightResult ConvertHexGridToSquareGridFilter::preflightImpl(const D auto pInputFileListInfoValue = filterArgs.value(k_GeneratedFileList_Key); auto pInputSingleFile = filterArgs.value(k_InputPath_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; FileSystemPathParameter::ValueType inputPath = pInputSingleFile; @@ -163,7 +163,7 @@ IFilter::PreflightResult ConvertHexGridToSquareGridFilter::preflightImpl(const D } if(err == -600) { - complex::Warning warning; + nx::core::Warning warning; warning.code = reader.getErrorCode(); warning.message = reader.getErrorMessage(); resultOutputActions.m_Warnings.emplace_back(std::move(warning)); @@ -203,4 +203,4 @@ Result<> ConvertHexGridToSquareGridFilter::executeImpl(DataStructure& dataStruct return ConvertHexGridToSquareGrid(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp index b00fb401f8..d57e198654 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ConvertHexGridToSquareGridFilter @@ -98,7 +98,7 @@ class ORIENTATIONANALYSIS_EXPORT ConvertHexGridToSquareGridFilter : public IFilt private: int32 m_InstanceId; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ConvertHexGridToSquareGridFilter, "960b0e35-de9f-496a-9423-0f55133b39c7"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ConvertHexGridToSquareGridFilter, "960b0e35-de9f-496a-9423-0f55133b39c7"); /* LEGACY UUID FOR THIS FILTER e1343abe-e5ad-5eb1-a89d-c209e620e4de */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.cpp index c3c2fab32d..0486f40323 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.cpp @@ -1,12 +1,12 @@ #include "ConvertOrientations.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include "EbsdLib/Core/Orientation.hpp" #include "EbsdLib/Core/OrientationTransformation.hpp" @@ -14,7 +14,7 @@ #include "EbsdLib/LaueOps/LaueOps.h" #include "EbsdLib/OrientationMath/OrientationConverter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include @@ -22,16 +22,16 @@ #pragma clang diagnostic push #pragma ide diagnostic ignored "UnusedValue" #endif -using namespace complex; +using namespace nx::core; namespace { // Error Code constants -constexpr complex::int32 k_InputRepresentationTypeError = -67001; -constexpr complex::int32 k_OutputRepresentationTypeError = -67002; -constexpr complex::int32 k_InputComponentDimensionError = -67003; -constexpr complex::int32 k_InputComponentCountError = -67004; +constexpr nx::core::int32 k_InputRepresentationTypeError = -67001; +constexpr nx::core::int32 k_OutputRepresentationTypeError = -67002; +constexpr nx::core::int32 k_InputComponentDimensionError = -67003; +constexpr nx::core::int32 k_InputComponentCountError = -67004; template struct EulerCheck @@ -298,7 +298,7 @@ class FromQuaternion } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ConvertOrientations::name() const @@ -446,358 +446,358 @@ Result<> ConvertOrientations::executeImpl(DataStructure& dataStructure, const Ar // This next block of code was generated from the ConvertOrientationsTest::_make_code() function. if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to OrientationMatrix"}); ConversionFunctionType eu2om = OrientationTransformation::eu2om; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, eu2om, euCheck)); } else if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to Quaternion"}); ToQuaternionFunctionType eu2qu = OrientationTransformation::eu2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, eu2qu, euCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to AxisAngle"}); ConversionFunctionType eu2ax = OrientationTransformation::eu2ax; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, eu2ax, euCheck)); } else if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to Rodrigues"}); ConversionFunctionType eu2ro = OrientationTransformation::eu2ro; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, eu2ro, euCheck)); } else if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to Homochoric"}); ConversionFunctionType eu2ho = OrientationTransformation::eu2ho; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, eu2ho, euCheck)); } else if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to Cubochoric"}); ConversionFunctionType eu2cu = OrientationTransformation::eu2cu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, eu2cu, euCheck)); } else if(inputType == OrientationRepresentation::Type::Euler && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Euler to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Euler to Stereographic"}); ConversionFunctionType eu2st = OrientationTransformation::eu2st; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, eu2st, euCheck)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to Euler"}); ConversionFunctionType om2eu = OrientationTransformation::om2eu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, om2eu, omCheck)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to Quaternion"}); ToQuaternionFunctionType om2qu = OrientationTransformation::om2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, om2qu, omCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to AxisAngle"}); ConversionFunctionType om2ax = OrientationTransformation::om2ax; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, om2ax, omCheck)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to Rodrigues"}); ConversionFunctionType om2ro = OrientationTransformation::om2ro; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, om2ro, omCheck)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to Homochoric"}); ConversionFunctionType om2ho = OrientationTransformation::om2ho; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, om2ho, omCheck)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to Cubochoric"}); ConversionFunctionType om2cu = OrientationTransformation::om2cu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, om2cu, omCheck)); } else if(inputType == OrientationRepresentation::Type::OrientationMatrix && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting OrientationMatrix to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting OrientationMatrix to Stereographic"}); ConversionFunctionType om2st = OrientationTransformation::om2st; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, om2st, omCheck)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to Euler"}); FromQuaternionFunctionType qu2eu = OrientationTransformation::qu2eu; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2eu, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to OrientationMatrix"}); FromQuaternionFunctionType qu2om = OrientationTransformation::qu2om; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2om, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to AxisAngle"}); FromQuaternionFunctionType qu2ax = OrientationTransformation::qu2ax; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2ax, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to Rodrigues"}); FromQuaternionFunctionType qu2ro = OrientationTransformation::qu2ro; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2ro, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to Homochoric"}); FromQuaternionFunctionType qu2ho = OrientationTransformation::qu2ho; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2ho, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to Cubochoric"}); FromQuaternionFunctionType qu2cu = OrientationTransformation::qu2cu; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2cu, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Quaternion && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Quaternion to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Quaternion to Stereographic"}); FromQuaternionFunctionType qu2st = OrientationTransformation::qu2st; parallelAlgorithm.execute( ::FromQuaternion(inputDataArray, outputDataArray, qu2st, quCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to Euler"}); ConversionFunctionType ax2eu = OrientationTransformation::ax2eu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ax2eu, axCheck)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to OrientationMatrix"}); ConversionFunctionType ax2om = OrientationTransformation::ax2om; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ax2om, axCheck)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to Quaternion"}); ToQuaternionFunctionType ax2qu = OrientationTransformation::ax2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, ax2qu, axCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to Rodrigues"}); ConversionFunctionType ax2ro = OrientationTransformation::ax2ro; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ax2ro, axCheck)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to Homochoric"}); ConversionFunctionType ax2ho = OrientationTransformation::ax2ho; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ax2ho, axCheck)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to Cubochoric"}); ConversionFunctionType ax2cu = OrientationTransformation::ax2cu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ax2cu, axCheck)); } else if(inputType == OrientationRepresentation::Type::AxisAngle && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting AxisAngle to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting AxisAngle to Stereographic"}); ConversionFunctionType ax2st = OrientationTransformation::ax2st; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ax2st, axCheck)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to Euler"}); ConversionFunctionType ro2eu = OrientationTransformation::ro2eu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ro2eu, roCheck)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to OrientationMatrix"}); ConversionFunctionType ro2om = OrientationTransformation::ro2om; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ro2om, roCheck)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to Quaternion"}); ToQuaternionFunctionType ro2qu = OrientationTransformation::ro2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, ro2qu, roCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to AxisAngle"}); ConversionFunctionType ro2ax = OrientationTransformation::ro2ax; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ro2ax, roCheck)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to Homochoric"}); ConversionFunctionType ro2ho = OrientationTransformation::ro2ho; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ro2ho, roCheck)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to Cubochoric"}); ConversionFunctionType ro2cu = OrientationTransformation::ro2cu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ro2cu, roCheck)); } else if(inputType == OrientationRepresentation::Type::Rodrigues && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Rodrigues to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Rodrigues to Stereographic"}); ConversionFunctionType ro2st = OrientationTransformation::ro2st; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ro2st, roCheck)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to Euler"}); ConversionFunctionType ho2eu = OrientationTransformation::ho2eu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ho2eu, hoCheck)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to OrientationMatrix"}); ConversionFunctionType ho2om = OrientationTransformation::ho2om; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ho2om, hoCheck)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to Quaternion"}); ToQuaternionFunctionType ho2qu = OrientationTransformation::ho2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, ho2qu, hoCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to AxisAngle"}); ConversionFunctionType ho2ax = OrientationTransformation::ho2ax; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ho2ax, hoCheck)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to Rodrigues"}); ConversionFunctionType ho2ro = OrientationTransformation::ho2ro; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ho2ro, hoCheck)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to Cubochoric"}); ConversionFunctionType ho2cu = OrientationTransformation::ho2cu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ho2cu, hoCheck)); } else if(inputType == OrientationRepresentation::Type::Homochoric && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Homochoric to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Homochoric to Stereographic"}); ConversionFunctionType ho2st = OrientationTransformation::ho2st; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, ho2st, hoCheck)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to Euler"}); ConversionFunctionType cu2eu = OrientationTransformation::cu2eu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, cu2eu, cuCheck)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to OrientationMatrix"}); ConversionFunctionType cu2om = OrientationTransformation::cu2om; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, cu2om, cuCheck)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to Quaternion"}); ToQuaternionFunctionType cu2qu = OrientationTransformation::cu2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, cu2qu, cuCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to AxisAngle"}); ConversionFunctionType cu2ax = OrientationTransformation::cu2ax; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, cu2ax, cuCheck)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to Rodrigues"}); ConversionFunctionType cu2ro = OrientationTransformation::cu2ro; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, cu2ro, cuCheck)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to Homochoric"}); ConversionFunctionType cu2ho = OrientationTransformation::cu2ho; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, cu2ho, cuCheck)); } else if(inputType == OrientationRepresentation::Type::Cubochoric && outputType == OrientationRepresentation::Type::Stereographic) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Cubochoric to Stereographic"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Cubochoric to Stereographic"}); ConversionFunctionType cu2st = OrientationTransformation::cu2st; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, cu2st, cuCheck)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::Euler) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to Euler"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to Euler"}); ConversionFunctionType st2eu = OrientationTransformation::st2eu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, st2eu, stCheck)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::OrientationMatrix) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to OrientationMatrix"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to OrientationMatrix"}); ConversionFunctionType st2om = OrientationTransformation::st2om; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, st2om, stCheck)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::Quaternion) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to Quaternion"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to Quaternion"}); ToQuaternionFunctionType st2qu = OrientationTransformation::st2qu; parallelAlgorithm.execute( ::ToQuaternion(inputDataArray, outputDataArray, st2qu, stCheck, QuaternionType::Order::VectorScalar)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::AxisAngle) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to AxisAngle"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to AxisAngle"}); ConversionFunctionType st2ax = OrientationTransformation::st2ax; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, st2ax, stCheck)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::Rodrigues) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to Rodrigues"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to Rodrigues"}); ConversionFunctionType st2ro = OrientationTransformation::st2ro; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, st2ro, stCheck)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::Homochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to Homochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to Homochoric"}); ConversionFunctionType st2ho = OrientationTransformation::st2ho; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, st2ho, stCheck)); } else if(inputType == OrientationRepresentation::Type::Stereographic && outputType == OrientationRepresentation::Type::Cubochoric) { - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, "Converting Stereographic to Cubochoric"}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, "Converting Stereographic to Cubochoric"}); ConversionFunctionType st2cu = OrientationTransformation::st2cu; parallelAlgorithm.execute(::ConvertOrientation(inputDataArray, outputDataArray, st2cu, stCheck)); } return {}; } -} // namespace complex +} // namespace nx::core #ifndef _MSC_VER #pragma clang diagnostic pop diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp index 70ef45f955..575c2d6f19 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientations.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** @@ -40,7 +40,7 @@ class ORIENTATIONANALYSIS_EXPORT ConvertOrientations : public IFilter static inline constexpr StringLiteral k_OutputOrientationArrayName_Key = "output_orientation_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -110,6 +110,6 @@ class ORIENTATIONANALYSIS_EXPORT ConvertOrientations : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ConvertOrientations, "501e54e6-a66f-4eeb-ae37-00e649c00d4b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ConvertOrientations, "501e54e6-a66f-4eeb-ae37-00e649c00d4b"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp index be11ff176e..14ffd154ba 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp @@ -2,19 +2,19 @@ #include "OrientationAnalysis/Filters/Algorithms/ConvertQuaternion.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -24,7 +24,7 @@ inline constexpr int32 k_IncorrectInputArray = -7000; inline constexpr int32 k_MissingInputArray = -7001; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ConvertQuaternionFilter::name() const @@ -88,7 +88,7 @@ IFilter::PreflightResult ConvertQuaternionFilter::preflightImpl(const DataStruct auto pQuaternionDataArrayPathValue = filterArgs.value(k_CellQuatsArrayPath_Key); auto pOutputDataArrayPathValue = pQuaternionDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Validate the Quats array @@ -154,4 +154,4 @@ Result ConvertQuaternionFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp index be349ae421..a1e8695f40 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ConvertQuaternionFilter @@ -30,7 +30,7 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternionFilter : public IFilter static inline constexpr StringLiteral k_ConversionType_Key = "conversion_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,7 +100,7 @@ class ORIENTATIONANALYSIS_EXPORT ConvertQuaternionFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ConvertQuaternionFilter, "d6b51fb2-279d-41cd-ad1a-c7a5a3f4b1cc"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ConvertQuaternionFilter, "d6b51fb2-279d-41cd-ad1a-c7a5a3f4b1cc"); /* LEGACY UUID FOR THIS FILTER 439e31b7-3198-5d0d-aef6-65a9e9c1a016 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp index 91b857b537..cebbc203b0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp @@ -1,21 +1,21 @@ #include "CreateEnsembleInfoFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/CreateEnsembleInfo.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/EnsembleInfoParameter.hpp" +#include "simplnx/Parameters/EnsembleInfoParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CreateEnsembleInfoFilter::name() const @@ -151,4 +151,4 @@ Result CreateEnsembleInfoFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp index 29d48cda60..4b0897ad90 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CreateEnsembleInfoFilter @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT CreateEnsembleInfoFilter : public IFilter static inline constexpr StringLiteral k_PhaseNamesArrayName_Key = "phase_names_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class ORIENTATIONANALYSIS_EXPORT CreateEnsembleInfoFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateEnsembleInfoFilter, "8ce3d70c-49fe-4812-a1eb-7ce4c962a59d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateEnsembleInfoFilter, "8ce3d70c-49fe-4812-a1eb-7ce4c962a59d"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp index 2c0653367d..7b7d332e57 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp @@ -1,21 +1,21 @@ #include "EBSDSegmentFeaturesFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/EBSDSegmentFeatures.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -25,7 +25,7 @@ inline constexpr int32 k_MissingInputArray = -601; inline constexpr int32 k_MissingOrIncorrectGoodVoxelsArray = -602; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string EBSDSegmentFeaturesFilter::name() const @@ -78,12 +78,12 @@ Parameters EBSDSegmentFeaturesFilter::parameters() const params.insert(std::make_unique(k_GridGeomPath_Key, "Grid Geometry", "DataPath to target Grid Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image, IGeometry::Type::RectGrid})); params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Required Input Cell Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", - DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{complex::DataType::uint32}, + DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); @@ -199,7 +199,7 @@ Result<> EBSDSegmentFeaturesFilter::executeImpl(DataStructure& dataStructure, co EBSDSegmentFeaturesInputValues inputValues; // Store the misorientation tolerance as radians - inputValues.misorientationTolerance = filterArgs.value(k_MisorientationTolerance_Key) * static_cast(complex::numbers::pi / 180.0f); + inputValues.misorientationTolerance = filterArgs.value(k_MisorientationTolerance_Key) * static_cast(nx::core::numbers::pi / 180.0f); inputValues.useGoodVoxels = filterArgs.value(k_UseMask_Key); inputValues.shouldRandomizeFeatureIds = filterArgs.value(k_RandomizeFeatures_Key); inputValues.gridGeomPath = filterArgs.value(k_GridGeomPath_Key); @@ -215,7 +215,7 @@ Result<> EBSDSegmentFeaturesFilter::executeImpl(DataStructure& dataStructure, co // Let the Algorithm instance do the work return EBSDSegmentFeatures(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp index 96a02a274a..f86285dbec 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class EBSDSegmentFeaturesFilter @@ -37,7 +37,7 @@ class ORIENTATIONANALYSIS_EXPORT EBSDSegmentFeaturesFilter : public IFilter static inline constexpr StringLiteral k_RandomizeFeatures_Key = "randomize_features"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class ORIENTATIONANALYSIS_EXPORT EBSDSegmentFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, EBSDSegmentFeaturesFilter, "1810c2c7-63e3-41db-b204-a5821e6271c0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, EBSDSegmentFeaturesFilter, "1810c2c7-63e3-41db-b204-a5821e6271c0"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp index 13b28ec64c..2fb524c912 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp @@ -2,20 +2,20 @@ #include "OrientationAnalysis/Filters/Algorithms/EbsdToH5Ebsd.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string EbsdToH5EbsdFilter::name() const @@ -86,7 +86,7 @@ IFilter::PreflightResult EbsdToH5EbsdFilter::preflightImpl(const DataStructure& PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -95,7 +95,7 @@ IFilter::PreflightResult EbsdToH5EbsdFilter::preflightImpl(const DataStructure& return {MakePreflightErrorResult(-60800, "Only .ang and .ctf files are supported")}; } - generatedFileListInfo.ordering = complex::FilePathGenerator::Ordering::LowToHigh; + generatedFileListInfo.ordering = nx::core::FilePathGenerator::Ordering::LowToHigh; std::vector fileList = generatedFileListInfo.generate(); if(fileList.empty()) { @@ -176,8 +176,8 @@ Result<> EbsdToH5EbsdFilter::executeImpl(DataStructure& dataStructure, const Arg // ALWAYS use LowToHigh (no matter what the user happened to click in the UI). We need // the list ordered from low to high to be correct. The Stacking Order is a piece of // meta-data that is stored in the HDF5 file and used when reading the .h5ebsd file - inputValues.InputFileListInfo.ordering = complex::FilePathGenerator::Ordering::LowToHigh; + inputValues.InputFileListInfo.ordering = nx::core::FilePathGenerator::Ordering::LowToHigh; return EbsdToH5Ebsd(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp index ac914f371c..faee55509c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class EbsdToH5EbsdFilter @@ -94,6 +94,6 @@ class ORIENTATIONANALYSIS_EXPORT EbsdToH5EbsdFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, EbsdToH5EbsdFilter, "2d05ca72-0a1b-4aec-b9b0-bc470845c448"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, EbsdToH5EbsdFilter, "2d05ca72-0a1b-4aec-b9b0-bc470845c448"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp index 93b81be94b..97b9469575 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp @@ -3,16 +3,16 @@ #include "OrientationAnalysis/Filters/Algorithms/FindAvgCAxes.hpp" #include "OrientationAnalysis/utilities/SIMPLConversion.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindAvgCAxesFilter::name() const @@ -151,4 +151,4 @@ Result FindAvgCAxesFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp index 936a7ad074..c28bb61790 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindAvgCAxesFilter @@ -32,7 +32,7 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgCAxesFilter : public IFilter static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgCAxesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindAvgCAxesFilter, "453cdb58-7bbb-4576-ad5e-f75a1c54d348"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindAvgCAxesFilter, "453cdb58-7bbb-4576-ad5e-f75a1c54d348"); /* LEGACY UUID FOR THIS FILTER c5a9a96c-7570-5279-b383-cc25ebae0046 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp index 3003b52866..ad3b9d189b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp @@ -1,17 +1,17 @@ #include "FindAvgOrientationsFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindAvgOrientations.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -24,7 +24,7 @@ inline constexpr int32 k_MissingInputArray = -7001; inline constexpr int32 k_MissingOrIncorrectGoodVoxelsArray = -7002; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindAvgOrientationsFilter::name() const @@ -72,7 +72,7 @@ Parameters FindAvgOrientationsFilter::parameters() const ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", - DataPath({"CellEnsembleData", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{complex::DataType::uint32}, + DataPath({"CellEnsembleData", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_CellFeatureAttributeMatrix_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", @@ -215,4 +215,4 @@ Result FindAvgOrientationsFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp index 2c1cd8b053..4d5c5f89ae 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindAvgOrientationsFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgOrientationsFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureAttributeMatrix_Key = "cell_feature_attribute_matrix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ORIENTATIONANALYSIS_EXPORT FindAvgOrientationsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindAvgOrientationsFilter, "086ddb9a-928f-46ab-bad6-b1498270d71e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindAvgOrientationsFilter, "086ddb9a-928f-46ab-bad6-b1498270d71e"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp index b4ae0456c3..7069cffc68 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp @@ -2,19 +2,19 @@ #include "OrientationAnalysis/Filters/Algorithms/FindBoundaryStrengths.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindBoundaryStrengthsFilter::name() const @@ -97,7 +97,7 @@ IFilter::PreflightResult FindBoundaryStrengthsFilter::preflightImpl(const DataSt auto pSurfaceMeshmPrimesArrayNameValue = filterArgs.value(k_SurfaceMeshmPrimesArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector faceLabelsTupShape = dataStructure.getDataAs(pSurfaceMeshFaceLabelsArrayPathValue)->getTupleShape(); @@ -190,4 +190,4 @@ Result FindBoundaryStrengthsFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.hpp index ba45261f5c..c8b04c6aec 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindBoundaryStrengthsFilter @@ -35,7 +35,7 @@ class ORIENTATIONANALYSIS_EXPORT FindBoundaryStrengthsFilter : public IFilter static inline constexpr StringLiteral k_SurfaceMeshmPrimesArrayName_Key = "surface_meshm_primes_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,7 +105,7 @@ class ORIENTATIONANALYSIS_EXPORT FindBoundaryStrengthsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindBoundaryStrengthsFilter, "f39707f9-0411-4736-a591-1bfbd099bb71"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindBoundaryStrengthsFilter, "f39707f9-0411-4736-a591-1bfbd099bb71"); /* LEGACY UUID FOR THIS FILTER 8071facb-8905-5699-b345-105ae4ac33ff */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp index cfff5716ed..2371f9acc6 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp @@ -2,18 +2,18 @@ #include "OrientationAnalysis/Filters/Algorithms/FindCAxisLocations.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindCAxisLocationsFilter::name() const @@ -138,4 +138,4 @@ Result FindCAxisLocationsFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.hpp index 28bbb52d9b..54d8275027 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindCAxisLocationsFilter @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT FindCAxisLocationsFilter : public IFilter static inline constexpr StringLiteral k_CAxisLocationsArrayName_Key = "c_axis_locations_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class ORIENTATIONANALYSIS_EXPORT FindCAxisLocationsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindCAxisLocationsFilter, "a51c257a-ddc1-499a-9b21-f2d25a19d098"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindCAxisLocationsFilter, "a51c257a-ddc1-499a-9b21-f2d25a19d098"); /* LEGACY UUID FOR THIS FILTER 68ae7b7e-b9f7-5799-9f82-ce21d0ccd55e */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp index 37efabd50e..57ff9e14de 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp @@ -2,20 +2,20 @@ #include "OrientationAnalysis/Filters/Algorithms/FindFeatureNeighborCAxisMisalignments.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NeighborListSelectionParameter.hpp" +#include "simplnx/Parameters/NeighborListSelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeatureNeighborCAxisMisalignmentsFilter::name() const @@ -96,7 +96,7 @@ IFilter::PreflightResult FindFeatureNeighborCAxisMisalignmentsFilter::preflightI auto pCAxisMisalignmentListArrayNameValue = filterArgs.value(k_CAxisMisalignmentListArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto tupleValidityCheck = dataStructure.validateNumberOfTuples({pNeighborListArrayPathValue, pAvgQuatsArrayPathValue, pFeaturePhasesArrayPathValue}); @@ -175,4 +175,4 @@ Result FindFeatureNeighborCAxisMisalignmentsFilter::FromSIMPLJson(con return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.hpp index 81801e096f..bdd67bbac4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeatureNeighborCAxisMisalignmentsFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureNeighborCAxisMisalignmentsFilter : p static inline constexpr StringLiteral k_AvgCAxisMisalignmentsArrayName_Key = "avg_c_axis_misalignments_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,7 +103,7 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureNeighborCAxisMisalignmentsFilter : p */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeatureNeighborCAxisMisalignmentsFilter, "636ee030-9f07-4f16-a4f3-592eff8ef1ee"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeatureNeighborCAxisMisalignmentsFilter, "636ee030-9f07-4f16-a4f3-592eff8ef1ee"); /* LEGACY UUID FOR THIS FILTER cdd50b83-ea09-5499-b008-4b253cf4c246 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp index dc020cf21f..acafc85af8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp @@ -2,16 +2,16 @@ #include "OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceCAxisMisorientations.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeatureReferenceCAxisMisorientationsFilter::name() const @@ -98,7 +98,7 @@ IFilter::PreflightResult FindFeatureReferenceCAxisMisorientationsFilter::preflig auto pFeatureReferenceCAxisMisorientationsArrayNameValue = filterArgs.value(k_FeatureReferenceCAxisMisorientationsArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto tupleValidityCheck = dataStructure.validateNumberOfTuples({pFeatureIdsArrayPathValue, pCellPhasesArrayPathValue, pQuatsArrayPathValue}); @@ -187,4 +187,4 @@ Result FindFeatureReferenceCAxisMisorientationsFilter::FromSIMPLJson( return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp index c3b43d9ba7..5a8e0b688d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeatureReferenceCAxisMisorientationsFilter @@ -35,7 +35,7 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceCAxisMisorientationsFilter static inline constexpr StringLiteral k_FeatureReferenceCAxisMisorientationsArrayName_Key = "feature_reference_c_axis_misorientations_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,7 +105,7 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceCAxisMisorientationsFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeatureReferenceCAxisMisorientationsFilter, "16c487d2-8f99-4fb5-a4df-d3f70a8e6b25"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeatureReferenceCAxisMisorientationsFilter, "16c487d2-8f99-4fb5-a4df-d3f70a8e6b25"); /* LEGACY UUID FOR THIS FILTER 1a0848da-2edd-52c0-b111-62a4dc6d2886 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp index aa3b8e62ac..7eb5c28e11 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp @@ -1,21 +1,21 @@ #include "FindFeatureReferenceMisorientationsFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindFeatureReferenceMisorientations.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeatureReferenceMisorientationsFilter::name() const @@ -123,7 +123,7 @@ IFilter::PreflightResult FindFeatureReferenceMisorientationsFilter::preflightImp PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -240,4 +240,4 @@ Result FindFeatureReferenceMisorientationsFilter::FromSIMPLJson(const return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp index 22df4789d2..cb0772e7ac 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeatureReferenceMisorientationsFilter @@ -36,7 +36,7 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceMisorientationsFilter : pub static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,6 +106,6 @@ class ORIENTATIONANALYSIS_EXPORT FindFeatureReferenceMisorientationsFilter : pub */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeatureReferenceMisorientationsFilter, "24b54daf-3bf5-4331-93f6-03a49f719bf1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeatureReferenceMisorientationsFilter, "24b54daf-3bf5-4331-93f6-03a49f719bf1"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp index ada43060e8..6c00505640 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp @@ -1,21 +1,21 @@ #include "FindGBCDFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindGBCD.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindGBCDFilter::name() const @@ -106,7 +106,7 @@ IFilter::PreflightResult FindGBCDFilter::preflightImpl(const DataStructure& data DataPath faceEnsembleAttributeMatrixPath = pTriangleGeometryPathValue.createChildPath(pFaceEnsembleAttributeMatrixNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(dataStructure.getDataAs(pFeatureEulerAnglesArrayPathValue) == nullptr) @@ -224,4 +224,4 @@ Result FindGBCDFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp index 6dc6684411..a1d863010b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindGBCDFilter @@ -36,7 +36,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDFilter : public IFilter static inline constexpr StringLiteral k_GBCDArrayName_Key = "gbcd_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,6 +106,6 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindGBCDFilter, "0cc592b7-a3d3-4c6a-8894-1533670a31b9"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindGBCDFilter, "0cc592b7-a3d3-4c6a-8894-1533670a31b9"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp index c249499a50..e6479e0eb3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp @@ -2,24 +2,24 @@ #include "OrientationAnalysis/Filters/Algorithms/FindGBCDMetricBased.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/StringUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindGBCDMetricBasedFilter::name() const @@ -136,7 +136,7 @@ IFilter::PreflightResult FindGBCDMetricBasedFilter::preflightImpl(const DataStru auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pMisorientationRotationValue[3] <= 0.0f || pMisorientationRotationValue[3] > 180.0f) @@ -263,4 +263,4 @@ Result FindGBCDMetricBasedFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp index 157a2bd783..f08bf3fee9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindGBCDMetricBasedFilter @@ -43,7 +43,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDMetricBasedFilter : public IFilter static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -113,7 +113,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBCDMetricBasedFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindGBCDMetricBasedFilter, "fc0d695a-e381-4f11-a8fd-26d5b5cda30a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindGBCDMetricBasedFilter, "fc0d695a-e381-4f11-a8fd-26d5b5cda30a"); /* LEGACY UUID FOR THIS FILTER d67e9f28-2fe5-5188-b0f8-323a7e603de6 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp index 376463f565..4a7e339874 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp @@ -2,21 +2,21 @@ #include "OrientationAnalysis/Filters/Algorithms/FindGBPDMetricBased.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindGBPDMetricBasedFilter::name() const @@ -119,7 +119,7 @@ IFilter::PreflightResult FindGBPDMetricBasedFilter::preflightImpl(const DataStru auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pNumSamplePtsValue < 1) @@ -232,4 +232,4 @@ Result FindGBPDMetricBasedFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp index e637e6d7e3..d21cbf2b4d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindGBPDMetricBasedFilter @@ -42,7 +42,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBPDMetricBasedFilter : public IFilter static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -112,7 +112,7 @@ class ORIENTATIONANALYSIS_EXPORT FindGBPDMetricBasedFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindGBPDMetricBasedFilter, "8267878b-d23a-4666-83a0-f1a7711861ce"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindGBPDMetricBasedFilter, "8267878b-d23a-4666-83a0-f1a7711861ce"); /* LEGACY UUID FOR THIS FILTER 00d20627-5b88-56ba-ac7a-fc2a4b337903 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp index 620cb0e279..810087cac4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp @@ -1,20 +1,20 @@ #include "FindKernelAvgMisorientationsFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindKernelAvgMisorientationsFilter::name() const @@ -96,7 +96,7 @@ IFilter::PreflightResult FindKernelAvgMisorientationsFilter::preflightImpl(const PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; const auto& cellPhases = dataStructure.getDataRefAs(pCellPhasesArrayPathValue); @@ -163,4 +163,4 @@ Result FindKernelAvgMisorientationsFilter::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp index a63cebf0ea..b247058d27 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindKernelAvgMisorientationsFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT FindKernelAvgMisorientationsFilter : public IFi static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ORIENTATIONANALYSIS_EXPORT FindKernelAvgMisorientationsFilter : public IFi */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindKernelAvgMisorientationsFilter, "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindKernelAvgMisorientationsFilter, "61cfc9c1-aa0e-452b-b9ef-d3b9e6268035"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp index 0740127eed..86e3b52f59 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp @@ -1,22 +1,22 @@ #include "FindMisorientationsFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindMisorientations.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NeighborListSelectionParameter.hpp" +#include "simplnx/Parameters/NeighborListSelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindMisorientationsFilter::name() const @@ -60,12 +60,12 @@ Parameters FindMisorientationsFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_NeighborListArrayPath_Key, "Feature Neighbor List", "List of the contiguous neighboring Features for a given Feature", - DataPath({"DataContainer", "FeatureData", "NeighborList"}), NeighborListSelectionParameter::AllowedTypes{complex::DataType::int32})); + DataPath({"DataContainer", "FeatureData", "NeighborList"}), NeighborListSelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Feature Average Quaternions", "Defines the average orientation of the Feature in quaternion representation", - DataPath({"DataContainer", "FeatureData", "AvgQuats"}), ArraySelectionParameter::AllowedTypes{complex::DataType::float32}, + DataPath({"DataContainer", "FeatureData", "AvgQuats"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Feature Phases", "Specifies to which Ensemble each Feature belongs", - DataPath({"DataContainer", "FeatureData", "Phases"}), ArraySelectionParameter::AllowedTypes{complex::DataType::int32}, + DataPath({"DataContainer", "FeatureData", "Phases"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); @@ -136,16 +136,16 @@ IFilter::PreflightResult FindMisorientationsFilter::preflightImpl(const DataStru return {MakeErrorResult(-34501, fmt::format("The following DataArrays all must have equal number of tuples but this was not satisfied.\n{}", tupleValidityCheck.error()))}; } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; if(pFindAvgMisorsValue) { - auto createArrayAction = std::make_unique(complex::DataType::float32, avgQuats->getIDataStore()->getTupleShape(), std::vector{1}, pAvgMisorientationsArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, avgQuats->getIDataStore()->getTupleShape(), std::vector{1}, pAvgMisorientationsArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } // Create the NeighborList array - auto createArrayAction = std::make_unique(complex::DataType::float32, avgQuats->getNumberOfTuples(), pMisorientationListArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, avgQuats->getNumberOfTuples(), pMisorientationListArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); std::vector preflightUpdatedValues; @@ -207,4 +207,4 @@ Result FindMisorientationsFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.hpp index 8a7dce89d1..6520335f66 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindMisorientationsFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT FindMisorientationsFilter : public IFilter static inline constexpr StringLiteral k_AvgMisorientationsArrayName_Key = "avg_misorientations_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ORIENTATIONANALYSIS_EXPORT FindMisorientationsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindMisorientationsFilter, "0b68fe25-b5ef-4805-ae32-20acb8d4e823"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindMisorientationsFilter, "0b68fe25-b5ef-4805-ae32-20acb8d4e823"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp index e3b6c95493..c69a1db792 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp @@ -1,20 +1,20 @@ #include "FindSchmidsFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindSchmids.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindSchmidsFilter::name() const @@ -67,13 +67,13 @@ Parameters FindSchmidsFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Feature Data"}); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath({"CellFeatureData", "Phases"}), - ArraySelectionParameter::AllowedTypes{complex::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Specifies the average orienation of each Feature in quaternion representation", - DataPath({"CellFeatureData", "AvgQuats"}), ArraySelectionParameter::AllowedTypes{complex::DataType::float32}, + DataPath({"CellFeatureData", "AvgQuats"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insertSeparator(Parameters::Separator{"Required Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", - DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{complex::DataType::uint32}, + DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Feature Data"}); @@ -122,7 +122,7 @@ IFilter::PreflightResult FindSchmidsFilter::preflightImpl(const DataStructure& d PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; DataPath featureDataGroup = pFeaturePhasesArrayPathValue.getParent(); @@ -246,4 +246,4 @@ Result FindSchmidsFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.hpp index 3b5528b458..4585a42fe5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindSchmidsFilter @@ -39,7 +39,7 @@ class ORIENTATIONANALYSIS_EXPORT FindSchmidsFilter : public IFilter static inline constexpr StringLiteral k_LambdasArrayName_Key = "lambdas_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -109,6 +109,6 @@ class ORIENTATIONANALYSIS_EXPORT FindSchmidsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindSchmidsFilter, "b4681855-0a3d-4237-97f2-5aec509115c4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindSchmidsFilter, "b4681855-0a3d-4237-97f2-5aec509115c4"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp index c023e5b255..bf2d76b030 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp @@ -2,19 +2,19 @@ #include "OrientationAnalysis/Filters/Algorithms/FindShapes.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindShapesFilter::name() const @@ -102,7 +102,7 @@ IFilter::PreflightResult FindShapesFilter::preflightImpl(const DataStructure& da PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -211,4 +211,4 @@ Result FindShapesFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp index 48c40f4369..4f793d53c1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindShapesFilter @@ -35,7 +35,7 @@ class ORIENTATIONANALYSIS_EXPORT FindShapesFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,6 +105,6 @@ class ORIENTATIONANALYSIS_EXPORT FindShapesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindShapesFilter, "036b17d5-23bb-4a24-9187-c4a8dd918792"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindShapesFilter, "036b17d5-23bb-4a24-9187-c4a8dd918792"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp index 38fd26e7a6..4434c2e1c4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp @@ -2,19 +2,19 @@ #include "OrientationAnalysis/Filters/Algorithms/FindSlipTransmissionMetrics.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NeighborListSelectionParameter.hpp" +#include "simplnx/Parameters/NeighborListSelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindSlipTransmissionMetricsFilter::name() const @@ -94,7 +94,7 @@ IFilter::PreflightResult FindSlipTransmissionMetricsFilter::preflightImpl(const auto pmPrimeListNameValue = filterArgs.value(k_mPrimeListArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; usize tupShape = dataStructure.getDataAs(pNeighborListPathValue)->getNumberOfTuples(); @@ -176,4 +176,4 @@ Result FindSlipTransmissionMetricsFilter::FromSIMPLJson(const nlohman return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.hpp index a17e76670f..fb6544ac08 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindSlipTransmissionMetricsFilter @@ -34,7 +34,7 @@ class ORIENTATIONANALYSIS_EXPORT FindSlipTransmissionMetricsFilter : public IFil static inline constexpr StringLiteral k_mPrimeListArrayName_Key = "m_prime_list_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,7 +104,7 @@ class ORIENTATIONANALYSIS_EXPORT FindSlipTransmissionMetricsFilter : public IFil */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindSlipTransmissionMetricsFilter, "7569d075-d05a-4e07-8660-5cca3e78ee49"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindSlipTransmissionMetricsFilter, "7569d075-d05a-4e07-8660-5cca3e78ee49"); /* LEGACY UUID FOR THIS FILTER 97523038-5fb2-5e82-9177-ed3e8b24b4bd */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp index dc95224900..abfc88488a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp @@ -1,17 +1,17 @@ #include "FindTriangleGeomShapesFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/FindTriangleGeomShapes.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindTriangleGeomShapesFilter::name() const @@ -52,7 +52,7 @@ Parameters FindTriangleGeomShapesFilter::parameters() const GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Required Face Data"}); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixName_Key, "Face Feature Attribute Matrix", @@ -95,7 +95,7 @@ IFilter::PreflightResult FindTriangleGeomShapesFilter::preflightImpl(const DataS PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Ensure the Face Feature Attribute Matrix is really an AttributeMatrix const auto* featureAttrMatrix = dataStructure.getDataAs(pFeatureAttributeMatrixPath); @@ -109,7 +109,7 @@ IFilter::PreflightResult FindTriangleGeomShapesFilter::preflightImpl(const DataS { auto createdArrayName = filterArgs.value(k_Omega3sArrayName_Key); DataPath createdArrayPath = pFeatureAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::float32, featureAttrMatrix->getShape(), std::vector{1}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, featureAttrMatrix->getShape(), std::vector{1}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -117,21 +117,21 @@ IFilter::PreflightResult FindTriangleGeomShapesFilter::preflightImpl(const DataS { auto createdArrayName = filterArgs.value(k_AxisLengthsArrayName_Key); DataPath createdArrayPath = pFeatureAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::float32, featureAttrMatrix->getShape(), std::vector{3}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, featureAttrMatrix->getShape(), std::vector{3}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } // Create the Axis Euler Angles Output Array { auto createdArrayName = filterArgs.value(k_AxisEulerAnglesArrayName_Key); DataPath createdArrayPath = pFeatureAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::float32, featureAttrMatrix->getShape(), std::vector{3}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, featureAttrMatrix->getShape(), std::vector{3}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } // Create the Aspect Ratios Output Array { auto createdArrayName = filterArgs.value(k_AspectRatiosArrayName_Key); DataPath createdArrayPath = pFeatureAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::float32, featureAttrMatrix->getShape(), std::vector{2}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, featureAttrMatrix->getShape(), std::vector{2}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -165,4 +165,4 @@ Result<> FindTriangleGeomShapesFilter::executeImpl(DataStructure& dataStructure, return FindTriangleGeomShapes(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp index d68790661d..9db6ae5334 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindTriangleGeomShapesFilter @@ -98,6 +98,6 @@ class ORIENTATIONANALYSIS_EXPORT FindTriangleGeomShapesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindTriangleGeomShapesFilter, "e8f0fed3-d0d8-456e-b5a1-7961cc17b739"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindTriangleGeomShapesFilter, "e8f0fed3-d0d8-456e-b5a1-7961cc17b739"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp index 237bf5547f..9d9f8a74aa 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp @@ -1,20 +1,20 @@ #include "GenerateFZQuaternions.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include "EbsdLib/LaueOps/LaueOps.h" -using namespace complex; +using namespace nx::core; namespace { @@ -110,7 +110,7 @@ class GenerateFZQuatsImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateFZQuaternions::name() const @@ -223,7 +223,7 @@ IFilter::PreflightResult GenerateFZQuaternions::preflightImpl(const DataStructur { return {MakeErrorResult(-49004, fmt::format("Mask Array number of components is not 1: '{}'", maskArray.getNumberOfComponents()))}; } - if(maskArray.getDataType() != complex::DataType::boolean && maskArray.getDataType() != complex::DataType::uint8 && maskArray.getDataType() != complex::DataType::int8) + if(maskArray.getDataType() != nx::core::DataType::boolean && maskArray.getDataType() != nx::core::DataType::uint8 && maskArray.getDataType() != nx::core::DataType::int8) { return {MakeErrorResult(-49005, fmt::format("Mask Array is not [BOOL (10) | UINT8 (2) | INT8 (1)]: '{}'", fmt::underlying(maskArray.getDataType())))}; } @@ -235,12 +235,12 @@ IFilter::PreflightResult GenerateFZQuaternions::preflightImpl(const DataStructur } } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto createArrayAction = - std::make_unique(complex::DataType::float32, quatArray.getDataStore()->getTupleShape(), quatArray.getDataStore()->getComponentShape(), pFZQuatsArrayPathValue); + std::make_unique(nx::core::DataType::float32, quatArray.getDataStore()->getTupleShape(), quatArray.getDataStore()->getComponentShape(), pFZQuatsArrayPathValue); resultOutputActions.value().appendAction(std::move(createArrayAction)); // Return both the resultOutputActions and the preflightUpdatedValues via std::move() @@ -348,4 +348,4 @@ Result GenerateFZQuaternions::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp index 5310d7a499..04e6fbc9d8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateFZQuaternions @@ -32,7 +32,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFZQuaternions : public IFilter static inline constexpr StringLiteral k_FZQuatsArrayPath_Key = "f_zquats_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,6 +102,6 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFZQuaternions : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateFZQuaternions, "8b651407-08a9-4c25-967a-d86444eca87f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateFZQuaternions, "8b651407-08a9-4c25-967a-d86444eca87f"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp index 85e7a7036a..ec170b59c1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp @@ -2,18 +2,18 @@ #include "OrientationAnalysis/Filters/Algorithms/GenerateFaceIPFColoring.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateFaceIPFColoringFilter::name() const @@ -89,7 +89,7 @@ IFilter::PreflightResult GenerateFaceIPFColoringFilter::preflightImpl(const Data auto pSurfaceMeshFaceIPFColorsArrayNameValue = filterArgs.value(k_SurfaceMeshFaceIPFColorsArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // make sure all the face data has same number of tuples (i.e. they should all be coming from the same Triangle Geometry) @@ -172,4 +172,4 @@ Result GenerateFaceIPFColoringFilter::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.hpp index 8f1acfd2b7..bfd258a0d5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateFaceIPFColoringFilter @@ -32,7 +32,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFaceIPFColoringFilter : public IFilter static inline constexpr StringLiteral k_SurfaceMeshFaceIPFColorsArrayName_Key = "surface_mesh_face_ipf_colors_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFaceIPFColoringFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateFaceIPFColoringFilter, "30759600-7c02-4650-b5ca-e7036d6b568e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateFaceIPFColoringFilter, "30759600-7c02-4650-b5ca-e7036d6b568e"); /* LEGACY UUID FOR THIS FILTER 0a121e03-3922-5c29-962d-40d88653f4b6 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.cpp index 817c1e42eb..a739e12d6b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.cpp @@ -2,18 +2,18 @@ #include "OrientationAnalysis/Filters/Algorithms/GenerateFaceMisorientationColoring.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateFaceMisorientationColoringFilter::name() const @@ -86,7 +86,7 @@ IFilter::PreflightResult GenerateFaceMisorientationColoringFilter::preflightImpl auto pSurfaceMeshFaceMisorientationColorsArrayNameValue = filterArgs.value(k_SurfaceMeshFaceMisorientationColorsArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // make sure all the cell data has same number of tuples (i.e. they should all be coming from the same Image Geometry) @@ -156,4 +156,4 @@ Result GenerateFaceMisorientationColoringFilter::FromSIMPLJson(const return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.hpp index 33d5d94032..1638a4f795 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateFaceMisorientationColoringFilter @@ -32,7 +32,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFaceMisorientationColoringFilter : publ static inline constexpr StringLiteral k_SurfaceMeshFaceMisorientationColorsArrayName_Key = "surface_mesh_face_misorientation_colors_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateFaceMisorientationColoringFilter : publ */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateFaceMisorientationColoringFilter, "f3473af9-db77-43db-bd25-60df7230ea73"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateFaceMisorientationColoringFilter, "f3473af9-db77-43db-bd25-60df7230ea73"); /* LEGACY UUID FOR THIS FILTER 7cd30864-7bcf-5c10-aea7-d107373e2d40 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp index dfd8539363..555ebe1a2f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp @@ -1,24 +1,24 @@ #include "GenerateGBCDPoleFigureFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/GenerateGBCDPoleFigure.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateGBCDPoleFigureFilter::name() const @@ -96,7 +96,7 @@ IFilter::PreflightResult GenerateGBCDPoleFigureFilter::preflightImpl(const DataS auto pCellIntensityArrayName = filterArgs.value(k_CellIntensityArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(dataStructure.getDataAs(pCrystalStructuresArrayPathValue) == nullptr) @@ -185,4 +185,4 @@ Result GenerateGBCDPoleFigureFilter::FromSIMPLJson(const nlohmann::js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp index 7de1b36bf3..1ef215d812 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateGBCDPoleFigureFilter @@ -34,7 +34,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateGBCDPoleFigureFilter : public IFilter static inline constexpr StringLiteral k_CellIntensityArrayName_Key = "cell_intensity_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,6 +104,6 @@ class ORIENTATIONANALYSIS_EXPORT GenerateGBCDPoleFigureFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateGBCDPoleFigureFilter, "eed5183e-5a9c-485b-9e64-579a81f0d301"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateGBCDPoleFigureFilter, "eed5183e-5a9c-485b-9e64-579a81f0d301"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp index 5a8b213f79..d89dc5a3fa 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp @@ -2,18 +2,18 @@ #include "OrientationAnalysis/Filters/Algorithms/GenerateIPFColors.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -26,7 +26,7 @@ inline constexpr int32 k_MissingInputArray = -71442; inline constexpr int32 k_MissingOrIncorrectGoodVoxelsArray = -71443; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateIPFColorsFilter::name() const @@ -141,7 +141,7 @@ IFilter::PreflightResult GenerateIPFColorsFilter::preflightImpl(const DataStruct { goodVoxelsPath = filterArgs.value(k_MaskArrayPath_Key); - const complex::IDataArray* goodVoxelsArray = dataStructure.getDataAs(goodVoxelsPath); + const nx::core::IDataArray* goodVoxelsArray = dataStructure.getDataAs(goodVoxelsPath); if(nullptr == goodVoxelsArray) { return {nonstd::make_unexpected(std::vector{Error{k_MissingOrIncorrectGoodVoxelsArray, fmt::format("Mask array is not located at path: '{}'", goodVoxelsPath.toString())}})}; @@ -224,4 +224,4 @@ Result GenerateIPFColorsFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.hpp index 166aa7a518..5a56c9e6e1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateIPFColorsFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateIPFColorsFilter : public IFilter static inline constexpr StringLiteral k_CellIPFColorsArrayName_Key = "cell_ipf_colors_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ORIENTATIONANALYSIS_EXPORT GenerateIPFColorsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateIPFColorsFilter, "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateIPFColorsFilter, "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp index 37ff890845..426c14f664 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp @@ -2,18 +2,18 @@ #include "OrientationAnalysis/Filters/Algorithms/GenerateQuaternionConjugate.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -21,7 +21,7 @@ inline constexpr int32 k_IncorrectInputArray = -7100; inline constexpr int32 k_MissingInputArray = -7101; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateQuaternionConjugateFilter::name() const @@ -83,7 +83,7 @@ IFilter::PreflightResult GenerateQuaternionConjugateFilter::preflightImpl(const auto pQuaternionDataArrayPathValue = filterArgs.value(k_CellQuatsArrayPath_Key); auto pOutputDataArrayPathValue = pQuaternionDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Validate the Quats array @@ -146,4 +146,4 @@ Result GenerateQuaternionConjugateFilter::FromSIMPLJson(const nlohman return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp index e6e8329320..9d8d02a756 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateQuaternionConjugateFilter @@ -29,7 +29,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateQuaternionConjugateFilter : public IFil static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,7 +99,7 @@ class ORIENTATIONANALYSIS_EXPORT GenerateQuaternionConjugateFilter : public IFil */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateQuaternionConjugateFilter, "e1653c62-3894-4b95-8449-605400038110"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateQuaternionConjugateFilter, "e1653c62-3894-4b95-8449-605400038110"); /* LEGACY UUID FOR THIS FILTER 630d7486-75ea-5e04-874c-894460cd7c4d */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp index 683a30beb8..b6f5d71d6a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp @@ -2,25 +2,25 @@ #include "OrientationAnalysis/Filters/Algorithms/MergeTwins.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NeighborListSelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NeighborListSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string MergeTwinsFilter::name() const @@ -137,7 +137,7 @@ IFilter::PreflightResult MergeTwinsFilter::preflightImpl(const DataStructure& da auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector cDims(1, 1); @@ -296,4 +296,4 @@ Result MergeTwinsFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp index f5733cd523..a0dfcbdfd5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class MergeTwinsFilter @@ -42,7 +42,7 @@ class ORIENTATIONANALYSIS_EXPORT MergeTwinsFilter : public IFilter static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -112,6 +112,6 @@ class ORIENTATIONANALYSIS_EXPORT MergeTwinsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, MergeTwinsFilter, "f173786a-50cd-4c3c-9518-48ef6fc2bac9"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, MergeTwinsFilter, "f173786a-50cd-4c3c-9518-48ef6fc2bac9"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp index fd04d0137b..8b27648a31 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp @@ -1,18 +1,18 @@ #include "NeighborOrientationCorrelationFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/NeighborOrientationCorrelation.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -22,7 +22,7 @@ inline constexpr int32 k_IncorrectInputArray = -580092; inline constexpr int32 k_InvalidNumTuples = -580093; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string NeighborOrientationCorrelationFilter::name() const @@ -104,7 +104,7 @@ IFilter::PreflightResult NeighborOrientationCorrelationFilter::preflightImpl(con auto pIgnoredDataArrayPathsValue = filterArgs.value(k_IgnoredDataArrayPaths_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto* imageGeomPtr = dataStructure.getDataAs(pImageGeomPathValue); @@ -225,7 +225,7 @@ IFilter::PreflightResult NeighborOrientationCorrelationFilter::preflightImpl(con // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pConfidenceIndexArrayPathValue.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pConfidenceIndexArrayPathValue.getParent(), {}); return {}; } @@ -285,4 +285,4 @@ Result NeighborOrientationCorrelationFilter::FromSIMPLJson(const nloh return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp index 135ebc2acc..dd22b823b9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class NeighborOrientationCorrelationFilter @@ -35,7 +35,7 @@ class ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelationFilter : public I static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,6 +105,6 @@ class ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelationFilter : public I */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, NeighborOrientationCorrelationFilter, "4625c192-7e46-4333-a294-67a2eb64cb37"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, NeighborOrientationCorrelationFilter, "4625c192-7e46-4333-a294-67a2eb64cb37"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp index 06c08d808b..c500a69689 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp @@ -2,27 +2,27 @@ #include "OrientationAnalysis/Filters/Algorithms/ReadAngData.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" #include "EbsdLib/IO/TSL/AngFields.h" #include "EbsdLib/IO/TSL/AngPhase.h" #include "EbsdLib/IO/TSL/AngReader.h" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadAngDataFilter::name() const @@ -125,7 +125,7 @@ IFilter::PreflightResult ReadAngDataFilter::preflightImpl(const DataStructure& d origin, spacing, pCellAttributeMatrixNameValue, IGeometry::LengthUnit::Micrometer); // Assign the createImageGeometryAction to the Result::actions vector via a push_back - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; resultOutputActions.value().appendAction(std::move(createImageGeometryAction)); DataPath cellAttributeMatrixPath = pImageGeometryPath.createChildPath(pCellAttributeMatrixNameValue); @@ -139,13 +139,13 @@ IFilter::PreflightResult ReadAngDataFilter::preflightImpl(const DataStructure& d if(reader.getPointerType(name) == EbsdLib::NumericTypes::Type::Int32) { DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(name); - auto action = std::make_unique(complex::DataType::int32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::int32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } else if(reader.getPointerType(name) == EbsdLib::NumericTypes::Type::Float) { DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(name); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } } @@ -154,7 +154,7 @@ IFilter::PreflightResult ReadAngDataFilter::preflightImpl(const DataStructure& d { cDims[0] = 1; DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(EbsdLib::AngFile::Phases); - auto action = std::make_unique(complex::DataType::int32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::int32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -162,7 +162,7 @@ IFilter::PreflightResult ReadAngDataFilter::preflightImpl(const DataStructure& d { cDims[0] = 3; DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(EbsdLib::AngFile::EulerAngles); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -179,14 +179,14 @@ IFilter::PreflightResult ReadAngDataFilter::preflightImpl(const DataStructure& d { cDims[0] = 1; DataPath dataArrayPath = ensembleAttributeMatrixPath.createChildPath(EbsdLib::AngFile::CrystalStructures); - auto action = std::make_unique(complex::DataType::uint32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::uint32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } // Create the Lattice Constants Array { cDims[0] = 6; DataPath dataArrayPath = ensembleAttributeMatrixPath.createChildPath(EbsdLib::AngFile::LatticeConstants); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } // Create the Material Names Array @@ -247,4 +247,4 @@ Result ReadAngDataFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp index ad727ce728..40d8915b2b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.hpp @@ -2,12 +2,12 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { // forward declare the private implementation class ReadAngDataPrivate; @@ -36,7 +36,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadAngDataFilter : public IFilter static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -109,6 +109,6 @@ class ORIENTATIONANALYSIS_EXPORT ReadAngDataFilter : public IFilter private: std::shared_ptr m_AngDataPrivate; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadAngDataFilter, "5b062816-79ac-47ce-93cb-e7966896bcbd"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadAngDataFilter, "5b062816-79ac-47ce-93cb-e7966896bcbd"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp index 7704b6ed41..81b911b950 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp @@ -2,30 +2,30 @@ #include "OrientationAnalysis/Filters/Algorithms/ReadCtfData.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" #include "EbsdLib/IO/HKL/CtfFields.h" #include "EbsdLib/IO/HKL/CtfPhase.h" #include "EbsdLib/IO/HKL/CtfReader.h" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadCtfDataFilter::name() const @@ -129,7 +129,7 @@ IFilter::PreflightResult ReadCtfDataFilter::preflightImpl(const DataStructure& d origin, spacing, pCellAttributeMatrixNameValue, IGeometry::LengthUnit::Micrometer); // Assign the createImageGeometryAction to the Result::actions vector via a push_back - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; resultOutputActions.value().appendAction(std::move(createImageGeometryAction)); DataPath cellAttributeMatrixPath = pImageGeometryPath.createChildPath(pCellAttributeMatrixNameValue); @@ -143,13 +143,13 @@ IFilter::PreflightResult ReadCtfDataFilter::preflightImpl(const DataStructure& d if(reader.getPointerType(name) == EbsdLib::NumericTypes::Type::Int32) { DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(name); - auto action = std::make_unique(complex::DataType::int32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::int32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } else if(reader.getPointerType(name) == EbsdLib::NumericTypes::Type::Float) { DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(name); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } } @@ -158,7 +158,7 @@ IFilter::PreflightResult ReadCtfDataFilter::preflightImpl(const DataStructure& d { cDims[0] = 1; DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(EbsdLib::CtfFile::Phases); - auto action = std::make_unique(complex::DataType::int32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::int32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -166,7 +166,7 @@ IFilter::PreflightResult ReadCtfDataFilter::preflightImpl(const DataStructure& d { cDims[0] = 3; DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(EbsdLib::CtfFile::EulerAngles); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -183,14 +183,14 @@ IFilter::PreflightResult ReadCtfDataFilter::preflightImpl(const DataStructure& d { cDims[0] = 1; DataPath dataArrayPath = ensembleAttributeMatrixPath.createChildPath(EbsdLib::CtfFile::CrystalStructures); - auto action = std::make_unique(complex::DataType::uint32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::uint32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } // Create the Lattice Constants Array { cDims[0] = 6; DataPath dataArrayPath = ensembleAttributeMatrixPath.createChildPath(EbsdLib::CtfFile::LatticeConstants); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } // Create the Material Names Array @@ -252,4 +252,4 @@ Result ReadCtfDataFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp index 986e307b53..28dc804da6 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadCtfDataFilter @@ -33,7 +33,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadCtfDataFilter : public IFilter static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class ORIENTATIONANALYSIS_EXPORT ReadCtfDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadCtfDataFilter, "7751923c-afb9-4032-8372-8078325c69a4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadCtfDataFilter, "7751923c-afb9-4032-8372-8078325c69a4"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp index b83b06e5e7..d2a2ef70ca 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp @@ -3,21 +3,21 @@ #include "OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp" #include "OrientationAnalysis/utilities/inicpp.h" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadEnsembleInfoFilter::name() const @@ -93,7 +93,7 @@ IFilter::PreflightResult ReadEnsembleInfoFilter::preflightImpl(const DataStructu const DataPath phaseTypesPath = cellEnsembleAttributeMatrixPath.createChildPath(pPhaseTypesArrayNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; int32 numPhases = 0; @@ -174,4 +174,4 @@ Result ReadEnsembleInfoFilter::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp index f41403bbbb..b69c3e504e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadEnsembleInfoFilter @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoFilter : public IFilter static inline constexpr StringLiteral k_PhaseTypesArrayName_Key = "phase_types_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadEnsembleInfoFilter, "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadEnsembleInfoFilter, "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a"); /* LEGACY UUID FOR THIS FILTER 33a37a47-d002-5c18-b270-86025881fe1e */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index f252ca9727..6ed498defc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -3,25 +3,25 @@ #include "OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp" #include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" #include "EbsdLib/IO/HKL/CtfFields.h" #include "EbsdLib/IO/HKL/H5CtfVolumeReader.h" #include "EbsdLib/IO/TSL/AngFields.h" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include "EbsdLib/IO/TSL/H5AngVolumeReader.h" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadH5EbsdFilter::name() const @@ -93,7 +93,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -174,13 +174,13 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da if(reader->getPointerType(names[i]) == EbsdLib::NumericTypes::Type::Int32) { const DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(names[i]); - auto action = std::make_unique(complex::DataType::int32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::int32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } else if(reader->getPointerType(names[i]) == EbsdLib::NumericTypes::Type::Float) { const DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(names[i]); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } } @@ -190,7 +190,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da { cDims[0] = 3; const DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(EbsdLib::CellData::EulerAngles); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -199,7 +199,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da { cDims[0] = 1; const DataPath dataArrayPath = cellAttributeMatrixPath.createChildPath(EbsdLib::H5Ebsd::Phases); - auto action = std::make_unique(complex::DataType::int32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::int32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -208,7 +208,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da tupleDims = {2}; { const DataPath dataArrayPath = pCellEnsembleAttributeMatrixNameValue.createChildPath(EbsdLib::EnsembleData::CrystalStructures); - auto action = std::make_unique(complex::DataType::uint32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::uint32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -221,7 +221,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da cDims[0] = 6; { const DataPath dataArrayPath = pCellEnsembleAttributeMatrixNameValue.createChildPath(EbsdLib::EnsembleData::LatticeConstants); - auto action = std::make_unique(complex::DataType::float32, tupleDims, cDims, dataArrayPath); + auto action = std::make_unique(nx::core::DataType::float32, tupleDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -349,4 +349,4 @@ Result ReadH5EbsdFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp index b1c8c52bf8..1e3152dabe 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadH5EbsdFilter @@ -30,7 +30,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EbsdFilter : public IFilter static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EbsdFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadH5EbsdFilter, "db291b6c-9aaf-432d-9547-430c865a539c"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadH5EbsdFilter, "db291b6c-9aaf-432d-9547-430c865a539c"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp index 1909290878..9cc162b63b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp @@ -4,18 +4,18 @@ #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" #include "OrientationAnalysis/utilities/SIMPLConversion.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include "EbsdLib/IO/BrukerNano/EspritConstants.h" #include "EbsdLib/IO/BrukerNano/EspritPhase.h" @@ -26,9 +26,9 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadH5EspritDataFilter::name() const @@ -108,7 +108,7 @@ IFilter::PreflightResult ReadH5EspritDataFilter::preflightImpl(const DataStructu DataPath cellAMPath = pImageGeometryNameValue.createChildPath(pCellAttributeMatrixNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pZSpacingValue <= 0) @@ -260,4 +260,4 @@ Result ReadH5EspritDataFilter::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp index 281afab366..42f8171631 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadH5EspritDataFilter @@ -34,7 +34,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataFilter : public IFilter static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,7 +104,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadH5EspritDataFilter, "694a0d54-b492-41bc-993b-ce0f5006e927"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadH5EspritDataFilter, "694a0d54-b492-41bc-993b-ce0f5006e927"); /* LEGACY UUID FOR THIS FILTER 8abdea7d-f715-5a24-8165-7f946bbc2fe9 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index fa340038d9..a1be9cd31b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -4,18 +4,18 @@ #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" #include "OrientationAnalysis/utilities/SIMPLConversion.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include "EbsdLib/IO/TSL/AngFields.h" #include "EbsdLib/IO/TSL/H5OIMReader.h" @@ -23,9 +23,9 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadH5OimDataFilter::name() const @@ -104,7 +104,7 @@ IFilter::PreflightResult ReadH5OimDataFilter::preflightImpl(const DataStructure& DataPath cellAMPath = pImageGeometryNameValue.createChildPath(pCellAttributeMatrixNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pZSpacingValue <= 0) @@ -247,4 +247,4 @@ Result ReadH5OimDataFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp index 5b736c0532..c01b264c98 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadH5OimDataFilter @@ -34,7 +34,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OimDataFilter : public IFilter static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,7 +104,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5OimDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadH5OimDataFilter, "4ad3d47c-b1e1-4429-bc65-5e021be62ba0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadH5OimDataFilter, "4ad3d47c-b1e1-4429-bc65-5e021be62ba0"); /* LEGACY UUID FOR THIS FILTER 3ff4701b-3a0c-52e3-910a-fa927aa6584c */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp index b5b3018328..33bc3ed5ac 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp @@ -2,25 +2,25 @@ #include "OrientationAnalysis/Filters/Algorithms/RodriguesConvertor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { inline constexpr int32 k_IncorrectInputArray = -7300; inline constexpr int32 k_MissingInputArray = -7301; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string RodriguesConvertorFilter::name() const @@ -83,7 +83,7 @@ IFilter::PreflightResult RodriguesConvertorFilter::preflightImpl(const DataStruc auto pRodriguesDataArrayPathValue = filterArgs.value(k_RodriguesDataArrayPath_Key); auto pOutputDataArrayPathValue = pRodriguesDataArrayPathValue.getParent().createChildPath(filterArgs.value(k_OutputDataArrayPath_Key)); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Validate the Rodrigues array @@ -146,4 +146,4 @@ Result RodriguesConvertorFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp index 3d221c1730..0fa61d6335 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RodriguesConvertorFilter @@ -29,7 +29,7 @@ class ORIENTATIONANALYSIS_EXPORT RodriguesConvertorFilter : public IFilter static inline constexpr StringLiteral k_DeleteOriginalData_Key = "delete_original_data"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,7 +99,7 @@ class ORIENTATIONANALYSIS_EXPORT RodriguesConvertorFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RodriguesConvertorFilter, "3704a3c6-dd09-4b91-9eda-2fbb4cb9bf99"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RodriguesConvertorFilter, "3704a3c6-dd09-4b91-9eda-2fbb4cb9bf99"); /* LEGACY UUID FOR THIS FILTER a2b62395-1a7d-5058-a840-752d8f8e2430 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp index e32059e03d..712691c542 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp @@ -1,17 +1,17 @@ #include "RotateEulerRefFrameFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/RotateEulerRefFrame.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string RotateEulerRefFrameFilter::name() const @@ -73,7 +73,7 @@ IFilter::PreflightResult RotateEulerRefFrameFilter::preflightImpl(const DataStru auto pRotationAxisAngleValue = filterArgs.value(k_RotationAxisAngle_Key); auto pCellEulerAnglesArrayPathValue = filterArgs.value(k_EulerAnglesArrayPath_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -88,7 +88,7 @@ IFilter::PreflightResult RotateEulerRefFrameFilter::preflightImpl(const DataStru Result<> RotateEulerRefFrameFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - complex::RotateEulerRefFrameInputValues inputValues; + nx::core::RotateEulerRefFrameInputValues inputValues; inputValues.eulerAngleDataPath = filterArgs.value(k_EulerAnglesArrayPath_Key); inputValues.rotationAxis = filterArgs.value(k_RotationAxisAngle_Key); @@ -121,4 +121,4 @@ Result RotateEulerRefFrameFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp index 3b04b92e90..3ca97bd604 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RotateEulerRefFrameFilter @@ -28,7 +28,7 @@ class ORIENTATIONANALYSIS_EXPORT RotateEulerRefFrameFilter : public IFilter static inline constexpr StringLiteral k_EulerAnglesArrayPath_Key = "euler_angles_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class ORIENTATIONANALYSIS_EXPORT RotateEulerRefFrameFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RotateEulerRefFrameFilter, "0458edcd-3655-4465-adc8-b036d76138b5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RotateEulerRefFrameFilter, "0458edcd-3655-4465-adc8-b036d76138b5"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp index c3e545ff78..28a84653bd 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp @@ -1,24 +1,24 @@ #include "WriteGBCDGMTFileFilter.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include "OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteGBCDGMTFileFilter::name() const @@ -89,7 +89,7 @@ IFilter::PreflightResult WriteGBCDGMTFileFilter::preflightImpl(const DataStructu auto pCrystalStructuresArrayPathValue = filterArgs.value(k_CrystalStructuresArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Make sure the file name ends with _1 so the GMT scripts work correctly @@ -168,4 +168,4 @@ Result WriteGBCDGMTFileFilter::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp index 51ee834dfe..d254d6312e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteGBCDGMTFileFilter @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFileFilter : public IFilter static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFileFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteGBCDGMTFileFilter, "31710abf-b8a6-423f-a03f-4b8885bd3633"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteGBCDGMTFileFilter, "31710abf-b8a6-423f-a03f-4b8885bd3633"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp index 53633918a9..0cce8a55dc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp @@ -2,21 +2,21 @@ #include "OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteGBCDTriangleDataFilter::name() const @@ -92,7 +92,7 @@ IFilter::PreflightResult WriteGBCDTriangleDataFilter::preflightImpl(const DataSt auto pFeatureEulerAnglesArrayPathValue = filterArgs.value(k_FeatureEulerAnglesArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // make sure all the face data has same number of tuples (i.e. they should all be coming from the same Triangle Geometry) @@ -157,4 +157,4 @@ Result WriteGBCDTriangleDataFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp index 8bd983c40d..f4292ec5ba 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteGBCDTriangleDataFilter @@ -31,7 +31,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleDataFilter : public IFilter static inline constexpr StringLiteral k_FeatureEulerAnglesArrayPath_Key = "feature_euler_angles_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteGBCDTriangleDataFilter, "6e0da3a1-dc42-4b01-80aa-3af9e8209ee3"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteGBCDTriangleDataFilter, "6e0da3a1-dc42-4b01-80aa-3af9e8209ee3"); /* LEGACY UUID FOR THIS FILTER 433976f0-710a-5dcc-938e-fcde49cd842f */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp index 4b4dd11939..932eabfb52 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp @@ -2,22 +2,22 @@ #include "OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteINLFileFilter::name() const @@ -94,7 +94,7 @@ IFilter::PreflightResult WriteINLFileFilter::preflightImpl(const DataStructure& auto pMaterialNameArrayPathValue = filterArgs.value(k_MaterialNameArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; IArray::ArrayType arrayType = dataStructure.getDataAs(pMaterialNameArrayPathValue)->getArrayType(); @@ -163,4 +163,4 @@ Result WriteINLFileFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp index f42b2ba978..6684b64c43 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteINLFileFilter @@ -34,7 +34,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteINLFileFilter : public IFilter static inline constexpr StringLiteral k_ImageGeomPath_Key = "image_geom_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,7 +104,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteINLFileFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteINLFileFilter, "a5a37eb3-c143-4b38-a89b-e0641a20dc7e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteINLFileFilter, "a5a37eb3-c143-4b38-a89b-e0641a20dc7e"); /* LEGACY UUID FOR THIS FILTER 27c724cc-8b69-5ebe-b90e-29d33858a032 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp index dc8e281a44..cdb24ac7a0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp @@ -5,26 +5,26 @@ #include "OrientationAnalysis/utilities/LatoBold.hpp" #include "OrientationAnalysis/utilities/SIMPLConversion.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -46,7 +46,7 @@ float32 GetXCharWidth(int32 imageSize, float32 fontPtSize) } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WritePoleFigureFilter::name() const @@ -168,7 +168,7 @@ IFilter::PreflightResult WritePoleFigureFilter::preflightImpl(const DataStructur return {MakeErrorResult(-680000, fmt::format("MaterialNames DataArray should be of type 'StringArray'. Selected array was '{}'", pMaterialNameArrayPathValue.toString())), {}}; } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Roughly calculate the output dimensions of the ImageGeometry. This may change // in small amounts due to the XCharWidth not being calculated. @@ -192,7 +192,7 @@ IFilter::PreflightResult WritePoleFigureFilter::preflightImpl(const DataStructur pageWidth = subCanvasWidth; pageHeight = pageHeight + subCanvasHeight * 4.0f; } - else if(static_cast(pImageLayoutValue) == complex::WritePoleFigure::LayoutType::Square) + else if(static_cast(pImageLayoutValue) == nx::core::WritePoleFigure::LayoutType::Square) { pageWidth = subCanvasWidth * 2.0f; pageHeight = pageHeight + subCanvasHeight * 2.0f; @@ -296,4 +296,4 @@ Result WritePoleFigureFilter::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp index 0e61ff9815..bc7882bb98 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WritePoleFigureFilter @@ -44,7 +44,7 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigureFilter : public IFilter static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -114,7 +114,7 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigureFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WritePoleFigureFilter, "00cbb97e-a5c2-43e6-9a35-17a0f9ce26ed"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WritePoleFigureFilter, "00cbb97e-a5c2-43e6-9a35-17a0f9ce26ed"); /* LEGACY UUID FOR THIS FILTER a10bb78e-fcff-553d-97d6-830a43c85385 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp index 5670ddcb9f..c8e10cccd1 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp @@ -2,22 +2,22 @@ #include "OrientationAnalysis/Filters/Algorithms/WriteStatsGenOdfAngleFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteStatsGenOdfAngleFileFilter::name() const @@ -104,7 +104,7 @@ IFilter::PreflightResult WriteStatsGenOdfAngleFileFilter::preflightImpl(const Da auto pGoodVoxelsArrayPathValue = filterArgs.value(k_MaskArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pWeightValue < 1.0f) @@ -186,4 +186,4 @@ Result WriteStatsGenOdfAngleFileFilter::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp index dec7779ea1..e45a3a7932 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp @@ -2,10 +2,10 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteStatsGenOdfAngleFileFilter @@ -35,7 +35,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFileFilter : public IFilte static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -111,7 +111,7 @@ class ORIENTATIONANALYSIS_EXPORT WriteStatsGenOdfAngleFileFilter : public IFilte */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteStatsGenOdfAngleFileFilter, "aa6d399b-715e-44f1-9902-f1bd18faf1c5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteStatsGenOdfAngleFileFilter, "aa6d399b-715e-44f1-9902-f1bd18faf1c5"); /* LEGACY UUID FOR THIS FILTER a4952f40-22dd-54ec-8c38-69c3fcd0e6f7 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X1.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X1.hpp index 4d2750c17d..d05e7dd4d9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X1.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X1.hpp @@ -5,7 +5,7 @@ #include #include -namespace complex +namespace nx::core { /** * @brief 3x1 Matrix as a row. @@ -283,4 +283,4 @@ class Matrix3X1 private: std::array m_Data = {0.0, 0.0, 0.0}; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X3.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X3.hpp index 6d62c5e68f..499b8d3d1a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X3.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Math/Matrix3X3.hpp @@ -7,7 +7,7 @@ #include #include -namespace complex +namespace nx::core { /** * @brief 3X3 Matrix that is row major, i.e., the data is laid out in memory as follows: @@ -414,4 +414,4 @@ class Matrix3X3 private: std::array m_Data = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp index 716ab4b7bf..0af436aa26 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" #include @@ -78,77 +78,77 @@ #include #include -namespace complex +namespace nx::core { static const AbstractPlugin::SIMPLMapType k_SIMPL_to_OrientationAnalysis { // syntax std::make_pair {Dream3d UUID , Dream3dnx UUID, {}}}, // dream3d-class-name - {complex::Uuid::FromString("0a121e03-3922-5c29-962d-40d88653f4b6").value(), {complex::FilterTraits::uuid, &GenerateFaceIPFColoringFilter::FromSIMPLJson}}, // GenerateFaceIPFColoring - {complex::Uuid::FromString("1a0848da-2edd-52c0-b111-62a4dc6d2886").value(), {complex::FilterTraits::uuid, &FindFeatureReferenceCAxisMisorientationsFilter::FromSIMPLJson}}, // FindFeatureReferenceCAxisMisorientations - {complex::Uuid::FromString("286dd493-4fea-54f4-b59e-459dd13bbe57").value(), {complex::FilterTraits::uuid, &FindMisorientationsFilter::FromSIMPLJson}}, // FindMisorientations - {complex::Uuid::FromString("2a0bfcd3-2517-5117-b164-964dfac8fe22").value(), {complex::FilterTraits::uuid, &CreateEnsembleInfoFilter::FromSIMPLJson}}, // CreateEnsembleInfoFilter - {complex::Uuid::FromString("33a37a47-d002-5c18-b270-86025881fe1e").value(), {complex::FilterTraits::uuid, &ReadEnsembleInfoFilter::FromSIMPLJson}}, // EnsembleInfoReader - {complex::Uuid::FromString("3b0ababf-9c8d-538d-96af-e40775c4f0ab").value(), {complex::FilterTraits::uuid, &FindShapesFilter::FromSIMPLJson}}, // FindShapes - {complex::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), {complex::FilterTraits::uuid, &ReadH5OimDataFilter::FromSIMPLJson}}, // ImportH5OimData - {complex::Uuid::FromString("428e1f5b-e6d8-5e8b-ad68-56ff14ee0e8c").value(), {complex::FilterTraits::uuid, &FindFeatureReferenceMisorientationsFilter::FromSIMPLJson}}, // FindFeatureReferenceMisorientations - {complex::Uuid::FromString("433976f0-710a-5dcc-938e-fcde49cd842f").value(), {complex::FilterTraits::uuid, &WriteGBCDTriangleDataFilter::FromSIMPLJson}}, // ExportGBCDTriangleDataFilter - {complex::Uuid::FromString("439e31b7-3198-5d0d-aef6-65a9e9c1a016").value(), {complex::FilterTraits::uuid, &ConvertQuaternionFilter::FromSIMPLJson}}, // ConvertQuaternion - {complex::Uuid::FromString("4ef7f56b-616e-5a80-9e68-1da8f35ad235").value(), {complex::FilterTraits::uuid, &ReadH5EbsdFilter::FromSIMPLJson}}, // ReadH5Ebsd - {complex::Uuid::FromString("4fb2b9de-3124-534b-b914-dbbbdbc14604").value(), {complex::FilterTraits::uuid, &AlignSectionsMisorientationFilter::FromSIMPLJson}}, // AlignSectionsMisorientation - {complex::Uuid::FromString("61c5519b-5561-58b8-a522-2ce1324e244d").value(), {complex::FilterTraits::uuid, &AlignSectionsMutualInformationFilter::FromSIMPLJson}}, // AlignSectionsMutualInformationFilter - {complex::Uuid::FromString("630d7486-75ea-5e04-874c-894460cd7c4d").value(), {complex::FilterTraits::uuid, &GenerateQuaternionConjugateFilter::FromSIMPLJson}}, // GenerateQuaternionConjugate - {complex::Uuid::FromString("6427cd5e-0ad2-5a24-8847-29f8e0720f4f").value(), {complex::FilterTraits::uuid, &NeighborOrientationCorrelationFilter::FromSIMPLJson}}, // NeighborOrientationCorrelation - {complex::Uuid::FromString("6e97ff50-48bf-5403-a049-1d271bd72df9").value(), {complex::FilterTraits::uuid, &FindGBCDFilter::FromSIMPLJson}}, // FindGBCDFilter - {complex::Uuid::FromString("7861c691-b821-537b-bd25-dc195578e0ea").value(), {complex::FilterTraits::uuid, &EBSDSegmentFeaturesFilter::FromSIMPLJson}}, // EBSDSegmentFeatures - {complex::Uuid::FromString("7cd30864-7bcf-5c10-aea7-d107373e2d40").value(), {complex::FilterTraits::uuid, &GenerateFaceMisorientationColoringFilter::FromSIMPLJson}}, // GenerateFaceMisorientationColoring - {complex::Uuid::FromString("85900eba-3da9-5985-ac71-1d9d290a5d31").value(), {complex::FilterTraits::uuid, &GenerateGBCDPoleFigureFilter::FromSIMPLJson}}, // VisualizeGBCDPoleFigureFilter - {complex::Uuid::FromString("88d332c1-cf6c-52d3-a38d-22f6eae19fa6").value(), {complex::FilterTraits::uuid, &FindKernelAvgMisorientationsFilter::FromSIMPLJson}}, // FindKernelAvgMisorientations - {complex::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), {complex::FilterTraits::uuid, &ReadH5EspritDataFilter::FromSIMPLJson}}, // ImportH5EspritData - {complex::Uuid::FromString("9a6677a6-b9e5-5fee-afa2-27e868cab8ca").value(), {complex::FilterTraits::uuid, &GenerateFZQuaternions::FromSIMPLJson}}, // GenerateFZQuaternions - {complex::Uuid::FromString("a10bb78e-fcff-553d-97d6-830a43c85385").value(), {complex::FilterTraits::uuid, &WritePoleFigureFilter::FromSIMPLJson}}, // WritePoleFigure - {complex::Uuid::FromString("a2b62395-1a7d-5058-a840-752d8f8e2430").value(), {complex::FilterTraits::uuid, &RodriguesConvertorFilter::FromSIMPLJson}}, // RodriguesConvertor - {complex::Uuid::FromString("a50e6532-8075-5de5-ab63-945feb0de7f7").value(), {complex::FilterTraits::uuid, &GenerateIPFColorsFilter::FromSIMPLJson}}, // GenerateIPFColors - {complex::Uuid::FromString("b8e128a8-c2a3-5e6c-a7ad-e4fb864e5d40").value(), {complex::FilterTraits::uuid, &ReadAngDataFilter::FromSIMPLJson}}, // ReadAngData - {complex::Uuid::FromString("bf7036d8-25bd-540e-b6de-3a5ab0e42c5f").value(), {complex::FilterTraits::uuid, &FindAvgOrientationsFilter::FromSIMPLJson}}, // FindAvgOrientations - {complex::Uuid::FromString("bff6be19-1219-5876-8838-1574ad29d965").value(), {complex::FilterTraits::uuid, &CAxisSegmentFeaturesFilter::FromSIMPLJson}}, // CAxisSegmentFeatures - {complex::Uuid::FromString("c5a9a96c-7570-5279-b383-cc25ebae0046").value(), {complex::FilterTraits::uuid, &FindAvgCAxesFilter::FromSIMPLJson}}, // FindAvgCAxes - {complex::Uuid::FromString("c9af506e-9ea1-5ff5-a882-fa561def5f52").value(), {complex::FilterTraits::uuid, &MergeTwinsFilter::FromSIMPLJson}}, // MergeTwins - {complex::Uuid::FromString("d1df969c-0428-53c3-b61d-99ea2bb6da28").value(), {complex::FilterTraits::uuid, &ReadCtfDataFilter::FromSIMPLJson}}, // ReadCtfData - {complex::Uuid::FromString("e5629880-98c4-5656-82b8-c9fe2b9744de").value(), {complex::FilterTraits::uuid, &ConvertOrientations::FromSIMPLJson}}, // ConvertOrientations - {complex::Uuid::FromString("e67ca06a-176f-58fc-a676-d6ee5553511a").value(), {complex::FilterTraits::uuid, &FindSchmidsFilter::FromSIMPLJson}}, // FindSchmids - {complex::Uuid::FromString("ef9420b2-8c46-55f3-8ae4-f53790639de4").value(), {complex::FilterTraits::uuid, &RotateEulerRefFrameFilter::FromSIMPLJson}}, // RotateEulerRefFrame - {complex::Uuid::FromString("f4a7c2df-e9b0-5da9-b745-a862666d6c99").value(), {complex::FilterTraits::uuid, &BadDataNeighborOrientationCheckFilter::FromSIMPLJson}}, // BadDataNeighborOrientationCheck - {complex::Uuid::FromString("f62065b4-54e9-53b1-bed7-2178a57d3c7a").value(), {complex::FilterTraits::uuid, &WriteGBCDGMTFileFilter::FromSIMPLJson}}, // ExportGBCDGMTFileFilter - {complex::Uuid::FromString("00d20627-5b88-56ba-ac7a-fc2a4b337903").value(), {complex::FilterTraits::uuid, &FindGBPDMetricBasedFilter::FromSIMPLJson}}, // FindGBPDMetricBased - // {complex::Uuid::FromString("17410178-4e5f-58b9-900e-8194c69200ab").value(), {complex::FilterTraits::uuid, {}}}, // ReplaceElementAttributesWithNeighborValues - // {complex::Uuid::FromString("179b0c7a-4e62-5070-ba49-ae58d5ccbfe8").value(), {complex::FilterTraits::uuid, {}}}, // ImportEbsdMontage - {complex::Uuid::FromString("1a0848da-2edd-52c0-b111-62a4dc6d2886").value(), {complex::FilterTraits::uuid, &FindFeatureReferenceCAxisMisorientationsFilter::FromSIMPLJson}}, // FindFeatureReferenceCAxisMisorientations - // {complex::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), {complex::FilterTraits::uuid, &INLWriterFilter::FromSIMPLJson}}, // INLWriter - // {complex::Uuid::FromString("3630623e-724b-5154-a060-a5fca4ecfff5").value(), {complex::FilterTraits::uuid, {}}}, // Stereographic3D - // {complex::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), {complex::FilterTraits::uuid, {}}}, // ImportH5OimData - // {complex::Uuid::FromString("5af9c1e6-ed6f-5672-9ae0-2b931344d729").value(), {complex::FilterTraits::uuid, {}}}, // OrientationUtility - {complex::Uuid::FromString("68ae7b7e-b9f7-5799-9f82-ce21d0ccd55e").value(), {complex::FilterTraits::uuid, &FindCAxisLocationsFilter::FromSIMPLJson}}, // FindCAxisLocations - // {complex::Uuid::FromString("6e332fca-0475-5fec-821e-e01f668ec1d3").value(), {complex::FilterTraits::uuid, {}}}, // EbsdToH5Ebsd - {complex::Uuid::FromString("8071facb-8905-5699-b345-105ae4ac33ff").value(), {complex::FilterTraits::uuid, &FindBoundaryStrengthsFilter::FromSIMPLJson}}, // FindBoundaryStrengths - // {complex::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), {complex::FilterTraits::uuid, {}}}, // ImportH5EspritData - // {complex::Uuid::FromString("94f986fc-1295-5e32-9808-752855fa658a").value(), {complex::FilterTraits::uuid, {}}}, // FindDistsToCharactGBs - {complex::Uuid::FromString("97523038-5fb2-5e82-9177-ed3e8b24b4bd").value(), {complex::FilterTraits::uuid, &FindSlipTransmissionMetricsFilter::FromSIMPLJson}}, // FindSlipTransmissionMetrics - // {complex::Uuid::FromString("a10124f3-05d0-5f49-93a0-e93926f5b48b").value(), {complex::FilterTraits::uuid, {}}}, // FindTwinBoundaries - // {complex::Uuid::FromString("a10bb78e-fcff-553d-97d6-830a43c85385").value(), {complex::FilterTraits::uuid, {}}}, // WritePoleFigure - // {complex::Uuid::FromString("a4952f40-22dd-54ec-8c38-69c3fcd0e6f7").value(), {complex::FilterTraits::uuid, &WriteStatsGenOdfAngleFileFilter::FromSIMPLJson}}, // WriteStatsGenOdfAngleFile - // {complex::Uuid::FromString("b0e30e6d-912d-5a7e-aeed-750134aba86b").value(), {complex::FilterTraits::uuid, {}}}, // FindTwinBoundarySchmidFactors - // {complex::Uuid::FromString("b78d8825-d3ac-5351-be20-172f07fd2aec").value(), {complex::FilterTraits::uuid, {}}}, // EMsoftSO3Sampler - // {complex::Uuid::FromString("c4398303-db7d-506e-81ea-08f253895ccb").value(), {complex::FilterTraits::uuid, {}}}, // CreateLambertSphere - // {complex::Uuid::FromString("c5a9a96c-7570-5279-b383-cc25ebae0046").value(), {complex::FilterTraits::uuid, {}}}, // FindAvgCAxes - {complex::Uuid::FromString("cdd50b83-ea09-5499-b008-4b253cf4c246").value(), {complex::FilterTraits::uuid, &FindFeatureNeighborCAxisMisalignmentsFilter::FromSIMPLJson}}, // FindFeatureNeighborCAxisMisalignments - //{complex::Uuid::FromString("d67e9f28-2fe5-5188-b0f8-323a7e603de6").value(), {complex::FilterTraits::uuid, &FindGBCDMetricBasedFilter::FromSIMPLJson}}, // FindGBCDMetricBased - // {complex::Uuid::FromString("e1343abe-e5ad-5eb1-a89d-c209e620e4de").value(), {complex::FilterTraits::uuid, {}}}, // ConvertHexGridToSquareGrid - // {complex::Uuid::FromString("ec58f4fe-8e51-527e-9536-8b6f185684be").value(), {complex::FilterTraits::uuid, {}}}, // GenerateOrientationMatrixTranspose - {complex::Uuid::FromString("d67e9f28-2fe5-5188-b0f8-323a7e603de6").value(), {complex::FilterTraits::uuid, &FindGBCDMetricBasedFilter::FromSIMPLJson}}, // FindGBCDMetricBased - {complex::Uuid::FromString("a4952f40-22dd-54ec-8c38-69c3fcd0e6f7").value(), {complex::FilterTraits::uuid, &WriteStatsGenOdfAngleFileFilter::FromSIMPLJson}}, // WriteStatsGenOdfAngleFile - {complex::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), {complex::FilterTraits::uuid, &WriteINLFileFilter::FromSIMPLJson}}, // INLWriter + {nx::core::Uuid::FromString("0a121e03-3922-5c29-962d-40d88653f4b6").value(), {nx::core::FilterTraits::uuid, &GenerateFaceIPFColoringFilter::FromSIMPLJson}}, // GenerateFaceIPFColoring + {nx::core::Uuid::FromString("1a0848da-2edd-52c0-b111-62a4dc6d2886").value(), {nx::core::FilterTraits::uuid, &FindFeatureReferenceCAxisMisorientationsFilter::FromSIMPLJson}}, // FindFeatureReferenceCAxisMisorientations + {nx::core::Uuid::FromString("286dd493-4fea-54f4-b59e-459dd13bbe57").value(), {nx::core::FilterTraits::uuid, &FindMisorientationsFilter::FromSIMPLJson}}, // FindMisorientations + {nx::core::Uuid::FromString("2a0bfcd3-2517-5117-b164-964dfac8fe22").value(), {nx::core::FilterTraits::uuid, &CreateEnsembleInfoFilter::FromSIMPLJson}}, // CreateEnsembleInfoFilter + {nx::core::Uuid::FromString("33a37a47-d002-5c18-b270-86025881fe1e").value(), {nx::core::FilterTraits::uuid, &ReadEnsembleInfoFilter::FromSIMPLJson}}, // EnsembleInfoReader + {nx::core::Uuid::FromString("3b0ababf-9c8d-538d-96af-e40775c4f0ab").value(), {nx::core::FilterTraits::uuid, &FindShapesFilter::FromSIMPLJson}}, // FindShapes + {nx::core::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), {nx::core::FilterTraits::uuid, &ReadH5OimDataFilter::FromSIMPLJson}}, // ImportH5OimData + {nx::core::Uuid::FromString("428e1f5b-e6d8-5e8b-ad68-56ff14ee0e8c").value(), {nx::core::FilterTraits::uuid, &FindFeatureReferenceMisorientationsFilter::FromSIMPLJson}}, // FindFeatureReferenceMisorientations + {nx::core::Uuid::FromString("433976f0-710a-5dcc-938e-fcde49cd842f").value(), {nx::core::FilterTraits::uuid, &WriteGBCDTriangleDataFilter::FromSIMPLJson}}, // ExportGBCDTriangleDataFilter + {nx::core::Uuid::FromString("439e31b7-3198-5d0d-aef6-65a9e9c1a016").value(), {nx::core::FilterTraits::uuid, &ConvertQuaternionFilter::FromSIMPLJson}}, // ConvertQuaternion + {nx::core::Uuid::FromString("4ef7f56b-616e-5a80-9e68-1da8f35ad235").value(), {nx::core::FilterTraits::uuid, &ReadH5EbsdFilter::FromSIMPLJson}}, // ReadH5Ebsd + {nx::core::Uuid::FromString("4fb2b9de-3124-534b-b914-dbbbdbc14604").value(), {nx::core::FilterTraits::uuid, &AlignSectionsMisorientationFilter::FromSIMPLJson}}, // AlignSectionsMisorientation + {nx::core::Uuid::FromString("61c5519b-5561-58b8-a522-2ce1324e244d").value(), {nx::core::FilterTraits::uuid, &AlignSectionsMutualInformationFilter::FromSIMPLJson}}, // AlignSectionsMutualInformationFilter + {nx::core::Uuid::FromString("630d7486-75ea-5e04-874c-894460cd7c4d").value(), {nx::core::FilterTraits::uuid, &GenerateQuaternionConjugateFilter::FromSIMPLJson}}, // GenerateQuaternionConjugate + {nx::core::Uuid::FromString("6427cd5e-0ad2-5a24-8847-29f8e0720f4f").value(), {nx::core::FilterTraits::uuid, &NeighborOrientationCorrelationFilter::FromSIMPLJson}}, // NeighborOrientationCorrelation + {nx::core::Uuid::FromString("6e97ff50-48bf-5403-a049-1d271bd72df9").value(), {nx::core::FilterTraits::uuid, &FindGBCDFilter::FromSIMPLJson}}, // FindGBCDFilter + {nx::core::Uuid::FromString("7861c691-b821-537b-bd25-dc195578e0ea").value(), {nx::core::FilterTraits::uuid, &EBSDSegmentFeaturesFilter::FromSIMPLJson}}, // EBSDSegmentFeatures + {nx::core::Uuid::FromString("7cd30864-7bcf-5c10-aea7-d107373e2d40").value(), {nx::core::FilterTraits::uuid, &GenerateFaceMisorientationColoringFilter::FromSIMPLJson}}, // GenerateFaceMisorientationColoring + {nx::core::Uuid::FromString("85900eba-3da9-5985-ac71-1d9d290a5d31").value(), {nx::core::FilterTraits::uuid, &GenerateGBCDPoleFigureFilter::FromSIMPLJson}}, // VisualizeGBCDPoleFigureFilter + {nx::core::Uuid::FromString("88d332c1-cf6c-52d3-a38d-22f6eae19fa6").value(), {nx::core::FilterTraits::uuid, &FindKernelAvgMisorientationsFilter::FromSIMPLJson}}, // FindKernelAvgMisorientations + {nx::core::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), {nx::core::FilterTraits::uuid, &ReadH5EspritDataFilter::FromSIMPLJson}}, // ImportH5EspritData + {nx::core::Uuid::FromString("9a6677a6-b9e5-5fee-afa2-27e868cab8ca").value(), {nx::core::FilterTraits::uuid, &GenerateFZQuaternions::FromSIMPLJson}}, // GenerateFZQuaternions + {nx::core::Uuid::FromString("a10bb78e-fcff-553d-97d6-830a43c85385").value(), {nx::core::FilterTraits::uuid, &WritePoleFigureFilter::FromSIMPLJson}}, // WritePoleFigure + {nx::core::Uuid::FromString("a2b62395-1a7d-5058-a840-752d8f8e2430").value(), {nx::core::FilterTraits::uuid, &RodriguesConvertorFilter::FromSIMPLJson}}, // RodriguesConvertor + {nx::core::Uuid::FromString("a50e6532-8075-5de5-ab63-945feb0de7f7").value(), {nx::core::FilterTraits::uuid, &GenerateIPFColorsFilter::FromSIMPLJson}}, // GenerateIPFColors + {nx::core::Uuid::FromString("b8e128a8-c2a3-5e6c-a7ad-e4fb864e5d40").value(), {nx::core::FilterTraits::uuid, &ReadAngDataFilter::FromSIMPLJson}}, // ReadAngData + {nx::core::Uuid::FromString("bf7036d8-25bd-540e-b6de-3a5ab0e42c5f").value(), {nx::core::FilterTraits::uuid, &FindAvgOrientationsFilter::FromSIMPLJson}}, // FindAvgOrientations + {nx::core::Uuid::FromString("bff6be19-1219-5876-8838-1574ad29d965").value(), {nx::core::FilterTraits::uuid, &CAxisSegmentFeaturesFilter::FromSIMPLJson}}, // CAxisSegmentFeatures + {nx::core::Uuid::FromString("c5a9a96c-7570-5279-b383-cc25ebae0046").value(), {nx::core::FilterTraits::uuid, &FindAvgCAxesFilter::FromSIMPLJson}}, // FindAvgCAxes + {nx::core::Uuid::FromString("c9af506e-9ea1-5ff5-a882-fa561def5f52").value(), {nx::core::FilterTraits::uuid, &MergeTwinsFilter::FromSIMPLJson}}, // MergeTwins + {nx::core::Uuid::FromString("d1df969c-0428-53c3-b61d-99ea2bb6da28").value(), {nx::core::FilterTraits::uuid, &ReadCtfDataFilter::FromSIMPLJson}}, // ReadCtfData + {nx::core::Uuid::FromString("e5629880-98c4-5656-82b8-c9fe2b9744de").value(), {nx::core::FilterTraits::uuid, &ConvertOrientations::FromSIMPLJson}}, // ConvertOrientations + {nx::core::Uuid::FromString("e67ca06a-176f-58fc-a676-d6ee5553511a").value(), {nx::core::FilterTraits::uuid, &FindSchmidsFilter::FromSIMPLJson}}, // FindSchmids + {nx::core::Uuid::FromString("ef9420b2-8c46-55f3-8ae4-f53790639de4").value(), {nx::core::FilterTraits::uuid, &RotateEulerRefFrameFilter::FromSIMPLJson}}, // RotateEulerRefFrame + {nx::core::Uuid::FromString("f4a7c2df-e9b0-5da9-b745-a862666d6c99").value(), {nx::core::FilterTraits::uuid, &BadDataNeighborOrientationCheckFilter::FromSIMPLJson}}, // BadDataNeighborOrientationCheck + {nx::core::Uuid::FromString("f62065b4-54e9-53b1-bed7-2178a57d3c7a").value(), {nx::core::FilterTraits::uuid, &WriteGBCDGMTFileFilter::FromSIMPLJson}}, // ExportGBCDGMTFileFilter + {nx::core::Uuid::FromString("00d20627-5b88-56ba-ac7a-fc2a4b337903").value(), {nx::core::FilterTraits::uuid, &FindGBPDMetricBasedFilter::FromSIMPLJson}}, // FindGBPDMetricBased + // {nx::core::Uuid::FromString("17410178-4e5f-58b9-900e-8194c69200ab").value(), {nx::core::FilterTraits::uuid, {}}}, // ReplaceElementAttributesWithNeighborValues + // {nx::core::Uuid::FromString("179b0c7a-4e62-5070-ba49-ae58d5ccbfe8").value(), {nx::core::FilterTraits::uuid, {}}}, // ImportEbsdMontage + {nx::core::Uuid::FromString("1a0848da-2edd-52c0-b111-62a4dc6d2886").value(), {nx::core::FilterTraits::uuid, &FindFeatureReferenceCAxisMisorientationsFilter::FromSIMPLJson}}, // FindFeatureReferenceCAxisMisorientations + // {nx::core::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), {nx::core::FilterTraits::uuid, &INLWriterFilter::FromSIMPLJson}}, // INLWriter + // {nx::core::Uuid::FromString("3630623e-724b-5154-a060-a5fca4ecfff5").value(), {nx::core::FilterTraits::uuid, {}}}, // Stereographic3D + // {nx::core::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), {nx::core::FilterTraits::uuid, {}}}, // ImportH5OimData + // {nx::core::Uuid::FromString("5af9c1e6-ed6f-5672-9ae0-2b931344d729").value(), {nx::core::FilterTraits::uuid, {}}}, // OrientationUtility + {nx::core::Uuid::FromString("68ae7b7e-b9f7-5799-9f82-ce21d0ccd55e").value(), {nx::core::FilterTraits::uuid, &FindCAxisLocationsFilter::FromSIMPLJson}}, // FindCAxisLocations + // {nx::core::Uuid::FromString("6e332fca-0475-5fec-821e-e01f668ec1d3").value(), {nx::core::FilterTraits::uuid, {}}}, // EbsdToH5Ebsd + {nx::core::Uuid::FromString("8071facb-8905-5699-b345-105ae4ac33ff").value(), {nx::core::FilterTraits::uuid, &FindBoundaryStrengthsFilter::FromSIMPLJson}}, // FindBoundaryStrengths + // {nx::core::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), {nx::core::FilterTraits::uuid, {}}}, // ImportH5EspritData + // {nx::core::Uuid::FromString("94f986fc-1295-5e32-9808-752855fa658a").value(), {nx::core::FilterTraits::uuid, {}}}, // FindDistsToCharactGBs + {nx::core::Uuid::FromString("97523038-5fb2-5e82-9177-ed3e8b24b4bd").value(), {nx::core::FilterTraits::uuid, &FindSlipTransmissionMetricsFilter::FromSIMPLJson}}, // FindSlipTransmissionMetrics + // {nx::core::Uuid::FromString("a10124f3-05d0-5f49-93a0-e93926f5b48b").value(), {nx::core::FilterTraits::uuid, {}}}, // FindTwinBoundaries + // {nx::core::Uuid::FromString("a10bb78e-fcff-553d-97d6-830a43c85385").value(), {nx::core::FilterTraits::uuid, {}}}, // WritePoleFigure + // {nx::core::Uuid::FromString("a4952f40-22dd-54ec-8c38-69c3fcd0e6f7").value(), {nx::core::FilterTraits::uuid, &WriteStatsGenOdfAngleFileFilter::FromSIMPLJson}}, // WriteStatsGenOdfAngleFile + // {nx::core::Uuid::FromString("b0e30e6d-912d-5a7e-aeed-750134aba86b").value(), {nx::core::FilterTraits::uuid, {}}}, // FindTwinBoundarySchmidFactors + // {nx::core::Uuid::FromString("b78d8825-d3ac-5351-be20-172f07fd2aec").value(), {nx::core::FilterTraits::uuid, {}}}, // EMsoftSO3Sampler + // {nx::core::Uuid::FromString("c4398303-db7d-506e-81ea-08f253895ccb").value(), {nx::core::FilterTraits::uuid, {}}}, // CreateLambertSphere + // {nx::core::Uuid::FromString("c5a9a96c-7570-5279-b383-cc25ebae0046").value(), {nx::core::FilterTraits::uuid, {}}}, // FindAvgCAxes + {nx::core::Uuid::FromString("cdd50b83-ea09-5499-b008-4b253cf4c246").value(), {nx::core::FilterTraits::uuid, &FindFeatureNeighborCAxisMisalignmentsFilter::FromSIMPLJson}}, // FindFeatureNeighborCAxisMisalignments + //{nx::core::Uuid::FromString("d67e9f28-2fe5-5188-b0f8-323a7e603de6").value(), {nx::core::FilterTraits::uuid, &FindGBCDMetricBasedFilter::FromSIMPLJson}}, // FindGBCDMetricBased + // {nx::core::Uuid::FromString("e1343abe-e5ad-5eb1-a89d-c209e620e4de").value(), {nx::core::FilterTraits::uuid, {}}}, // ConvertHexGridToSquareGrid + // {nx::core::Uuid::FromString("ec58f4fe-8e51-527e-9536-8b6f185684be").value(), {nx::core::FilterTraits::uuid, {}}}, // GenerateOrientationMatrixTranspose + {nx::core::Uuid::FromString("d67e9f28-2fe5-5188-b0f8-323a7e603de6").value(), {nx::core::FilterTraits::uuid, &FindGBCDMetricBasedFilter::FromSIMPLJson}}, // FindGBCDMetricBased + {nx::core::Uuid::FromString("a4952f40-22dd-54ec-8c38-69c3fcd0e6f7").value(), {nx::core::FilterTraits::uuid, &WriteStatsGenOdfAngleFileFilter::FromSIMPLJson}}, // WriteStatsGenOdfAngleFile + {nx::core::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), {nx::core::FilterTraits::uuid, &WriteINLFileFilter::FromSIMPLJson}}, // INLWriter // @@__MAP__UPDATE__TOKEN__DO__NOT__DELETE__@@ }; -} // namespace complex +} // namespace nx::core // clang-format on diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp index bc774d6bbf..29909ef16b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp @@ -3,12 +3,12 @@ #include "OrientationAnalysis/OrientationAnalysis_filter_registration.hpp" -using namespace complex; +using namespace nx::core; namespace { // This maps previous filters from DREAM.3D Version 6.x to DREAM.3D Version 7.x -std::map k_SimplToComplexFilterMapping = { +std::map k_SimplToComplexFilterMapping = { {Uuid::FromString("{f4a7c2df-e9b0-5da9-b745-a862666d6c99}").value(), Uuid::FromString("f4a7c2df-e9b0-5da9-b745-a862666d6c99").value()}, /* BadDataNeighborOrientationCheck */ {Uuid::FromString("{f7bc0e1e-0f50-5fe0-a9e7-510b6ed83792}").value(), Uuid::FromString("f7bc0e1e-0f50-5fe0-a9e7-510b6ed83792").value()}, /* ChangeAngleRepresentation */ {Uuid::FromString("{e1343abe-e5ad-5eb1-a89d-c209e620e4de}").value(), Uuid::FromString("e1343abe-e5ad-5eb1-a89d-c209e620e4de").value()}, /* ConvertHexGridToSquareGrid */ @@ -74,9 +74,9 @@ OrientationAnalysisPlugin::OrientationAnalysisPlugin() OrientationAnalysisPlugin::~OrientationAnalysisPlugin() = default; -AbstractPlugin::SIMPLMapType OrientationAnalysisPlugin::getSimplToComplexMap() const +AbstractPlugin::SIMPLMapType OrientationAnalysisPlugin::getSimplToSimplnxMap() const { - return complex::k_SIMPL_to_OrientationAnalysis; + return nx::core::k_SIMPL_to_OrientationAnalysis; } -COMPLEX_DEF_PLUGIN(OrientationAnalysisPlugin) +SIMPLNX_DEF_PLUGIN(OrientationAnalysisPlugin) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.hpp index 1fa20d99b4..747b8b3444 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.hpp @@ -2,9 +2,9 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" -class ORIENTATIONANALYSIS_EXPORT OrientationAnalysisPlugin : public complex::AbstractPlugin +class ORIENTATIONANALYSIS_EXPORT OrientationAnalysisPlugin : public nx::core::AbstractPlugin { public: OrientationAnalysisPlugin(); @@ -18,8 +18,8 @@ class ORIENTATIONANALYSIS_EXPORT OrientationAnalysisPlugin : public complex::Abs /** * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to - * their complex counterpart - * @return std::map + * their simplnx counterpart + * @return std::map */ - SIMPLMapType getSimplToComplexMap() const override; + SIMPLMapType getSimplToSimplnxMap() const override; }; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp index 0d5d04b2b6..eede3d5a43 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.cpp @@ -1,15 +1,15 @@ #include "OEMEbsdScanSelectionParameter.h" -#include "complex/Common/Any.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include #include -namespace complex +namespace nx::core { namespace { @@ -179,7 +179,7 @@ Result<> OEMEbsdScanSelectionParameter::validate(const std::any& valueRef) const return {nonstd::make_unexpected(std::move(errors))}; } - const std::string lowerExtension = complex::StringUtilities::toLower(value.inputFilePath.extension().string()); + const std::string lowerExtension = nx::core::StringUtilities::toLower(value.inputFilePath.extension().string()); if(value.inputFilePath.has_extension() && !m_AvailableExtensions.empty() && m_AvailableExtensions.find(lowerExtension) == m_AvailableExtensions.end()) { return {nonstd::make_unexpected(std::vector{{-20032, fmt::format("File extension '{}' is not a valid file extension.", value.inputFilePath.extension().string())}})}; @@ -199,4 +199,4 @@ OEMEbsdScanSelectionParameter::EbsdReaderType OEMEbsdScanSelectionParameter::get return m_ReaderType; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h index 22dc1a9225..f757382c54 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h @@ -1,9 +1,9 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Utilities/FilePathGenerator.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Utilities/FilePathGenerator.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -12,7 +12,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { /** @brief RefFrameZDir defined for the Stacking order of images into a 3D Volume. This is taken from * EbsdLib. If EbsdLib changes, this should follow suit. @@ -24,7 +24,7 @@ inline constexpr uint32_t k_HightoLow = 1; inline constexpr uint32_t UnknownRefFrameZDirection = 2; } // namespace RefFrameZDir -class COMPLEX_EXPORT OEMEbsdScanSelectionParameter : public ValueParameter +class SIMPLNX_EXPORT OEMEbsdScanSelectionParameter : public ValueParameter { public: @@ -126,6 +126,6 @@ class COMPLEX_EXPORT OEMEbsdScanSelectionParameter : public ValueParameter ExtensionsType m_AvailableExtensions = {}; EbsdReaderType m_ReaderType = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp index 5a2250b101..60ae064d9e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp @@ -1,7 +1,7 @@ #include "ReadH5EbsdFileParameter.h" -#include "complex/Common/Any.hpp" -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/StringLiteral.hpp" #include "EbsdLib/IO/H5EbsdVolumeInfo.h" #include "EbsdLib/IO/HKL/CtfFields.h" @@ -15,7 +15,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace { @@ -231,4 +231,4 @@ Result<> ReadH5EbsdFileParameter::validate(const std::any& valueRef) const return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h index 573b27bd5e..f76d5a0062 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h @@ -1,17 +1,17 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Utilities/FilePathGenerator.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Utilities/FilePathGenerator.hpp" +#include "simplnx/simplnx_export.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT ReadH5EbsdFileParameter : public ValueParameter +class SIMPLNX_EXPORT ReadH5EbsdFileParameter : public ValueParameter { public: @@ -92,6 +92,6 @@ class COMPLEX_EXPORT ReadH5EbsdFileParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ReadH5EbsdFileParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ReadH5EbsdFileParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.cpp index 16d2d7456b..8d6f71c485 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.cpp @@ -2,7 +2,7 @@ #include "EbsdLib/LaueOps/LaueOps.h" -namespace complex +namespace nx::core { namespace OrientationUtilities { @@ -18,4 +18,4 @@ std::string CrystalStructureEnumToString(uint32_t crystalStructureType) } } // namespace OrientationUtilities -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.hpp index 1a19d6b843..39dff46adc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/OrientationUtilities.hpp @@ -5,7 +5,7 @@ #include -namespace complex +namespace nx::core { namespace OrientationUtilities { @@ -71,4 +71,4 @@ Eigen::Matrix EbsdLibMatrixToEigenMatrix(const EbsdLib std::string CrystalStructureEnumToString(uint32_t crystalStructureType); } // namespace OrientationUtilities -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.cpp index 4f50f9cdbf..98d3650089 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.cpp @@ -1,6 +1,6 @@ #include "PhaseType.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- PhaseType::PhaseType() = default; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.hpp index 7bf2ffb7fb..e452b735d8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/PhaseType.hpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Types.hpp" #include #include #include -namespace complex +namespace nx::core { /** * @class PhaseType PhaseType.h @@ -132,4 +132,4 @@ class ORIENTATIONANALYSIS_EXPORT PhaseType PhaseType& operator=(PhaseType&&) = delete; // Move Assignment Not Implemented }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp index 807044c293..a71544659d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp @@ -3,15 +3,15 @@ #include "OrientationAnalysis/OrientationAnalysis_export.hpp" #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "EbsdLib/IO/BrukerNano/H5EspritReader.h" #include "EbsdLib/IO/TSL/H5OIMReader.h" -namespace complex +namespace nx::core { struct ORIENTATIONANALYSIS_EXPORT ReadH5DataInputValues { @@ -140,4 +140,4 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5Data const ReadH5DataInputValues* m_InputValues; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/SIMPLConversion.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/SIMPLConversion.hpp index 15e28840d3..15ffbe5a48 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/SIMPLConversion.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/SIMPLConversion.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" @@ -8,7 +8,7 @@ #include -namespace complex::SIMPLConversion +namespace nx::core::SIMPLConversion { struct OEMEbsdScanSelectionFilterParameterConverter { @@ -37,4 +37,4 @@ struct OEMEbsdScanSelectionFilterParameterConverter return {std::move(value)}; } }; -} // namespace complex::SIMPLConversion +} // namespace nx::core::SIMPLConversion diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/TiffWriter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/TiffWriter.cpp index 8eb9485c2b..bf1d15a85f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/TiffWriter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/TiffWriter.cpp @@ -1,6 +1,6 @@ #include "TiffWriter.hpp" -#include "complex/Common/Bit.hpp" +#include "simplnx/Common/Bit.hpp" #include @@ -40,7 +40,7 @@ std::pair TiffWriter::WriteImage(const std::string& filepa // Check for Endianess of the system and write the appropriate magic number according to the tiff spec std::array magicNumber = {0x49, 0x49, 0x2A, 0x00}; - if(complex::checkEndian() == complex::endian::big) + if(nx::core::checkEndian() == nx::core::endian::big) { magicNumber = {0x4D, 0x4D, 0x00, 0x2A}; } diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp index 3f9d8c1261..28c405f410 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMisorientationTest.cpp @@ -4,21 +4,21 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; /** * Read H5Ebsd File @@ -38,14 +38,14 @@ using namespace complex::UnitTest; TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline", "[OrientationAnalysis][AlignSectionsMisorientation]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_align_sections_misorientation.tar.gz", - "6_6_align_sections_misorientation.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_align_sections_misorientation.tar.gz", + "6_6_align_sections_misorientation.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); const std::string kDataInputArchive2 = "align_sections.tar.gz"; const std::string kExpectedOutputTopLevel2 = "align_sections_misorientation.txt"; - const complex::UnitTest::TestFileSentinel testDataSentinel2(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, kDataInputArchive2, kExpectedOutputTopLevel2); + const nx::core::UnitTest::TestFileSentinel testDataSentinel2(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, kDataInputArchive2, kExpectedOutputTopLevel2); // We are just going to generate a big number so that we can use that in the output // file path. This tests the creation of intermediate directories that the filter @@ -85,7 +85,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline Arguments args; // read in the exemplar shift data file args.insertOrAssign(k_InputFileKey, std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::int32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); args.insertOrAssign(k_NCompKey, std::make_any(6)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); @@ -94,14 +94,14 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } - // MultiThreshold Objects Filter (From ComplexCore Plugins) + // MultiThreshold Objects Filter (From SimplnxCore Plugins) SmallIn100::ExecuteMultiThresholdObjects(dataStructure, *filterList); // Convert Orientations Filter (From OrientationAnalysis Plugin) @@ -129,11 +129,11 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellAttributeMatrix, k_ExemplarDataContainer); @@ -155,7 +155,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::int32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(116)}})); args.insertOrAssign(k_NCompKey, std::make_any(6)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); @@ -164,13 +164,13 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMisorientation Small IN100 Pipeline // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/align_sections_misorientation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif diff --git a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp index 2936e71715..27ad17aa08 100644 --- a/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/AlignSectionsMutualInformationTest.cpp @@ -4,26 +4,26 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filter execution") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_align_sections_mutual_information.tar.gz", - "6_5_align_sections_mutual_information"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_align_sections_mutual_information.tar.gz", + "6_5_align_sections_mutual_information"); // We are just going to generate a big number so that we can use that in the output // file path. This tests the creation of intermediate directories that the filter @@ -64,11 +64,11 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } const static DynamicTableInfo::TableDataType k_TupleDims = {{static_cast(k_NumSlices)}}; @@ -92,7 +92,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // read in the exemplar shift data file args.insertOrAssign(k_InputFileKey, std::make_any( fs::path(fmt::format("{}/6_5_align_sections_mutual_information/6_5_align_sections_mutual_information.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::int32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); args.insertOrAssign(k_NCompKey, std::make_any(6)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); @@ -101,11 +101,11 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Read Computed Shifts File @@ -125,7 +125,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::int32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::int32)); args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); args.insertOrAssign(k_NCompKey, std::make_any(6)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(0)); @@ -134,14 +134,14 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/align_sections_mutual_information.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -154,7 +154,7 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: Valid filt TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: InValid filter execution") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); @@ -182,6 +182,6 @@ TEST_CASE("OrientationAnalysis::AlignSectionsMutualInformationFilter: InValid fi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); REQUIRE(preflightResult.outputActions.errors()[0].code == -3542); } diff --git a/src/Plugins/OrientationAnalysis/test/BadDataNeighborOrientationCheckTest.cpp b/src/Plugins/OrientationAnalysis/test/BadDataNeighborOrientationCheckTest.cpp index 325ef8f6d1..625171163d 100644 --- a/src/Plugins/OrientationAnalysis/test/BadDataNeighborOrientationCheckTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/BadDataNeighborOrientationCheckTest.cpp @@ -4,17 +4,17 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; /** * Read H5Ebsd File * MultiThreshold Objects @@ -35,10 +35,10 @@ using namespace complex::UnitTest; TEST_CASE("OrientationAnalysis::BadDataNeighborOrientationCheckFilter: Small IN100 Pipeline", "[OrientationAnalysis][BadDataNeighborOrientationCheckFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "bad_data_neighbor_orientation_check.tar.gz", - "bad_data_neighbor_orientation_check.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "bad_data_neighbor_orientation_check.tar.gz", + "bad_data_neighbor_orientation_check.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -51,7 +51,7 @@ TEST_CASE("OrientationAnalysis::BadDataNeighborOrientationCheckFilter: Small IN1 auto baseDataFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = LoadDataStructure(baseDataFilePath); - // MultiThreshold Objects Filter (From ComplexCore Plugins) + // MultiThreshold Objects Filter (From SimplnxCore Plugins) SmallIn100::ExecuteMultiThresholdObjects(dataStructure, *filterList); // Convert Orientations Filter (From OrientationAnalysis Plugin) @@ -181,7 +181,7 @@ TEST_CASE("OrientationAnalysis::BadDataNeighborOrientationCheckFilter: Small IN1 } } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/bad_data_neighbor_orientation_check.dream3d", unit_test::k_BinaryTestOutputDir)); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/CAxisSegmentFeaturesTest.cpp b/src/Plugins/OrientationAnalysis/test/CAxisSegmentFeaturesTest.cpp index 9bdbed4c96..01a69d4fda 100644 --- a/src/Plugins/OrientationAnalysis/test/CAxisSegmentFeaturesTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/CAxisSegmentFeaturesTest.cpp @@ -1,6 +1,6 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" @@ -9,8 +9,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -21,7 +21,7 @@ const std::string k_ComputedCellFeatureData = "NX_CellFeatureData"; TEST_CASE("OrientationAnalysis::CAxisSegmentFeaturesFilter: Valid Filter Execution", "[OrientationAnalysis][CAxisSegmentFeaturesFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_caxis_segment_features.dream3d", unit_test::k_TestFilesDir)); @@ -48,11 +48,11 @@ TEST_CASE("OrientationAnalysis::CAxisSegmentFeaturesFilter: Valid Filter Executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group @@ -70,7 +70,7 @@ TEST_CASE("OrientationAnalysis::CAxisSegmentFeaturesFilter: Valid Filter Executi TEST_CASE("OrientationAnalysis::CAxisSegmentFeaturesFilter: Invalid Filter Execution", "[OrientationAnalysis][CAxisSegmentFeaturesFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -97,9 +97,9 @@ TEST_CASE("OrientationAnalysis::CAxisSegmentFeaturesFilter: Invalid Filter Execu // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt index efcec869a9..4772ff2b44 100644 --- a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt @@ -69,7 +69,7 @@ set(DISABLED_TESTS Stereographic3DTest.cpp ) -create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} +create_simplnx_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} FILTER_LIST ${${PLUGIN_NAME}UnitTest_SRCS}) # ------------------------------------------------------------------------------ @@ -100,15 +100,15 @@ target_sources(${PLUGIN_NAME}UnitTest # Here we are going to setup to download and decompress the test files. In order # to add your own test files you will need to tar.gz the test file, compute the # SHA 512 Hash of the file and then upload the file to -# https://github.com/BlueQuartzSoftware/complex/releases/tag/Data_Archive. +# https://github.com/bluequartzsoftware/simplnx/releases/tag/Data_Archive. # # Go to the web site above, "edit" the release, add the filename and SHA 512 to # the table and then upload your compressed file. # Save the release so that the repo is updated # ----------------------------------------------------------------------------- -option(COMPLEX_DOWNLOAD_TEST_FILES "Download the test files" ON) +option(SIMPLNX_DOWNLOAD_TEST_FILES "Download the test files" ON) -if(EXISTS "${DREAM3D_DATA_DIR}" AND COMPLEX_DOWNLOAD_TEST_FILES) +if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) if(NOT EXISTS ${DREAM3D_DATA_DIR}/TestFiles/) file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") endif() @@ -143,7 +143,7 @@ endif() # ----------------------------------------------------------------------------- # Include any example pipelines into the unit testing # ----------------------------------------------------------------------------- -include(${complex_SOURCE_DIR}/cmake/Utility.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) set(TEST_PIPELINE_LIST_FILE ${${PLUGIN_NAME}_BINARY_DIR}/PrebuiltPipelineTests/nxrunner_tests.txt) FILE(WRITE ${TEST_PIPELINE_LIST_FILE} "Prebuilt Pipeline Tests\n") @@ -182,9 +182,9 @@ function(add_pipeline_test) FILE(APPEND ${TEST_PIPELINE_LIST_FILE} "[${ARGS_TEST_INDEX}]:${ARGS_PIPELINE_PATH}\n") get_filename_component(test "${ARGS_PIPELINE_PATH}" NAME) - set(COMPLEX_CTEST_TEST_DRIVER "${${PLUGIN_NAME}_BINARY_DIR}/PrebuiltPipelineTests/${test}.${TEST_SCRIPT_FILE_EXT}") + set(SIMPLNX_CTEST_TEST_DRIVER "${${PLUGIN_NAME}_BINARY_DIR}/PrebuiltPipelineTests/${test}.${TEST_SCRIPT_FILE_EXT}") - # message(STATUS "==> ${COMPLEX_CTEST_TEST_DRIVER}") + # message(STATUS "==> ${SIMPLNX_CTEST_TEST_DRIVER}") set(DELETE_FILE_COMMANDS "") get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -285,10 +285,10 @@ fi endforeach() configure_file(${${PLUGIN_NAME}_SOURCE_DIR}/test/ctest_pipeline_driver.${TEST_SCRIPT_FILE_EXT} - "${COMPLEX_CTEST_TEST_DRIVER}" @ONLY) + "${SIMPLNX_CTEST_TEST_DRIVER}" @ONLY) string(REPLACE "/" "_" test "${test}") - add_test(NAME ${PLUGIN_NAME}_${ARGS_TEST_INDEX} COMMAND "${COMPLEX_CTEST_TEST_DRIVER}") + add_test(NAME ${PLUGIN_NAME}_${ARGS_TEST_INDEX} COMMAND "${SIMPLNX_CTEST_TEST_DRIVER}") endfunction() # ------------------------------------------------------------------------------ diff --git a/src/Plugins/OrientationAnalysis/test/ConvertHexGridToSquareGridTest.cpp b/src/Plugins/OrientationAnalysis/test/ConvertHexGridToSquareGridTest.cpp index 10a099cd86..b1b5110523 100644 --- a/src/Plugins/OrientationAnalysis/test/ConvertHexGridToSquareGridTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ConvertHexGridToSquareGridTest.cpp @@ -1,8 +1,8 @@ #include "OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -12,7 +12,7 @@ namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -57,9 +57,9 @@ bool CompareFiles(const std::string& p1, const std::string& p2) TEST_CASE("OrientationAnalysis::ConvertHexGridToSquareGridFilter: Single File Valid Execution", "[OrientationAnalysis][ConvertHexGridToSquareGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "convert_hex_grid_to_square_grid_test.tar.gz", - k_HexToSqrTestFilesDir); - fs::path k_OutPath = fs::path(fmt::format("{}/single", complex::unit_test::k_BinaryTestOutputDir)); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "convert_hex_grid_to_square_grid_test.tar.gz", + k_HexToSqrTestFilesDir); + fs::path k_OutPath = fs::path(fmt::format("{}/single", nx::core::unit_test::k_BinaryTestOutputDir)); if(!exists(k_OutPath)) { @@ -72,7 +72,7 @@ TEST_CASE("OrientationAnalysis::ConvertHexGridToSquareGridFilter: Single File Va DataStructure dataStructure; Arguments args; - fs::path k_InPath = fs::path(fmt::format("{}/{}/single/hex_grid.ang", complex::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir)); + fs::path k_InPath = fs::path(fmt::format("{}/{}/single/hex_grid.ang", nx::core::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir)); // Input Parameters args.insertOrAssign(ConvertHexGridToSquareGridFilter::k_MultipleFiles_Key, std::make_any(false)); @@ -85,21 +85,21 @@ TEST_CASE("OrientationAnalysis::ConvertHexGridToSquareGridFilter: Single File Va // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } - REQUIRE(::CompareFiles(fmt::format("{}/{}/single/exemplar/Sqr_SIMPL_hex_grid.ang", complex::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir), k_OutPath.string() + "/Sqr_hex_grid.ang")); + REQUIRE(::CompareFiles(fmt::format("{}/{}/single/exemplar/Sqr_SIMPL_hex_grid.ang", nx::core::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir), k_OutPath.string() + "/Sqr_hex_grid.ang")); } TEST_CASE("OrientationAnalysis::ConvertHexGridToSquareGridFilter: Multiple File Valid Execution", "[OrientationAnalysis][ConvertHexGridToSquareGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "convert_hex_grid_to_square_grid_test.tar.gz", - k_HexToSqrTestFilesDir); - fs::path k_OutPath = fs::path(fmt::format("{}/multi", complex::unit_test::k_BinaryTestOutputDir)); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "convert_hex_grid_to_square_grid_test.tar.gz", + k_HexToSqrTestFilesDir); + fs::path k_OutPath = fs::path(fmt::format("{}/multi", nx::core::unit_test::k_BinaryTestOutputDir)); if(!exists(k_OutPath)) { @@ -116,7 +116,7 @@ TEST_CASE("OrientationAnalysis::ConvertHexGridToSquareGridFilter: Multiple File k_InPath.startIndex = 1; k_InPath.incrementIndex = 1; k_InPath.endIndex = 2; - k_InPath.inputPath = fmt::format("{}/{}/multi", complex::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir); + k_InPath.inputPath = fmt::format("{}/{}/multi", nx::core::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir); k_InPath.filePrefix = "hex_grid"; k_InPath.ordering = GeneratedFileListParameter::Ordering::LowToHigh; k_InPath.paddingDigits = 0; @@ -134,15 +134,15 @@ TEST_CASE("OrientationAnalysis::ConvertHexGridToSquareGridFilter: Multiple File // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } REQUIRE((fs::exists(k_OutPath) && fs::is_directory(k_OutPath))); - REQUIRE(::CompareFiles(fmt::format("{}/{}/multi/exemplars/Sqr_SIMPL_hex_grid1.ang", complex::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir), k_OutPath.string() + "/Sqr_hex_grid1.ang")); - REQUIRE(::CompareFiles(fmt::format("{}/{}/multi/exemplars/Sqr_SIMPL_hex_grid2.ang", complex::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir), k_OutPath.string() + "/Sqr_hex_grid2.ang")); + REQUIRE(::CompareFiles(fmt::format("{}/{}/multi/exemplars/Sqr_SIMPL_hex_grid1.ang", nx::core::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir), k_OutPath.string() + "/Sqr_hex_grid1.ang")); + REQUIRE(::CompareFiles(fmt::format("{}/{}/multi/exemplars/Sqr_SIMPL_hex_grid2.ang", nx::core::unit_test::k_TestFilesDir, ::k_HexToSqrTestFilesDir), k_OutPath.string() + "/Sqr_hex_grid2.ang")); } diff --git a/src/Plugins/OrientationAnalysis/test/ConvertOrientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/ConvertOrientationsTest.cpp index 2256a4339c..e140df027f 100644 --- a/src/Plugins/OrientationAnalysis/test/ConvertOrientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ConvertOrientationsTest.cpp @@ -22,14 +22,14 @@ #include "OrientationAnalysis/Filters/ConvertOrientations.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; // This section of code exists solely to generate a source code in case another // orientation representation is created. Leave this code here. @@ -52,7 +52,7 @@ void _make_code() std::cout << "else if( inputType == OrientationRepresentation::Type::" << names[i] << " && outputType == OrientationRepresentation::Type::" << names[o] << ")\n" << "{\n"; - std::cout << " messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, \"Converting " << names[i] << " to " << names[o] << "\"});\n"; + std::cout << " messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, \"Converting " << names[i] << " to " << names[o] << "\"});\n"; if(inRep[i] == "qu") { @@ -113,7 +113,7 @@ TEST_CASE("OrientationAnalysis::ConvertOrientations: Invalid preflight", "[Orien auto preflightResult = filter.preflight(dataStructure, args); const std::vector& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); - REQUIRE(errors[0].code == complex::FilterParameter::Constants::k_Validate_Does_Not_Exist); + REQUIRE(errors[0].code == nx::core::FilterParameter::Constants::k_Validate_Does_Not_Exist); REQUIRE(!preflightResult.outputActions.valid()); } @@ -126,7 +126,7 @@ TEST_CASE("OrientationAnalysis::ConvertOrientations: Invalid preflight", "[Orien auto preflightResult = filter.preflight(dataStructure, args); const std::vector& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); - REQUIRE(errors[0].code == complex::FilterParameter::Constants::k_Validate_OutOfRange_Error); + REQUIRE(errors[0].code == nx::core::FilterParameter::Constants::k_Validate_OutOfRange_Error); REQUIRE(!preflightResult.outputActions.valid()); } @@ -136,7 +136,7 @@ TEST_CASE("OrientationAnalysis::ConvertOrientations: Invalid preflight", "[Orien auto preflightResult = filter.preflight(dataStructure, args); auto& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); - REQUIRE(errors[0].code == complex::FilterParameter::Constants::k_Validate_OutOfRange_Error); + REQUIRE(errors[0].code == nx::core::FilterParameter::Constants::k_Validate_OutOfRange_Error); REQUIRE(!preflightResult.outputActions.valid()); } } diff --git a/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp b/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp index a0c541a24d..8c97682b3c 100644 --- a/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ConvertQuaternionTest.cpp @@ -1,16 +1,16 @@ #include -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -68,11 +68,11 @@ TEST_CASE("OrientationAnalysis::ConvertQuaternionFilter", "[OrientationAnalysis] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto& outputArray = dataStructure.getDataRefAs(DataPath({k_ConvertedName})); UnitTest::CompareDataArrays(*toScalarVector, outputArray); @@ -93,11 +93,11 @@ TEST_CASE("OrientationAnalysis::ConvertQuaternionFilter", "[OrientationAnalysis] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto& outputArray = dataStructure.getDataRefAs(DataPath({k_Exemplar1})); UnitTest::CompareDataArrays(*quats, outputArray); diff --git a/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp b/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp index 02d25b1d04..72a2390537 100644 --- a/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/CreateEnsembleInfoTest.cpp @@ -1,13 +1,13 @@ #include "OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/EnsembleInfoParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/EnsembleInfoParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter execution", "[OrientationAnalysis][CreateEnsembleInfoFilter]") { @@ -29,7 +29,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } SECTION("Missing attribute matrix path") @@ -43,7 +43,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } SECTION("Invalid crystal structure ensemble phase data") @@ -57,7 +57,7 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); } SECTION("Invalid phase type ensemble phase data") @@ -71,20 +71,20 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Invalid filter executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); } // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Valid filter execution", "[OrientationAnalysis][CreateEnsembleInfoFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "so3_cubic_high_ipf_001.tar.gz", - "so3_cubic_high_ipf_001.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "so3_cubic_high_ipf_001.tar.gz", + "so3_cubic_high_ipf_001.dream3d"); // Instantiate the filter, a DataStructure object and an Arguments Object CreateEnsembleInfoFilter filter; @@ -105,11 +105,11 @@ TEST_CASE("OrientationAnalysis::CreateEnsembleInfoFilter: Valid filter execution // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/so3_cubic_high_ipf_001.dream3d", unit_test::k_TestFilesDir)); diff --git a/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp b/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp index 100f527d43..2888a97757 100644 --- a/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/EBSDSegmentFeaturesFilterTest.cpp @@ -4,26 +4,26 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; TEST_CASE("OrientationAnalysis::EBSDSegmentFeatures: Valid Execution", "[OrientationAnalysis][EBSDSegmentFeatures]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ebsd_segment_features.tar.gz", - "6_6_ebsd_segment_features.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_ebsd_segment_features.tar.gz", + "6_6_ebsd_segment_features.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -36,7 +36,7 @@ TEST_CASE("OrientationAnalysis::EBSDSegmentFeatures: Valid Execution", "[Orienta auto baseDataFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - // MultiThreshold Objects Filter (From ComplexCore Plugins) + // MultiThreshold Objects Filter (From SimplnxCore Plugins) SmallIn100::ExecuteMultiThresholdObjects(dataStructure, *filterList); // Convert Orientations Filter (From OrientationAnalysis Plugin) @@ -77,11 +77,11 @@ TEST_CASE("OrientationAnalysis::EBSDSegmentFeatures: Valid Execution", "[Orienta // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group diff --git a/src/Plugins/OrientationAnalysis/test/EbsdToH5EbsdTest.cpp b/src/Plugins/OrientationAnalysis/test/EbsdToH5EbsdTest.cpp index f6530f8c95..662838af72 100644 --- a/src/Plugins/OrientationAnalysis/test/EbsdToH5EbsdTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/EbsdToH5EbsdTest.cpp @@ -2,11 +2,11 @@ #include "OrientationAnalysis/Filters/EbsdToH5EbsdFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "H5Support/H5Lite.h" #include "H5Support/H5ScopedSentinel.h" @@ -18,7 +18,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; using namespace H5Support; namespace @@ -182,7 +182,7 @@ int TraverseFile(const std::string& fileName) const std::string k_ExemplarFilePath = fmt::format("{}/6_5_h5ebsd_exemplar/6_5_h5ebsd_exemplar.h5ebsd", unit_test::k_TestFilesDir); -const auto k_HighToLow = static_cast(complex::FilePathGenerator::Ordering::HighToLow); +const auto k_HighToLow = static_cast(nx::core::FilePathGenerator::Ordering::HighToLow); const int32 k_StartIndex = 1; const int32 k_EndIndex = 2; const int32 k_IncrementIndex = 1; @@ -200,8 +200,8 @@ TEST_CASE("OrientationAnalysis::EbsdToH5Ebsd", "[OrientationAnalysis][EbsdToH5Eb { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100.tar.gz", "Small_IN100"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_h5ebsd_exemplar.tar.gz", "6_5_h5ebsd_exemplar"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100.tar.gz", "Small_IN100"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_h5ebsd_exemplar.tar.gz", "6_5_h5ebsd_exemplar"); fs::path inputPath(k_InputPath); REQUIRE(fs::exists(inputPath)); @@ -218,17 +218,17 @@ TEST_CASE("OrientationAnalysis::EbsdToH5Ebsd", "[OrientationAnalysis][EbsdToH5Eb // Create default Parameters for the filter. args.insertOrAssign(EbsdToH5EbsdFilter::k_ZSpacing_Key, std::make_any(0.25F)); args.insertOrAssign(EbsdToH5EbsdFilter::k_StackingOrder_Key, std::make_any(k_HighToLow)); - args.insertOrAssign(EbsdToH5EbsdFilter::k_ReferenceFrame_Key, std::make_any(complex::EbsdToH5EbsdInputConstants::k_Edax)); + args.insertOrAssign(EbsdToH5EbsdFilter::k_ReferenceFrame_Key, std::make_any(nx::core::EbsdToH5EbsdInputConstants::k_Edax)); args.insertOrAssign(EbsdToH5EbsdFilter::k_OutputPath_Key, std::make_any(fs::path(s_OutputFilePath))); args.insertOrAssign(EbsdToH5EbsdFilter::k_InputFileListInfo_Key, std::make_any(k_FileListInfo)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); ::TraverseFile(k_ExemplarFilePath); } diff --git a/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp b/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp index 24ee3228d0..4d28cfff4c 100644 --- a/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindAvgCAxesTest.cpp @@ -1,12 +1,12 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -18,7 +18,7 @@ TEST_CASE("OrientationAnalysis::FindAvgCAxesFilter: Valid Filter Execution", "[O { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -38,11 +38,11 @@ TEST_CASE("OrientationAnalysis::FindAvgCAxesFilter: Valid Filter Execution", "[O // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareFloatArraysWithNans(dataStructure, k_CellFeatureDataPath.createChildPath(k_AvgCAxesExemplar), k_CellFeatureDataPath.createChildPath(k_AvgCAxesComputed), UnitTest::EPSILON, false); @@ -52,7 +52,7 @@ TEST_CASE("OrientationAnalysis::FindAvgCAxesFilter: Invalid Filter Execution", " { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -75,9 +75,9 @@ TEST_CASE("OrientationAnalysis::FindAvgCAxesFilter: Invalid Filter Execution", " // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp index 3078aadeea..cabaea680d 100644 --- a/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindAvgOrientationsTest.cpp @@ -28,27 +28,27 @@ of doing that. #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace FindAvgOrientationsTest { // These are the argument keys for the Import Text filter. We cannot use the ones from the -// header file as that would bring in a dependency on the ComplexCorePlugin +// header file as that would bring in a dependency on the SimplnxCorePlugin static constexpr StringLiteral k_InputFileKey = "input_file"; static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; static constexpr StringLiteral k_NTuplesKey = "n_tuples"; @@ -58,7 +58,7 @@ static constexpr StringLiteral k_DelimiterChoiceKey = "delimiter_choice"; static constexpr StringLiteral k_DataArrayKey = "output_data_array"; } // namespace FindAvgOrientationsTest -void runReadTextDataArrayFilter(const std::string k_InputFileName, complex::NumericType k_NumericType, const uint64 k_NumTuples, const uint64 k_NumComponents, const DataPath k_InputFileDataPath, +void runReadTextDataArrayFilter(const std::string k_InputFileName, nx::core::NumericType k_NumericType, const uint64 k_NumTuples, const uint64 k_NumComponents, const DataPath k_InputFileDataPath, DataStructure& dataStructure) { auto* filterList = Application::Instance()->getFilterList(); @@ -78,16 +78,16 @@ void runReadTextDataArrayFilter(const std::string k_InputFileName, complex::Nume // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } TEST_CASE("OrientationAnalysis::FindAvgOrientations", "[OrientationAnalysis][FindAvgOrientations]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ASCIIData.tar.gz", "ASCIIData"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ASCIIData.tar.gz", "ASCIIData"); // Instantiate an "Application" instance to load plugins Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -120,7 +120,7 @@ TEST_CASE("OrientationAnalysis::FindAvgOrientations", "[OrientationAnalysis][Fin DataStructure dataStructure; // Create the Crystal Structures Array (needed later down the pipeline) - UInt32Array* crystalStructuresPtr = complex::UnitTest::CreateTestDataArray(dataStructure, k_CrystalStuctures, {2}, {1}); + UInt32Array* crystalStructuresPtr = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_CrystalStuctures, {2}, {1}); (*crystalStructuresPtr)[0] = 999; // Unknown Crystal Structure (*crystalStructuresPtr)[1] = 1; // Cubic Laue Class @@ -162,11 +162,11 @@ TEST_CASE("OrientationAnalysis::FindAvgOrientations", "[OrientationAnalysis][Fin // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the data sets diff --git a/src/Plugins/OrientationAnalysis/test/FindBoundaryStrengthsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindBoundaryStrengthsTest.cpp index 58077b91d8..5048563960 100644 --- a/src/Plugins/OrientationAnalysis/test/FindBoundaryStrengthsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindBoundaryStrengthsTest.cpp @@ -1,13 +1,13 @@ #include -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include "OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -27,8 +27,8 @@ TEST_CASE("OrientationAnalysis::FindBoundaryStrengthsFilter: Valid Filter Execut { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission.tar.gz", - "feature_boundary_neighbor_slip_transmission"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission.tar.gz", + "feature_boundary_neighbor_slip_transmission"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/feature_boundary_neighbor_slip_transmission/6_6_feature_boundary_neighbor_slip_transmission.dream3d", unit_test::k_TestFilesDir))); diff --git a/src/Plugins/OrientationAnalysis/test/FindCAxisLocationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindCAxisLocationsTest.cpp index afe3381b14..6fd94dbce4 100644 --- a/src/Plugins/OrientationAnalysis/test/FindCAxisLocationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindCAxisLocationsTest.cpp @@ -1,12 +1,12 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/FindCAxisLocationsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -18,7 +18,7 @@ TEST_CASE("OrientationAnalysis::FindCAxisLocationsFilter: Valid Filter Execution { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -36,11 +36,11 @@ TEST_CASE("OrientationAnalysis::FindCAxisLocationsFilter: Valid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareFloatArraysWithNans(dataStructure, k_CellAttributeMatrix.createChildPath(k_CAxisLocationsExemplar), k_CellAttributeMatrix.createChildPath(k_CAxisLocationsComputed), UnitTest::EPSILON, false); @@ -50,7 +50,7 @@ TEST_CASE("OrientationAnalysis::FindCAxisLocationsFilter: InValid Filter Executi { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -71,9 +71,9 @@ TEST_CASE("OrientationAnalysis::FindCAxisLocationsFilter: InValid Filter Executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/FindFeatureNeighborCAxisMisalignmentsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindFeatureNeighborCAxisMisalignmentsTest.cpp index 0095e5fa23..66bab6bd46 100644 --- a/src/Plugins/OrientationAnalysis/test/FindFeatureNeighborCAxisMisalignmentsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindFeatureNeighborCAxisMisalignmentsTest.cpp @@ -1,12 +1,12 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -21,7 +21,7 @@ TEST_CASE("OrientationAnalysis::FindFeatureNeighborCAxisMisalignmentsFilter: Val { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -42,11 +42,11 @@ TEST_CASE("OrientationAnalysis::FindFeatureNeighborCAxisMisalignmentsFilter: Val // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareNeighborListFloatArraysWithNans(dataStructure, k_CellFeatureDataPath.createChildPath(k_CAxisMisalignmentListNameExemplar), k_CellFeatureDataPath.createChildPath(k_CAxisMisalignmentListNameComputed), UnitTest::EPSILON, true); @@ -58,7 +58,7 @@ TEST_CASE("OrientationAnalysis::FindFeatureNeighborCAxisMisalignmentsFilter: InV { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -85,7 +85,7 @@ TEST_CASE("OrientationAnalysis::FindFeatureNeighborCAxisMisalignmentsFilter: InV // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } SECTION("Mismatching Input Array Tuples") { @@ -93,10 +93,10 @@ TEST_CASE("OrientationAnalysis::FindFeatureNeighborCAxisMisalignmentsFilter: InV // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceCAxisMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceCAxisMisorientationsTest.cpp index c798972032..6b9adf0422 100644 --- a/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceCAxisMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceCAxisMisorientationsTest.cpp @@ -1,12 +1,12 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -23,7 +23,7 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceCAxisMisorientationsFilter: { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -46,11 +46,11 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceCAxisMisorientationsFilter: // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareFloatArraysWithNans(dataStructure, k_CellAttributeMatrix.createChildPath(k_FeatRefCAxisMisExemplar), k_CellAttributeMatrix.createChildPath(k_FeatRefCAxisMisComputed), UnitTest::EPSILON, false); @@ -64,7 +64,7 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceCAxisMisorientationsFilter: { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_caxis_data.tar.gz", "6_6_caxis_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_caxis_data/6_6_find_caxis_data.dream3d", unit_test::k_TestFilesDir)); @@ -90,9 +90,9 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceCAxisMisorientationsFilter: // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceMisorientationsTest.cpp index 821c1ecf32..c35c06ee10 100644 --- a/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindFeatureReferenceMisorientationsTest.cpp @@ -1,19 +1,19 @@ #include "OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; // afasdf namespace { @@ -29,13 +29,13 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceMisorientationsFilter", "[Or { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); DataPath cellFeatureDataPath({k_DataContainer, k_CellFeatureData}); DataPath avgQuatsDataPath = cellFeatureDataPath.createChildPath(k_AvgQuats); @@ -63,11 +63,11 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceMisorientationsFilter", "[Or // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Cell Data @@ -86,7 +86,7 @@ TEST_CASE("OrientationAnalysis::FindFeatureReferenceMisorientationsFilter", "[Or UnitTest::CompareArrays(dataStructure, k_ExemplarArrayPath, k_GeneratedDataPath); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_feature_reference_misorientations.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp index 075843d73d..8619196eb2 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBCDMetricBasedTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" @@ -14,8 +14,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -45,8 +45,8 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", - "6_6_find_gbcd_metric_based"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", + "6_6_find_gbcd_metric_based"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); const auto* filterListPtr = Application::Instance()->getFilterList(); @@ -87,11 +87,11 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // read in exemplar and computed data files for comparison @@ -109,7 +109,7 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(exemplarDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -117,13 +117,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarDistributionPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // exemplar errors { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(exemplarErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -131,13 +131,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarErrorPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // computed distribution { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -145,13 +145,13 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedDistributionPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // computed errors { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3052)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -159,7 +159,7 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedErrorPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } } @@ -172,8 +172,8 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: InValid Filter Execut { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", - "6_6_find_gbcd_metric_based"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", + "6_6_find_gbcd_metric_based"); // Read Exemplar DREAM3D File Input auto exemplarInputFilePath = fs::path(fmt::format("{}/6_6_find_gbcd_metric_based/6_6_find_gbcd_metric_based.dream3d", unit_test::k_TestFilesDir)); @@ -246,9 +246,9 @@ TEST_CASE("OrientationAnalysis::FindGBCDMetricBasedFilter: InValid Filter Execut // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp index fc0b814939..e8b951a7f9 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBCDTest.cpp @@ -1,20 +1,20 @@ #include "OrientationAnalysis/Filters/FindGBCDFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -26,12 +26,12 @@ TEST_CASE("OrientationAnalysis::FindGBCD", "[OrientationAnalysis][FindGBCD]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_SmallIN100}); + DataPath smallIn100Group({nx::core::Constants::k_SmallIN100}); DataPath featureDataPath = smallIn100Group.createChildPath(Constants::k_Grain_Data); DataPath avgEulerAnglesPath = featureDataPath.createChildPath(Constants::k_AvgEulerAngles); DataPath featurePhasesPath = featureDataPath.createChildPath(Constants::k_Phases); @@ -68,11 +68,11 @@ TEST_CASE("OrientationAnalysis::FindGBCD", "[OrientationAnalysis][FindGBCD]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output GBCD Data @@ -83,7 +83,7 @@ TEST_CASE("OrientationAnalysis::FindGBCD", "[OrientationAnalysis][FindGBCD]") UnitTest::CompareFloatArraysWithNans(dataStructure, k_ExemplarArrayPath, k_GeneratedDataPath); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_gbcd.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp index a5456ed8c6..071b384312 100644 --- a/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindGBPDMetricBasedTest.cpp @@ -1,9 +1,9 @@ #include -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" @@ -12,8 +12,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -43,8 +43,8 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", - "6_6_find_gbcd_metric_based"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", + "6_6_find_gbcd_metric_based"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -84,11 +84,11 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // read in exemplar and computed data files for comparison @@ -106,7 +106,7 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(exemplarDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -114,13 +114,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarDistributionPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // exemplar errors { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(exemplarErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -128,13 +128,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ExemplarErrorPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // computed distribution { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedDistOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -142,13 +142,13 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedDistributionPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // computed errors { Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedErrorsOutput)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(DynamicTableInfo::TableDataType{{static_cast(3624)}})); args.insertOrAssign(k_NCompKey, std::make_any(3)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(1)); @@ -156,7 +156,7 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: Valid Filter Executio args.insertOrAssign(k_DataArrayKey, std::make_any(k_ComputedErrorPath)); auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } } @@ -169,8 +169,8 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: InValid Filter Execut { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", - "6_6_find_gbcd_metric_based"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz", + "6_6_find_gbcd_metric_based"); // Read Exemplar DREAM3D File Input auto exemplarInputFilePath = fs::path(fmt::format("{}/6_6_find_gbcd_metric_based/6_6_find_gbcd_metric_based.dream3d", unit_test::k_TestFilesDir)); @@ -225,9 +225,9 @@ TEST_CASE("OrientationAnalysis::FindGBPDMetricBasedFilter: InValid Filter Execut // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp index 6e11fcb9ba..ca1ba0afe6 100644 --- a/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindKernelAvgMisorientationsTest.cpp @@ -1,19 +1,19 @@ #include "OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -25,13 +25,13 @@ TEST_CASE("OrientationAnalysis::FindKernelAvgMisorientationsFilter", "[Orientati { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); { // Instantiate the filter, a DataStructure object and an Arguments Object @@ -53,11 +53,11 @@ TEST_CASE("OrientationAnalysis::FindKernelAvgMisorientationsFilter", "[Orientati // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Cell Data @@ -68,7 +68,7 @@ TEST_CASE("OrientationAnalysis::FindKernelAvgMisorientationsFilter", "[Orientati UnitTest::CompareArrays(dataStructure, k_ExemplarArrayPath, k_GeneratedDataPath); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_kernel_average_misorientations.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/FindMisorientationsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindMisorientationsTest.cpp index 090241f4da..4fdf9e2a94 100644 --- a/src/Plugins/OrientationAnalysis/test/FindMisorientationsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindMisorientationsTest.cpp @@ -1,18 +1,18 @@ #include "OrientationAnalysis/Filters/FindMisorientationsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -25,13 +25,13 @@ TEST_CASE("OrientationAnalysis::FindMisorientationsFilter", "[OrientationAnalysi { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); DataPath cellFeatureDataPath({k_DataContainer, k_CellFeatureData}); DataPath neighborLstDataPath = cellFeatureDataPath.createChildPath(k_NeighborListArrayName); DataPath avgQuatsDataPath = cellFeatureDataPath.createChildPath(k_AvgQuats); @@ -54,11 +54,11 @@ TEST_CASE("OrientationAnalysis::FindMisorientationsFilter", "[OrientationAnalysi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the k_MisorientationList output with those precalculated from the file @@ -69,7 +69,7 @@ TEST_CASE("OrientationAnalysis::FindMisorientationsFilter", "[OrientationAnalysi } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_misorientations.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/FindSchmidsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindSchmidsTest.cpp index d16f21e79e..3175740ffa 100644 --- a/src/Plugins/OrientationAnalysis/test/FindSchmidsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindSchmidsTest.cpp @@ -1,19 +1,19 @@ #include "OrientationAnalysis/Filters/FindSchmidsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -29,13 +29,13 @@ TEST_CASE("OrientationAnalysis::FindSchmidsFilter", "[OrientationAnalysis][FindS { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); DataPath cellFeatureDataPath({k_DataContainer, k_CellFeatureData}); DataPath avgQuatsDataPath = cellFeatureDataPath.createChildPath(k_AvgQuats); DataPath featurePhasesDataPath = cellFeatureDataPath.createChildPath(k_Phases); @@ -64,11 +64,11 @@ TEST_CASE("OrientationAnalysis::FindSchmidsFilter", "[OrientationAnalysis][FindS // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the float output arrays with those precalculated from the file @@ -95,7 +95,7 @@ TEST_CASE("OrientationAnalysis::FindSchmidsFilter", "[OrientationAnalysis][FindS } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_schmids.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp b/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp index 6171f31825..8ab1967fe9 100644 --- a/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindShapesFilterTest.cpp @@ -1,23 +1,23 @@ #include "OrientationAnalysis/Filters/FindShapesFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; -TEST_CASE("OrientationAnalysis::FindShapesFilter", "[ComplexCore][FindShapesFilter]") +TEST_CASE("OrientationAnalysis::FindShapesFilter", "[SimplnxCore][FindShapesFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); @@ -61,11 +61,11 @@ TEST_CASE("OrientationAnalysis::FindShapesFilter", "[ComplexCore][FindShapesFilt args.insertOrAssign(FindShapesFilter::k_SelectedImageGeometry_Key, std::make_any(k_SelectedGeometryPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Compare the output arrays with those precalculated from the file @@ -82,7 +82,7 @@ TEST_CASE("OrientationAnalysis::FindShapesFilter", "[ComplexCore][FindShapesFilt } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_shapes.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/FindSlipTransmissionMetricsTest.cpp b/src/Plugins/OrientationAnalysis/test/FindSlipTransmissionMetricsTest.cpp index 3af6eae324..29882f9da5 100644 --- a/src/Plugins/OrientationAnalysis/test/FindSlipTransmissionMetricsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindSlipTransmissionMetricsTest.cpp @@ -3,9 +3,9 @@ #include "OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -25,8 +25,8 @@ TEST_CASE("OrientationAnalysis::FindSlipTransmissionMetricsFilter: Valid Filter { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission.tar.gz", - "feature_boundary_neighbor_slip_transmission"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission.tar.gz", + "feature_boundary_neighbor_slip_transmission"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/feature_boundary_neighbor_slip_transmission/6_6_feature_boundary_neighbor_slip_transmission.dream3d", unit_test::k_TestFilesDir))); diff --git a/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp b/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp index a12e4dba20..e2215e5bd0 100644 --- a/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/FindTriangleGeomShapesTest.cpp @@ -1,15 +1,15 @@ #include "OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace FindTriangleGeomShapesFilterTest { @@ -38,7 +38,7 @@ TEST_CASE("OrientationAnalysis::FindTriangleGeomShapes", "[OrientationAnalysis][ { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/12_IN625_GBCD/12_IN625_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -64,11 +64,11 @@ TEST_CASE("OrientationAnalysis::FindTriangleGeomShapes", "[OrientationAnalysis][ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } std::vector outputArrayNames = {k_Omega3SArrayName, k_AxisLengthsArrayName, k_AxisEulerAnglesArrayName, k_AspectRatiosArrayName}; @@ -84,7 +84,7 @@ TEST_CASE("OrientationAnalysis::FindTriangleGeomShapes", "[OrientationAnalysis][ UnitTest::CompareDataArrays(kExemplarsArray, kNxArray); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_triangle_geom_shapes.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp index 691a591b09..a965c39c51 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateFZQuaternionsTest.cpp @@ -1,18 +1,18 @@ #include "OrientationAnalysis/Filters/GenerateFZQuaternions.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "EbsdLib/Core/EbsdLibConstants.h" #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -20,14 +20,14 @@ DataStructure CreateDataStructure() { DataStructure dataStructure; - DataGroup* group = complex::DataGroup::Create(dataStructure, complex::Constants::k_SmallIN100); - DataGroup* scanData = complex::DataGroup::Create(dataStructure, complex::Constants::k_EbsdScanData, group->getId()); + DataGroup* group = nx::core::DataGroup::Create(dataStructure, nx::core::Constants::k_SmallIN100); + DataGroup* scanData = nx::core::DataGroup::Create(dataStructure, nx::core::Constants::k_EbsdScanData, group->getId()); // Create an Image Geometry grid for the Scan Data ImageGeom* imageGeom = ImageGeom::Create(dataStructure, k_SmallIn100ImageGeom, scanData->getId()); imageGeom->setSpacing({0.25f, 0.25f, 0.25f}); imageGeom->setOrigin({0.0f, 0.0f, 0.0f}); - complex::SizeVec3 imageGeomDims = {100, 100, 2}; + nx::core::SizeVec3 imageGeomDims = {100, 100, 2}; imageGeom->setDimensions(imageGeomDims); // Listed from slowest to fastest (Z, Y, X) // Create some DataArrays; The DataStructure keeps a shared_ptr<> to the DataArray so DO NOT put @@ -35,19 +35,19 @@ DataStructure CreateDataStructure() std::vector compDims = {4}; std::vector tupleDims = {100, 100, 2}; - std::string filePath = complex::unit_test::k_DataDir.str(); + std::string filePath = nx::core::unit_test::k_DataDir.str(); std::string fileName = "/quats.raw"; - complex::ImportFromBinaryFile(filePath + fileName, k_Quats, dataStructure, tupleDims, compDims, scanData->getId()); + nx::core::ImportFromBinaryFile(filePath + fileName, k_Quats, dataStructure, tupleDims, compDims, scanData->getId()); fileName = "/fz_quats.raw"; - complex::ImportFromBinaryFile(filePath + fileName, "FZ_QUATS_EXEMPLAR", dataStructure, tupleDims, compDims, scanData->getId()); + nx::core::ImportFromBinaryFile(filePath + fileName, "FZ_QUATS_EXEMPLAR", dataStructure, tupleDims, compDims, scanData->getId()); - Int32Array* phases_data = complex::UnitTest::CreateTestDataArray(dataStructure, k_Phases, tupleDims, {1}, scanData->getId()); + Int32Array* phases_data = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_Phases, tupleDims, {1}, scanData->getId()); phases_data->fill(1); // Add in another group that is just information about the grid data. - DataGroup* phaseGroup = complex::DataGroup::Create(dataStructure, k_PhaseData, group->getId()); + DataGroup* phaseGroup = nx::core::DataGroup::Create(dataStructure, k_PhaseData, group->getId()); UInt32Array* laueClass = UInt32Array::CreateWithStore(dataStructure, k_LaueClass, {2}, {1}, phaseGroup->getId()); (*laueClass)[0] = EbsdLib::CrystalStructure::UnknownCrystalStructure; (*laueClass)[1] = EbsdLib::CrystalStructure::Cubic_High; @@ -70,7 +70,7 @@ TEST_CASE("OrientationAnalysis::GenerateFZQuaternions", "[OrientationAnalysis][G DataStructure dataStructure = CreateDataStructure(); Arguments args; - DataPath scanDataPath = DataPath({complex::Constants::k_SmallIN100, complex::Constants::k_EbsdScanData}); + DataPath scanDataPath = DataPath({nx::core::Constants::k_SmallIN100, nx::core::Constants::k_EbsdScanData}); // Create default Parameters for the filter. args.insertOrAssign(GenerateFZQuaternions::k_QuatsArrayPath_Key, std::make_any(scanDataPath.createChildPath(k_Quats))); diff --git a/src/Plugins/OrientationAnalysis/test/GenerateFaceIPFColoringTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateFaceIPFColoringTest.cpp index 8361ce018a..998b958226 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateFaceIPFColoringTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateFaceIPFColoringTest.cpp @@ -1,39 +1,39 @@ #include "OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { inline constexpr StringLiteral k_FaceIPFColors("SurfaceMeshFaceIPFColors"); inline constexpr StringLiteral k_NXFaceIPFColors("NXFaceIPFColors"); -DataPath smallIn100Group({complex::Constants::k_SmallIN100}); -DataPath featureDataPath = smallIn100Group.createChildPath(complex::Constants::k_Grain_Data); -DataPath avgEulerAnglesPath = featureDataPath.createChildPath(complex::Constants::k_AvgEulerAngles); -DataPath featurePhasesPath = featureDataPath.createChildPath(complex::Constants::k_Phases); -DataPath crystalStructurePath = smallIn100Group.createChildPath(complex::Constants::k_Phase_Data).createChildPath(complex::Constants::k_CrystalStructures); +DataPath smallIn100Group({nx::core::Constants::k_SmallIN100}); +DataPath featureDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_Grain_Data); +DataPath avgEulerAnglesPath = featureDataPath.createChildPath(nx::core::Constants::k_AvgEulerAngles); +DataPath featurePhasesPath = featureDataPath.createChildPath(nx::core::Constants::k_Phases); +DataPath crystalStructurePath = smallIn100Group.createChildPath(nx::core::Constants::k_Phase_Data).createChildPath(nx::core::Constants::k_CrystalStructures); DataPath avgQuatsPath = featureDataPath.createChildPath("AvgQuats"); -DataPath triangleDataContainerPath({complex::Constants::k_TriangleDataContainerName}); -DataPath faceDataGroup = triangleDataContainerPath.createChildPath(complex::Constants::k_FaceData); +DataPath triangleDataContainerPath({nx::core::Constants::k_TriangleDataContainerName}); +DataPath faceDataGroup = triangleDataContainerPath.createChildPath(nx::core::Constants::k_FaceData); -DataPath faceLabels = faceDataGroup.createChildPath(complex::Constants::k_FaceLabels); -DataPath faceNormals = faceDataGroup.createChildPath(complex::Constants::k_FaceNormals); -DataPath faceAreas = faceDataGroup.createChildPath(complex::Constants::k_FaceAreas); +DataPath faceLabels = faceDataGroup.createChildPath(nx::core::Constants::k_FaceLabels); +DataPath faceNormals = faceDataGroup.createChildPath(nx::core::Constants::k_FaceNormals); +DataPath faceAreas = faceDataGroup.createChildPath(nx::core::Constants::k_FaceAreas); } // namespace TEST_CASE("OrientationAnalysis::GenerateFaceIPFColoringFilter: Valid filter execution", "[OrientationAnalysis][GenerateFaceIPFColoringFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -53,11 +53,11 @@ TEST_CASE("OrientationAnalysis::GenerateFaceIPFColoringFilter: Valid filter exec // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // compare the resulting face IPF Colors array DataPath exemplarPath = faceDataGroup.createChildPath(::k_FaceIPFColors); @@ -69,7 +69,7 @@ TEST_CASE("OrientationAnalysis::GenerateFaceIPFColoringFilter: Invalid filter ex { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -100,9 +100,9 @@ TEST_CASE("OrientationAnalysis::GenerateFaceIPFColoringFilter: Invalid filter ex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } diff --git a/src/Plugins/OrientationAnalysis/test/GenerateFaceMisorientationColoringTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateFaceMisorientationColoringTest.cpp index 15a8ebb6ef..5318c2b4eb 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateFaceMisorientationColoringTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateFaceMisorientationColoringTest.cpp @@ -2,13 +2,13 @@ #include "OrientationAnalysis/Filters/GenerateFaceMisorientationColoringFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -16,26 +16,26 @@ inline constexpr StringLiteral k_FaceMisorientationColors("SurfaceMeshFaceMisori inline constexpr StringLiteral k_NXFaceMisorientationColors("NXFaceMisorientationColors"); inline constexpr StringLiteral k_AvgQuats("AvgQuats"); -DataPath smallIn100Group({complex::Constants::k_SmallIN100}); -DataPath featureDataPath = smallIn100Group.createChildPath(complex::Constants::k_Grain_Data); -DataPath avgEulerAnglesPath = featureDataPath.createChildPath(complex::Constants::k_AvgEulerAngles); -DataPath featurePhasesPath = featureDataPath.createChildPath(complex::Constants::k_Phases); -DataPath crystalStructurePath = smallIn100Group.createChildPath(complex::Constants::k_Phase_Data).createChildPath(complex::Constants::k_CrystalStructures); +DataPath smallIn100Group({nx::core::Constants::k_SmallIN100}); +DataPath featureDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_Grain_Data); +DataPath avgEulerAnglesPath = featureDataPath.createChildPath(nx::core::Constants::k_AvgEulerAngles); +DataPath featurePhasesPath = featureDataPath.createChildPath(nx::core::Constants::k_Phases); +DataPath crystalStructurePath = smallIn100Group.createChildPath(nx::core::Constants::k_Phase_Data).createChildPath(nx::core::Constants::k_CrystalStructures); DataPath avgQuatsPath = featureDataPath.createChildPath(k_AvgQuats); -DataPath triangleDataContainerPath({complex::Constants::k_TriangleDataContainerName}); -DataPath faceDataGroup = triangleDataContainerPath.createChildPath(complex::Constants::k_FaceData); +DataPath triangleDataContainerPath({nx::core::Constants::k_TriangleDataContainerName}); +DataPath faceDataGroup = triangleDataContainerPath.createChildPath(nx::core::Constants::k_FaceData); -DataPath faceLabels = faceDataGroup.createChildPath(complex::Constants::k_FaceLabels); -DataPath faceNormals = faceDataGroup.createChildPath(complex::Constants::k_FaceNormals); -DataPath faceAreas = faceDataGroup.createChildPath(complex::Constants::k_FaceAreas); +DataPath faceLabels = faceDataGroup.createChildPath(nx::core::Constants::k_FaceLabels); +DataPath faceNormals = faceDataGroup.createChildPath(nx::core::Constants::k_FaceNormals); +DataPath faceAreas = faceDataGroup.createChildPath(nx::core::Constants::k_FaceAreas); } // namespace TEST_CASE("OrientationAnalysis::GenerateFaceMisorientationColoringFilter: Valid filter execution", "[OrientationAnalysis][GenerateFaceMisorientationColoringFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -55,7 +55,7 @@ TEST_CASE("OrientationAnalysis::GenerateFaceMisorientationColoringFilter: Valid // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // GenerateFaceMisorientationColoringFilter @@ -73,11 +73,11 @@ TEST_CASE("OrientationAnalysis::GenerateFaceMisorientationColoringFilter: Valid // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // compare the resulting face IPF Colors array @@ -90,7 +90,7 @@ TEST_CASE("OrientationAnalysis::GenerateFaceMisorientationColoringFilter: Invali { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -116,7 +116,7 @@ TEST_CASE("OrientationAnalysis::GenerateFaceMisorientationColoringFilter: Invali // Execute the filter and check the result auto convertOrientationsResult = convertOrientationsFilter.execute(dataStructure, convertOrientationsArgs); - COMPLEX_RESULT_REQUIRE_VALID(convertOrientationsResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(convertOrientationsResult.result); } args.insertOrAssign(GenerateFaceMisorientationColoringFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(faceLabels)); @@ -137,9 +137,9 @@ TEST_CASE("OrientationAnalysis::GenerateFaceMisorientationColoringFilter: Invali // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } diff --git a/src/Plugins/OrientationAnalysis/test/GenerateGBCDPoleFigureTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateGBCDPoleFigureTest.cpp index b0844421c2..124a9df978 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateGBCDPoleFigureTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateGBCDPoleFigureTest.cpp @@ -1,20 +1,20 @@ #include "OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -37,12 +37,12 @@ TEST_CASE("OrientationAnalysis::GenerateGBCDPoleFigureFilter", "[OrientationAnal { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_SmallIN100}); + DataPath smallIn100Group({nx::core::Constants::k_SmallIN100}); DataPath featureDataPath = smallIn100Group.createChildPath(Constants::k_Grain_Data); DataPath avgEulerAnglesPath = featureDataPath.createChildPath(Constants::k_AvgEulerAngles); DataPath featurePhasesPath = featureDataPath.createChildPath(Constants::k_Phases); @@ -80,11 +80,11 @@ TEST_CASE("OrientationAnalysis::GenerateGBCDPoleFigureFilter", "[OrientationAnal // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Pole Figure for Sigma 3 @@ -111,11 +111,11 @@ TEST_CASE("OrientationAnalysis::GenerateGBCDPoleFigureFilter", "[OrientationAnal // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Pole Figure for Sigma 9 @@ -142,11 +142,11 @@ TEST_CASE("OrientationAnalysis::GenerateGBCDPoleFigureFilter", "[OrientationAnal // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Pole Figure for Sigma 11 @@ -157,7 +157,7 @@ TEST_CASE("OrientationAnalysis::GenerateGBCDPoleFigureFilter", "[OrientationAnal UnitTest::CompareFloatArraysWithNans(dataStructure, k_ExemplarArrayPath, k_GeneratedDataPath); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/gbcd_pole_figure.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/GenerateIPFColorsTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateIPFColorsTest.cpp index 44f07a11c8..d0aa79e7e7 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateIPFColorsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateIPFColorsTest.cpp @@ -21,10 +21,10 @@ Compare the data sets. The values should be exactly the same. #include "OrientationAnalysis/Filters/GenerateIPFColorsFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -32,22 +32,22 @@ Compare the data sets. The values should be exactly the same. #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::UnitTest; +using namespace nx::core::Constants; -namespace complex::Constants +namespace nx::core::Constants { inline constexpr StringLiteral k_ImageDataContainer("ImageDataContainer"); inline constexpr StringLiteral k_OutputIPFColors("IPF Colors_Test_Output"); -} // namespace complex::Constants +} // namespace nx::core::Constants TEST_CASE("OrientationAnalysis::GenerateIPFColors", "[OrientationAnalysis][GenerateIPFColors]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "so3_cubic_high_ipf_001.tar.gz", - "so3_cubic_high_ipf_001.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "so3_cubic_high_ipf_001.tar.gz", + "so3_cubic_high_ipf_001.dream3d"); DataStructure dataStructure; { @@ -86,17 +86,17 @@ TEST_CASE("OrientationAnalysis::GenerateIPFColors", "[OrientationAnalysis][Gener // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); { // Write out the DataStructure for later viewing/debugging - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/GenerateIPFColors_Test.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/GenerateIPFColors_Test.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } DataPath ipfColors({Constants::k_ImageDataContainer, Constants::k_CellData, Constants::k_Ipf_Colors}); diff --git a/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp b/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp index 83d44495fd..ce97dca201 100644 --- a/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/GenerateQuaternionConjugateTest.cpp @@ -1,14 +1,14 @@ #include -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { const std::string k_QuatName = "Quats"; @@ -65,11 +65,11 @@ TEST_CASE("OrientationAnalysis::GenerateQuaternionConjugateFilter", "[Orientatio // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto& outputArray = dataStructure.getDataRefAs(DataPath({k_ConvertedName})); UnitTest::CompareDataArrays(*exemplarData, outputArray); diff --git a/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp b/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp index 90e6198ee2..4cb923a1bf 100644 --- a/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/MergeTwinsTest.cpp @@ -6,23 +6,23 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; TEST_CASE("Reconstruction::MergeTwinsFilter: Valid Execution", "[Reconstruction][MergeTwinsFilter][.][UNIMPLEMENTED][!mayfail]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "neighbor_orientation_correlation.tar.gz", - "neighbor_orientation_correlation.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "neighbor_orientation_correlation.tar.gz", + "neighbor_orientation_correlation.dream3d"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -75,11 +75,11 @@ TEST_CASE("Reconstruction::MergeTwinsFilter: Valid Execution", "[Reconstruction] // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // SegmentFeatures (Misorientation) filter @@ -185,10 +185,10 @@ TEST_CASE("Reconstruction::MergeTwinsFilter: Valid Execution", "[Reconstruction] args.insert(k_SurfaceFeatures_Key, std::make_any("SurfaceFeatures")); auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); } // merge twins filter diff --git a/src/Plugins/OrientationAnalysis/test/NeighborOrientationCorrelationTest.cpp b/src/Plugins/OrientationAnalysis/test/NeighborOrientationCorrelationTest.cpp index 9ffd7b6e01..ef1c3cd67d 100644 --- a/src/Plugins/OrientationAnalysis/test/NeighborOrientationCorrelationTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/NeighborOrientationCorrelationTest.cpp @@ -2,21 +2,21 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; /** * Read H5Ebsd File @@ -37,10 +37,10 @@ using namespace complex::UnitTest; TEST_CASE("OrientationAnalysis::NeighborOrientationCorrelationFilter: Small IN100 Pipeline", "[OrientationAnalysis][NeighborOrientationCorrelationFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "neighbor_orientation_correlation.tar.gz", - "neighbor_orientation_correlation.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "neighbor_orientation_correlation.tar.gz", + "neighbor_orientation_correlation.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -53,7 +53,7 @@ TEST_CASE("OrientationAnalysis::NeighborOrientationCorrelationFilter: Small IN10 auto baseDataFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - // MultiThreshold Objects Filter (From ComplexCore Plugins) + // MultiThreshold Objects Filter (From SimplnxCore Plugins) SmallIn100::ExecuteMultiThresholdObjects(dataStructure, *filterList); // Convert Orientations Filter (From OrientationAnalysis Plugin) @@ -90,11 +90,11 @@ TEST_CASE("OrientationAnalysis::NeighborOrientationCorrelationFilter: Small IN10 // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group @@ -188,7 +188,7 @@ TEST_CASE("OrientationAnalysis::NeighborOrientationCorrelationFilter: Small IN10 } } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/neighbor_orientation_correlation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp index dcfd650322..670bcaf615 100644 --- a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp +++ b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp @@ -2,13 +2,13 @@ #include -#include "complex/Common/Uuid.hpp" -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Parameters/ArrayThresholdsParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Uuid.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Parameters/ArrayThresholdsParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -37,31 +37,31 @@ inline const std::string MaterialName("MaterialName"); } // namespace EnsembleData } // namespace EbsdLib -namespace complex +namespace nx::core { // Make sure we can instantiate the Import Text Filter const Uuid k_ReadTextDataArrayFilterId = *Uuid::FromString("25f7df3e-ca3e-4634-adda-732c0e56efd4"); -const FilterHandle k_ReadTextDataArrayFilterHandle(k_ReadTextDataArrayFilterId, k_ComplexCorePluginId); +const FilterHandle k_ReadTextDataArrayFilterHandle(k_ReadTextDataArrayFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the Read DREAM3D Data File const Uuid k_ImportDream3dFilterId = *Uuid::FromString("0dbd31c7-19e0-4077-83ef-f4a6459a0e2d"); -const FilterHandle k_ImportDream3dFilterHandle(k_ImportDream3dFilterId, k_ComplexCorePluginId); +const FilterHandle k_ImportDream3dFilterHandle(k_ImportDream3dFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the Read RenameDataObject const Uuid k_RenameDataObjectFilterId = *Uuid::FromString("911a3aa9-d3c2-4f66-9451-8861c4b726d5"); -const FilterHandle k_RenameDataObjectFilterHandle(k_RenameDataObjectFilterId, k_ComplexCorePluginId); +const FilterHandle k_RenameDataObjectFilterHandle(k_RenameDataObjectFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the Crop Image Geometry const Uuid k_CropImageGeometryFilterId = *Uuid::FromString("e6476737-4aa7-48ba-a702-3dfab82c96e2"); -const FilterHandle k_CropImageGeometryFilterHandle(k_CropImageGeometryFilterId, k_ComplexCorePluginId); +const FilterHandle k_CropImageGeometryFilterHandle(k_CropImageGeometryFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the CopyDataGroup const Uuid k_CopyDataGroupFilterId = *Uuid::FromString("ac8d51d8-9167-5628-a060-95a8863a76b1"); -const FilterHandle k_CopyDataGroupFilterHandle(k_CopyDataGroupFilterId, k_ComplexCorePluginId); +const FilterHandle k_CopyDataGroupFilterHandle(k_CopyDataGroupFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the RemoveMinimumSizeFeaturesFilter const Uuid k_RemoveMinimumSizeFeaturesFilterId = *Uuid::FromString("074472d3-ba8d-4a1a-99f2-2d56a0d082a0"); -const FilterHandle k_RemoveMinimumSizeFeaturesFilterHandle(k_RemoveMinimumSizeFeaturesFilterId, k_ComplexCorePluginId); +const FilterHandle k_RemoveMinimumSizeFeaturesFilterHandle(k_RemoveMinimumSizeFeaturesFilterId, k_SimplnxCorePluginId); // Make sure we can instantiate the CalculateFeatureSizesFilter const Uuid k_CalculateFeatureSizesFilterId = *Uuid::FromString("c666ee17-ca58-4969-80d0-819986c72485"); -const FilterHandle k_CalculateFeatureSizesFilterHandle(k_CalculateFeatureSizesFilterId, k_ComplexCorePluginId); +const FilterHandle k_CalculateFeatureSizesFilterHandle(k_CalculateFeatureSizesFilterId, k_SimplnxCorePluginId); const Uuid k_ReadCSVFileFilterId = *Uuid::FromString("373be1f8-31cf-49f6-aa5d-e356f4f3f261"); -const FilterHandle k_ReadCSVFileFilterHandle(k_ReadCSVFileFilterId, k_ComplexCorePluginId); +const FilterHandle k_ReadCSVFileFilterHandle(k_ReadCSVFileFilterId, k_SimplnxCorePluginId); const Uuid k_OrientationAnalysisPluginId = *Uuid::FromString("c09cf01b-014e-5adb-84eb-ea76fc79eeb1"); // Make sure we can instantiate the Convert Orientations @@ -84,15 +84,15 @@ const Uuid k_CorePluginId = *Uuid::FromString("65a0a3fc-8c93-5405-8ac6-182e7f313 // Make sure we can instantiate the Align Sections Feature Centroid const Uuid k_AlignSectionsFeatureCentroidFilterId = *Uuid::FromString("b83f9bae-9ccf-4932-96c3-7f2fdb091452"); -const FilterHandle k_AlignSectionsFeatureCentroidFilterHandle(k_AlignSectionsFeatureCentroidFilterId, k_ComplexCorePluginId); +const FilterHandle k_AlignSectionsFeatureCentroidFilterHandle(k_AlignSectionsFeatureCentroidFilterId, k_SimplnxCorePluginId); const Uuid k_FindFeaturePhasesObjectsId = *Uuid::FromString("da5bb20e-4a8e-49d9-9434-fbab7bc434fc"); -const FilterHandle k_FindNFeaturePhasesFilterHandle(k_FindFeaturePhasesObjectsId, k_ComplexCorePluginId); +const FilterHandle k_FindNFeaturePhasesFilterHandle(k_FindFeaturePhasesObjectsId, k_SimplnxCorePluginId); const Uuid k_FindNeighborsObjectsId = *Uuid::FromString("7177e88c-c3ab-4169-abe9-1fdaff20e598"); -const FilterHandle k_FindNeighborsFilterHandle(k_FindNeighborsObjectsId, k_ComplexCorePluginId); -} // namespace complex +const FilterHandle k_FindNeighborsFilterHandle(k_FindNeighborsObjectsId, k_SimplnxCorePluginId); +} // namespace nx::core -using namespace complex; +using namespace nx::core; namespace SmallIn100 { @@ -119,11 +119,11 @@ inline void ExecuteConvertOrientations(DataStructure& dataStructure, const Filte // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } //------------------------------------------------------------------------------ @@ -163,11 +163,11 @@ inline void ExecuteEbsdSegmentFeatures(DataStructure& dataStructure, const Filte // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } //------------------------------------------------------------------------------ @@ -212,11 +212,11 @@ inline void ExecuteAlignSectionsMisorientation(DataStructure& dataStructure, con // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } //------------------------------------------------------------------------------ @@ -247,11 +247,11 @@ inline void ExecuteAlignSectionsFeatureCentroid(DataStructure& dataStructure, co // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } //------------------------------------------------------------------------------ @@ -282,11 +282,11 @@ inline void ExecuteBadDataNeighborOrientationCheck(DataStructure& dataStructure, // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } //------------------------------------------------------------------------------ @@ -321,10 +321,10 @@ inline void ExecuteNeighborOrientationCorrelation(DataStructure& dataStructure, // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } } // namespace SmallIn100 diff --git a/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp index 842918c739..b4e1a84350 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadAngDataTest.cpp @@ -1,8 +1,8 @@ #include "OrientationAnalysis/Filters/ReadAngDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -10,15 +10,15 @@ namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("OrientationAnalysis::ReadAngData: Valid Execution", "[OrientationAnalysis][ReadAngData]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_read_ang_data.tar.gz", "6_6_read_ang_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_read_ang_data.tar.gz", "6_6_read_ang_data"); // Read Exemplar DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/6_6_read_ang_data/6_6_read_ang_data.dream3d", unit_test::k_TestFilesDir)); @@ -39,11 +39,11 @@ TEST_CASE("OrientationAnalysis::ReadAngData: Valid Execution", "[OrientationAnal // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellAttributeMatrix, k_ExemplarDataContainer); } diff --git a/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp index 3280780748..f5d6bf4f89 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp @@ -1,8 +1,8 @@ #include "OrientationAnalysis/Filters/ReadCtfDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -10,15 +10,15 @@ namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; TEST_CASE("OrientationAnalysis::ReadCtfData: Valid Execution", "[OrientationAnalysis][ReadCtfData]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_read_ctf_data.tar.gz", "6_6_read_ctf_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_read_ctf_data.tar.gz", "6_6_read_ctf_data"); // Read Exemplar DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/6_6_read_ctf_data/6_6_read_ctf_data.dream3d", unit_test::k_TestFilesDir)); @@ -41,11 +41,11 @@ TEST_CASE("OrientationAnalysis::ReadCtfData: Valid Execution", "[OrientationAnal // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellAttributeMatrix, k_ExemplarDataContainer); } diff --git a/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp index 8c2d8130c2..3ac7a55c3c 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp @@ -1,8 +1,8 @@ #include -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include @@ -11,7 +11,7 @@ namespace fs = std::filesystem; #include "OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; +using namespace nx::core; using namespace unit_test; namespace @@ -61,11 +61,11 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: Valid Filter Execution", // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* crystalStructures = ds.getDataAs(DataPath({Constants::k_DataContainer, Constants::k_EnsembleAttributeMatrix, Constants::k_CrystalStructures})); REQUIRE(crystalStructures != nullptr); @@ -106,7 +106,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } SECTION("EnsembleInfo misspelled") { @@ -116,7 +116,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } SECTION("NumberPhases missing") { @@ -126,7 +126,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } SECTION("Wrong number of phases") { @@ -136,7 +136,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } SECTION("PhaseType missing") { @@ -146,7 +146,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } SECTION("CrystalStructure missing") { @@ -156,7 +156,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } SECTION("PrimaryPhase misspelled") { @@ -166,7 +166,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } SECTION("Cubic misspelled") { @@ -176,7 +176,7 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } SECTION("Incorrect group numbers") { @@ -186,10 +186,10 @@ TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp index 85e54fd995..b91892f7ca 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp @@ -2,15 +2,15 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { inline const std::string k_MaterialName("MaterialName"); @@ -18,9 +18,9 @@ inline const std::string k_MaterialName("MaterialName"); TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[OrientationAnalysis][ReadH5Ebsd]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_h5ebsd.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_h5ebsd.tar.gz", "Small_IN100.dream3d"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -50,11 +50,11 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp index 8a8dee0399..13eea1fb0a 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp @@ -1,10 +1,10 @@ #include -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" @@ -15,8 +15,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -27,7 +27,7 @@ TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: Valid Filter Execution", { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); // Read Exemplar DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/6_6_ImportH5Data/6_6_import_h5_esprit_data.dream3d", unit_test::k_TestFilesDir)); @@ -53,11 +53,11 @@ TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: Valid Filter Execution", // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto& imageGeom = dataStructure.getDataRefAs(DataPath({ImageGeom::k_TypeName})); const auto& exemplarImageGeom = exemplarDataStructure.getDataRefAs(DataPath({k_ExemplarDataContainer})); @@ -85,7 +85,7 @@ TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: InValid Filter Execution { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); // Instantiate the filter, a DataStructure object and an Arguments Object ReadH5EspritDataFilter filter; @@ -130,9 +130,9 @@ TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: InValid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp index 35efe75252..61129dba87 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp @@ -1,10 +1,10 @@ #include -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" @@ -15,8 +15,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -27,7 +27,7 @@ TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: Valid Filter Execution", "[ { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); // Read Exemplar DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/6_6_ImportH5Data/6_6_import_h5_oim_data.dream3d", unit_test::k_TestFilesDir)); @@ -52,11 +52,11 @@ TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: Valid Filter Execution", "[ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto& imageGeom = dataStructure.getDataRefAs(DataPath({ImageGeom::k_TypeName})); const auto& exemplarImageGeom = exemplarDataStructure.getDataRefAs(DataPath({k_ExemplarDataContainer})); @@ -84,7 +84,7 @@ TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: InValid Filter Execution", { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); // Instantiate the filter, a DataStructure object and an Arguments Object ReadH5OimDataFilter filter; @@ -122,9 +122,9 @@ TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: InValid Filter Execution", // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp b/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp index a5b2fa5891..de066c7bb9 100644 --- a/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/RodriguesConvertorTest.cpp @@ -1,14 +1,14 @@ #include -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include "OrientationAnalysis/Filters/RodriguesConvertorFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { const std::string k_InputArrayName = "Input"; @@ -57,11 +57,11 @@ TEST_CASE("OrientationAnalysis::RodriguesConvertorFilter", "[OrientationAnalysis // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto& outputArray = dataStructure.getDataRefAs(DataPath({k_ConvertedName})); diff --git a/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp b/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp index 6581f3c7e1..d45074c58e 100644 --- a/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/RotateEulerRefFrameTest.cpp @@ -4,30 +4,30 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ASCIIData.tar.gz", "ASCIIData"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ASCIIData.tar.gz", "ASCIIData"); // Instantiate an "Application" instance to load plugins Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); const uint64 k_NumComponents = 3; const static DynamicTableInfo::TableDataType k_NumTuples = {{static_cast(480000)}}; - const complex::NumericType k_NumericType = complex::NumericType::float32; + const nx::core::NumericType k_NumericType = nx::core::NumericType::float32; // Constant strings and DataPaths to be used later const DataPath k_EulerAnglesDataPath({Constants::k_EulerAngles}); @@ -39,7 +39,7 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") std::string comparisonDataFile = fmt::format("{}/ASCIIData/EulersRotated.csv", unit_test::k_TestFilesDir.view()); // These are the argument keys for the Import Text filter. We cannot use the ones from the - // header file as that would bring in a dependency on the ComplexCorePlugin + // header file as that would bring in a dependency on the SimplnxCorePlugin static constexpr StringLiteral k_InputFileKey = "input_file"; static constexpr StringLiteral k_ScalarTypeKey = "scalar_type"; static constexpr StringLiteral k_NTuplesKey = "n_tuples"; @@ -70,11 +70,11 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } { @@ -92,11 +92,11 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") // Preflight the filter and check result auto preflightResult = filter->preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Run the RotateEulerRefFrameFilter @@ -110,11 +110,11 @@ TEST_CASE("OrientationAnalysis::RotateEulerRefFrame", "[OrientationAnalysis]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the 2 data sets diff --git a/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp index d75b1b190d..784bd54cdc 100644 --- a/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp @@ -4,21 +4,21 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Parameters/util/ReadCSVData.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/util/ReadCSVData.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -41,7 +41,7 @@ inline constexpr StringLiteral k_GMT3("GMT3"); TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][WriteGBCDGMTFile]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -49,7 +49,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_Small_IN100_GBCD/6_6_Small_IN100_GBCD.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - const DataPath smallIn100Group({complex::Constants::k_SmallIN100}); + const DataPath smallIn100Group({nx::core::Constants::k_SmallIN100}); const DataPath featureDataPath = smallIn100Group.createChildPath(Constants::k_Grain_Data); const DataPath avgEulerAnglesPath = featureDataPath.createChildPath(Constants::k_AvgEulerAngles); const DataPath featurePhasesPath = featureDataPath.createChildPath(Constants::k_Phases); @@ -85,11 +85,11 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ // Preflight the filter and check result auto preflightResult = gmtFilter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = gmtFilter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Pole Figure @@ -113,7 +113,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(faceEnsemblePath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } { @@ -133,7 +133,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(gmtGroupPath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } const DataPath gmt1ArrayPath = gmtGroupPath.createChildPath(k_GMT1); @@ -171,11 +171,11 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Pole Figure @@ -199,7 +199,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(faceEnsemblePath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } { @@ -219,7 +219,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(gmtGroupPath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } const DataPath gmt1ArrayPath = gmtGroupPath.createChildPath(k_GMT1); @@ -257,11 +257,11 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output Pole Figure @@ -285,7 +285,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(faceEnsemblePath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } { @@ -305,7 +305,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(gmtGroupPath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } const DataPath gmt1ArrayPath = gmtGroupPath.createChildPath(k_GMT1); @@ -326,7 +326,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][ UnitTest::CompareFloatArraysWithNans(dataStructure, exemplarGmt3ArrayPath, gmt3ArrayPath); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/gbcd_gmt.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp index 9cc9b26f72..4f20815fd5 100644 --- a/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp @@ -4,16 +4,16 @@ #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/util/ReadCSVData.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/util/ReadCSVData.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -43,7 +43,7 @@ inline constexpr float32 k_EPSILON = 0.001; TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: Valid filter execution") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = Application::Instance()->getFilterList(); @@ -76,10 +76,10 @@ TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: Valid filter execut args.insertOrAssign(WriteGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the Output triangles files @@ -105,7 +105,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: Valid filter execut args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(DataPath{})); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // read in generated @@ -127,7 +127,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: Valid filter execut args.insertOrAssign(k_SelectedDataGroup_Key, std::make_any(generatedResultsGroupPath)); auto executeResult = importDataFilter->execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // do comparison @@ -193,7 +193,7 @@ TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: InValid filter exec { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Instantiate the filter and an Arguments Object WriteGBCDTriangleDataFilter filter; @@ -237,9 +237,9 @@ TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: InValid filter exec // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } diff --git a/src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp index 8890aa6308..0a63c29044 100644 --- a/src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp @@ -3,15 +3,15 @@ #include "OrientationAnalysis/Filters/WriteINLFileFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -65,7 +65,7 @@ void CompareResults() // compare hash of both file strings TEST_CASE("OrientationAnalysis::WriteINLFileFilter: Valid Filter Execution", "[OrientationAnalysis][WriteINLFileFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "INL_writer.tar.gz", "INL_writer"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "INL_writer.tar.gz", "INL_writer"); // Instantiate the filter, a DataStructure object and an Arguments Object WriteINLFileFilter filter; diff --git a/src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp b/src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp index eb32c6def9..76e48687f7 100644 --- a/src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp @@ -1,13 +1,13 @@ #include -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; @@ -15,8 +15,8 @@ namespace fs = std::filesystem; #include "OrientationAnalysis/Filters/WritePoleFigureFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -27,7 +27,7 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-1", "[OrientationAnalysis] { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PoleFigure_Exemplars.tar.gz", "PoleFigure_Exemplars"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars.tar.gz", "PoleFigure_Exemplars"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir)); @@ -62,12 +62,12 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-1", "[OrientationAnalysis] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); -#ifdef COMPLEX_WRITE_TEST_OUTPUT + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/write_pole_figure-1.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -78,7 +78,7 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-2", "[OrientationAnalysis] { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PoleFigure_Exemplars.tar.gz", "PoleFigure_Exemplars"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars.tar.gz", "PoleFigure_Exemplars"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir)); @@ -113,13 +113,13 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-2", "[OrientationAnalysis] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/write_pole_figure-2.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -130,7 +130,7 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-3", "[OrientationAnalysis] { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PoleFigure_Exemplars.tar.gz", "PoleFigure_Exemplars"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars.tar.gz", "PoleFigure_Exemplars"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir)); @@ -165,13 +165,13 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-3", "[OrientationAnalysis] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/write_pole_figure-3.dream3d", unit_test::k_BinaryTestOutputDir)); #endif diff --git a/src/Plugins/OrientationAnalysis/test/WriteStatsGenOdfAngleFileTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteStatsGenOdfAngleFileTest.cpp index 811cb345fb..3f8d3e9bf4 100644 --- a/src/Plugins/OrientationAnalysis/test/WriteStatsGenOdfAngleFileTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteStatsGenOdfAngleFileTest.cpp @@ -1,7 +1,7 @@ -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include "OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" @@ -12,14 +12,14 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; TEST_CASE("OrientationAnalysis::WriteStatsGenOdfAngleFileFilter: Valid Filter Execution", "[OrientationAnalysis][WriteStatsGenOdfAngleFileFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "write_stats_gen_odf_angle_file.tar.gz", - "write_stats_gen_odf_angle_file"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "write_stats_gen_odf_angle_file.tar.gz", + "write_stats_gen_odf_angle_file"); // Read Exemplar DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/write_stats_gen_odf_angle_file/write_stats_gen_odf_angle_file.dream3d", unit_test::k_TestFilesDir)); @@ -44,18 +44,18 @@ TEST_CASE("OrientationAnalysis::WriteStatsGenOdfAngleFileFilter: Valid Filter Ex args.insertOrAssign(WriteStatsGenOdfAngleFileFilter::k_CellPhasesArrayPath_Key, std::make_any(Constants::k_PhasesArrayPath)); args.insertOrAssign(WriteStatsGenOdfAngleFileFilter::k_MaskArrayPath_Key, std::make_any(Constants::k_MaskArrayPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) args.insertOrAssign(WriteStatsGenOdfAngleFileFilter::k_OutputFile_Key, std::make_any(fs::path(fmt::format("{}/StatsGenODF_RadiansNoMask.txt", unit_test::k_BinaryTestOutputDir)))); args.insertOrAssign(WriteStatsGenOdfAngleFileFilter::k_ConvertToDegrees_Key, std::make_any(false)); args.insertOrAssign(WriteStatsGenOdfAngleFileFilter::k_UseMask_Key, std::make_any(false)); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) std::vector linesToSkip{2}; std::ifstream computedFile1(computedOutput1Path); @@ -70,8 +70,8 @@ TEST_CASE("OrientationAnalysis::WriteStatsGenOdfAngleFileFilter: InValid Filter { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "write_stats_gen_odf_angle_file.tar.gz", - "write_stats_gen_odf_angle_file"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "write_stats_gen_odf_angle_file.tar.gz", + "write_stats_gen_odf_angle_file"); // Read Exemplar DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/write_stats_gen_odf_angle_file/write_stats_gen_odf_angle_file.dream3d", unit_test::k_TestFilesDir)); @@ -108,8 +108,8 @@ TEST_CASE("OrientationAnalysis::WriteStatsGenOdfAngleFileFilter: InValid Filter } auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/OrientationAnalysis/test/test_dirs.hpp.in b/src/Plugins/OrientationAnalysis/test/test_dirs.hpp.in index adab33dab8..fafa416032 100644 --- a/src/Plugins/OrientationAnalysis/test/test_dirs.hpp.in +++ b/src/Plugins/OrientationAnalysis/test/test_dirs.hpp.in @@ -5,26 +5,26 @@ */ #pragma once -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/StringLiteral.hpp" -#cmakedefine COMPLEX_WRITE_TEST_OUTPUT +#cmakedefine SIMPLNX_WRITE_TEST_OUTPUT -namespace complex +namespace nx::core { namespace unit_test { -inline constexpr StringLiteral k_ComplexSourceDir = "@COMPLEX_SOURCE_DIR_NORM@"; -inline constexpr StringLiteral k_ComplexTestSourceDir = "@COMPLEX_SOURCE_DIR_NORM@/test"; -inline constexpr StringLiteral k_ComplexTestDataSourceDir = "@COMPLEX_SOURCE_DIR_NORM@/test/Data"; +inline constexpr StringLiteral k_ComplexSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@"; +inline constexpr StringLiteral k_ComplexTestSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@/test"; +inline constexpr StringLiteral k_ComplexTestDataSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@/test/Data"; inline constexpr StringLiteral k_SourceDir = "@PLUGIN_SOURCE_DIR_NORM@"; inline constexpr StringLiteral k_DataDir = "@PLUGIN_SOURCE_DIR_NORM@/data"; inline constexpr StringLiteral k_TestDataSourceDir = "@PLUGIN_SOURCE_DIR_NORM@/data"; -inline constexpr StringLiteral k_BinaryDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; -inline constexpr StringLiteral k_BinaryTestOutputDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@/test_output"; -inline constexpr StringLiteral k_BuildDir = COMPLEX_BUILD_DIR; +inline constexpr StringLiteral k_BinaryDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; +inline constexpr StringLiteral k_BinaryTestOutputDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@/test_output"; +inline constexpr StringLiteral k_BuildDir = SIMPLNX_BUILD_DIR; inline constexpr StringLiteral k_DREAM3DDataDir = "@DREAM3D_DATA_DIR_NORM@"; inline constexpr StringLiteral k_TestFilesDir = "@DREAM3D_DATA_DIR_NORM@/TestFiles"; inline constexpr StringLiteral k_CMakeExecutable = "@CMAKE_COMMAND_NORM@"; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp b/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp index 74a36d1b9e..1d07ad7d66 100644 --- a/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp +++ b/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp @@ -7,22 +7,22 @@ #include "OrientationAnalysis/OrientationAnalysisFilterBinding.hpp" -using namespace complex; -using namespace complex::CxPybind; +using namespace nx::core; +using namespace nx::core::CxPybind; namespace py = pybind11; using namespace pybind11::literals; PYBIND11_MODULE(orientationanalysis, mod) { - py::module_::import("complex"); + py::module_::import("simplnx"); auto& internals = Internals::Instance(); auto* plugin = internals.addPlugin(); - auto h5EbsdReaderParameter = COMPLEX_PY_BIND_PARAMETER(mod, ReadH5EbsdFileParameter); - auto oemEbsdScanSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, OEMEbsdScanSelectionParameter); + auto h5EbsdReaderParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ReadH5EbsdFileParameter); + auto oemEbsdScanSelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, OEMEbsdScanSelectionParameter); py::class_ h5EbsdReaderValueType(h5EbsdReaderParameter, "ValueType"); h5EbsdReaderValueType.def(py::init<>()); diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/SimplnxCore/CMakeLists.txt similarity index 97% rename from src/Plugins/ComplexCore/CMakeLists.txt rename to src/Plugins/SimplnxCore/CMakeLists.txt index fd0f6ea132..8da1e83e94 100644 --- a/src/Plugins/ComplexCore/CMakeLists.txt +++ b/src/Plugins/SimplnxCore/CMakeLists.txt @@ -1,7 +1,7 @@ -include("${complex_SOURCE_DIR}/cmake/Plugin.cmake") +include("${simplnx_SOURCE_DIR}/cmake/Plugin.cmake") -set(PLUGIN_NAME "ComplexCore") -set(${PLUGIN_NAME}_SOURCE_DIR ${complex_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) +set(PLUGIN_NAME "SimplnxCore") +set(${PLUGIN_NAME}_SOURCE_DIR ${simplnx_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) # ------------------------------------------------------------------------------ # These are all the filters in the plugin. All filters should be kept in the @@ -202,7 +202,7 @@ set(AlgorithmList WriteVtkRectilinearGrid ) -create_complex_plugin(NAME ${PLUGIN_NAME} +create_simplnx_plugin(NAME ${PLUGIN_NAME} FILTER_LIST ${FilterList} ACTION_LIST ${ActionList} ALGORITHM_LIST ${AlgorithmList} @@ -214,7 +214,7 @@ create_complex_plugin(NAME ${PLUGIN_NAME} #------------------------------------------------------------------------------ # Add in the unit tests for the filters included in this plugin -if(COMPLEX_BUILD_TESTS) +if(SIMPLNX_BUILD_TESTS) enable_testing() add_subdirectory(${${PLUGIN_NAME}_SOURCE_DIR}/test) endif() @@ -230,8 +230,8 @@ get_target_property(reproc_dll_path reproc++ IMPORTED_LOCATION_RELEASE) get_filename_component(reproc_dll_path "${reproc_dll_path}" DIRECTORY) file(REAL_PATH "${reproc_dll_path}" reproc_dll_path) file(TO_CMAKE_PATH "${reproc_dll_path}" reproc_dll_path) -get_property(COMPLEX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS) -set_property(GLOBAL PROPERTY COMPLEX_EXTRA_LIBRARY_DIRS ${COMPLEX_EXTRA_LIBRARY_DIRS} ${reproc_dll_path}) +get_property(SIMPLNX_EXTRA_LIBRARY_DIRS GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS) +set_property(GLOBAL PROPERTY SIMPLNX_EXTRA_LIBRARY_DIRS ${SIMPLNX_EXTRA_LIBRARY_DIRS} ${reproc_dll_path}) #------------------------------------------------------------------------------ @@ -380,17 +380,17 @@ endif() # ----------------------------------------------------------------------- # Download Example Data Files # ----------------------------------------------------------------------- -include(${complex_SOURCE_DIR}/cmake/Utility.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) set(DATA_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CX_CONFIG_DIR}/Data") file(TO_CMAKE_PATH "${DREAM3D_DATA_DIR}" DREAM3D_DATA_DIR_NORM) # ----------------------------------------------------------------------- -# These data files are pulled from the 'complex data archive' on github, +# These data files are pulled from the 'simplnx data archive' on github, # decompressed and then copied to the build folder. Install rules are also # generated for each of the data sets. # ----------------------------------------------------------------------- -if(EXISTS "${DREAM3D_DATA_DIR}" AND COMPLEX_DOWNLOAD_TEST_FILES) +if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) if(NOT EXISTS ${DREAM3D_DATA_DIR}/TestFiles/) file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") endif() diff --git a/src/Plugins/ComplexCore/docs/AddBadDataFilter.md b/src/Plugins/SimplnxCore/docs/AddBadDataFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AddBadDataFilter.md rename to src/Plugins/SimplnxCore/docs/AddBadDataFilter.md diff --git a/src/Plugins/ComplexCore/docs/AlignGeometries.md b/src/Plugins/SimplnxCore/docs/AlignGeometries.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AlignGeometries.md rename to src/Plugins/SimplnxCore/docs/AlignGeometries.md diff --git a/src/Plugins/ComplexCore/docs/AlignSectionsFeatureCentroidFilter.md b/src/Plugins/SimplnxCore/docs/AlignSectionsFeatureCentroidFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AlignSectionsFeatureCentroidFilter.md rename to src/Plugins/SimplnxCore/docs/AlignSectionsFeatureCentroidFilter.md diff --git a/src/Plugins/ComplexCore/docs/AlignSectionsListFilter.md b/src/Plugins/SimplnxCore/docs/AlignSectionsListFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AlignSectionsListFilter.md rename to src/Plugins/SimplnxCore/docs/AlignSectionsListFilter.md diff --git a/src/Plugins/ComplexCore/docs/AppendImageGeometryZSliceFilter.md b/src/Plugins/SimplnxCore/docs/AppendImageGeometryZSliceFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AppendImageGeometryZSliceFilter.md rename to src/Plugins/SimplnxCore/docs/AppendImageGeometryZSliceFilter.md diff --git a/src/Plugins/ComplexCore/docs/ApplyTransformationToGeometryFilter.md b/src/Plugins/SimplnxCore/docs/ApplyTransformationToGeometryFilter.md similarity index 95% rename from src/Plugins/ComplexCore/docs/ApplyTransformationToGeometryFilter.md rename to src/Plugins/SimplnxCore/docs/ApplyTransformationToGeometryFilter.md index e52707a1ac..4ba3c6ad8a 100644 --- a/src/Plugins/ComplexCore/docs/ApplyTransformationToGeometryFilter.md +++ b/src/Plugins/SimplnxCore/docs/ApplyTransformationToGeometryFilter.md @@ -55,9 +55,9 @@ The user may select from a variety of options for the type of transformation to ## Example Pipelines -+ Pipelines/ComplexCore/Examples/apply_transformation_basic.d3dpipeline -+ Pipelines/ComplexCore/Examples/apply_transformation_image.d3dpipeline -+ Pipelines/ComplexCore/Examples/apply_transformation_node.d3dpipeline ++ Pipelines/SimplnxCore/Examples/apply_transformation_basic.d3dpipeline ++ Pipelines/SimplnxCore/Examples/apply_transformation_image.d3dpipeline ++ Pipelines/SimplnxCore/Examples/apply_transformation_node.d3dpipeline ## License & Copyright diff --git a/src/Plugins/ComplexCore/docs/ApproximatePointCloudHull.md b/src/Plugins/SimplnxCore/docs/ApproximatePointCloudHull.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ApproximatePointCloudHull.md rename to src/Plugins/SimplnxCore/docs/ApproximatePointCloudHull.md diff --git a/src/Plugins/ComplexCore/docs/ArrayCalculatorFilter.md b/src/Plugins/SimplnxCore/docs/ArrayCalculatorFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ArrayCalculatorFilter.md rename to src/Plugins/SimplnxCore/docs/ArrayCalculatorFilter.md diff --git a/src/Plugins/ComplexCore/docs/CalculateArrayHistogramFilter.md b/src/Plugins/SimplnxCore/docs/CalculateArrayHistogramFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CalculateArrayHistogramFilter.md rename to src/Plugins/SimplnxCore/docs/CalculateArrayHistogramFilter.md diff --git a/src/Plugins/ComplexCore/docs/CalculateFeatureSizesFilter.md b/src/Plugins/SimplnxCore/docs/CalculateFeatureSizesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CalculateFeatureSizesFilter.md rename to src/Plugins/SimplnxCore/docs/CalculateFeatureSizesFilter.md diff --git a/src/Plugins/ComplexCore/docs/CalculateTriangleAreasFilter.md b/src/Plugins/SimplnxCore/docs/CalculateTriangleAreasFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CalculateTriangleAreasFilter.md rename to src/Plugins/SimplnxCore/docs/CalculateTriangleAreasFilter.md diff --git a/src/Plugins/ComplexCore/docs/ChangeAngleRepresentation.md b/src/Plugins/SimplnxCore/docs/ChangeAngleRepresentation.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ChangeAngleRepresentation.md rename to src/Plugins/SimplnxCore/docs/ChangeAngleRepresentation.md diff --git a/src/Plugins/ComplexCore/docs/CombineAttributeArraysFilter.md b/src/Plugins/SimplnxCore/docs/CombineAttributeArraysFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CombineAttributeArraysFilter.md rename to src/Plugins/SimplnxCore/docs/CombineAttributeArraysFilter.md diff --git a/src/Plugins/ComplexCore/docs/CombineStlFilesFilter.md b/src/Plugins/SimplnxCore/docs/CombineStlFilesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CombineStlFilesFilter.md rename to src/Plugins/SimplnxCore/docs/CombineStlFilesFilter.md diff --git a/src/Plugins/ComplexCore/docs/ComputeFeatureRectFilter.md b/src/Plugins/SimplnxCore/docs/ComputeFeatureRectFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ComputeFeatureRectFilter.md rename to src/Plugins/SimplnxCore/docs/ComputeFeatureRectFilter.md diff --git a/src/Plugins/ComplexCore/docs/ComputeMomentInvariants2DFilter.md b/src/Plugins/SimplnxCore/docs/ComputeMomentInvariants2DFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ComputeMomentInvariants2DFilter.md rename to src/Plugins/SimplnxCore/docs/ComputeMomentInvariants2DFilter.md diff --git a/src/Plugins/ComplexCore/docs/ConditionalSetValue.md b/src/Plugins/SimplnxCore/docs/ConditionalSetValue.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ConditionalSetValue.md rename to src/Plugins/SimplnxCore/docs/ConditionalSetValue.md diff --git a/src/Plugins/ComplexCore/docs/ConvertColorToGrayScaleFilter.md b/src/Plugins/SimplnxCore/docs/ConvertColorToGrayScaleFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ConvertColorToGrayScaleFilter.md rename to src/Plugins/SimplnxCore/docs/ConvertColorToGrayScaleFilter.md diff --git a/src/Plugins/ComplexCore/docs/ConvertDataFilter.md b/src/Plugins/SimplnxCore/docs/ConvertDataFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ConvertDataFilter.md rename to src/Plugins/SimplnxCore/docs/ConvertDataFilter.md diff --git a/src/Plugins/ComplexCore/docs/CopyDataObjectFilter.md b/src/Plugins/SimplnxCore/docs/CopyDataObjectFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CopyDataObjectFilter.md rename to src/Plugins/SimplnxCore/docs/CopyDataObjectFilter.md diff --git a/src/Plugins/ComplexCore/docs/CopyFeatureArrayToElementArray.md b/src/Plugins/SimplnxCore/docs/CopyFeatureArrayToElementArray.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CopyFeatureArrayToElementArray.md rename to src/Plugins/SimplnxCore/docs/CopyFeatureArrayToElementArray.md diff --git a/src/Plugins/ComplexCore/docs/CreateAttributeMatrixFilter.md b/src/Plugins/SimplnxCore/docs/CreateAttributeMatrixFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CreateAttributeMatrixFilter.md rename to src/Plugins/SimplnxCore/docs/CreateAttributeMatrixFilter.md diff --git a/src/Plugins/ComplexCore/docs/CreateDataArray.md b/src/Plugins/SimplnxCore/docs/CreateDataArray.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CreateDataArray.md rename to src/Plugins/SimplnxCore/docs/CreateDataArray.md diff --git a/src/Plugins/ComplexCore/docs/CreateDataGroup.md b/src/Plugins/SimplnxCore/docs/CreateDataGroup.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CreateDataGroup.md rename to src/Plugins/SimplnxCore/docs/CreateDataGroup.md diff --git a/src/Plugins/ComplexCore/docs/CreateFeatureArrayFromElementArray.md b/src/Plugins/SimplnxCore/docs/CreateFeatureArrayFromElementArray.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CreateFeatureArrayFromElementArray.md rename to src/Plugins/SimplnxCore/docs/CreateFeatureArrayFromElementArray.md diff --git a/src/Plugins/ComplexCore/docs/CreateGeometryFilter.md b/src/Plugins/SimplnxCore/docs/CreateGeometryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CreateGeometryFilter.md rename to src/Plugins/SimplnxCore/docs/CreateGeometryFilter.md diff --git a/src/Plugins/ComplexCore/docs/CreateImageGeometry.md b/src/Plugins/SimplnxCore/docs/CreateImageGeometry.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CreateImageGeometry.md rename to src/Plugins/SimplnxCore/docs/CreateImageGeometry.md diff --git a/src/Plugins/ComplexCore/docs/CropImageGeometry.md b/src/Plugins/SimplnxCore/docs/CropImageGeometry.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CropImageGeometry.md rename to src/Plugins/SimplnxCore/docs/CropImageGeometry.md diff --git a/src/Plugins/ComplexCore/docs/CropVertexGeometry.md b/src/Plugins/SimplnxCore/docs/CropVertexGeometry.md similarity index 100% rename from src/Plugins/ComplexCore/docs/CropVertexGeometry.md rename to src/Plugins/SimplnxCore/docs/CropVertexGeometry.md diff --git a/src/Plugins/ComplexCore/docs/DeleteData.md b/src/Plugins/SimplnxCore/docs/DeleteData.md similarity index 100% rename from src/Plugins/ComplexCore/docs/DeleteData.md rename to src/Plugins/SimplnxCore/docs/DeleteData.md diff --git a/src/Plugins/ComplexCore/docs/ErodeDilateBadDataFilter.md b/src/Plugins/SimplnxCore/docs/ErodeDilateBadDataFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ErodeDilateBadDataFilter.md rename to src/Plugins/SimplnxCore/docs/ErodeDilateBadDataFilter.md diff --git a/src/Plugins/ComplexCore/docs/ErodeDilateCoordinationNumberFilter.md b/src/Plugins/SimplnxCore/docs/ErodeDilateCoordinationNumberFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ErodeDilateCoordinationNumberFilter.md rename to src/Plugins/SimplnxCore/docs/ErodeDilateCoordinationNumberFilter.md diff --git a/src/Plugins/ComplexCore/docs/ErodeDilateMaskFilter.md b/src/Plugins/SimplnxCore/docs/ErodeDilateMaskFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ErodeDilateMaskFilter.md rename to src/Plugins/SimplnxCore/docs/ErodeDilateMaskFilter.md diff --git a/src/Plugins/ComplexCore/docs/ExecuteProcessFilter.md b/src/Plugins/SimplnxCore/docs/ExecuteProcessFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ExecuteProcessFilter.md rename to src/Plugins/SimplnxCore/docs/ExecuteProcessFilter.md diff --git a/src/Plugins/ComplexCore/docs/ExtractComponentAsArrayFilter.md b/src/Plugins/SimplnxCore/docs/ExtractComponentAsArrayFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ExtractComponentAsArrayFilter.md rename to src/Plugins/SimplnxCore/docs/ExtractComponentAsArrayFilter.md diff --git a/src/Plugins/ComplexCore/docs/ExtractInternalSurfacesFromTriangleGeometry.md b/src/Plugins/SimplnxCore/docs/ExtractInternalSurfacesFromTriangleGeometry.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ExtractInternalSurfacesFromTriangleGeometry.md rename to src/Plugins/SimplnxCore/docs/ExtractInternalSurfacesFromTriangleGeometry.md diff --git a/src/Plugins/ComplexCore/docs/ExtractVertexGeometryFilter.md b/src/Plugins/SimplnxCore/docs/ExtractVertexGeometryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ExtractVertexGeometryFilter.md rename to src/Plugins/SimplnxCore/docs/ExtractVertexGeometryFilter.md diff --git a/src/Plugins/ComplexCore/docs/FeatureFaceCurvatureFilter.md b/src/Plugins/SimplnxCore/docs/FeatureFaceCurvatureFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FeatureFaceCurvatureFilter.md rename to src/Plugins/SimplnxCore/docs/FeatureFaceCurvatureFilter.md diff --git a/src/Plugins/ComplexCore/docs/FillBadDataFilter.md b/src/Plugins/SimplnxCore/docs/FillBadDataFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FillBadDataFilter.md rename to src/Plugins/SimplnxCore/docs/FillBadDataFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindArrayStatisticsFilter.md b/src/Plugins/SimplnxCore/docs/FindArrayStatisticsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindArrayStatisticsFilter.md rename to src/Plugins/SimplnxCore/docs/FindArrayStatisticsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindBiasedFeaturesFilter.md b/src/Plugins/SimplnxCore/docs/FindBiasedFeaturesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindBiasedFeaturesFilter.md rename to src/Plugins/SimplnxCore/docs/FindBiasedFeaturesFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindBoundaryCellsFilter.md b/src/Plugins/SimplnxCore/docs/FindBoundaryCellsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindBoundaryCellsFilter.md rename to src/Plugins/SimplnxCore/docs/FindBoundaryCellsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindBoundaryElementFractionsFilter.md b/src/Plugins/SimplnxCore/docs/FindBoundaryElementFractionsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindBoundaryElementFractionsFilter.md rename to src/Plugins/SimplnxCore/docs/FindBoundaryElementFractionsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindDifferencesMap.md b/src/Plugins/SimplnxCore/docs/FindDifferencesMap.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindDifferencesMap.md rename to src/Plugins/SimplnxCore/docs/FindDifferencesMap.md diff --git a/src/Plugins/ComplexCore/docs/FindEuclideanDistMapFilter.md b/src/Plugins/SimplnxCore/docs/FindEuclideanDistMapFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindEuclideanDistMapFilter.md rename to src/Plugins/SimplnxCore/docs/FindEuclideanDistMapFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindFeatureCentroidsFilter.md b/src/Plugins/SimplnxCore/docs/FindFeatureCentroidsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindFeatureCentroidsFilter.md rename to src/Plugins/SimplnxCore/docs/FindFeatureCentroidsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindFeatureClusteringFilter.md b/src/Plugins/SimplnxCore/docs/FindFeatureClusteringFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindFeatureClusteringFilter.md rename to src/Plugins/SimplnxCore/docs/FindFeatureClusteringFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindFeaturePhasesBinaryFilter.md b/src/Plugins/SimplnxCore/docs/FindFeaturePhasesBinaryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindFeaturePhasesBinaryFilter.md rename to src/Plugins/SimplnxCore/docs/FindFeaturePhasesBinaryFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindFeaturePhasesFilter.md b/src/Plugins/SimplnxCore/docs/FindFeaturePhasesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindFeaturePhasesFilter.md rename to src/Plugins/SimplnxCore/docs/FindFeaturePhasesFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindLargestCrossSectionsFilter.md b/src/Plugins/SimplnxCore/docs/FindLargestCrossSectionsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindLargestCrossSectionsFilter.md rename to src/Plugins/SimplnxCore/docs/FindLargestCrossSectionsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindNeighborListStatistics.md b/src/Plugins/SimplnxCore/docs/FindNeighborListStatistics.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindNeighborListStatistics.md rename to src/Plugins/SimplnxCore/docs/FindNeighborListStatistics.md diff --git a/src/Plugins/ComplexCore/docs/FindNeighborhoodsFilter.md b/src/Plugins/SimplnxCore/docs/FindNeighborhoodsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindNeighborhoodsFilter.md rename to src/Plugins/SimplnxCore/docs/FindNeighborhoodsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindNeighbors.md b/src/Plugins/SimplnxCore/docs/FindNeighbors.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindNeighbors.md rename to src/Plugins/SimplnxCore/docs/FindNeighbors.md diff --git a/src/Plugins/ComplexCore/docs/FindNumFeaturesFilter.md b/src/Plugins/SimplnxCore/docs/FindNumFeaturesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindNumFeaturesFilter.md rename to src/Plugins/SimplnxCore/docs/FindNumFeaturesFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindSurfaceAreaToVolumeFilter.md b/src/Plugins/SimplnxCore/docs/FindSurfaceAreaToVolumeFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindSurfaceAreaToVolumeFilter.md rename to src/Plugins/SimplnxCore/docs/FindSurfaceAreaToVolumeFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindSurfaceFeatures.md b/src/Plugins/SimplnxCore/docs/FindSurfaceFeatures.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindSurfaceFeatures.md rename to src/Plugins/SimplnxCore/docs/FindSurfaceFeatures.md diff --git a/src/Plugins/ComplexCore/docs/FindTriangleGeomCentroidsFilter.md b/src/Plugins/SimplnxCore/docs/FindTriangleGeomCentroidsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindTriangleGeomCentroidsFilter.md rename to src/Plugins/SimplnxCore/docs/FindTriangleGeomCentroidsFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindTriangleGeomSizesFilter.md b/src/Plugins/SimplnxCore/docs/FindTriangleGeomSizesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindTriangleGeomSizesFilter.md rename to src/Plugins/SimplnxCore/docs/FindTriangleGeomSizesFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindVertexToTriangleDistancesFilter.md b/src/Plugins/SimplnxCore/docs/FindVertexToTriangleDistancesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindVertexToTriangleDistancesFilter.md rename to src/Plugins/SimplnxCore/docs/FindVertexToTriangleDistancesFilter.md diff --git a/src/Plugins/ComplexCore/docs/FindVolFractionsFilter.md b/src/Plugins/SimplnxCore/docs/FindVolFractionsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FindVolFractionsFilter.md rename to src/Plugins/SimplnxCore/docs/FindVolFractionsFilter.md diff --git a/src/Plugins/ComplexCore/docs/GenerateColorTableFilter.md b/src/Plugins/SimplnxCore/docs/GenerateColorTableFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/GenerateColorTableFilter.md rename to src/Plugins/SimplnxCore/docs/GenerateColorTableFilter.md diff --git a/src/Plugins/ComplexCore/docs/GenerateVectorColorsFilter.md b/src/Plugins/SimplnxCore/docs/GenerateVectorColorsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/GenerateVectorColorsFilter.md rename to src/Plugins/SimplnxCore/docs/GenerateVectorColorsFilter.md diff --git a/src/Plugins/ComplexCore/docs/IdentifySample.md b/src/Plugins/SimplnxCore/docs/IdentifySample.md similarity index 100% rename from src/Plugins/ComplexCore/docs/IdentifySample.md rename to src/Plugins/SimplnxCore/docs/IdentifySample.md diff --git a/src/Plugins/ComplexCore/docs/ImageContouringFilter.md b/src/Plugins/SimplnxCore/docs/ImageContouringFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ImageContouringFilter.md rename to src/Plugins/SimplnxCore/docs/ImageContouringFilter.md diff --git a/src/Plugins/ComplexCore/docs/Images/3D-contouring.png b/src/Plugins/SimplnxCore/docs/Images/3D-contouring.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/3D-contouring.png rename to src/Plugins/SimplnxCore/docs/Images/3D-contouring.png diff --git a/src/Plugins/ComplexCore/docs/Images/ApplyTransformation_AsRead.png b/src/Plugins/SimplnxCore/docs/Images/ApplyTransformation_AsRead.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ApplyTransformation_AsRead.png rename to src/Plugins/SimplnxCore/docs/Images/ApplyTransformation_AsRead.png diff --git a/src/Plugins/ComplexCore/docs/Images/ApplyTransformation_Rotated.png b/src/Plugins/SimplnxCore/docs/Images/ApplyTransformation_Rotated.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ApplyTransformation_Rotated.png rename to src/Plugins/SimplnxCore/docs/Images/ApplyTransformation_Rotated.png diff --git a/src/Plugins/ComplexCore/docs/Images/ApplyTransformation_Scaled.png b/src/Plugins/SimplnxCore/docs/Images/ApplyTransformation_Scaled.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ApplyTransformation_Scaled.png rename to src/Plugins/SimplnxCore/docs/Images/ApplyTransformation_Scaled.png diff --git a/src/Plugins/ComplexCore/docs/Images/CombineAttributeArraysGUI_1.png b/src/Plugins/SimplnxCore/docs/Images/CombineAttributeArraysGUI_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/CombineAttributeArraysGUI_1.png rename to src/Plugins/SimplnxCore/docs/Images/CombineAttributeArraysGUI_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/CombineAttributeArraysGUI_2.png b/src/Plugins/SimplnxCore/docs/Images/CombineAttributeArraysGUI_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/CombineAttributeArraysGUI_2.png rename to src/Plugins/SimplnxCore/docs/Images/CombineAttributeArraysGUI_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/ComputeMomentInvariants2D.png b/src/Plugins/SimplnxCore/docs/Images/ComputeMomentInvariants2D.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ComputeMomentInvariants2D.png rename to src/Plugins/SimplnxCore/docs/Images/ComputeMomentInvariants2D.png diff --git a/src/Plugins/ComplexCore/docs/Images/ComputeMomentInvariants_Fig1.png b/src/Plugins/SimplnxCore/docs/Images/ComputeMomentInvariants_Fig1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ComputeMomentInvariants_Fig1.png rename to src/Plugins/SimplnxCore/docs/Images/ComputeMomentInvariants_Fig1.png diff --git a/src/Plugins/ComplexCore/docs/Images/CropImageGeometry_1.png b/src/Plugins/SimplnxCore/docs/Images/CropImageGeometry_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/CropImageGeometry_1.png rename to src/Plugins/SimplnxCore/docs/Images/CropImageGeometry_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateBadData_1.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateBadData_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateBadData_1.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateBadData_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateBadData_2.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateBadData_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateBadData_2.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateBadData_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateBadData_3.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateBadData_3.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateBadData_3.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateBadData_3.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateCoordinationNumber_After.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateCoordinationNumber_After.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateCoordinationNumber_After.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateCoordinationNumber_After.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateCoordinationNumber_Before.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateCoordinationNumber_Before.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateCoordinationNumber_Before.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateCoordinationNumber_Before.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateMask_Before.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateMask_Before.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateMask_Before.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateMask_Before.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateMask_Dilate.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateMask_Dilate.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateMask_Dilate.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateMask_Dilate.png diff --git a/src/Plugins/ComplexCore/docs/Images/ErodeDilateMask_Erode.png b/src/Plugins/SimplnxCore/docs/Images/ErodeDilateMask_Erode.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ErodeDilateMask_Erode.png rename to src/Plugins/SimplnxCore/docs/Images/ErodeDilateMask_Erode.png diff --git a/src/Plugins/ComplexCore/docs/Images/ExtractVertexGeometry_1.png b/src/Plugins/SimplnxCore/docs/Images/ExtractVertexGeometry_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ExtractVertexGeometry_1.png rename to src/Plugins/SimplnxCore/docs/Images/ExtractVertexGeometry_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/FeatureFaceCurvatureFilter.png b/src/Plugins/SimplnxCore/docs/Images/FeatureFaceCurvatureFilter.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/FeatureFaceCurvatureFilter.png rename to src/Plugins/SimplnxCore/docs/Images/FeatureFaceCurvatureFilter.png diff --git a/src/Plugins/ComplexCore/docs/Images/FindBiasedFeaturesBeforeAndAfter.png b/src/Plugins/SimplnxCore/docs/Images/FindBiasedFeaturesBeforeAndAfter.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/FindBiasedFeaturesBeforeAndAfter.png rename to src/Plugins/SimplnxCore/docs/Images/FindBiasedFeaturesBeforeAndAfter.png diff --git a/src/Plugins/ComplexCore/docs/Images/FindBoundaryCellsInput.png b/src/Plugins/SimplnxCore/docs/Images/FindBoundaryCellsInput.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/FindBoundaryCellsInput.png rename to src/Plugins/SimplnxCore/docs/Images/FindBoundaryCellsInput.png diff --git a/src/Plugins/ComplexCore/docs/Images/FindBoundaryCellsOutput.png b/src/Plugins/SimplnxCore/docs/Images/FindBoundaryCellsOutput.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/FindBoundaryCellsOutput.png rename to src/Plugins/SimplnxCore/docs/Images/FindBoundaryCellsOutput.png diff --git a/src/Plugins/ComplexCore/docs/Images/FindSurfaceFeatures_Cylinder.png b/src/Plugins/SimplnxCore/docs/Images/FindSurfaceFeatures_Cylinder.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/FindSurfaceFeatures_Cylinder.png rename to src/Plugins/SimplnxCore/docs/Images/FindSurfaceFeatures_Cylinder.png diff --git a/src/Plugins/ComplexCore/docs/Images/FindSurfaceFeatures_Square.png b/src/Plugins/SimplnxCore/docs/Images/FindSurfaceFeatures_Square.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/FindSurfaceFeatures_Square.png rename to src/Plugins/SimplnxCore/docs/Images/FindSurfaceFeatures_Square.png diff --git a/src/Plugins/ComplexCore/docs/Images/HistogramExample.png b/src/Plugins/SimplnxCore/docs/Images/HistogramExample.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/HistogramExample.png rename to src/Plugins/SimplnxCore/docs/Images/HistogramExample.png diff --git a/src/Plugins/ComplexCore/docs/Images/ImportAsciDataArray_ui.png b/src/Plugins/SimplnxCore/docs/Images/ImportAsciDataArray_ui.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ImportAsciDataArray_ui.png rename to src/Plugins/SimplnxCore/docs/Images/ImportAsciDataArray_ui.png diff --git a/src/Plugins/ComplexCore/docs/Images/ImportHDF5Dataset_ui.png b/src/Plugins/SimplnxCore/docs/Images/ImportHDF5Dataset_ui.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/ImportHDF5Dataset_ui.png rename to src/Plugins/SimplnxCore/docs/Images/ImportHDF5Dataset_ui.png diff --git a/src/Plugins/ComplexCore/docs/Images/Laplacian_Eq1.png b/src/Plugins/SimplnxCore/docs/Images/Laplacian_Eq1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Laplacian_Eq1.png rename to src/Plugins/SimplnxCore/docs/Images/Laplacian_Eq1.png diff --git a/src/Plugins/ComplexCore/docs/Images/Laplacian_Eq2.png b/src/Plugins/SimplnxCore/docs/Images/Laplacian_Eq2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Laplacian_Eq2.png rename to src/Plugins/SimplnxCore/docs/Images/Laplacian_Eq2.png diff --git a/src/Plugins/ComplexCore/docs/Images/Laplacian_Fig1.png b/src/Plugins/SimplnxCore/docs/Images/Laplacian_Fig1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Laplacian_Fig1.png rename to src/Plugins/SimplnxCore/docs/Images/Laplacian_Fig1.png diff --git a/src/Plugins/ComplexCore/docs/Images/Laplacian_Fig2.png b/src/Plugins/SimplnxCore/docs/Images/Laplacian_Fig2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Laplacian_Fig2.png rename to src/Plugins/SimplnxCore/docs/Images/Laplacian_Fig2.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_After_Cleanup.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_After_Cleanup.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_After_Cleanup.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_After_Cleanup.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_After_Cleanup_2.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_After_Cleanup_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_After_Cleanup_2.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_After_Cleanup_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_CTF_After.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_CTF_After.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_CTF_After.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_CTF_After.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_CTF_Before.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_CTF_Before.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_CTF_Before.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_CTF_Before.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_Exemplar.bmp b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_Exemplar.bmp similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_Exemplar.bmp rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_Exemplar.bmp diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_No_Cleanup.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_No_Cleanup.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_No_Cleanup.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_No_Cleanup.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_No_Cleanup_2.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_No_Cleanup_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_No_Cleanup_2.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_No_Cleanup_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_No_Cleanup_Mask.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_No_Cleanup_Mask.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_No_Cleanup_Mask.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_No_Cleanup_Mask.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_Small_IN100_After.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_Small_IN100_After.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_Small_IN100_After.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_Small_IN100_After.png diff --git a/src/Plugins/ComplexCore/docs/Images/NeighborReplace_Small_IN100_Before.png b/src/Plugins/SimplnxCore/docs/Images/NeighborReplace_Small_IN100_Before.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/NeighborReplace_Small_IN100_Before.png rename to src/Plugins/SimplnxCore/docs/Images/NeighborReplace_Small_IN100_Before.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_2.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_2.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_3.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_3.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_3.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_3.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_4.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_4.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_4.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_4.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_5.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_5.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_5.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_5.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_6.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_6.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_6.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_6.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_7.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_7.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_7.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_7.png diff --git a/src/Plugins/ComplexCore/docs/Images/PSTG_8.png b/src/Plugins/SimplnxCore/docs/Images/PSTG_8.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PSTG_8.png rename to src/Plugins/SimplnxCore/docs/Images/PSTG_8.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_1.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_1.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_1a.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_1a.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_1a.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_1a.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_1b.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_1b.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_1b.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_1b.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_2.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_2.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_2a.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_2a.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_2a.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_2a.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_2b.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_2b.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Advanced_Mode_2b.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Advanced_Mode_2b.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Basic_Mode.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Basic_Mode.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Basic_Mode.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Basic_Mode.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Basic_Mode_Result1a.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Basic_Mode_Result1a.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Basic_Mode_Result1a.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Basic_Mode_Result1a.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Basic_Mode_Result1b.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Basic_Mode_Result1b.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/Basic_Mode_Result1b.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/Basic_Mode_Result1b.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1a.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1a.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1a.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1a.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1b.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1b.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1b.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/BoundingBox_Mode_1b.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/UseVertexMask_1a.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/UseVertexMask_1a.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/UseVertexMask_1a.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/UseVertexMask_1a.png diff --git a/src/Plugins/ComplexCore/docs/Images/PartitionGeometry/UseVertexMask_1b.png b/src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/UseVertexMask_1b.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PartitionGeometry/UseVertexMask_1b.png rename to src/Plugins/SimplnxCore/docs/Images/PartitionGeometry/UseVertexMask_1b.png diff --git a/src/Plugins/ComplexCore/docs/Images/PointSampleTriangleGeometry_Eqn1.png b/src/Plugins/SimplnxCore/docs/Images/PointSampleTriangleGeometry_Eqn1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/PointSampleTriangleGeometry_Eqn1.png rename to src/Plugins/SimplnxCore/docs/Images/PointSampleTriangleGeometry_Eqn1.png diff --git a/src/Plugins/ComplexCore/docs/Images/QuickMesh_NodeType_2.png b/src/Plugins/SimplnxCore/docs/Images/QuickMesh_NodeType_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/QuickMesh_NodeType_2.png rename to src/Plugins/SimplnxCore/docs/Images/QuickMesh_NodeType_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/QuickMesh_NodeType_3.png b/src/Plugins/SimplnxCore/docs/Images/QuickMesh_NodeType_3.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/QuickMesh_NodeType_3.png rename to src/Plugins/SimplnxCore/docs/Images/QuickMesh_NodeType_3.png diff --git a/src/Plugins/ComplexCore/docs/Images/QuickMesh_NodeType_4.png b/src/Plugins/SimplnxCore/docs/Images/QuickMesh_NodeType_4.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/QuickMesh_NodeType_4.png rename to src/Plugins/SimplnxCore/docs/Images/QuickMesh_NodeType_4.png diff --git a/src/Plugins/ComplexCore/docs/Images/QuickSurface_Output.png b/src/Plugins/SimplnxCore/docs/Images/QuickSurface_Output.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/QuickSurface_Output.png rename to src/Plugins/SimplnxCore/docs/Images/QuickSurface_Output.png diff --git a/src/Plugins/ComplexCore/docs/Images/QuickSurface_Smooth_Output.png b/src/Plugins/SimplnxCore/docs/Images/QuickSurface_Smooth_Output.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/QuickSurface_Smooth_Output.png rename to src/Plugins/SimplnxCore/docs/Images/QuickSurface_Smooth_Output.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_1.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_1.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_10.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_10.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_10.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_10.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_2.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_2.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_3.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_3.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_3.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_3.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_4.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_4.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_4.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_4.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_5.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_5.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_5.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_5.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_6.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_6.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_6.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_6.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_7.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_7.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_7.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_7.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_8.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_8.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_8.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_8.png diff --git a/src/Plugins/ComplexCore/docs/Images/Read_CSV_9.png b/src/Plugins/SimplnxCore/docs/Images/Read_CSV_9.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Read_CSV_9.png rename to src/Plugins/SimplnxCore/docs/Images/Read_CSV_9.png diff --git a/src/Plugins/ComplexCore/docs/Images/RotateSampleRefFrame_1.png b/src/Plugins/SimplnxCore/docs/Images/RotateSampleRefFrame_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/RotateSampleRefFrame_1.png rename to src/Plugins/SimplnxCore/docs/Images/RotateSampleRefFrame_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/SharedFeaturFace_1.png b/src/Plugins/SimplnxCore/docs/Images/SharedFeaturFace_1.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/SharedFeaturFace_1.png rename to src/Plugins/SimplnxCore/docs/Images/SharedFeaturFace_1.png diff --git a/src/Plugins/ComplexCore/docs/Images/SharedFeaturFace_2.png b/src/Plugins/SimplnxCore/docs/Images/SharedFeaturFace_2.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/SharedFeaturFace_2.png rename to src/Plugins/SimplnxCore/docs/Images/SharedFeaturFace_2.png diff --git a/src/Plugins/ComplexCore/docs/Images/Small_IN100.png b/src/Plugins/SimplnxCore/docs/Images/Small_IN100.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Small_IN100.png rename to src/Plugins/SimplnxCore/docs/Images/Small_IN100.png diff --git a/src/Plugins/ComplexCore/docs/Images/Sphericity_Equation.png b/src/Plugins/SimplnxCore/docs/Images/Sphericity_Equation.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/Sphericity_Equation.png rename to src/Plugins/SimplnxCore/docs/Images/Sphericity_Equation.png diff --git a/src/Plugins/ComplexCore/docs/Images/SurfaceNets_Output.png b/src/Plugins/SimplnxCore/docs/Images/SurfaceNets_Output.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/SurfaceNets_Output.png rename to src/Plugins/SimplnxCore/docs/Images/SurfaceNets_Output.png diff --git a/src/Plugins/ComplexCore/docs/Images/SurfaceNets_Smooth_Output.png b/src/Plugins/SimplnxCore/docs/Images/SurfaceNets_Smooth_Output.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/SurfaceNets_Smooth_Output.png rename to src/Plugins/SimplnxCore/docs/Images/SurfaceNets_Smooth_Output.png diff --git a/src/Plugins/ComplexCore/docs/Images/VectorColors.png b/src/Plugins/SimplnxCore/docs/Images/VectorColors.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/VectorColors.png rename to src/Plugins/SimplnxCore/docs/Images/VectorColors.png diff --git a/src/Plugins/ComplexCore/docs/Images/aptr12_001_0.png b/src/Plugins/SimplnxCore/docs/Images/aptr12_001_0.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/aptr12_001_0.png rename to src/Plugins/SimplnxCore/docs/Images/aptr12_001_0.png diff --git a/src/Plugins/ComplexCore/docs/Images/fill_bad_data_after.png b/src/Plugins/SimplnxCore/docs/Images/fill_bad_data_after.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/fill_bad_data_after.png rename to src/Plugins/SimplnxCore/docs/Images/fill_bad_data_after.png diff --git a/src/Plugins/ComplexCore/docs/Images/fill_bad_data_before.png b/src/Plugins/SimplnxCore/docs/Images/fill_bad_data_before.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/fill_bad_data_before.png rename to src/Plugins/SimplnxCore/docs/Images/fill_bad_data_before.png diff --git a/src/Plugins/ComplexCore/docs/Images/latex24.png b/src/Plugins/SimplnxCore/docs/Images/latex24.png similarity index 100% rename from src/Plugins/ComplexCore/docs/Images/latex24.png rename to src/Plugins/SimplnxCore/docs/Images/latex24.png diff --git a/src/Plugins/ComplexCore/docs/InitializeData.md b/src/Plugins/SimplnxCore/docs/InitializeData.md similarity index 100% rename from src/Plugins/ComplexCore/docs/InitializeData.md rename to src/Plugins/SimplnxCore/docs/InitializeData.md diff --git a/src/Plugins/ComplexCore/docs/InitializeImageGeomCellData.md b/src/Plugins/SimplnxCore/docs/InitializeImageGeomCellData.md similarity index 100% rename from src/Plugins/ComplexCore/docs/InitializeImageGeomCellData.md rename to src/Plugins/SimplnxCore/docs/InitializeImageGeomCellData.md diff --git a/src/Plugins/ComplexCore/docs/InterpolatePointCloudToRegularGridFilter.md b/src/Plugins/SimplnxCore/docs/InterpolatePointCloudToRegularGridFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/InterpolatePointCloudToRegularGridFilter.md rename to src/Plugins/SimplnxCore/docs/InterpolatePointCloudToRegularGridFilter.md diff --git a/src/Plugins/ComplexCore/docs/IterativeClosestPointFilter.md b/src/Plugins/SimplnxCore/docs/IterativeClosestPointFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/IterativeClosestPointFilter.md rename to src/Plugins/SimplnxCore/docs/IterativeClosestPointFilter.md diff --git a/src/Plugins/ComplexCore/docs/KMeansFilter.md b/src/Plugins/SimplnxCore/docs/KMeansFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/KMeansFilter.md rename to src/Plugins/SimplnxCore/docs/KMeansFilter.md diff --git a/src/Plugins/ComplexCore/docs/KMedoidsFilter.md b/src/Plugins/SimplnxCore/docs/KMedoidsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/KMedoidsFilter.md rename to src/Plugins/SimplnxCore/docs/KMedoidsFilter.md diff --git a/src/Plugins/ComplexCore/docs/LaplacianSmoothingFilter.md b/src/Plugins/SimplnxCore/docs/LaplacianSmoothingFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/LaplacianSmoothingFilter.md rename to src/Plugins/SimplnxCore/docs/LaplacianSmoothingFilter.md diff --git a/src/Plugins/ComplexCore/docs/MapPointCloudToRegularGridFilter.md b/src/Plugins/SimplnxCore/docs/MapPointCloudToRegularGridFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/MapPointCloudToRegularGridFilter.md rename to src/Plugins/SimplnxCore/docs/MapPointCloudToRegularGridFilter.md diff --git a/src/Plugins/ComplexCore/docs/MinNeighbors.md b/src/Plugins/SimplnxCore/docs/MinNeighbors.md similarity index 100% rename from src/Plugins/ComplexCore/docs/MinNeighbors.md rename to src/Plugins/SimplnxCore/docs/MinNeighbors.md diff --git a/src/Plugins/ComplexCore/docs/MoveData.md b/src/Plugins/SimplnxCore/docs/MoveData.md similarity index 100% rename from src/Plugins/ComplexCore/docs/MoveData.md rename to src/Plugins/SimplnxCore/docs/MoveData.md diff --git a/src/Plugins/ComplexCore/docs/MultiThresholdObjects.md b/src/Plugins/SimplnxCore/docs/MultiThresholdObjects.md similarity index 100% rename from src/Plugins/ComplexCore/docs/MultiThresholdObjects.md rename to src/Plugins/SimplnxCore/docs/MultiThresholdObjects.md diff --git a/src/Plugins/ComplexCore/docs/NearestPointFuseRegularGridsFilter.md b/src/Plugins/SimplnxCore/docs/NearestPointFuseRegularGridsFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/NearestPointFuseRegularGridsFilter.md rename to src/Plugins/SimplnxCore/docs/NearestPointFuseRegularGridsFilter.md diff --git a/src/Plugins/ComplexCore/docs/PartitionGeometryFilter.md b/src/Plugins/SimplnxCore/docs/PartitionGeometryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/PartitionGeometryFilter.md rename to src/Plugins/SimplnxCore/docs/PartitionGeometryFilter.md diff --git a/src/Plugins/ComplexCore/docs/PointSampleTriangleGeometryFilter.md b/src/Plugins/SimplnxCore/docs/PointSampleTriangleGeometryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/PointSampleTriangleGeometryFilter.md rename to src/Plugins/SimplnxCore/docs/PointSampleTriangleGeometryFilter.md diff --git a/src/Plugins/ComplexCore/docs/QuickSurfaceMeshFilter.md b/src/Plugins/SimplnxCore/docs/QuickSurfaceMeshFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/QuickSurfaceMeshFilter.md rename to src/Plugins/SimplnxCore/docs/QuickSurfaceMeshFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadBinaryCTNorthstarFilter.md b/src/Plugins/SimplnxCore/docs/ReadBinaryCTNorthstarFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadBinaryCTNorthstarFilter.md rename to src/Plugins/SimplnxCore/docs/ReadBinaryCTNorthstarFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadCSVFileFilter.md b/src/Plugins/SimplnxCore/docs/ReadCSVFileFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadCSVFileFilter.md rename to src/Plugins/SimplnxCore/docs/ReadCSVFileFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadDREAM3DFilter.md b/src/Plugins/SimplnxCore/docs/ReadDREAM3DFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadDREAM3DFilter.md rename to src/Plugins/SimplnxCore/docs/ReadDREAM3DFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadDeformKeyFileV12Filter.md b/src/Plugins/SimplnxCore/docs/ReadDeformKeyFileV12Filter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadDeformKeyFileV12Filter.md rename to src/Plugins/SimplnxCore/docs/ReadDeformKeyFileV12Filter.md diff --git a/src/Plugins/ComplexCore/docs/ReadHDF5Dataset.md b/src/Plugins/SimplnxCore/docs/ReadHDF5Dataset.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadHDF5Dataset.md rename to src/Plugins/SimplnxCore/docs/ReadHDF5Dataset.md diff --git a/src/Plugins/ComplexCore/docs/ReadRawBinaryFilter.md b/src/Plugins/SimplnxCore/docs/ReadRawBinaryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadRawBinaryFilter.md rename to src/Plugins/SimplnxCore/docs/ReadRawBinaryFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadStlFileFilter.md b/src/Plugins/SimplnxCore/docs/ReadStlFileFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadStlFileFilter.md rename to src/Plugins/SimplnxCore/docs/ReadStlFileFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadTextDataArrayFilter.md b/src/Plugins/SimplnxCore/docs/ReadTextDataArrayFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadTextDataArrayFilter.md rename to src/Plugins/SimplnxCore/docs/ReadTextDataArrayFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReadVolumeGraphicsFileFilter.md b/src/Plugins/SimplnxCore/docs/ReadVolumeGraphicsFileFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReadVolumeGraphicsFileFilter.md rename to src/Plugins/SimplnxCore/docs/ReadVolumeGraphicsFileFilter.md diff --git a/src/Plugins/ComplexCore/docs/RegularGridSampleSurfaceMesh.md b/src/Plugins/SimplnxCore/docs/RegularGridSampleSurfaceMesh.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RegularGridSampleSurfaceMesh.md rename to src/Plugins/SimplnxCore/docs/RegularGridSampleSurfaceMesh.md diff --git a/src/Plugins/ComplexCore/docs/RegularGridSampleSurfaceMeshFilter.md b/src/Plugins/SimplnxCore/docs/RegularGridSampleSurfaceMeshFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RegularGridSampleSurfaceMeshFilter.md rename to src/Plugins/SimplnxCore/docs/RegularGridSampleSurfaceMeshFilter.md diff --git a/src/Plugins/ComplexCore/docs/RemoveFlaggedFeaturesFilter.md b/src/Plugins/SimplnxCore/docs/RemoveFlaggedFeaturesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RemoveFlaggedFeaturesFilter.md rename to src/Plugins/SimplnxCore/docs/RemoveFlaggedFeaturesFilter.md diff --git a/src/Plugins/ComplexCore/docs/RemoveFlaggedVertices.md b/src/Plugins/SimplnxCore/docs/RemoveFlaggedVertices.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RemoveFlaggedVertices.md rename to src/Plugins/SimplnxCore/docs/RemoveFlaggedVertices.md diff --git a/src/Plugins/ComplexCore/docs/RemoveMinimumSizeFeaturesFilter.md b/src/Plugins/SimplnxCore/docs/RemoveMinimumSizeFeaturesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RemoveMinimumSizeFeaturesFilter.md rename to src/Plugins/SimplnxCore/docs/RemoveMinimumSizeFeaturesFilter.md diff --git a/src/Plugins/ComplexCore/docs/RenameDataObject.md b/src/Plugins/SimplnxCore/docs/RenameDataObject.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RenameDataObject.md rename to src/Plugins/SimplnxCore/docs/RenameDataObject.md diff --git a/src/Plugins/ComplexCore/docs/ReplaceElementAttributesWithNeighborValuesFilter.md b/src/Plugins/SimplnxCore/docs/ReplaceElementAttributesWithNeighborValuesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReplaceElementAttributesWithNeighborValuesFilter.md rename to src/Plugins/SimplnxCore/docs/ReplaceElementAttributesWithNeighborValuesFilter.md diff --git a/src/Plugins/ComplexCore/docs/ResampleImageGeomFilter.md b/src/Plugins/SimplnxCore/docs/ResampleImageGeomFilter.md similarity index 99% rename from src/Plugins/ComplexCore/docs/ResampleImageGeomFilter.md rename to src/Plugins/SimplnxCore/docs/ResampleImageGeomFilter.md index 80e3bd81d1..5bf551ea39 100644 --- a/src/Plugins/ComplexCore/docs/ResampleImageGeomFilter.md +++ b/src/Plugins/SimplnxCore/docs/ResampleImageGeomFilter.md @@ -68,7 +68,7 @@ A new grid of **Cells** is created and "overlaid" on the existing grid of **Cell ## Example Pipelines -ComplexCore/ResamplePorosityImage +SimplnxCore/ResamplePorosityImage ## License & Copyright diff --git a/src/Plugins/ComplexCore/docs/ResampleRectGridToImageGeomFilter.md b/src/Plugins/SimplnxCore/docs/ResampleRectGridToImageGeomFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ResampleRectGridToImageGeomFilter.md rename to src/Plugins/SimplnxCore/docs/ResampleRectGridToImageGeomFilter.md diff --git a/src/Plugins/ComplexCore/docs/ReverseTriangleWindingFilter.md b/src/Plugins/SimplnxCore/docs/ReverseTriangleWindingFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ReverseTriangleWindingFilter.md rename to src/Plugins/SimplnxCore/docs/ReverseTriangleWindingFilter.md diff --git a/src/Plugins/ComplexCore/docs/RobustAutomaticThreshold.md b/src/Plugins/SimplnxCore/docs/RobustAutomaticThreshold.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RobustAutomaticThreshold.md rename to src/Plugins/SimplnxCore/docs/RobustAutomaticThreshold.md diff --git a/src/Plugins/ComplexCore/docs/RotateSampleRefFrameFilter.md b/src/Plugins/SimplnxCore/docs/RotateSampleRefFrameFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RotateSampleRefFrameFilter.md rename to src/Plugins/SimplnxCore/docs/RotateSampleRefFrameFilter.md diff --git a/src/Plugins/ComplexCore/docs/ScalarSegmentFeaturesFilter.md b/src/Plugins/SimplnxCore/docs/ScalarSegmentFeaturesFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ScalarSegmentFeaturesFilter.md rename to src/Plugins/SimplnxCore/docs/ScalarSegmentFeaturesFilter.md diff --git a/src/Plugins/ComplexCore/docs/SetImageGeomOriginScalingFilter.md b/src/Plugins/SimplnxCore/docs/SetImageGeomOriginScalingFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/SetImageGeomOriginScalingFilter.md rename to src/Plugins/SimplnxCore/docs/SetImageGeomOriginScalingFilter.md diff --git a/src/Plugins/ComplexCore/docs/SharedFeatureFaceFilter.md b/src/Plugins/SimplnxCore/docs/SharedFeatureFaceFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/SharedFeatureFaceFilter.md rename to src/Plugins/SimplnxCore/docs/SharedFeatureFaceFilter.md diff --git a/src/Plugins/ComplexCore/docs/SilhouetteFilter.md b/src/Plugins/SimplnxCore/docs/SilhouetteFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/SilhouetteFilter.md rename to src/Plugins/SimplnxCore/docs/SilhouetteFilter.md diff --git a/src/Plugins/ComplexCore/docs/SplitAttributeArrayFilter.md b/src/Plugins/SimplnxCore/docs/SplitAttributeArrayFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/SplitAttributeArrayFilter.md rename to src/Plugins/SimplnxCore/docs/SplitAttributeArrayFilter.md diff --git a/src/Plugins/ComplexCore/docs/SurfaceNetsFilter.md b/src/Plugins/SimplnxCore/docs/SurfaceNetsFilter.md similarity index 94% rename from src/Plugins/ComplexCore/docs/SurfaceNetsFilter.md rename to src/Plugins/SimplnxCore/docs/SurfaceNetsFilter.md index 766b6b5c1a..4bf58e1e88 100644 --- a/src/Plugins/ComplexCore/docs/SurfaceNetsFilter.md +++ b/src/Plugins/SimplnxCore/docs/SurfaceNetsFilter.md @@ -7,7 +7,7 @@ Surface Meshing (Generation) ## Description This filter uses the algorithm from {1} to produce a triangle surface mesh. The code is directly based on the sample code from the paper but has been modified to -work with the complex library classes. This filter uses a different algorithm that aims to produce a mush that keeps sharp edges +work with the simplnx library classes. This filter uses a different algorithm that aims to produce a mush that keeps sharp edges while still producing a mesh superior to marching cubes or QuickMesh. From the abstract of the paper: @@ -39,7 +39,7 @@ SurfaceNets output **with** the built-in smoothing operation applied. ## Example Pipelines - Pipelines/ComplexCore/SurfaceNets_Demo.d3dpipeline + Pipelines/SimplnxCore/SurfaceNets_Demo.d3dpipeline ## Citations diff --git a/src/Plugins/ComplexCore/docs/TriangleCentroidFilter.md b/src/Plugins/SimplnxCore/docs/TriangleCentroidFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/TriangleCentroidFilter.md rename to src/Plugins/SimplnxCore/docs/TriangleCentroidFilter.md diff --git a/src/Plugins/ComplexCore/docs/TriangleDihedralAngleFilter.md b/src/Plugins/SimplnxCore/docs/TriangleDihedralAngleFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/TriangleDihedralAngleFilter.md rename to src/Plugins/SimplnxCore/docs/TriangleDihedralAngleFilter.md diff --git a/src/Plugins/ComplexCore/docs/TriangleNormalFilter.md b/src/Plugins/SimplnxCore/docs/TriangleNormalFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/TriangleNormalFilter.md rename to src/Plugins/SimplnxCore/docs/TriangleNormalFilter.md diff --git a/src/Plugins/ComplexCore/docs/UncertainRegularGridSampleSurfaceMesh.md b/src/Plugins/SimplnxCore/docs/UncertainRegularGridSampleSurfaceMesh.md similarity index 100% rename from src/Plugins/ComplexCore/docs/UncertainRegularGridSampleSurfaceMesh.md rename to src/Plugins/SimplnxCore/docs/UncertainRegularGridSampleSurfaceMesh.md diff --git a/src/Plugins/ComplexCore/docs/UncertainRegularGridSampleSurfaceMeshFilter.md b/src/Plugins/SimplnxCore/docs/UncertainRegularGridSampleSurfaceMeshFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/UncertainRegularGridSampleSurfaceMeshFilter.md rename to src/Plugins/SimplnxCore/docs/UncertainRegularGridSampleSurfaceMeshFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteASCIIDataFilter.md b/src/Plugins/SimplnxCore/docs/WriteASCIIDataFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteASCIIDataFilter.md rename to src/Plugins/SimplnxCore/docs/WriteASCIIDataFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteAbaqusHexahedronFilter.md b/src/Plugins/SimplnxCore/docs/WriteAbaqusHexahedronFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteAbaqusHexahedronFilter.md rename to src/Plugins/SimplnxCore/docs/WriteAbaqusHexahedronFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteAvizoRectilinearCoordinateFilter.md b/src/Plugins/SimplnxCore/docs/WriteAvizoRectilinearCoordinateFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteAvizoRectilinearCoordinateFilter.md rename to src/Plugins/SimplnxCore/docs/WriteAvizoRectilinearCoordinateFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteAvizoUniformCoordinateFilter.md b/src/Plugins/SimplnxCore/docs/WriteAvizoUniformCoordinateFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteAvizoUniformCoordinateFilter.md rename to src/Plugins/SimplnxCore/docs/WriteAvizoUniformCoordinateFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteBinaryDataFilter.md b/src/Plugins/SimplnxCore/docs/WriteBinaryDataFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteBinaryDataFilter.md rename to src/Plugins/SimplnxCore/docs/WriteBinaryDataFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteDREAM3DFilter.md b/src/Plugins/SimplnxCore/docs/WriteDREAM3DFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteDREAM3DFilter.md rename to src/Plugins/SimplnxCore/docs/WriteDREAM3DFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteFeatureDataCSVFilter.md b/src/Plugins/SimplnxCore/docs/WriteFeatureDataCSVFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteFeatureDataCSVFilter.md rename to src/Plugins/SimplnxCore/docs/WriteFeatureDataCSVFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteLosAlamosFFTFilter.md b/src/Plugins/SimplnxCore/docs/WriteLosAlamosFFTFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteLosAlamosFFTFilter.md rename to src/Plugins/SimplnxCore/docs/WriteLosAlamosFFTFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteStlFileFilter.md b/src/Plugins/SimplnxCore/docs/WriteStlFileFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteStlFileFilter.md rename to src/Plugins/SimplnxCore/docs/WriteStlFileFilter.md diff --git a/src/Plugins/ComplexCore/docs/WriteVtkRectilinearGridFilter.md b/src/Plugins/SimplnxCore/docs/WriteVtkRectilinearGridFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/WriteVtkRectilinearGridFilter.md rename to src/Plugins/SimplnxCore/docs/WriteVtkRectilinearGridFilter.md diff --git a/src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline similarity index 90% rename from src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline index e1838d52ab..06e10246b7 100644 --- a/src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateImageGeometry", + "name": "simplnx::CreateImageGeometry", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false @@ -46,7 +46,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -67,7 +67,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -88,7 +88,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -109,7 +109,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -136,7 +136,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -163,7 +163,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -178,7 +178,7 @@ }, "comments": "", "filter": { - "name": "complex::AppendImageGeometryZSliceFilter", + "name": "simplnx::AppendImageGeometryZSliceFilter", "uuid": "c62c5c89-5ea8-4948-99ca-51cbc5b54b05" }, "isDisabled": false @@ -190,7 +190,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline similarity index 92% rename from src/Plugins/ComplexCore/pipelines/ApplyTransformation_Demo.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline index 41d7032ef7..f7f2866dad 100644 --- a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline @@ -9,7 +9,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataGroup", + "name": "simplnx::CreateDataGroup", "uuid": "e7d2f9b8-4131-4b28-a843-ea3c6950f101" }, "isDisabled": false @@ -20,7 +20,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataGroup", + "name": "simplnx::CreateDataGroup", "uuid": "e7d2f9b8-4131-4b28-a843-ea3c6950f101" }, "isDisabled": false @@ -62,7 +62,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateGeometryFilter", + "name": "simplnx::CreateGeometryFilter", "uuid": "24768170-5b90-4a9d-82ac-9aeecd9f892e" }, "isDisabled": false @@ -83,7 +83,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -140,7 +140,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline similarity index 92% rename from src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline index bc0e0ddcb7..4e7e94a66a 100644 --- a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -26,7 +26,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -83,7 +83,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -154,7 +154,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -225,7 +225,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -239,7 +239,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -296,7 +296,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -310,7 +310,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -367,7 +367,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -379,7 +379,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline similarity index 92% rename from src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline index 55248b59dd..b85226870c 100644 --- a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadStlFileFilter", + "name": "simplnx::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -26,7 +26,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadStlFileFilter", + "name": "simplnx::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -83,7 +83,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadStlFileFilter", + "name": "simplnx::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -154,7 +154,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadStlFileFilter", + "name": "simplnx::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -225,7 +225,7 @@ }, "comments": "", "filter": { - "name": "complex::ApplyTransformationToGeometryFilter", + "name": "simplnx::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false @@ -237,7 +237,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline similarity index 89% rename from src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline index 0eed6efce7..f3ecea0b9b 100644 --- a/src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -16,7 +16,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -35,7 +35,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -54,7 +54,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -71,7 +71,7 @@ }, "comments": "", "filter": { - "name": "complex::ArrayCalculatorFilter", + "name": "simplnx::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -88,7 +88,7 @@ }, "comments": "", "filter": { - "name": "complex::ArrayCalculatorFilter", + "name": "simplnx::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -105,7 +105,7 @@ }, "comments": "", "filter": { - "name": "complex::ArrayCalculatorFilter", + "name": "simplnx::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -122,7 +122,7 @@ }, "comments": "", "filter": { - "name": "complex::ArrayCalculatorFilter", + "name": "simplnx::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -139,7 +139,7 @@ }, "comments": "", "filter": { - "name": "complex::ArrayCalculatorFilter", + "name": "simplnx::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -156,7 +156,7 @@ }, "comments": "", "filter": { - "name": "complex::ArrayCalculatorFilter", + "name": "simplnx::ArrayCalculatorFilter", "uuid": "eea49b17-0db2-5bbc-80ef-f44249cc8d55" }, "isDisabled": false @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline similarity index 94% rename from src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline index 8b3fcb08bb..98c8dc3a0f 100644 --- a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AvizoWriters.d3dpipeline @@ -44,7 +44,7 @@ }, "comments": "This pipeline requires the output from the (08) Small IN100 Full Reconstruction pipeline as input", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteAvizoUniformCoordinateFilter", + "name": "simplnx::WriteAvizoUniformCoordinateFilter", "uuid": "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212" }, "isDisabled": false @@ -74,7 +74,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteAvizoRectilinearCoordinateFilter", + "name": "simplnx::WriteAvizoRectilinearCoordinateFilter", "uuid": "58661ea8-0322-44af-a48e-1dc80e999376" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline similarity index 89% rename from src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline index e2ac41cf96..fb0bdb91af 100644 --- a/src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline @@ -13,7 +13,7 @@ }, "comments": "", "filter": { - "name": "complex::CombineStlFilesFilter", + "name": "simplnx::CombineStlFilesFilter", "uuid": "76b56f80-fcbe-4d48-a34d-a73d0fc6e5ae" }, "isDisabled": false @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ExecuteProcess.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline similarity index 89% rename from src/Plugins/ComplexCore/pipelines/ExecuteProcess.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline index 271b7568df..d522dfd992 100644 --- a/src/Plugins/ComplexCore/pipelines/ExecuteProcess.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExecuteProcess.d3dpipeline @@ -7,12 +7,12 @@ "args": { "arguments": "nxrunner", "blocking": false, - "output_log_file": "Data/Output/ComplexCore/ExecuteProcessOutput.txt", + "output_log_file": "Data/Output/SimplnxCore/ExecuteProcessOutput.txt", "timeout": 30000 }, "comments": "This pipeline demonstrates the use of the Execute Process filter in order to execute an external program from DREAM.3D. Here are a few general rules to keep in mind when formatting your command;\n--> The Command Line Arguments parameter should contain the absolute path to the program you wish to execute as well as any arguments that program requires (each separated by spaces). \n--> Path's containing spaces should be enclosed with double quotes (\"). \n--> Linux and MacOS users should be sure to use forward slashes (/) as the path separator instead of backslashes (\\)", "filter": { - "name": "complex::ExecuteProcessFilter", + "name": "simplnx::ExecuteProcessFilter", "uuid": "fb511a70-2175-4595-8c11-d1b5b6794221" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ExtractVertexGeometry.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline similarity index 93% rename from src/Plugins/ComplexCore/pipelines/ExtractVertexGeometry.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline index 1fc7d0fa9b..45b775f493 100644 --- a/src/Plugins/ComplexCore/pipelines/ExtractVertexGeometry.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline @@ -11,7 +11,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -28,7 +28,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -66,7 +66,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -118,7 +118,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -149,7 +149,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -178,7 +178,7 @@ }, "comments": "This filter will only create vertices where the Y Position was below a threshold set in the previous filter. The filter will move the arrays to the newly created vertext geometry", "filter": { - "name": "complex::ExtractVertexGeometryFilter", + "name": "simplnx::ExtractVertexGeometryFilter", "uuid": "621a71ca-124b-4471-ad1a-02f05ffba099" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline similarity index 93% rename from src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline index b9251d8721..711e4feb87 100644 --- a/src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline @@ -50,7 +50,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -70,7 +70,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -84,7 +84,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeatureCentroidsFilter", + "name": "simplnx::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false @@ -99,7 +99,7 @@ }, "comments": "", "filter": { - "name": "complex::FindSurfaceFeatures", + "name": "simplnx::FindSurfaceFeatures", "uuid": "0893e490-5d24-4c21-95e7-e8372baa8948" }, "isDisabled": false @@ -115,7 +115,7 @@ }, "comments": "", "filter": { - "name": "complex::FindBoundingBoxFeaturesFilter", + "name": "simplnx::FindBoundingBoxFeaturesFilter", "uuid": "d46f2fd7-dc68-4b57-bca3-693016512b2f" }, "isDisabled": false @@ -127,7 +127,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline similarity index 95% rename from src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline index d671b3dca2..0fe093ab87 100644 --- a/src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindBoundaryCells.d3dpipeline @@ -49,7 +49,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -64,7 +64,7 @@ }, "comments": "", "filter": { - "name": "complex::FindBoundaryCellsFilter", + "name": "simplnx::FindBoundaryCellsFilter", "uuid": "a1dd1c29-9152-4648-836c-3b6967e32600" }, "isDisabled": false @@ -76,7 +76,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline similarity index 92% rename from src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline index da085b23a6..087d6c0a1b 100644 --- a/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline @@ -28,7 +28,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EbsdFilter", + "name": "simplnx::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -62,7 +62,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -76,7 +76,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -112,7 +112,7 @@ }, "comments": "", "filter": { - "name": "complex::FindLargestCrossSectionsFilter", + "name": "simplnx::FindLargestCrossSectionsFilter", "uuid": "18ba2f7a-4e3a-4547-bd8c-b0955d542a9f" }, "isDisabled": false @@ -124,7 +124,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline similarity index 92% rename from src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline index 94785d2ce2..847983a7e5 100644 --- a/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateImageGeometry", + "name": "simplnx::CreateImageGeometry", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false @@ -84,7 +84,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCSVFileFilter", + "name": "simplnx::ReadCSVFileFilter", "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261" }, "isDisabled": false @@ -102,7 +102,7 @@ }, "comments": "", "filter": { - "name": "complex::CombineAttributeArraysFilter", + "name": "simplnx::CombineAttributeArraysFilter", "uuid": "2436b614-e96d-47f0-9f6f-41d6fe97acd4" }, "isDisabled": false @@ -117,7 +117,7 @@ }, "comments": "", "filter": { - "name": "complex::DeleteData", + "name": "simplnx::DeleteData", "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" }, "isDisabled": false @@ -138,7 +138,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateEnsembleInfoFilter", + "name": "simplnx::CreateEnsembleInfoFilter", "uuid": "8ce3d70c-49fe-4812-a1eb-7ce4c962a59d" }, "isDisabled": false @@ -159,7 +159,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -174,7 +174,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImageWriter", + "name": "simplnx::ITKImageWriter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -186,7 +186,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": true diff --git a/src/Plugins/ComplexCore/pipelines/Import_ASCII_Data.d3dworkflow b/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow similarity index 95% rename from src/Plugins/ComplexCore/pipelines/Import_ASCII_Data.d3dworkflow rename to src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow index 5fac1fefc2..a7607835df 100644 --- a/src/Plugins/ComplexCore/pipelines/Import_ASCII_Data.d3dworkflow +++ b/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateImageGeometry", + "name": "simplnx::CreateImageGeometry", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false @@ -48,7 +48,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/Import_CSV_Data.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline similarity index 91% rename from src/Plugins/ComplexCore/pipelines/Import_CSV_Data.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline index 48d274aacd..3c4580d25f 100644 --- a/src/Plugins/ComplexCore/pipelines/Import_CSV_Data.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateImageGeometry", + "name": "simplnx::CreateImageGeometry", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false @@ -48,7 +48,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -71,7 +71,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -94,7 +94,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -117,7 +117,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline similarity index 88% rename from src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline index 97cb3d8c73..69b655be51 100644 --- a/src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadStlFileFilter", + "name": "simplnx::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -24,7 +24,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateTriangleAreasFilter", + "name": "simplnx::CalculateTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false @@ -43,7 +43,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArray", + "name": "simplnx::CreateDataArray", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": true diff --git a/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline similarity index 91% rename from src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline index 9389b5bfbd..38d556286a 100644 --- a/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadAngDataFilter", + "name": "simplnx::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateSampleRefFrameFilter", + "name": "simplnx::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -114,7 +114,7 @@ }, "comments": "", "filter": { - "name": "complex::RotateEulerRefFrameFilter", + "name": "simplnx::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -137,7 +137,7 @@ }, "comments": "", "filter": { - "name": "complex::SetImageGeomOriginScalingFilter", + "name": "simplnx::SetImageGeomOriginScalingFilter", "uuid": "057bc7fd-c84a-4902-9397-87e51b1b1fe0" }, "isDisabled": false @@ -164,7 +164,7 @@ }, "comments": "", "filter": { - "name": "complex::CropImageGeometry", + "name": "simplnx::CropImageGeometry", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -185,7 +185,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -200,7 +200,7 @@ }, "comments": "", "filter": { - "name": "complex::ReplaceElementAttributesWithNeighborValuesFilter", + "name": "simplnx::ReplaceElementAttributesWithNeighborValuesFilter", "uuid": "65128c53-d3be-4a69-a559-32a48d603884" }, "isDisabled": false @@ -212,7 +212,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline similarity index 93% rename from src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline index 57d42842db..f11a3c7e24 100644 --- a/src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline @@ -33,7 +33,7 @@ }, "comments": "", "filter": { - "name": "complex::ITKImportImageStack", + "name": "simplnx::ITKImportImageStack", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -65,7 +65,7 @@ }, "comments": "", "filter": { - "name": "complex::ResampleImageGeomFilter", + "name": "simplnx::ResampleImageGeomFilter", "uuid": "9783ea2c-4cf7-46de-ab21-b40d91a48c5b" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::ResampleImageGeomFilter", + "name": "simplnx::ResampleImageGeomFilter", "uuid": "9783ea2c-4cf7-46de-ab21-b40d91a48c5b" }, "isDisabled": false @@ -129,7 +129,7 @@ }, "comments": "", "filter": { - "name": "complex::ResampleImageGeomFilter", + "name": "simplnx::ResampleImageGeomFilter", "uuid": "9783ea2c-4cf7-46de-ab21-b40d91a48c5b" }, "isDisabled": false @@ -141,7 +141,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline similarity index 92% rename from src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index 55e16613fe..a5500820ff 100644 --- a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -35,7 +35,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadCSVFileFilter", + "name": "simplnx::ReadCSVFileFilter", "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261" }, "isDisabled": false @@ -78,7 +78,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateGeometryFilter", + "name": "simplnx::CreateGeometryFilter", "uuid": "24768170-5b90-4a9d-82ac-9aeecd9f892e" }, "isDisabled": false @@ -101,7 +101,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -124,7 +124,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -147,7 +147,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -170,7 +170,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -193,7 +193,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -216,7 +216,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadTextDataArrayFilter", + "name": "simplnx::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false @@ -242,7 +242,7 @@ }, "comments": "", "filter": { - "name": "complex::ResampleRectGridToImageGeomFilter", + "name": "simplnx::ResampleRectGridToImageGeomFilter", "uuid": "28ed3258-41b2-45a0-8f37-6574264650f9" }, "isDisabled": false @@ -254,7 +254,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline similarity index 93% rename from src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline index 28f39be4de..d99ba0faf1 100644 --- a/src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline @@ -33,7 +33,7 @@ }, "comments": "This pipeline shows how to import a stack of binarized images, segment them and perform a surfacemeshing on those pores using the 'SurfaceNets' Algorithm.\n\nIf you want to visualize the pores you will need to threshold out (with a visualization program) those triangle faces that have a FaceLael > 0 (for the 2nd component of the FaceLabels) array.", "filter": { - "name": "complex::ITKImportImageStack", + "name": "simplnx::ITKImportImageStack", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -64,7 +64,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -83,7 +83,7 @@ }, "comments": "", "filter": { - "name": "complex::ScalarSegmentFeaturesFilter", + "name": "simplnx::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false @@ -106,7 +106,7 @@ }, "comments": "", "filter": { - "name": "complex::SurfaceNetsFilter", + "name": "simplnx::SurfaceNetsFilter", "uuid": "13ddf0bd-af49-4e0f-95fb-3267952fd6e5" }, "isDisabled": false @@ -118,7 +118,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline similarity index 86% rename from src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline index 81259ae3d9..cf0a8a38a2 100644 --- a/src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadStlFileFilter", + "name": "simplnx::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -24,7 +24,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateTriangleAreasFilter", + "name": "simplnx::CalculateTriangleAreasFilter", "uuid": "b149addd-c0c8-4010-a264-596005eaf2a5" }, "isDisabled": false @@ -36,7 +36,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleNormalFilter", + "name": "simplnx::TriangleNormalFilter", "uuid": "8133d419-1919-4dbf-a5bf-1c97282ba63f" }, "isDisabled": false @@ -48,7 +48,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleDihedralAngleFilter", + "name": "simplnx::TriangleDihedralAngleFilter", "uuid": "dd42c521-4ae5-485d-ad35-d1276547d2f1" }, "isDisabled": false @@ -60,7 +60,7 @@ }, "comments": "", "filter": { - "name": "complex::TriangleCentroidFilter", + "name": "simplnx::TriangleCentroidFilter", "uuid": "5d7156ae-3e0a-4db0-a792-552f492e8911" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline similarity index 93% rename from src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index 855c0f230b..0eeddcf8cb 100644 --- a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -70,7 +70,7 @@ }, "comments": "", "filter": { - "name": "complex::ReadH5EbsdFilter", + "name": "simplnx::ReadH5EbsdFilter", "uuid": "db291b6c-9aaf-432d-9547-430c865a539c" }, "isDisabled": false @@ -104,7 +104,7 @@ }, "comments": "", "filter": { - "name": "complex::MultiThresholdObjects", + "name": "simplnx::MultiThresholdObjects", "uuid": "4246245e-1011-4add-8436-0af6bed19228" }, "isDisabled": false @@ -118,7 +118,7 @@ }, "comments": "", "filter": { - "name": "complex::ConvertOrientations", + "name": "simplnx::ConvertOrientations", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -137,7 +137,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsMisorientationFilter", + "name": "simplnx::AlignSectionsMisorientationFilter", "uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced" }, "isDisabled": false @@ -150,7 +150,7 @@ }, "comments": "", "filter": { - "name": "complex::IdentifySample", + "name": "simplnx::IdentifySample", "uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273" }, "isDisabled": false @@ -167,7 +167,7 @@ }, "comments": "", "filter": { - "name": "complex::AlignSectionsFeatureCentroidFilter", + "name": "simplnx::AlignSectionsFeatureCentroidFilter", "uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452" }, "isDisabled": false @@ -184,7 +184,7 @@ }, "comments": "", "filter": { - "name": "complex::BadDataNeighborOrientationCheckFilter", + "name": "simplnx::BadDataNeighborOrientationCheckFilter", "uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3" }, "isDisabled": false @@ -203,7 +203,7 @@ }, "comments": "", "filter": { - "name": "complex::NeighborOrientationCorrelationFilter", + "name": "simplnx::NeighborOrientationCorrelationFilter", "uuid": "4625c192-7e46-4333-a294-67a2eb64cb37" }, "isDisabled": false @@ -224,7 +224,7 @@ }, "comments": "", "filter": { - "name": "complex::EBSDSegmentFeaturesFilter", + "name": "simplnx::EBSDSegmentFeaturesFilter", "uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0" }, "isDisabled": false @@ -238,7 +238,7 @@ }, "comments": "", "filter": { - "name": "complex::FindFeaturePhasesFilter", + "name": "simplnx::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -255,7 +255,7 @@ }, "comments": "", "filter": { - "name": "complex::FindAvgOrientationsFilter", + "name": "simplnx::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -275,7 +275,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -298,7 +298,7 @@ }, "comments": "", "filter": { - "name": "complex::MergeTwinsFilter", + "name": "simplnx::MergeTwinsFilter", "uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9" }, "isDisabled": false @@ -315,7 +315,7 @@ }, "comments": "", "filter": { - "name": "complex::CalculateFeatureSizesFilter", + "name": "simplnx::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -332,7 +332,7 @@ }, "comments": "", "filter": { - "name": "complex::RemoveMinimumSizeFeaturesFilter", + "name": "simplnx::RemoveMinimumSizeFeaturesFilter", "uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0" }, "isDisabled": false @@ -352,7 +352,7 @@ }, "comments": "", "filter": { - "name": "complex::FindNeighbors", + "name": "simplnx::FindNeighbors", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -371,7 +371,7 @@ }, "comments": "", "filter": { - "name": "complex::MinNeighbors", + "name": "simplnx::MinNeighbors", "uuid": "4ab5153f-6014-4e6d-bbd6-194068620389" }, "isDisabled": false @@ -387,7 +387,7 @@ }, "comments": "", "filter": { - "name": "complex::FillBadDataFilter", + "name": "simplnx::FillBadDataFilter", "uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e" }, "isDisabled": false @@ -405,7 +405,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -423,7 +423,7 @@ }, "comments": "", "filter": { - "name": "complex::ErodeDilateBadDataFilter", + "name": "simplnx::ErodeDilateBadDataFilter", "uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b" }, "isDisabled": false @@ -444,7 +444,7 @@ }, "comments": "", "filter": { - "name": "complex::GenerateIPFColorsFilter", + "name": "simplnx::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -456,7 +456,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteDREAM3DFilter", + "name": "simplnx::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -466,7 +466,7 @@ }, "comments": "The input for this pipeline requires the output from the (08) Small IN100 Full Reconstruction bookmarked pipeline.", "filter": { - "name": "complex::ReadDREAM3DFilter", + "name": "simplnx::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -494,7 +494,7 @@ }, "comments": "", "filter": { - "name": "complex::WriteVtkRectilinearGridFilter", + "name": "simplnx::WriteVtkRectilinearGridFilter", "uuid": "58a4d758-c5ff-43d3-a394-1508ad00a0d2" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AddBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AddBadDataFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp index 1ef4c0f380..6d9024e22a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AddBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp @@ -1,24 +1,24 @@ #include "AddBadDataFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AddBadData.hpp" +#include "SimplnxCore/Filters/Algorithms/AddBadData.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string AddBadDataFilter::name() const @@ -101,7 +101,7 @@ IFilter::PreflightResult AddBadDataFilter::preflightImpl(const DataStructure& da auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(!pBoundaryNoiseValue && !pPoissonNoiseValue) @@ -195,4 +195,4 @@ Result AddBadDataFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AddBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AddBadDataFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp index 432c8251ca..7dda4806cc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AddBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class AddBadDataFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT AddBadDataFilter : public IFilter +class SIMPLNXCORE_EXPORT AddBadDataFilter : public IFilter { public: AddBadDataFilter() = default; @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT AddBadDataFilter : public IFilter static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,7 +105,7 @@ class COMPLEXCORE_EXPORT AddBadDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AddBadDataFilter, "f44c66d1-a095-4e33-871c-c7699d89a011"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AddBadDataFilter, "f44c66d1-a095-4e33-871c-c7699d89a011"); /* LEGACY UUID FOR THIS FILTER ac99b706-d1e0-5f78-9246-fbbe1efd93d2 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AddBadData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AddBadData.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AddBadData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AddBadData.cpp index 37855fcaf7..000a522679 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AddBadData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AddBadData.cpp @@ -1,14 +1,14 @@ #include "AddBadData.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AddBadData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AddBadData.hpp similarity index 71% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AddBadData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AddBadData.hpp index db153ce90e..4cea31e4c7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AddBadData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AddBadData.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT AddBadDataInputValues +struct SIMPLNXCORE_EXPORT AddBadDataInputValues { bool PoissonNoise; float32 PoissonVolFraction; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT AddBadDataInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT AddBadData +class SIMPLNXCORE_EXPORT AddBadData { public: AddBadData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AddBadDataInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT AddBadData const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp similarity index 87% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp index 415cdf28e4..39f44720ea 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.cpp @@ -1,13 +1,13 @@ #include "AlignSectionsFeatureCentroid.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- AlignSectionsFeatureCentroid::AlignSectionsFeatureCentroid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -64,7 +64,7 @@ Result<> AlignSectionsFeatureCentroid::findShifts(std::vector& xShifts, } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->MaskArrayPath.toString()); return MakeErrorResult(-53900, message); } @@ -74,7 +74,7 @@ Result<> AlignSectionsFeatureCentroid::findShifts(std::vector& xShifts, { // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(m_InputValues->AlignmentShiftFileName.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(m_InputValues->AlignmentShiftFileName.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; @@ -107,7 +107,7 @@ Result<> AlignSectionsFeatureCentroid::findShifts(std::vector& xShifts, size_t slice = 0; size_t point = 0; - complex::FloatVec3 spacing = gridGeom->getSpacing(); + nx::core::FloatVec3 spacing = gridGeom->getSpacing(); std::vector xCentroid(dims[2], 0.0f); std::vector yCentroid(dims[2], 0.0f); @@ -121,7 +121,7 @@ Result<> AlignSectionsFeatureCentroid::findShifts(std::vector& xShifts, if(std::chrono::duration_cast(now - start).count() > 1000) { std::string message = fmt::format("Determining Shifts || {}% Complete", progInt); - m_MessageHandler(complex::IFilter::ProgressMessage{complex::IFilter::Message::Type::Info, message, progInt}); + m_MessageHandler(nx::core::IFilter::ProgressMessage{nx::core::IFilter::Message::Type::Info, message, progInt}); start = std::chrono::steady_clock::now(); } if(getCancel()) @@ -174,7 +174,7 @@ Result<> AlignSectionsFeatureCentroid::findShifts(std::vector& xShifts, std::string message = fmt::format("A shift was greater than the X dimension of the Image Geometry. " "All subsequent slices are probably wrong. Slice={} X Dim={} X Shift={} sDims[0]={}", iter, dims[0], xShifts[iter], sdims[0]); - m_MessageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, message}); + m_MessageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); xWarning = true; } if((yShifts[iter] < -sdims[1] || yShifts[iter] > sdims[1]) && !yWarning) @@ -182,19 +182,19 @@ Result<> AlignSectionsFeatureCentroid::findShifts(std::vector& xShifts, std::string message = fmt::format("A shift was greater than the Y dimension of the Image Geometry. " "All subsequent slices are probably wrong. Slice={} Y Dim={} Y Shift={} sDims[1]={}", iter, dims[1], yShifts[iter], sdims[1]); - m_MessageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, message}); + m_MessageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); yWarning = true; } if(std::isnan(xCentroid[iter]) && !xWarning) { std::string message = fmt::format("The X Centroid was NaN. All subsequent slices are probably wrong. Slice=", iter); - m_MessageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, message}); + m_MessageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); xWarning = true; } if(std::isnan(yCentroid[iter]) && !yWarning) { std::string message = fmt::format("The Y Centroid was NaN. All subsequent slices are probably wrong. Slice=", iter); - m_MessageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, message}); + m_MessageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); yWarning = true; } if(m_InputValues->WriteAlignmentShifts) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp similarity index 76% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp index 94331788b1..2f36247b5b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/AlignSections.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/AlignSections.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT AlignSectionsFeatureCentroidInputValues +struct SIMPLNXCORE_EXPORT AlignSectionsFeatureCentroidInputValues { bool WriteAlignmentShifts; FileSystemPathParameter::ValueType AlignmentShiftFileName; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT AlignSectionsFeatureCentroidInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT AlignSectionsFeatureCentroid : public AlignSections +class SIMPLNXCORE_EXPORT AlignSectionsFeatureCentroid : public AlignSections { public: AlignSectionsFeatureCentroid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AlignSectionsFeatureCentroidInputValues* inputValues); @@ -54,4 +54,4 @@ class COMPLEXCORE_EXPORT AlignSectionsFeatureCentroid : public AlignSections Result<> m_Result; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsList.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsList.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsList.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsList.cpp index 04f22c7ca0..4a0c2bf2b1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsList.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsList.cpp @@ -1,11 +1,11 @@ #include "AlignSectionsList.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- AlignSectionsList::AlignSectionsList(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AlignSectionsListInputValues* inputValues) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsList.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsList.hpp similarity index 68% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsList.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsList.hpp index 7629061c02..ca8ca46ef6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AlignSectionsList.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AlignSectionsList.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/AlignSections.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/AlignSections.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT AlignSectionsListInputValues +struct SIMPLNXCORE_EXPORT AlignSectionsListInputValues { FileSystemPathParameter::ValueType InputFile; bool DREAM3DAlignmentFile; @@ -26,7 +26,7 @@ struct COMPLEXCORE_EXPORT AlignSectionsListInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT AlignSectionsList : public AlignSections +class SIMPLNXCORE_EXPORT AlignSectionsList : public AlignSections { public: AlignSectionsList(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AlignSectionsListInputValues* inputValues); @@ -52,4 +52,4 @@ class COMPLEXCORE_EXPORT AlignSectionsList : public AlignSections Result<> m_Result; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.cpp index 4f368c6951..887c2bec8c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.cpp @@ -1,11 +1,11 @@ #include "AppendImageGeometryZSlice.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/IArray.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- AppendImageGeometryZSlice::AppendImageGeometryZSlice(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp similarity index 74% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp index e2118b6115..2471e4ba92 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT AppendImageGeometryZSliceInputValues +struct SIMPLNXCORE_EXPORT AppendImageGeometryZSliceInputValues { DataPath InputGeometryPath; DataPath DestinationGeometryPath; @@ -23,7 +23,7 @@ struct COMPLEXCORE_EXPORT AppendImageGeometryZSliceInputValues * @class AppendImageGeometryZSlice * @brief This filter allows the user to append an Image Geometry onto the "end" of another Image Geometry. */ -class COMPLEXCORE_EXPORT AppendImageGeometryZSlice +class SIMPLNXCORE_EXPORT AppendImageGeometryZSlice { public: AppendImageGeometryZSlice(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AppendImageGeometryZSliceInputValues* inputValues); @@ -45,4 +45,4 @@ class COMPLEXCORE_EXPORT AppendImageGeometryZSlice const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.cpp index f9a7856302..666f957c2c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.cpp @@ -1,13 +1,13 @@ #include "ApplyTransformationToGeometry.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" + +using namespace nx::core; // ----------------------------------------------------------------------------- ApplyTransformationToGeometry::ApplyTransformationToGeometry(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp similarity index 57% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp index 19b5e4455b..52ab95a8ca 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/ImageRotationUtilities.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/ImageRotationUtilities.hpp" #include @@ -27,29 +27,29 @@ const std::string k_ManualTransformationMatrix("Manual Transformation Matrix"); const std::string k_Rotation("Rotation"); const std::string k_Translation("Translation"); const std::string k_Scale("Scale"); -const complex::ChoicesParameter::Choices k_TransformationChoices = {k_NoTransform, k_PrecomputedTransformationMatrix, k_ManualTransformationMatrix, k_Rotation, k_Translation, k_Scale}; +const nx::core::ChoicesParameter::Choices k_TransformationChoices = {k_NoTransform, k_PrecomputedTransformationMatrix, k_ManualTransformationMatrix, k_Rotation, k_Translation, k_Scale}; -const complex::ChoicesParameter::ValueType k_NoTransformIdx = 0ULL; -const complex::ChoicesParameter::ValueType k_PrecomputedTransformationMatrixIdx = 1ULL; -const complex::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; -const complex::ChoicesParameter::ValueType k_RotationIdx = 3ULL; -const complex::ChoicesParameter::ValueType k_TranslationIdx = 4ULL; -const complex::ChoicesParameter::ValueType k_ScaleIdx = 5ULL; +const nx::core::ChoicesParameter::ValueType k_NoTransformIdx = 0ULL; +const nx::core::ChoicesParameter::ValueType k_PrecomputedTransformationMatrixIdx = 1ULL; +const nx::core::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; +const nx::core::ChoicesParameter::ValueType k_RotationIdx = 3ULL; +const nx::core::ChoicesParameter::ValueType k_TranslationIdx = 4ULL; +const nx::core::ChoicesParameter::ValueType k_ScaleIdx = 5ULL; const std::string k_NearestNeighborInterpolation("Nearest Neighbor Resampling"); const std::string k_LinearInterpolation("Linear Interpolation"); const std::string k_NoInterpolation("No Interpolation"); -const complex::ChoicesParameter::Choices k_InterpolationChoices = {k_NearestNeighborInterpolation, k_LinearInterpolation, k_NoInterpolation}; +const nx::core::ChoicesParameter::Choices k_InterpolationChoices = {k_NearestNeighborInterpolation, k_LinearInterpolation, k_NoInterpolation}; -const complex::ChoicesParameter::ValueType k_NearestNeighborInterpolationIdx = 0ULL; -const complex::ChoicesParameter::ValueType k_LinearInterpolationIdx = 1ULL; -const complex::ChoicesParameter::ValueType k_NoInterpolationIdx = 2ULL; +const nx::core::ChoicesParameter::ValueType k_NearestNeighborInterpolationIdx = 0ULL; +const nx::core::ChoicesParameter::ValueType k_LinearInterpolationIdx = 1ULL; +const nx::core::ChoicesParameter::ValueType k_NoInterpolationIdx = 2ULL; } // namespace -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ApplyTransformationToGeometryInputValues +struct SIMPLNXCORE_EXPORT ApplyTransformationToGeometryInputValues { DataPath SelectedGeometryPath; @@ -73,7 +73,7 @@ struct COMPLEXCORE_EXPORT ApplyTransformationToGeometryInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ApplyTransformationToGeometry +class SIMPLNXCORE_EXPORT ApplyTransformationToGeometry { public: ApplyTransformationToGeometry(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ApplyTransformationToGeometryInputValues* inputValues); @@ -101,4 +101,4 @@ class COMPLEXCORE_EXPORT ApplyTransformationToGeometry ImageRotationUtilities::Matrix4fR m_TransformationMatrix; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ArrayCalculator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ArrayCalculator.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ArrayCalculator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ArrayCalculator.cpp index dd9aefa396..8e98f28b70 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ArrayCalculator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ArrayCalculator.cpp @@ -1,41 +1,41 @@ #include "ArrayCalculator.hpp" -#include "ComplexCore/utils/ABSOperator.hpp" -#include "ComplexCore/utils/ACosOperator.hpp" -#include "ComplexCore/utils/ASinOperator.hpp" -#include "ComplexCore/utils/ATanOperator.hpp" -#include "ComplexCore/utils/AdditionOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" -#include "ComplexCore/utils/CalculatorOperator.hpp" -#include "ComplexCore/utils/CeilOperator.hpp" -#include "ComplexCore/utils/CommaSeparator.hpp" -#include "ComplexCore/utils/CosOperator.hpp" -#include "ComplexCore/utils/DivisionOperator.hpp" -#include "ComplexCore/utils/ExpOperator.hpp" -#include "ComplexCore/utils/FloorOperator.hpp" -#include "ComplexCore/utils/LeftParenthesisItem.hpp" -#include "ComplexCore/utils/LnOperator.hpp" -#include "ComplexCore/utils/Log10Operator.hpp" -#include "ComplexCore/utils/LogOperator.hpp" -#include "ComplexCore/utils/MultiplicationOperator.hpp" -#include "ComplexCore/utils/NegativeOperator.hpp" -#include "ComplexCore/utils/PowOperator.hpp" -#include "ComplexCore/utils/RightParenthesisItem.hpp" -#include "ComplexCore/utils/RootOperator.hpp" -#include "ComplexCore/utils/SinOperator.hpp" -#include "ComplexCore/utils/SqrtOperator.hpp" -#include "ComplexCore/utils/SubtractionOperator.hpp" -#include "ComplexCore/utils/TanOperator.hpp" - -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "SimplnxCore/utils/ABSOperator.hpp" +#include "SimplnxCore/utils/ACosOperator.hpp" +#include "SimplnxCore/utils/ASinOperator.hpp" +#include "SimplnxCore/utils/ATanOperator.hpp" +#include "SimplnxCore/utils/AdditionOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/CalculatorOperator.hpp" +#include "SimplnxCore/utils/CeilOperator.hpp" +#include "SimplnxCore/utils/CommaSeparator.hpp" +#include "SimplnxCore/utils/CosOperator.hpp" +#include "SimplnxCore/utils/DivisionOperator.hpp" +#include "SimplnxCore/utils/ExpOperator.hpp" +#include "SimplnxCore/utils/FloorOperator.hpp" +#include "SimplnxCore/utils/LeftParenthesisItem.hpp" +#include "SimplnxCore/utils/LnOperator.hpp" +#include "SimplnxCore/utils/Log10Operator.hpp" +#include "SimplnxCore/utils/LogOperator.hpp" +#include "SimplnxCore/utils/MultiplicationOperator.hpp" +#include "SimplnxCore/utils/NegativeOperator.hpp" +#include "SimplnxCore/utils/PowOperator.hpp" +#include "SimplnxCore/utils/RightParenthesisItem.hpp" +#include "SimplnxCore/utils/RootOperator.hpp" +#include "SimplnxCore/utils/SinOperator.hpp" +#include "SimplnxCore/utils/SqrtOperator.hpp" +#include "SimplnxCore/utils/SubtractionOperator.hpp" +#include "SimplnxCore/utils/TanOperator.hpp" + +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ArrayCalculator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ArrayCalculator.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ArrayCalculator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ArrayCalculator.hpp index 05b4b2c3b9..77bc25b75a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ArrayCalculator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ArrayCalculator.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorItem.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/CalculatorParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/CalculatorParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ArrayCalculatorInputValues +struct SIMPLNXCORE_EXPORT ArrayCalculatorInputValues { DataPath SelectedGroup; std::string InfixEquation; @@ -22,7 +22,7 @@ struct COMPLEXCORE_EXPORT ArrayCalculatorInputValues DataPath CalculatedArray; }; -class COMPLEXCORE_EXPORT ArrayCalculatorParser +class SIMPLNXCORE_EXPORT ArrayCalculatorParser { public: using ParsedEquation = std::vector; @@ -62,7 +62,7 @@ class COMPLEXCORE_EXPORT ArrayCalculatorParser * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ArrayCalculator +class SIMPLNXCORE_EXPORT ArrayCalculator { public: ArrayCalculator(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ArrayCalculatorInputValues* inputValues); @@ -84,4 +84,4 @@ class COMPLEXCORE_EXPORT ArrayCalculator const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateArrayHistogram.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateArrayHistogram.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateArrayHistogram.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateArrayHistogram.cpp index 031f55f095..8133c8ee36 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateArrayHistogram.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateArrayHistogram.cpp @@ -1,17 +1,17 @@ #include "CalculateArrayHistogram.hpp" -#include "ComplexCore/Filters/CalculateArrayHistogramFilter.hpp" +#include "SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" #include #include #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateArrayHistogram.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateArrayHistogram.hpp similarity index 80% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateArrayHistogram.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateArrayHistogram.hpp index 28c695d982..557e3b34ec 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateArrayHistogram.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateArrayHistogram.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" #include #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT CalculateArrayHistogramInputValues +struct SIMPLNXCORE_EXPORT CalculateArrayHistogramInputValues { int32 NumberOfBins = 0; bool UserDefinedRange = false; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT CalculateArrayHistogramInputValues * @brief This filter calculates a Histogram according to user specification and stores it accordingly */ -class COMPLEXCORE_EXPORT CalculateArrayHistogram +class SIMPLNXCORE_EXPORT CalculateArrayHistogram { public: CalculateArrayHistogram(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, CalculateArrayHistogramInputValues* inputValues); @@ -58,4 +58,4 @@ class COMPLEXCORE_EXPORT CalculateArrayHistogram std::chrono::steady_clock::time_point m_InitialTime = std::chrono::steady_clock::now(); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp index 30cff9fc08..c8dae5ea9d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.cpp @@ -35,15 +35,15 @@ #include "CalculateTriangleGroupCurvatures.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" -#include "ComplexCore/Filters/Algorithms/FindNRingNeighbors.hpp" -#include "ComplexCore/Filters/FeatureFaceCurvatureFilter.hpp" +#include "SimplnxCore/Filters/Algorithms/FindNRingNeighbors.hpp" +#include "SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp" #include -namespace complex +namespace nx::core { // ----------------------------------------------------------------------------- CalculateTriangleGroupCurvatures::CalculateTriangleGroupCurvatures(int64_t nring, std::vector triangleIds, bool useNormalsForCurveFitting, Float64Array* principleCurvature1, @@ -389,4 +389,4 @@ std::shared_ptr CalculateTriangleGroupCurvatures::extractPatch extractedData->resizeTuples({triPatch.size()}); // Resize the TriPatch DataArray return extractedData; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp index b89c08d847..45c3d6dfbd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp @@ -37,22 +37,22 @@ #include -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/IFilter.hpp" -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" class FeatureFaceCurvatureFilter; -namespace complex +namespace nx::core { /** * @brief The CalculateTriangleGroupCurvatures class calculates the curvature values for a group of triangles * where each triangle in the group will have the 2 Principal Curvature values computed and optionally * the 2 Principal Directions and optionally the Mean and Gaussian Curvature computed. */ -class COMPLEXCORE_EXPORT CalculateTriangleGroupCurvatures +class SIMPLNXCORE_EXPORT CalculateTriangleGroupCurvatures { public: CalculateTriangleGroupCurvatures(int64_t nring, std::vector triangleIds, bool useNormalsForCurveFitting, Float64Array* principleCurvature1, Float64Array* principleCurvature2, @@ -94,4 +94,4 @@ class COMPLEXCORE_EXPORT CalculateTriangleGroupCurvatures const IFilter::MessageHandler& m_MessageHandler; const std::atomic_bool& m_ShouldCancel; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineAttributeArrays.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineAttributeArrays.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineAttributeArrays.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineAttributeArrays.cpp index 53839d3727..09f695290a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineAttributeArrays.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineAttributeArrays.cpp @@ -1,10 +1,10 @@ #include "CombineAttributeArrays.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; /** * @brief The CombineAttributeArraysImpl class is a templated private implementation that deals with diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineAttributeArrays.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineAttributeArrays.hpp similarity index 72% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineAttributeArrays.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineAttributeArrays.hpp index a162cf0a45..32b8c9a0a1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineAttributeArrays.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineAttributeArrays.hpp @@ -1,22 +1,22 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" /** * This is example code to put in the Execute Method of the filter. */ -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT CombineAttributeArraysInputValues +struct SIMPLNXCORE_EXPORT CombineAttributeArraysInputValues { bool NormalizeData = {}; MultiArraySelectionParameter::ValueType SelectedDataArrayPaths; @@ -29,7 +29,7 @@ struct COMPLEXCORE_EXPORT CombineAttributeArraysInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT CombineAttributeArrays +class SIMPLNXCORE_EXPORT CombineAttributeArrays { public: CombineAttributeArrays(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, CombineAttributeArraysInputValues* inputValues); @@ -51,4 +51,4 @@ class COMPLEXCORE_EXPORT CombineAttributeArrays const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp index 39fc6cc080..d64d358391 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.cpp @@ -1,17 +1,17 @@ #include "CombineStlFiles.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.hpp similarity index 71% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.hpp index 75c99e4608..7891c572f9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/CombineStlFiles.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT CombineStlFilesInputValues +struct SIMPLNXCORE_EXPORT CombineStlFilesInputValues { FileSystemPathParameter::ValueType StlFilesPath; DataPath TriangleDataContainerName; @@ -24,7 +24,7 @@ struct COMPLEXCORE_EXPORT CombineStlFilesInputValues * @brief This filter combines all of the STL files from a given directory into a single triangle geometry */ -class COMPLEXCORE_EXPORT CombineStlFiles +class SIMPLNXCORE_EXPORT CombineStlFiles { public: CombineStlFiles(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, CombineStlFilesInputValues* inputValues); @@ -46,4 +46,4 @@ class COMPLEXCORE_EXPORT CombineStlFiles const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeFeatureRect.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeFeatureRect.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeFeatureRect.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeFeatureRect.cpp index 3490a8a16a..4bad48f4ee 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeFeatureRect.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeFeatureRect.cpp @@ -1,8 +1,8 @@ #include "ComputeFeatureRect.hpp" -#include "complex/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataArray.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeFeatureRect.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeFeatureRect.hpp similarity index 73% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeFeatureRect.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeFeatureRect.hpp index e6f416b046..1a3f82ce17 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeFeatureRect.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeFeatureRect.hpp @@ -1,22 +1,22 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ComputeFeatureRectInputValues +struct SIMPLNXCORE_EXPORT ComputeFeatureRectInputValues { DataPath FeatureIdsArrayPath; DataPath FeatureDataAttributeMatrixPath; DataPath FeatureRectArrayPath; }; -class COMPLEXCORE_EXPORT ComputeFeatureRect +class SIMPLNXCORE_EXPORT ComputeFeatureRect { public: ComputeFeatureRect(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ComputeFeatureRectInputValues* inputValues); @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT ComputeFeatureRect const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.cpp index 6061414dc4..6ac8b523dc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.cpp @@ -1,11 +1,11 @@ #include "ComputeMomentInvariants2D.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; class ComputeMomentInvariants2DImpl { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp index dde8d8624a..03637a0116 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ComputeMomentInvariants2DInputValues +struct SIMPLNXCORE_EXPORT ComputeMomentInvariants2DInputValues { DataPath ImageGeometryPath; DataPath FeatureIdsArrayPath; @@ -29,7 +29,7 @@ struct COMPLEXCORE_EXPORT ComputeMomentInvariants2DInputValues * matrix as a DataArray to the Cell Feature Attribute Matrix. */ -class COMPLEXCORE_EXPORT ComputeMomentInvariants2D +class SIMPLNXCORE_EXPORT ComputeMomentInvariants2D { public: using DoubleMatrixType = Eigen::Matrix; @@ -59,4 +59,4 @@ class COMPLEXCORE_EXPORT ComputeMomentInvariants2D const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.cpp index e0f05669e6..c37c8f3e10 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.cpp @@ -1,14 +1,14 @@ #include "ConvertColorToGrayScale.hpp" -#include "complex/Common/Array.hpp" -#include "complex/Common/Range.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Core/Preferences.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" - -using namespace complex; +#include "simplnx/Common/Array.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Core/Preferences.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" + +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.hpp similarity index 72% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.hpp index 9d10e51474..66cfd4377c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ConvertColorToGrayScaleInputValues +struct SIMPLNXCORE_EXPORT ConvertColorToGrayScaleInputValues { ChoicesParameter::ValueType ConversionAlgorithm; VectorFloat32Parameter::ValueType ColorWeights; @@ -29,7 +29,7 @@ struct COMPLEXCORE_EXPORT ConvertColorToGrayScaleInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ConvertColorToGrayScale +class SIMPLNXCORE_EXPORT ConvertColorToGrayScale { public: ConvertColorToGrayScale(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ConvertColorToGrayScaleInputValues* inputValues); @@ -60,4 +60,4 @@ class COMPLEXCORE_EXPORT ConvertColorToGrayScale const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertData.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertData.cpp index b648e63320..c9bddeec00 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertData.cpp @@ -1,10 +1,10 @@ #include "ConvertData.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace Detail { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertData.hpp similarity index 75% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertData.hpp index 0979561bd9..d89a55bb7f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ConvertData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ConvertData.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ConvertDataInputValues +struct SIMPLNXCORE_EXPORT ConvertDataInputValues { DataType ScalarType; DataPath SelectedArrayPath; @@ -22,7 +22,7 @@ struct COMPLEXCORE_EXPORT ConvertDataInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ConvertData +class SIMPLNXCORE_EXPORT ConvertData { public: ConvertData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ConvertDataInputValues* inputValues); @@ -44,4 +44,4 @@ class COMPLEXCORE_EXPORT ConvertData const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateBadData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateBadData.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateBadData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateBadData.cpp index 4ce7a9d89c..65e1ba0bd2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateBadData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateBadData.cpp @@ -1,12 +1,12 @@ #include "ErodeDilateBadData.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { class ErodeDilateBadDataTransferDataImpl @@ -222,7 +222,7 @@ Result<> ErodeDilateBadData::operator()() } // Build up a list of the DataArrays that we are going to operate on. - const std::vector> voxelArrays = complex::GenerateDataArrayList(m_DataStructure, m_InputValues->FeatureIdsArrayPath, m_InputValues->IgnoredDataArrayPaths); + const std::vector> voxelArrays = nx::core::GenerateDataArrayList(m_DataStructure, m_InputValues->FeatureIdsArrayPath, m_InputValues->IgnoredDataArrayPaths); ParallelTaskAlgorithm taskRunner; taskRunner.setParallelizationEnabled(true); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateBadData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateBadData.hpp similarity index 69% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateBadData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateBadData.hpp index cd374db568..cb50fe78f4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateBadData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateBadData.hpp @@ -1,31 +1,31 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" namespace { const std::string k_DilateString("Dilate"); const std::string k_ErodeString("Erode"); -const complex::ChoicesParameter::Choices k_OperationChoices = { +const nx::core::ChoicesParameter::Choices k_OperationChoices = { k_DilateString, k_ErodeString, }; -const complex::ChoicesParameter::ValueType k_DilateIndex = 0ULL; -const complex::ChoicesParameter::ValueType k_ErodeIndex = 1ULL; +const nx::core::ChoicesParameter::ValueType k_DilateIndex = 0ULL; +const nx::core::ChoicesParameter::ValueType k_ErodeIndex = 1ULL; } // namespace -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ErodeDilateBadDataInputValues +struct SIMPLNXCORE_EXPORT ErodeDilateBadDataInputValues { ChoicesParameter::ValueType Operation; int32 NumIterations; @@ -42,7 +42,7 @@ struct COMPLEXCORE_EXPORT ErodeDilateBadDataInputValues * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ErodeDilateBadData +class SIMPLNXCORE_EXPORT ErodeDilateBadData { public: ErodeDilateBadData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ErodeDilateBadDataInputValues* inputValues); @@ -65,4 +65,4 @@ class COMPLEXCORE_EXPORT ErodeDilateBadData const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp index dda496c8ab..44702d5514 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.cpp @@ -1,11 +1,11 @@ #include "ErodeDilateCoordinationNumber.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; struct DataArrayCopyTupleFunctor { @@ -70,7 +70,7 @@ Result<> ErodeDilateCoordinationNumber::operator()() std::array neighpoints = {-dims[0] * dims[1], -dims[0], -1, 1, dims[0], dims[0] * dims[1]}; const std::string attrMatName = m_InputValues->FeatureIdsArrayPath.getTargetName(); - const std::vector> voxelArrays = complex::GenerateDataArrayList(m_DataStructure, m_InputValues->FeatureIdsArrayPath, m_InputValues->IgnoredDataArrayPaths); + const std::vector> voxelArrays = nx::core::GenerateDataArrayList(m_DataStructure, m_InputValues->FeatureIdsArrayPath, m_InputValues->IgnoredDataArrayPaths); std::vector featureCount(numFeatures + 1, 0); std::vector coordinationNumber(totalPoints, 0); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp similarity index 68% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp index 7488e67af7..cc0e2642bd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ErodeDilateCoordinationNumberInputValues +struct SIMPLNXCORE_EXPORT ErodeDilateCoordinationNumberInputValues { int32 CoordinationNumber; bool Loop; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT ErodeDilateCoordinationNumberInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ErodeDilateCoordinationNumber +class SIMPLNXCORE_EXPORT ErodeDilateCoordinationNumber { public: ErodeDilateCoordinationNumber(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ErodeDilateCoordinationNumberInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT ErodeDilateCoordinationNumber const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateMask.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateMask.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateMask.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateMask.cpp index 6afe62562a..ae293ffa9c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateMask.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateMask.cpp @@ -1,10 +1,10 @@ #include "ErodeDilateMask.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- ErodeDilateMask::ErodeDilateMask(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ErodeDilateMaskInputValues* inputValues) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateMask.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateMask.hpp similarity index 62% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateMask.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateMask.hpp index 8789fea10b..1f402c9bd2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ErodeDilateMask.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ErodeDilateMask.hpp @@ -1,29 +1,29 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" namespace { const std::string k_DilateString("Dilate"); const std::string k_ErodeString("Erode"); -const complex::ChoicesParameter::Choices k_OperationChoices = {k_DilateString, k_ErodeString}; +const nx::core::ChoicesParameter::Choices k_OperationChoices = {k_DilateString, k_ErodeString}; -const complex::ChoicesParameter::ValueType k_DilateIndex = 0ULL; -const complex::ChoicesParameter::ValueType k_ErodeIndex = 1ULL; +const nx::core::ChoicesParameter::ValueType k_DilateIndex = 0ULL; +const nx::core::ChoicesParameter::ValueType k_ErodeIndex = 1ULL; } // namespace -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ErodeDilateMaskInputValues +struct SIMPLNXCORE_EXPORT ErodeDilateMaskInputValues { ChoicesParameter::ValueType Operation; int32 NumIterations; @@ -40,7 +40,7 @@ struct COMPLEXCORE_EXPORT ErodeDilateMaskInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ErodeDilateMask +class SIMPLNXCORE_EXPORT ErodeDilateMask { public: ErodeDilateMask(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ErodeDilateMaskInputValues* inputValues); @@ -62,4 +62,4 @@ class COMPLEXCORE_EXPORT ErodeDilateMask const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExecuteProcess.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExecuteProcess.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExecuteProcess.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExecuteProcess.cpp index 006f35024f..ca778ca9e7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExecuteProcess.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExecuteProcess.cpp @@ -1,9 +1,9 @@ #include "ExecuteProcess.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include @@ -12,7 +12,7 @@ #include #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- ExecuteProcess::ExecuteProcess(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExecuteProcessInputValues* inputValues) @@ -50,7 +50,7 @@ Result<> ExecuteProcess::operator()() // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(absPath.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(absPath.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExecuteProcess.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExecuteProcess.hpp similarity index 71% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExecuteProcess.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExecuteProcess.hpp index c59fde9a49..eb6749587b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExecuteProcess.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExecuteProcess.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ExecuteProcessInputValues +struct SIMPLNXCORE_EXPORT ExecuteProcessInputValues { StringParameter::ValueType Arguments; bool Blocking; @@ -26,7 +26,7 @@ struct COMPLEXCORE_EXPORT ExecuteProcessInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ExecuteProcess +class SIMPLNXCORE_EXPORT ExecuteProcess { public: ExecuteProcess(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExecuteProcessInputValues* inputValues); @@ -51,4 +51,4 @@ class COMPLEXCORE_EXPORT ExecuteProcess const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractComponentAsArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractComponentAsArray.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp index 905a84d236..3c07cc5c67 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractComponentAsArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.cpp @@ -1,10 +1,10 @@ #include "ExtractComponentAsArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { struct RemoveComponentsFunctor diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractComponentAsArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.hpp similarity index 70% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractComponentAsArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.hpp index c11c9bebc2..f9a4f4594d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractComponentAsArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ExtractComponentAsArrayInputValues +struct SIMPLNXCORE_EXPORT ExtractComponentAsArrayInputValues { bool MoveComponentsToNewArray; bool RemoveComponentsFromArray; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT ExtractComponentAsArrayInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ExtractComponentAsArray +class SIMPLNXCORE_EXPORT ExtractComponentAsArray { public: ExtractComponentAsArray(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExtractComponentAsArrayInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT ExtractComponentAsArray const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractVertexGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractVertexGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp index b7bd537366..d275fed3a2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractVertexGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp @@ -1,12 +1,12 @@ #include "ExtractVertexGeometry.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -108,7 +108,7 @@ Result<> ExtractVertexGeometry::operator()() } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // some other context that is NOT going through the normal complex::IFilter API of Preflight and Execute + // some other context that is NOT going through the normal nx::core::IFilter API of Preflight and Execute return MakeErrorResult(-53900, fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", maskArrayPath.toString())); } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractVertexGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.hpp similarity index 75% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractVertexGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.hpp index 4fc0c2614a..9f10527f36 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ExtractVertexGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ExtractVertexGeometryInputValues +struct SIMPLNXCORE_EXPORT ExtractVertexGeometryInputValues { ChoicesParameter::ValueType ArrayHandling; bool UseMask; @@ -22,7 +22,7 @@ struct COMPLEXCORE_EXPORT ExtractVertexGeometryInputValues std::string SharedVertexListName; }; -class COMPLEXCORE_EXPORT ExtractVertexGeometry +class SIMPLNXCORE_EXPORT ExtractVertexGeometry { public: ExtractVertexGeometry(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExtractVertexGeometryInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT ExtractVertexGeometry const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FillBadData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FillBadData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp index fb70bcf91d..f51b7db52a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FillBadData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.cpp @@ -1,13 +1,13 @@ #include "FillBadData.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" + +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FillBadData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.hpp similarity index 77% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FillBadData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.hpp index ce2ccabfe8..ce158ce126 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FillBadData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FillBadData.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FillBadDataInputValues +struct SIMPLNXCORE_EXPORT FillBadDataInputValues { int32 minAllowedDefectSizeValue; bool storeAsNewPhase; @@ -27,7 +27,7 @@ struct COMPLEXCORE_EXPORT FillBadDataInputValues * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FillBadData +class SIMPLNXCORE_EXPORT FillBadData { public: FillBadData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FillBadDataInputValues* inputValues); @@ -49,4 +49,4 @@ class COMPLEXCORE_EXPORT FillBadData const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindArrayStatistics.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindArrayStatistics.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindArrayStatistics.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindArrayStatistics.cpp index 5136b50bb8..d6b30c5d8f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindArrayStatistics.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindArrayStatistics.cpp @@ -1,14 +1,14 @@ #include "FindArrayStatistics.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/Math/StatisticsCalculations.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/Math/StatisticsCalculations.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -672,7 +672,7 @@ void FindStatistics(const DataArray& source, const Int32Array* featureIds, co indexAlgArrays.push_back(histArrayPtr); indexAlgArrays.push_back(mostPopulatedBinPtr); -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE if(IParallelAlgorithm::CheckArraysInMemory(indexAlgArrays)) { const tbb::simple_partitioner simplePartitioner; @@ -824,7 +824,7 @@ struct FindArrayStatisticsFunctor } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute const std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", inputValues->MaskArrayPath.toString()); return MakeErrorResult(-563501, message); } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindArrayStatistics.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindArrayStatistics.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindArrayStatistics.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindArrayStatistics.hpp index 5339bb5523..c925a2611a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindArrayStatistics.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindArrayStatistics.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" #include #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindArrayStatisticsInputValues +struct SIMPLNXCORE_EXPORT FindArrayStatisticsInputValues { bool FindHistogram; float64 MinRange; @@ -60,7 +60,7 @@ struct COMPLEXCORE_EXPORT FindArrayStatisticsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindArrayStatistics +class SIMPLNXCORE_EXPORT FindArrayStatistics { public: FindArrayStatistics(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, FindArrayStatisticsInputValues* inputValues); @@ -99,4 +99,4 @@ class COMPLEXCORE_EXPORT FindArrayStatistics usize findNumFeatures(const Int32Array& featureIds) const; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBiasedFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBiasedFeatures.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBiasedFeatures.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBiasedFeatures.cpp index a955498958..0eb783c00a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBiasedFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBiasedFeatures.cpp @@ -1,9 +1,9 @@ #include "FindBiasedFeatures.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindBiasedFeatures::FindBiasedFeatures(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindBiasedFeaturesInputValues* inputValues) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBiasedFeatures.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBiasedFeatures.hpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBiasedFeatures.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBiasedFeatures.hpp index ac27a4a6c9..31a266352f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBiasedFeatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBiasedFeatures.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindBiasedFeaturesInputValues +struct SIMPLNXCORE_EXPORT FindBiasedFeaturesInputValues { bool CalcByPhase; DataPath ImageGeometryPath; @@ -24,7 +24,7 @@ struct COMPLEXCORE_EXPORT FindBiasedFeaturesInputValues * @brief This filter determines which Features are biased by the outer surfaces of the sample. */ -class COMPLEXCORE_EXPORT FindBiasedFeatures +class SIMPLNXCORE_EXPORT FindBiasedFeatures { public: FindBiasedFeatures(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindBiasedFeaturesInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT FindBiasedFeatures const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBoundaryCells.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBoundaryCells.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBoundaryCells.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBoundaryCells.cpp index 7caafa1fa0..b88cffaab6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBoundaryCells.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBoundaryCells.cpp @@ -1,9 +1,9 @@ #include "FindBoundaryCells.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindBoundaryCells::FindBoundaryCells(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindBoundaryCellsInputValues* inputValues) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBoundaryCells.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBoundaryCells.hpp similarity index 77% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBoundaryCells.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBoundaryCells.hpp index 44dd468505..66dd0a42c4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindBoundaryCells.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindBoundaryCells.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindBoundaryCellsInputValues +struct SIMPLNXCORE_EXPORT FindBoundaryCellsInputValues { bool IgnoreFeatureZero; bool IncludeVolumeBoundary; @@ -24,7 +24,7 @@ struct COMPLEXCORE_EXPORT FindBoundaryCellsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindBoundaryCells +class SIMPLNXCORE_EXPORT FindBoundaryCells { public: FindBoundaryCells(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindBoundaryCellsInputValues* inputValues); @@ -46,4 +46,4 @@ class COMPLEXCORE_EXPORT FindBoundaryCells const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindEuclideanDistMap.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindEuclideanDistMap.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.cpp index c9ef508ea0..65ccac07b8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindEuclideanDistMap.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.cpp @@ -1,11 +1,11 @@ #include "FindEuclideanDistMap.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindEuclideanDistMap.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindEuclideanDistMap.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.hpp index 14b8a8c54c..01058a0616 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindEuclideanDistMap.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindEuclideanDistMapInputValues +struct SIMPLNXCORE_EXPORT FindEuclideanDistMapInputValues { bool CalcManhattanDist; bool DoBoundaries; @@ -30,7 +30,7 @@ struct COMPLEXCORE_EXPORT FindEuclideanDistMapInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindEuclideanDistMap +class SIMPLNXCORE_EXPORT FindEuclideanDistMap { public: FindEuclideanDistMap(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindEuclideanDistMapInputValues* inputValues); @@ -61,4 +61,4 @@ class COMPLEXCORE_EXPORT FindEuclideanDistMap const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureCentroids.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureCentroids.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureCentroids.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureCentroids.cpp index 439b03ae15..3649e13d6d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureCentroids.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureCentroids.cpp @@ -1,11 +1,11 @@ #include "FindFeatureCentroids.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -13,7 +13,7 @@ namespace class FindFeatureCentroidsImpl1 { public: - FindFeatureCentroidsImpl1(FindFeatureCentroids* filter, double* sum, double* center, size_t* count, std::array dims, const complex::ImageGeom& imageGeom, const Int32Array& featureIds) + FindFeatureCentroidsImpl1(FindFeatureCentroids* filter, double* sum, double* center, size_t* count, std::array dims, const nx::core::ImageGeom& imageGeom, const Int32Array& featureIds) : m_Filter(filter) , m_Sum(sum) , m_Center(center) @@ -39,7 +39,7 @@ class FindFeatureCentroidsImpl1 { continue; } - complex::Point3Dd voxel_center = m_ImageGeom.getCoords(k, j, i); // Get the voxel center based on XYZ index from Image Geom + nx::core::Point3Dd voxel_center = m_ImageGeom.getCoords(k, j, i); // Get the voxel center based on XYZ index from Image Geom // Kahan Sum for X Coord size_t featureId_idx = featureId * 3ULL; @@ -81,7 +81,7 @@ class FindFeatureCentroidsImpl1 size_t* m_Count = nullptr; size_t m_TotalFeatures = 0; std::array m_Dims = {0, 0, 0}; - const complex::ImageGeom& m_ImageGeom; + const nx::core::ImageGeom& m_ImageGeom; const Int32AbstractDataStore& m_FeatureIds; }; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureCentroids.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureCentroids.hpp similarity index 77% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureCentroids.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureCentroids.hpp index 2fcd81c163..59a4984471 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureCentroids.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureCentroids.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindFeatureCentroidsInputValues +struct SIMPLNXCORE_EXPORT FindFeatureCentroidsInputValues { DataPath FeatureIdsArrayPath; DataPath CentroidsArrayPath; @@ -23,7 +23,7 @@ struct COMPLEXCORE_EXPORT FindFeatureCentroidsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindFeatureCentroids +class SIMPLNXCORE_EXPORT FindFeatureCentroids { public: FindFeatureCentroids(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindFeatureCentroidsInputValues* inputValues); @@ -45,4 +45,4 @@ class COMPLEXCORE_EXPORT FindFeatureCentroids const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureClustering.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureClustering.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureClustering.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureClustering.cpp index f97a0cf61f..568ea707ab 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureClustering.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureClustering.cpp @@ -1,12 +1,12 @@ #include "FindFeatureClustering.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureClustering.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureClustering.hpp similarity index 77% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureClustering.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureClustering.hpp index 1ff1b8d9da..e98c8e8570 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindFeatureClustering.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindFeatureClustering.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindFeatureClusteringInputValues +struct SIMPLNXCORE_EXPORT FindFeatureClusteringInputValues { DataPath ImageGeometryPath; int32 NumberOfBins; @@ -32,7 +32,7 @@ struct COMPLEXCORE_EXPORT FindFeatureClusteringInputValues * @brief This filter determines the radial distribution function (RDF), as a histogram, of a given set of Features. */ -class COMPLEXCORE_EXPORT FindFeatureClustering +class SIMPLNXCORE_EXPORT FindFeatureClustering { public: FindFeatureClustering(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindFeatureClusteringInputValues* inputValues); @@ -54,4 +54,4 @@ class COMPLEXCORE_EXPORT FindFeatureClustering const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindLargestCrossSections.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindLargestCrossSections.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindLargestCrossSections.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindLargestCrossSections.cpp index 968f3945e6..072a557dca 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindLargestCrossSections.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindLargestCrossSections.cpp @@ -1,10 +1,10 @@ #include "FindLargestCrossSections.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindLargestCrossSections::FindLargestCrossSections(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindLargestCrossSections.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindLargestCrossSections.hpp similarity index 74% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindLargestCrossSections.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindLargestCrossSections.hpp index 0dcc259544..892695be80 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindLargestCrossSections.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindLargestCrossSections.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindLargestCrossSectionsInputValues +struct SIMPLNXCORE_EXPORT FindLargestCrossSectionsInputValues { ChoicesParameter::ValueType Plane; DataPath ImageGeometryPath; @@ -24,7 +24,7 @@ struct COMPLEXCORE_EXPORT FindLargestCrossSectionsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindLargestCrossSections +class SIMPLNXCORE_EXPORT FindLargestCrossSections { public: FindLargestCrossSections(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindLargestCrossSectionsInputValues* inputValues); @@ -46,4 +46,4 @@ class COMPLEXCORE_EXPORT FindLargestCrossSections const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNRingNeighbors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNRingNeighbors.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNRingNeighbors.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNRingNeighbors.cpp index cedd5c1df6..f3e8b1cfa0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNRingNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNRingNeighbors.cpp @@ -1,13 +1,13 @@ #include "FindNRingNeighbors.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" #include #include #include -namespace complex +namespace nx::core { // ----------------------------------------------------------------------------- FindNRingNeighbors::FindNRingNeighbors(FindNRingNeighborsInputValues* inputValues) @@ -103,4 +103,4 @@ FindNRingNeighbors::UniqueFaceIds_t FindNRingNeighbors::getNRingTriangles() cons { return m_NRingTriangles; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNRingNeighbors.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNRingNeighbors.hpp similarity index 70% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNRingNeighbors.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNRingNeighbors.hpp index 88374ab69b..85e80174d8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNRingNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNRingNeighbors.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { class TriangleGeom; -struct COMPLEXCORE_EXPORT FindNRingNeighborsInputValues +struct SIMPLNXCORE_EXPORT FindNRingNeighborsInputValues { TriangleGeom* TriangleGeomPtr = nullptr; int64 TriangleId = {-1}; @@ -26,7 +26,7 @@ struct COMPLEXCORE_EXPORT FindNRingNeighborsInputValues bool WriteConformalMesh = {true}; }; -class COMPLEXCORE_EXPORT FindNRingNeighbors +class SIMPLNXCORE_EXPORT FindNRingNeighbors { public: using UniqueFaceIds_t = std::set; @@ -47,4 +47,4 @@ class COMPLEXCORE_EXPORT FindNRingNeighbors const FindNRingNeighborsInputValues* m_InputValues = nullptr; UniqueFaceIds_t m_NRingTriangles; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNeighborhoods.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNeighborhoods.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNeighborhoods.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNeighborhoods.cpp index a1625c5ab6..74ec236142 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNeighborhoods.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNeighborhoods.cpp @@ -1,13 +1,13 @@ #include "FindNeighborhoods.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include -using namespace complex; +using namespace nx::core; class FindNeighborhoodsImpl { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNeighborhoods.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNeighborhoods.hpp similarity index 79% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNeighborhoods.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNeighborhoods.hpp index 9af1048f6d..94fcde2531 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindNeighborhoods.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindNeighborhoods.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindNeighborhoodsInputValues +struct SIMPLNXCORE_EXPORT FindNeighborhoodsInputValues { float32 MultiplesOfAverage; DataPath EquivalentDiametersArrayPath; @@ -30,7 +30,7 @@ struct COMPLEXCORE_EXPORT FindNeighborhoodsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindNeighborhoods +class SIMPLNXCORE_EXPORT FindNeighborhoods { public: FindNeighborhoods(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindNeighborhoodsInputValues* inputValues); @@ -63,4 +63,4 @@ class COMPLEXCORE_EXPORT FindNeighborhoods std::vector> m_LocalNeighborhoodList; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.cpp index 59c2b73761..189ac32aca 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.cpp @@ -1,11 +1,11 @@ #include "FindSurfaceAreaToVolume.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindSurfaceAreaToVolume::FindSurfaceAreaToVolume(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -161,7 +161,7 @@ Result<> FindSurfaceAreaToVolume::operator()() } } - const float thirdRootPi = std::pow(complex::Constants::k_PiF, 0.333333f); + const float thirdRootPi = std::pow(nx::core::Constants::k_PiF, 0.333333f); for(size_t i = 1; i < static_cast(numFeatures); i++) { float featureVolume = voxelVol * numCells[i]; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp index 73c62dd9fc..4241ad21a8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindSurfaceAreaToVolumeInputValues +struct SIMPLNXCORE_EXPORT FindSurfaceAreaToVolumeInputValues { DataPath FeatureIdsArrayPath; DataPath NumCellsArrayPath; @@ -25,7 +25,7 @@ struct COMPLEXCORE_EXPORT FindSurfaceAreaToVolumeInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindSurfaceAreaToVolume +class SIMPLNXCORE_EXPORT FindSurfaceAreaToVolume { public: FindSurfaceAreaToVolume(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindSurfaceAreaToVolumeInputValues* inputValues); @@ -47,4 +47,4 @@ class COMPLEXCORE_EXPORT FindSurfaceAreaToVolume const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.cpp index df744cff06..e248359b16 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.cpp @@ -1,11 +1,11 @@ #include "FindTriangleGeomCentroids.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- FindTriangleGeomCentroids::FindTriangleGeomCentroids(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp similarity index 77% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp index d51c382253..0ad14c8ef8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindTriangleGeomCentroidsInputValues +struct SIMPLNXCORE_EXPORT FindTriangleGeomCentroidsInputValues { DataPath TriangleGeometryPath; DataPath FaceLabelsArrayPath; @@ -23,7 +23,7 @@ struct COMPLEXCORE_EXPORT FindTriangleGeomCentroidsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindTriangleGeomCentroids +class SIMPLNXCORE_EXPORT FindTriangleGeomCentroids { public: FindTriangleGeomCentroids(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindTriangleGeomCentroidsInputValues* inputValues); @@ -45,4 +45,4 @@ class COMPLEXCORE_EXPORT FindTriangleGeomCentroids const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.cpp index 2dbb8838a2..b537a05f69 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.cpp @@ -1,12 +1,12 @@ #include "FindTriangleGeomSizes.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.hpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.hpp index 0d01cad82a..341a6e4c7d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" /** * This is example code to put in the Execute Method of the filter. */ -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindTriangleGeomSizesInputValues +struct SIMPLNXCORE_EXPORT FindTriangleGeomSizesInputValues { DataPath TriangleGeometryPath; DataPath FaceLabelsArrayPath; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT FindTriangleGeomSizesInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindTriangleGeomSizes +class SIMPLNXCORE_EXPORT FindTriangleGeomSizes { public: FindTriangleGeomSizes(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindTriangleGeomSizesInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT FindTriangleGeomSizes const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.cpp index 51b6f691b2..1a3cf0931e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.cpp @@ -1,15 +1,15 @@ #include "FindVertexToTriangleDistances.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/RTree.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/RTree.hpp" using RTreeType = RTree; -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp similarity index 74% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp index 6b6ec0ba09..3e3285fd0b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT FindVertexToTriangleDistancesInputValues +struct SIMPLNXCORE_EXPORT FindVertexToTriangleDistancesInputValues { DataPath VertexDataContainer; DataPath TriangleDataContainer; @@ -28,7 +28,7 @@ struct COMPLEXCORE_EXPORT FindVertexToTriangleDistancesInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT FindVertexToTriangleDistances +class SIMPLNXCORE_EXPORT FindVertexToTriangleDistances { public: FindVertexToTriangleDistances(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, FindVertexToTriangleDistancesInputValues* inputValues); @@ -58,4 +58,4 @@ class COMPLEXCORE_EXPORT FindVertexToTriangleDistances size_t m_LastProgressInt = 0; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateColorTable.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateColorTable.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateColorTable.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateColorTable.cpp index 0054a04387..22d48d4d29 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateColorTable.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateColorTable.cpp @@ -1,13 +1,13 @@ #include "GenerateColorTable.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -40,7 +40,7 @@ class GenerateColorTableImpl { public: GenerateColorTableImpl(const DataArray& arrayPtr, const std::vector& binPoints, const std::vector>& controlPoints, int numControlColors, UInt8Array& colorArray, - const complex::IDataArray* goodVoxels, const std::vector& invalidColor) + const nx::core::IDataArray* goodVoxels, const std::vector& invalidColor) : m_ArrayPtr(arrayPtr) , m_BinPoints(binPoints) , m_NumControlColors(numControlColors) @@ -163,7 +163,7 @@ class GenerateColorTableImpl int m_NumControlColors; const std::vector>& m_ControlPoints; UInt8Array& m_ColorArray; - const complex::IDataArray* m_GoodVoxels = nullptr; + const nx::core::IDataArray* m_GoodVoxels = nullptr; const std::vector& m_InvalidColor; }; @@ -215,7 +215,7 @@ struct GenerateColorArrayFunctor auto& colorArray = dataStructure.getDataRefAs(rgbArrayPath); - complex::IDataArray* goodVoxelsArray = nullptr; + nx::core::IDataArray* goodVoxelsArray = nullptr; if(inputValues->UseMask) { goodVoxelsArray = dataStructure.getDataAs(inputValues->MaskArrayPath); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateColorTable.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateColorTable.hpp similarity index 65% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateColorTable.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateColorTable.hpp index 7d8948bc19..72384666a0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateColorTable.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateColorTable.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/GenerateColorTableParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/GenerateColorTableParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT GenerateColorTableInputValues +struct SIMPLNXCORE_EXPORT GenerateColorTableInputValues { nlohmann::json SelectedPreset; DataPath SelectedDataArrayPath; @@ -22,7 +22,7 @@ struct COMPLEXCORE_EXPORT GenerateColorTableInputValues std::vector InvalidColor; }; -class COMPLEXCORE_EXPORT GenerateColorTable +class SIMPLNXCORE_EXPORT GenerateColorTable { public: GenerateColorTable(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, GenerateColorTableInputValues* inputValues); @@ -44,4 +44,4 @@ class COMPLEXCORE_EXPORT GenerateColorTable const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateVectorColors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateVectorColors.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateVectorColors.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateVectorColors.cpp index 2ded59ea8e..90e8df4521 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateVectorColors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateVectorColors.cpp @@ -1,14 +1,14 @@ #include "GenerateVectorColors.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/Common/RgbColor.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/Common/RgbColor.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -44,7 +44,7 @@ Result<> GenerateVectorColors::operator()() } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute return MakeErrorResult(-54700, fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->MaskArrayPath.toString())); } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateVectorColors.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateVectorColors.hpp similarity index 70% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateVectorColors.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateVectorColors.hpp index 58864cedef..f17bd1f183 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/GenerateVectorColors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/GenerateVectorColors.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT GenerateVectorColorsInputValues +struct SIMPLNXCORE_EXPORT GenerateVectorColorsInputValues { bool UseMask; DataPath VectorsArrayPath; @@ -25,7 +25,7 @@ struct COMPLEXCORE_EXPORT GenerateVectorColorsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT GenerateVectorColors +class SIMPLNXCORE_EXPORT GenerateVectorColors { public: GenerateVectorColors(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, GenerateVectorColorsInputValues* inputValues); @@ -47,4 +47,4 @@ class COMPLEXCORE_EXPORT GenerateVectorColors const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImageContouring.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ImageContouring.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImageContouring.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ImageContouring.cpp index 26d2037789..50e386670f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImageContouring.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ImageContouring.cpp @@ -1,9 +1,9 @@ #include "ImageContouring.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/FlyingEdges.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/FlyingEdges.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImageContouring.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ImageContouring.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImageContouring.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ImageContouring.hpp index 0c8343c82e..83eecb2adb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImageContouring.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ImageContouring.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ImageContouringInputValues +struct SIMPLNXCORE_EXPORT ImageContouringInputValues { DataPath imageGeomPath; DataPath triangleGeomPath; @@ -20,7 +20,7 @@ struct COMPLEXCORE_EXPORT ImageContouringInputValues * @class ImageContouring * @brief This filter draw a 3 dimensional contouring line through an Image Geometry based on an input value. */ -class COMPLEXCORE_EXPORT ImageContouring +class SIMPLNXCORE_EXPORT ImageContouring { public: ImageContouring(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ImageContouringInputValues* inputValues); @@ -42,4 +42,4 @@ class COMPLEXCORE_EXPORT ImageContouring const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMeans.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMeans.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMeans.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMeans.cpp index 91ad950cb5..7ea63e703c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMeans.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMeans.cpp @@ -1,12 +1,12 @@ #include "KMeans.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/KUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/KUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMeans.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMeans.hpp similarity index 65% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMeans.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMeans.hpp index db3255b038..3e01af0373 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMeans.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMeans.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/KUtilities.hpp" - -namespace complex +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/KUtilities.hpp" + +namespace nx::core { -struct COMPLEXCORE_EXPORT KMeansInputValues +struct SIMPLNXCORE_EXPORT KMeansInputValues { uint64 InitClusters; KUtilities::DistanceMetric DistanceMetric; @@ -31,7 +31,7 @@ struct COMPLEXCORE_EXPORT KMeansInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT KMeans +class SIMPLNXCORE_EXPORT KMeans { public: KMeans(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, KMeansInputValues* inputValues); @@ -53,4 +53,4 @@ class COMPLEXCORE_EXPORT KMeans const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMedoids.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMedoids.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMedoids.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMedoids.cpp index e68267209a..17e590e8b8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMedoids.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMedoids.cpp @@ -1,12 +1,12 @@ #include "KMedoids.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/KUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/KUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMedoids.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMedoids.hpp similarity index 72% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMedoids.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMedoids.hpp index 75c94bab51..07d459e8de 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/KMedoids.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/KMedoids.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/KUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Utilities/KUtilities.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT KMedoidsInputValues +struct SIMPLNXCORE_EXPORT KMedoidsInputValues { uint64 InitClusters; KUtilities::DistanceMetric DistanceMetric; @@ -27,7 +27,7 @@ struct COMPLEXCORE_EXPORT KMedoidsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT KMedoids +class SIMPLNXCORE_EXPORT KMedoids { public: KMedoids(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, KMedoidsInputValues* inputValues); @@ -49,4 +49,4 @@ class COMPLEXCORE_EXPORT KMedoids const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LaplacianSmoothing.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/LaplacianSmoothing.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LaplacianSmoothing.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/LaplacianSmoothing.cpp index 477a83490b..e7fa328c68 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LaplacianSmoothing.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/LaplacianSmoothing.cpp @@ -2,11 +2,11 @@ #include "LaplacianSmoothing.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" -using namespace complex; +using namespace nx::core; LaplacianSmoothing::LaplacianSmoothing(DataStructure& dataStructure, LaplacianSmoothingInputValues* inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler) : m_DataStructure(dataStructure) @@ -168,24 +168,24 @@ std::vector LaplacianSmoothing::generateLambdaArray() { switch(surfaceMeshNode[i]) { - case complex::NodeType::Unused: + case nx::core::NodeType::Unused: break; - case complex::NodeType::Default: + case nx::core::NodeType::Default: lambdas[i] = m_InputValues->pLambda; break; - case complex::NodeType::TriplePoint: + case nx::core::NodeType::TriplePoint: lambdas[i] = m_InputValues->pTripleLineLambda; break; - case complex::NodeType::QuadPoint: + case nx::core::NodeType::QuadPoint: lambdas[i] = m_InputValues->pQuadPointLambda; break; - case complex::NodeType::SurfaceDefault: + case nx::core::NodeType::SurfaceDefault: lambdas[i] = m_InputValues->pSurfacePointLambda; break; - case complex::NodeType::SurfaceTriplePoint: + case nx::core::NodeType::SurfaceTriplePoint: lambdas[i] = m_InputValues->pSurfaceTripleLineLambda; break; - case complex::NodeType::SurfaceQuadPoint: + case nx::core::NodeType::SurfaceQuadPoint: lambdas[i] = m_InputValues->pSurfaceQuadPointLambda; break; default: diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LaplacianSmoothing.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/LaplacianSmoothing.hpp similarity index 80% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LaplacianSmoothing.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/LaplacianSmoothing.hpp index 6a327c42a8..31f8dcf227 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LaplacianSmoothing.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/LaplacianSmoothing.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT LaplacianSmoothingInputValues +struct SIMPLNXCORE_EXPORT LaplacianSmoothingInputValues { DataPath pTriangleGeometryDataPath; int32 pIterationSteps; @@ -32,7 +32,7 @@ struct COMPLEXCORE_EXPORT LaplacianSmoothingInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT LaplacianSmoothing +class SIMPLNXCORE_EXPORT LaplacianSmoothing { public: LaplacianSmoothing(DataStructure& data, LaplacianSmoothingInputValues* inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler); @@ -55,4 +55,4 @@ class COMPLEXCORE_EXPORT LaplacianSmoothing Result<> edgeBasedSmoothing(); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.cpp index 63bb4e8798..b3db0976ea 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.cpp @@ -1,13 +1,13 @@ #include "NearestPointFuseRegularGrids.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" + +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp similarity index 75% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp index 29850faa7d..e4032e67dd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT NearestPointFuseRegularGridsInputValues +struct SIMPLNXCORE_EXPORT NearestPointFuseRegularGridsInputValues { DataPath ReferenceGeometryPath; DataPath SamplingGeometryPath; @@ -25,7 +25,7 @@ struct COMPLEXCORE_EXPORT NearestPointFuseRegularGridsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT NearestPointFuseRegularGrids +class SIMPLNXCORE_EXPORT NearestPointFuseRegularGrids { public: NearestPointFuseRegularGrids(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, NearestPointFuseRegularGridsInputValues* inputValues); @@ -47,4 +47,4 @@ class COMPLEXCORE_EXPORT NearestPointFuseRegularGrids const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PartitionGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PartitionGeometry.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PartitionGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PartitionGeometry.cpp index f004f04d45..bb63b6a928 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PartitionGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PartitionGeometry.cpp @@ -1,13 +1,13 @@ #include "PartitionGeometry.hpp" -#include "complex/Common/Range.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/Utilities/ParallelData3DAlgorithm.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/Utilities/ParallelData3DAlgorithm.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -#include "ComplexCore/Filters/PartitionGeometryFilter.hpp" +#include "SimplnxCore/Filters/PartitionGeometryFilter.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PartitionGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PartitionGeometry.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PartitionGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PartitionGeometry.hpp index 7b86a18b70..f43fe2ba64 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PartitionGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PartitionGeometry.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT PartitionGeometryInputValues +struct SIMPLNXCORE_EXPORT PartitionGeometryInputValues { ChoicesParameter::ValueType PartitioningMode; int32 StartingFeatureID; @@ -51,7 +51,7 @@ struct COMPLEXCORE_EXPORT PartitionGeometryInputValues * a set of bounding box points. */ -class COMPLEXCORE_EXPORT PartitionGeometry +class SIMPLNXCORE_EXPORT PartitionGeometry { public: PartitionGeometry(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, PartitionGeometryInputValues* inputValues); @@ -122,4 +122,4 @@ class COMPLEXCORE_EXPORT PartitionGeometry const std::optional& maskArrayOpt); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.cpp index ba0a126843..2fcfa14504 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.cpp @@ -35,12 +35,12 @@ #include "PointSampleTriangleGeometry.hpp" #include "TupleTransfer.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- PointSampleTriangleGeometry::PointSampleTriangleGeometry(DataStructure& dataStructure, PointSampleTriangleGeometryInputs* inputValues, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp index b2deb282e1..f573cc8089 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp @@ -35,19 +35,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/Common/Array.hpp" -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/Common/Array.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" #include #include @@ -55,10 +55,10 @@ #include #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT PointSampleTriangleGeometryInputs +struct SIMPLNXCORE_EXPORT PointSampleTriangleGeometryInputs { int32 pNumberOfSamples; bool pUseMask; @@ -75,7 +75,7 @@ struct COMPLEXCORE_EXPORT PointSampleTriangleGeometryInputs /** * @brief The PointSampleTriangleGeometry class. See [Filter documentation](@ref pointsampletrianglegeometry) for details. */ -class COMPLEXCORE_EXPORT PointSampleTriangleGeometry +class SIMPLNXCORE_EXPORT PointSampleTriangleGeometry { public: @@ -119,4 +119,4 @@ class COMPLEXCORE_EXPORT PointSampleTriangleGeometry const IFilter::MessageHandler& m_MessageHandler; }; -} // end namespace complex +} // end namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/QuickSurfaceMesh.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.cpp similarity index 99% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/QuickSurfaceMesh.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.cpp index 9509cd27f7..daaab441ff 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/QuickSurfaceMesh.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.cpp @@ -1,17 +1,17 @@ #include "QuickSurfaceMesh.hpp" #include "TupleTransfer.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/EdgeGeom.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelData3DAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/EdgeGeom.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelData3DAlgorithm.hpp" #include #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- namespace @@ -284,7 +284,7 @@ Result<> QuickSurfaceMesh::operator()() // Resize the Face Arrays that are being copied over from the ImageGeom Cell Data for(const auto& dataPath : m_InputValues->CreatedDataArrayPaths) { - Result<> result = complex::ResizeAndReplaceDataArray(m_DataStructure, dataPath, tupleShape, complex::IDataAction::Mode::Execute); + Result<> result = nx::core::ResizeAndReplaceDataArray(m_DataStructure, dataPath, tupleShape, nx::core::IDataAction::Mode::Execute); } createNodesAndTriangles(nodeIds, nodeCount, triangleCount); @@ -365,7 +365,7 @@ Result<> QuickSurfaceMesh::operator()() // ----------------------------------------------------------------------------- void QuickSurfaceMesh::getGridCoordinates(const IGridGeometry* grid, size_t x, size_t y, size_t z, IGeometry::SharedVertexList& verts, IGeometry::MeshIndexType nodeIndex) { - complex::Point3D tmpCoords = grid->getPlaneCoords(x, y, z); + nx::core::Point3D tmpCoords = grid->getPlaneCoords(x, y, z); verts[nodeIndex] = static_cast(tmpCoords[0]); verts[nodeIndex + 1] = static_cast(tmpCoords[1]); verts[nodeIndex + 2] = static_cast(tmpCoords[2]); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/QuickSurfaceMesh.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/QuickSurfaceMesh.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.hpp index 20918fa786..af82a1448f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/QuickSurfaceMesh.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" #include #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT QuickSurfaceMeshInputValues +struct SIMPLNXCORE_EXPORT QuickSurfaceMeshInputValues { bool FixProblemVoxels; bool GenerateTripleLines; @@ -30,7 +30,7 @@ struct COMPLEXCORE_EXPORT QuickSurfaceMeshInputValues MultiArraySelectionParameter::ValueType CreatedDataArrayPaths; }; -class COMPLEXCORE_EXPORT QuickSurfaceMesh +class SIMPLNXCORE_EXPORT QuickSurfaceMesh { public: @@ -125,4 +125,4 @@ class COMPLEXCORE_EXPORT QuickSurfaceMesh bool m_GenerateTripleLines = false; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp index 859e014604..b38a515c7b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp @@ -1,10 +1,10 @@ #include "ReadBinaryCTNorthstar.hpp" -#include "complex/Common/ScopeGuard.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Common/ScopeGuard.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp similarity index 76% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp index b53454d00b..7b6335e242 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" namespace fs = std::filesystem; -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ReadBinaryCTNorthstarInputValues +struct SIMPLNXCORE_EXPORT ReadBinaryCTNorthstarInputValues { FileSystemPathParameter::ValueType InputHeaderFile; DataPath ImageGeometryPath; @@ -33,7 +33,7 @@ struct COMPLEXCORE_EXPORT ReadBinaryCTNorthstarInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ReadBinaryCTNorthstar +class SIMPLNXCORE_EXPORT ReadBinaryCTNorthstar { public: ReadBinaryCTNorthstar(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, ReadBinaryCTNorthstarInputValues* inputValues); @@ -55,4 +55,4 @@ class COMPLEXCORE_EXPORT ReadBinaryCTNorthstar const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp index 7ba2754d4e..36b9edd083 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp @@ -1,14 +1,14 @@ #include "ReadDeformKeyFileV12.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/DataStructure/Geometry/QuadGeom.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/DataStructure/Geometry/QuadGeom.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp index 2c3ad0ec4a..1d4a8bd3d3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp @@ -1,24 +1,24 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/IFilter.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT DataArrayMetadata +struct SIMPLNXCORE_EXPORT DataArrayMetadata { DataPath path; usize tupleCount; usize componentCount; }; -struct COMPLEXCORE_EXPORT FileCache +struct SIMPLNXCORE_EXPORT FileCache { fs::path inputFile; std::vector dataArrays; @@ -34,7 +34,7 @@ struct COMPLEXCORE_EXPORT FileCache } }; -struct COMPLEXCORE_EXPORT ReadDeformKeyFileV12InputValues +struct SIMPLNXCORE_EXPORT ReadDeformKeyFileV12InputValues { fs::path InputFilePath; DataPath QuadGeomPath; @@ -48,7 +48,7 @@ struct COMPLEXCORE_EXPORT ReadDeformKeyFileV12InputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ReadDeformKeyFileV12 +class SIMPLNXCORE_EXPORT ReadDeformKeyFileV12 { public: ReadDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadDeformKeyFileV12InputValues* inputValues); @@ -72,4 +72,4 @@ class COMPLEXCORE_EXPORT ReadDeformKeyFileV12 const IFilter::MessageHandler& m_MessageHandler; FileCache m_Cache = {}; }; -} // namespace complex \ No newline at end of file +} // namespace nx::core \ No newline at end of file diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadRawBinary.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadRawBinary.cpp index 615e67d630..15d7ddff16 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadRawBinary.cpp @@ -36,14 +36,14 @@ #include "ReadRawBinary.hpp" -#include "complex/Common/Bit.hpp" -#include "complex/Common/ComplexConstants.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/Bit.hpp" +#include "simplnx/Common/SimplnxConstants.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -89,7 +89,7 @@ Result<> ReadBinaryFile(IDataArray& dataArrayPtr, const std::string& filename, u return result; } - if(endian != static_cast(complex::endian::native)) + if(endian != static_cast(nx::core::endian::native)) { dataArray.byteSwapElements(); } @@ -98,7 +98,7 @@ Result<> ReadBinaryFile(IDataArray& dataArrayPtr, const std::string& filename, u } } // namespace -namespace complex +namespace nx::core { ReadRawBinary::ReadRawBinary(DataStructure& dataStructure, const ReadRawBinaryInputValues& inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler) : m_DataStructure(dataStructure) @@ -151,7 +151,7 @@ Result<> ReadRawBinary::execute() case NumericType::float64: return ReadBinaryFile(binaryIDataArray, inputFile, m_InputValues.skipHeaderBytesValue, m_InputValues.endianValue); default: - return MakeErrorResult(complex::k_UnsupportedScalarType, "The chosen scalar type is not supported by this filter."); + return MakeErrorResult(nx::core::k_UnsupportedScalarType, "The chosen scalar type is not supported by this filter."); } } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadRawBinary.hpp similarity index 75% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadRawBinary.hpp index 9854a60413..5a5dfb2fce 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadRawBinary.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -namespace complex +namespace nx::core { inline constexpr int32 k_UnsupportedScalarType = -1070; -struct COMPLEXCORE_EXPORT ReadRawBinaryInputValues +struct SIMPLNXCORE_EXPORT ReadRawBinaryInputValues { FileSystemPathParameter::ValueType inputFileValue; NumericType scalarTypeValue; @@ -19,7 +19,7 @@ struct COMPLEXCORE_EXPORT ReadRawBinaryInputValues DataPath createdAttributeArrayPathValue; }; -class COMPLEXCORE_EXPORT ReadRawBinary +class SIMPLNXCORE_EXPORT ReadRawBinary { public: ReadRawBinary(DataStructure& data, const ReadRawBinaryInputValues& inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler); @@ -40,4 +40,4 @@ class COMPLEXCORE_EXPORT ReadRawBinary Result<> execute(); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadStlFile.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadStlFile.cpp index 9f678a4e98..68d7d44f43 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadStlFile.cpp @@ -1,18 +1,18 @@ #include "ReadStlFile.hpp" -#include "ComplexCore/utils/StlUtilities.hpp" +#include "SimplnxCore/utils/StlUtilities.hpp" -#include "complex/Common/Range.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -24,7 +24,7 @@ namespace class FindUniqueIdsImpl { public: - FindUniqueIdsImpl(IGeometry::SharedVertexList& vertex, const std::vector>& nodesInBin, complex::Int64DataStore& uniqueIds) + FindUniqueIdsImpl(IGeometry::SharedVertexList& vertex, const std::vector>& nodesInBin, nx::core::Int64DataStore& uniqueIds) : m_Vertex(vertex) , m_NodesInBin(nodesInBin) , m_UniqueIds(uniqueIds) @@ -63,7 +63,7 @@ class FindUniqueIdsImpl private: const IGeometry::SharedVertexList& m_Vertex; const std::vector>& m_NodesInBin; - complex::Int64DataStore& m_UniqueIds; + nx::core::Int64DataStore& m_UniqueIds; }; class StlFileSentinel @@ -118,16 +118,16 @@ Result<> ReadStlFile::operator()() FILE* f = std::fopen(m_FilePath.string().c_str(), "rb"); if(nullptr == f) { - return MakeErrorResult(complex::StlConstants::k_ErrorOpeningFile, "Error opening STL file"); + return MakeErrorResult(nx::core::StlConstants::k_ErrorOpeningFile, "Error opening STL file"); } StlFileSentinel fileSentinel(f); // Will ensure that the file is closed when this method returns // Read Header - std::array stlHeader = {0}; + std::array stlHeader = {0}; int32_t triCount = 0; - if(std::fread(stlHeader.data(), complex::StlConstants::k_STL_HEADER_LENGTH, 1, f) != 1) + if(std::fread(stlHeader.data(), nx::core::StlConstants::k_STL_HEADER_LENGTH, 1, f) != 1) { - return MakeErrorResult(complex::StlConstants::k_StlHeaderParseError, "Error reading first 8 bytes of STL header. This can't be good."); + return MakeErrorResult(nx::core::StlConstants::k_StlHeaderParseError, "Error reading first 8 bytes of STL header. This can't be good."); } // Look for the tell-tale signs that the file was written from Magics Materialise @@ -136,7 +136,7 @@ Result<> ReadStlFile::operator()() // This NON Zero value does NOT indicate a length but is some sort of color // value encoded into the file. Instead of being normal like everyone else and // using the STL spec they went off and did their own thing. - std::string stlHeaderStr(stlHeader.data(), complex::StlConstants::k_STL_HEADER_LENGTH); + std::string stlHeaderStr(stlHeader.data(), nx::core::StlConstants::k_STL_HEADER_LENGTH); bool magicsFile = false; static const std::string k_ColorHeader("COLOR="); @@ -148,7 +148,7 @@ Result<> ReadStlFile::operator()() // Read the number of triangles in the file. if(std::fread(&triCount, sizeof(int32_t), 1, f) != 1) { - return MakeErrorResult(complex::StlConstants::k_TriangleCountParseError, "Error reading number of triangles from file. This is bad."); + return MakeErrorResult(nx::core::StlConstants::k_TriangleCountParseError, "Error reading number of triangles from file. This is bad."); } TriangleGeom& triangleGeom = m_DataStructure.getDataRefAs(m_GeometryDataPath); @@ -175,14 +175,14 @@ Result<> ReadStlFile::operator()() if(k_StlElementCount != objsRead) { std::string msg = fmt::format("Error reading Triangle '{}}'. Object Count was {} and should have been {}", t, objsRead, k_StlElementCount); - return MakeErrorResult(complex::StlConstants::k_TriangleParseError, msg); + return MakeErrorResult(nx::core::StlConstants::k_TriangleParseError, msg); } objsRead = std::fread(&attr, sizeof(uint16_t), 1, f); // Read the Triangle Attribute Data length if(objsRead != 1) { std::string msg = fmt::format("Error reading Number of attributes for triangle '{}'. Object Count was {} and should have been 1", t, objsRead); - return MakeErrorResult(complex::StlConstants::k_AttributeParseError, msg); + return MakeErrorResult(nx::core::StlConstants::k_AttributeParseError, msg); } if(attr > 0 && !magicsFile) { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadStlFile.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadStlFile.hpp index d0ff101bcb..7292336de5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadStlFile.hpp @@ -1,25 +1,25 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/IFilter.hpp" #include #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { /** * @class ConditionalSetValue * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ReadStlFile +class SIMPLNXCORE_EXPORT ReadStlFile { public: ReadStlFile(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, float32 scaleFactor, @@ -58,4 +58,4 @@ class COMPLEXCORE_EXPORT ReadStlFile const float m_ScaleFactor = 1.0F; const std::atomic_bool& m_ShouldCancel; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp index a205c4fd19..a1412b8fc5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp @@ -1,10 +1,10 @@ #include "ReadVolumeGraphicsFile.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace fs = std::filesystem; namespace diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp similarity index 74% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp index ffa7352955..b79554f189 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ReadVolumeGraphicsFileInputValues +struct SIMPLNXCORE_EXPORT ReadVolumeGraphicsFileInputValues { DataPath ImageGeometryPath; std::string CellAttributeMatrixName; @@ -21,7 +21,7 @@ struct COMPLEXCORE_EXPORT ReadVolumeGraphicsFileInputValues fs::path VGDataFile; }; -class COMPLEXCORE_EXPORT ReadVolumeGraphicsFile +class SIMPLNXCORE_EXPORT ReadVolumeGraphicsFile { public: ReadVolumeGraphicsFile(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, ReadVolumeGraphicsFileInputValues* inputValues); @@ -43,4 +43,4 @@ class COMPLEXCORE_EXPORT ReadVolumeGraphicsFile const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp index 6f6a2c31ad..57b16dd69c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.cpp @@ -1,10 +1,10 @@ #include "RegularGridSampleSurfaceMesh.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- RegularGridSampleSurfaceMesh::RegularGridSampleSurfaceMesh(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp similarity index 67% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp index 05900ea4bf..002d8b130d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SampleSurfaceMesh.hpp" - -namespace complex +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/SampleSurfaceMesh.hpp" + +namespace nx::core { -struct COMPLEXCORE_EXPORT RegularGridSampleSurfaceMeshInputValues +struct SIMPLNXCORE_EXPORT RegularGridSampleSurfaceMeshInputValues { VectorUInt64Parameter::ValueType Dimensions; VectorFloat32Parameter::ValueType Spacing; @@ -29,7 +29,7 @@ struct COMPLEXCORE_EXPORT RegularGridSampleSurfaceMeshInputValues * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT RegularGridSampleSurfaceMesh : public SampleSurfaceMesh +class SIMPLNXCORE_EXPORT RegularGridSampleSurfaceMesh : public SampleSurfaceMesh { public: RegularGridSampleSurfaceMesh(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, RegularGridSampleSurfaceMeshInputValues* inputValues); @@ -53,4 +53,4 @@ class COMPLEXCORE_EXPORT RegularGridSampleSurfaceMesh : public SampleSurfaceMesh const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp index b1e7a5b7b4..cb81b924de 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp @@ -1,16 +1,16 @@ #include "RemoveFlaggedFeatures.hpp" -#include "ComplexCore/Filters/ComputeFeatureRectFilter.hpp" -#include "ComplexCore/Filters/CropImageGeometry.hpp" +#include "SimplnxCore/Filters/ComputeFeatureRectFilter.hpp" +#include "SimplnxCore/Filters/CropImageGeometry.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -298,7 +298,7 @@ Result<> RemoveFlaggedFeatures::operator()() } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", m_InputValues->FlaggedFeaturesArrayPath.toString()); return MakeErrorResult(-53900, message); } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RemoveFlaggedFeatures.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.hpp similarity index 80% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RemoveFlaggedFeatures.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.hpp index c380d29229..ede0e5c5ee 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RemoveFlaggedFeatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -namespace complex +namespace nx::core { enum class Functionality : uint64 @@ -17,7 +17,7 @@ enum class Functionality : uint64 ExtractThenRemove = 2, }; -struct COMPLEXCORE_EXPORT RemoveFlaggedFeaturesInputValues +struct SIMPLNXCORE_EXPORT RemoveFlaggedFeaturesInputValues { bool FillRemovedFeatures; uint64 ExtractFeatures; @@ -35,7 +35,7 @@ struct COMPLEXCORE_EXPORT RemoveFlaggedFeaturesInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT RemoveFlaggedFeatures +class SIMPLNXCORE_EXPORT RemoveFlaggedFeatures { public: RemoveFlaggedFeatures(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, RemoveFlaggedFeaturesInputValues* inputValues); @@ -65,4 +65,4 @@ class COMPLEXCORE_EXPORT RemoveFlaggedFeatures size_t m_ProgressCounter = 0; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp index 57136b76ba..0bdc0fca6d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp @@ -1,11 +1,11 @@ #include "ReplaceElementAttributesWithNeighborValues.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp similarity index 71% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp index 47a8d66a4a..5b32f17af3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp @@ -1,26 +1,26 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" namespace { const std::string k_LessThan("< [Less Than]"); const std::string k_GreaterThan("> [Greater Than]"); -const complex::ChoicesParameter::Choices k_OperationChoices = {k_LessThan, k_GreaterThan}; +const nx::core::ChoicesParameter::Choices k_OperationChoices = {k_LessThan, k_GreaterThan}; } // namespace -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesInputValues +struct SIMPLNXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesInputValues { float32 MinConfidence; ChoicesParameter::ValueType SelectedComparison; @@ -35,7 +35,7 @@ struct COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValues +class SIMPLNXCORE_EXPORT ReplaceElementAttributesWithNeighborValues { public: ReplaceElementAttributesWithNeighborValues(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -58,4 +58,4 @@ class COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValues const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleImageGeom.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleImageGeom.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleImageGeom.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleImageGeom.cpp index 335b807cc3..1aeb05825c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleImageGeom.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleImageGeom.cpp @@ -1,17 +1,17 @@ #include "ResampleImageGeom.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelData3DAlgorithm.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" -#include "complex/Utilities/SamplingUtils.hpp" -#include "complex/Utilities/StringUtilities.hpp" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelData3DAlgorithm.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Utilities/SamplingUtils.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" + +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleImageGeom.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleImageGeom.hpp similarity index 76% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleImageGeom.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleImageGeom.hpp index 6eb4b0a871..acdd0b8330 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleImageGeom.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleImageGeom.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ResampleImageGeomInputValues +struct SIMPLNXCORE_EXPORT ResampleImageGeomInputValues { std::vector Spacing; DataPath SelectedImageGeometryPath; @@ -30,7 +30,7 @@ struct COMPLEXCORE_EXPORT ResampleImageGeomInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ResampleImageGeom +class SIMPLNXCORE_EXPORT ResampleImageGeom { public: ResampleImageGeom(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, ResampleImageGeomInputValues* inputValues); @@ -52,4 +52,4 @@ class COMPLEXCORE_EXPORT ResampleImageGeom const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.cpp index 50f2e30823..8343cbc891 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.cpp @@ -1,12 +1,12 @@ #include "ResampleRectGridToImageGeom.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- ResampleRectGridToImageGeom::ResampleRectGridToImageGeom(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp similarity index 72% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp index 0cb5d8d8dc..2af17217d9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ResampleRectGridToImageGeomInputValues +struct SIMPLNXCORE_EXPORT ResampleRectGridToImageGeomInputValues { DataPath RectilinearGridPath; MultiArraySelectionParameter::ValueType SelectedDataArrayPaths; @@ -26,7 +26,7 @@ struct COMPLEXCORE_EXPORT ResampleRectGridToImageGeomInputValues * @brief This filter will re-sample an existing RectilinearGrid onto a regular grid (Image Geometry) and copy cell data into the newly created Image Geometry Data Container during the process. */ -class COMPLEXCORE_EXPORT ResampleRectGridToImageGeom +class SIMPLNXCORE_EXPORT ResampleRectGridToImageGeom { public: ResampleRectGridToImageGeom(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ResampleRectGridToImageGeomInputValues* inputValues); @@ -48,4 +48,4 @@ class COMPLEXCORE_EXPORT ResampleRectGridToImageGeom const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp index dac8bd6432..d67e441173 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.cpp @@ -1,12 +1,12 @@ #include "ScalarSegmentFeatures.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; #define CX_DEFAULT_CONSTRUCTORS(className) \ className(const className&) = delete; \ @@ -136,7 +136,7 @@ ScalarSegmentFeatures::~ScalarSegmentFeatures() noexcept = default; // ----------------------------------------------------------------------------- Result<> ScalarSegmentFeatures::operator()() { - complex::AbstractDataStore* goodVoxels = nullptr; + nx::core::AbstractDataStore* goodVoxels = nullptr; if(m_InputValues->pUseGoodVoxels) { m_GoodVoxelsArray = m_DataStructure.getDataAs(m_InputValues->pGoodVoxelsPath); @@ -149,53 +149,53 @@ Result<> ScalarSegmentFeatures::operator()() m_FeatureIdsArray->fill(0); // initialize the output array with zeros IDataArray* inputDataArray = m_DataStructure.getDataAs(m_InputValues->pInputDataPath); size_t inDataPoints = inputDataArray->getNumberOfTuples(); - complex::DataType dataType = inputDataArray->getDataType(); + nx::core::DataType dataType = inputDataArray->getDataType(); auto featureIds = m_FeatureIdsArray->getDataStore(); switch(dataType) { - case complex::DataType::int8: { + case nx::core::DataType::int8: { m_CompareFunctor = std::make_shared<::TSpecificCompareFunctor>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::uint8: { + case nx::core::DataType::uint8: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::boolean: { + case nx::core::DataType::boolean: { m_CompareFunctor = std::make_shared(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::int16: { + case nx::core::DataType::int16: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::uint16: { + case nx::core::DataType::uint16: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::int32: { + case nx::core::DataType::int32: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::uint32: { + case nx::core::DataType::uint32: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::int64: { + case nx::core::DataType::int64: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::uint64: { + case nx::core::DataType::uint64: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::float32: { + case nx::core::DataType::float32: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } - case complex::DataType::float64: { + case nx::core::DataType::float64: { m_CompareFunctor = std::make_shared>(inputDataArray, inDataPoints, static_cast(m_InputValues->pScalarTolerance), featureIds); break; } @@ -246,13 +246,13 @@ Result<> ScalarSegmentFeatures::operator()() // ----------------------------------------------------------------------------- int64_t ScalarSegmentFeatures::getSeed(int32 gnum, int64 nextSeed) const { - complex::AbstractDataStore* goodVoxels = nullptr; + nx::core::AbstractDataStore* goodVoxels = nullptr; if(m_InputValues->pUseGoodVoxels) { goodVoxels = m_GoodVoxelsArray->getDataStore(); } - complex::DataArray::store_type* featureIds = m_FeatureIdsArray->getDataStore(); + nx::core::DataArray::store_type* featureIds = m_FeatureIdsArray->getDataStore(); usize totalPoints = featureIds->getNumberOfTuples(); int64 seed = -1; @@ -293,7 +293,7 @@ bool ScalarSegmentFeatures::determineGrouping(int64 referencepoint, int64 neighb auto featureIds = m_FeatureIdsArray->getDataStore(); - const complex::AbstractDataStore* goodVoxels = nullptr; + const nx::core::AbstractDataStore* goodVoxels = nullptr; if(m_InputValues->pUseGoodVoxels) { goodVoxels = m_GoodVoxelsArray->getDataStore(); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.hpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.hpp index f32ab1e6a6..da3fe7f6df 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.hpp @@ -1,21 +1,21 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Utilities/SegmentFeatures.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Utilities/SegmentFeatures.hpp" #include #include -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT ScalarSegmentFeaturesInputValues +struct SIMPLNXCORE_EXPORT ScalarSegmentFeaturesInputValues { DataPath pInputDataPath; int pScalarTolerance = 0; @@ -31,7 +31,7 @@ struct COMPLEXCORE_EXPORT ScalarSegmentFeaturesInputValues /** * @brief The ScalarSegmentFeatures class */ -class COMPLEXCORE_EXPORT ScalarSegmentFeatures : public SegmentFeatures +class SIMPLNXCORE_EXPORT ScalarSegmentFeatures : public SegmentFeatures { public: using SeedGenerator = std::mt19937_64; @@ -77,4 +77,4 @@ class COMPLEXCORE_EXPORT ScalarSegmentFeatures : public SegmentFeatures GoodVoxelsArrayType* m_GoodVoxelsArray = nullptr; std::shared_ptr m_CompareFunctor; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SharedFeatureFace.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SharedFeatureFace.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.cpp index fe7400b24f..f9184b4e2e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SharedFeatureFace.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.cpp @@ -1,16 +1,16 @@ #include "SharedFeatureFace.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -75,7 +75,7 @@ SeedGenerator initializeStaticVoxelSeedGenerator(Int64Distribution& distribution } // ----------------------------------------------------------------------------- -void RandomizeFaceIds(complex::Int32Array& featureIds, uint64 totalFeatures, Int64Distribution& distribution) +void RandomizeFaceIds(nx::core::Int32Array& featureIds, uint64 totalFeatures, Int64Distribution& distribution) { // Generate an even distribution of numbers between the min and max range const int64 rangeMin = 1; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SharedFeatureFace.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.hpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SharedFeatureFace.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.hpp index 5b8416fb58..ce72648218 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SharedFeatureFace.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SharedFeatureFace.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT SharedFeatureFaceInputValues +struct SIMPLNXCORE_EXPORT SharedFeatureFaceInputValues { DataPath TriangleGeometryPath; @@ -27,7 +27,7 @@ struct COMPLEXCORE_EXPORT SharedFeatureFaceInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT SharedFeatureFace +class SIMPLNXCORE_EXPORT SharedFeatureFace { public: SharedFeatureFace(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, SharedFeatureFaceInputValues* inputValues); @@ -49,4 +49,4 @@ class COMPLEXCORE_EXPORT SharedFeatureFace const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/Silhouette.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/Silhouette.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp index 7ac2f69c13..4b0b239cd0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/Silhouette.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.cpp @@ -1,12 +1,12 @@ #include "Silhouette.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/KUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/KUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/Silhouette.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.hpp similarity index 67% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/Silhouette.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.hpp index 63035f839f..67c14c4520 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/Silhouette.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/Silhouette.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/KUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Utilities/KUtilities.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT SilhouetteInputValues +struct SIMPLNXCORE_EXPORT SilhouetteInputValues { KUtilities::DistanceMetric DistanceMetric; DataPath ClusteringArrayPath; @@ -27,7 +27,7 @@ struct COMPLEXCORE_EXPORT SilhouetteInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT Silhouette +class SIMPLNXCORE_EXPORT Silhouette { public: Silhouette(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, SilhouetteInputValues* inputValues); @@ -48,4 +48,4 @@ class COMPLEXCORE_EXPORT Silhouette const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SplitAttributeArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SplitAttributeArray.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp index f012f1f745..5d6f6d9134 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SplitAttributeArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.cpp @@ -1,10 +1,10 @@ #include "SplitAttributeArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SplitAttributeArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.hpp similarity index 76% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SplitAttributeArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.hpp index 37df48dae5..d586110518 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SplitAttributeArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SplitAttributeArray.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT SplitAttributeArrayInputValues +struct SIMPLNXCORE_EXPORT SplitAttributeArrayInputValues { DataPath InputArrayPath; std::string SplitArraysSuffix; @@ -21,7 +21,7 @@ struct COMPLEXCORE_EXPORT SplitAttributeArrayInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT SplitAttributeArray +class SIMPLNXCORE_EXPORT SplitAttributeArray { public: SplitAttributeArray(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, SplitAttributeArrayInputValues* inputValues); @@ -43,4 +43,4 @@ class COMPLEXCORE_EXPORT SplitAttributeArray const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SurfaceNets.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SurfaceNets.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SurfaceNets.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SurfaceNets.cpp index 176eb92d18..f1cd9b53f1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SurfaceNets.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SurfaceNets.cpp @@ -1,18 +1,18 @@ #include "SurfaceNets.hpp" #include "TupleTransfer.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" - -#include "ComplexCore/SurfaceNets/MMCellFlag.h" -#include "ComplexCore/SurfaceNets/MMCellMap.h" -#include "ComplexCore/SurfaceNets/MMGeometryOBJ.h" -#include "ComplexCore/SurfaceNets/MMSurfaceNet.h" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" + +#include "SimplnxCore/SurfaceNets/MMCellFlag.h" +#include "SimplnxCore/SurfaceNets/MMCellMap.h" +#include "SimplnxCore/SurfaceNets/MMGeometryOBJ.h" +#include "SimplnxCore/SurfaceNets/MMSurfaceNet.h" + +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SurfaceNets.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SurfaceNets.hpp similarity index 68% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SurfaceNets.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SurfaceNets.hpp index a88bfdb9d4..a29cdb6139 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/SurfaceNets.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SurfaceNets.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" - -namespace complex +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" + +namespace nx::core { -struct COMPLEXCORE_EXPORT SurfaceNetsInputValues +struct SIMPLNXCORE_EXPORT SurfaceNetsInputValues { bool ApplySmoothing; int32 SmoothingIterations; @@ -38,7 +38,7 @@ struct COMPLEXCORE_EXPORT SurfaceNetsInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT SurfaceNets +class SIMPLNXCORE_EXPORT SurfaceNets { public: SurfaceNets(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, SurfaceNetsInputValues* inputValues); @@ -60,4 +60,4 @@ class COMPLEXCORE_EXPORT SurfaceNets const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TriangleCentroid.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TriangleCentroid.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TriangleCentroid.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TriangleCentroid.cpp index 5ca609d770..6735812e92 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TriangleCentroid.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TriangleCentroid.cpp @@ -1,13 +1,13 @@ #include "TriangleCentroid.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" + +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TriangleCentroid.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TriangleCentroid.hpp similarity index 69% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TriangleCentroid.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TriangleCentroid.hpp index a5b9191bc1..447a2c5bd5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TriangleCentroid.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TriangleCentroid.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT TriangleCentroidInputValues +struct SIMPLNXCORE_EXPORT TriangleCentroidInputValues { DataPath TriangleGeometryDataPath; DataObjectNameParameter::ValueType CentroidsArrayName; @@ -23,7 +23,7 @@ struct COMPLEXCORE_EXPORT TriangleCentroidInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT TriangleCentroid +class SIMPLNXCORE_EXPORT TriangleCentroid { public: TriangleCentroid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, TriangleCentroidInputValues* inputValues); @@ -45,4 +45,4 @@ class COMPLEXCORE_EXPORT TriangleCentroid const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TupleTransfer.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TupleTransfer.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TupleTransfer.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TupleTransfer.cpp index 2fdea29b36..a6584139a3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TupleTransfer.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TupleTransfer.cpp @@ -1,6 +1,6 @@ #include "TupleTransfer.hpp" -namespace complex +namespace nx::core { void AddTupleTransferInstance(DataStructure& dataStructure, const DataPath& selectedDataPath, const DataPath& createdDataPath, @@ -58,4 +58,4 @@ void AddTupleTransferInstance(DataStructure& dataStructure, const DataPath& sele } } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TupleTransfer.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TupleTransfer.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TupleTransfer.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TupleTransfer.hpp index 65191dfd2d..505b243bfd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/TupleTransfer.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/TupleTransfer.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/TemplateHelpers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/TemplateHelpers.hpp" -namespace complex +namespace nx::core { /** * @brief This is the base class that is used to transfer cell data to triangle face data * but could be used generally to copy the tuple value from one Data Array to another * DataArray of the same type. */ -class COMPLEXCORE_EXPORT AbstractTupleTransfer +class SIMPLNXCORE_EXPORT AbstractTupleTransfer { public: ~AbstractTupleTransfer() = default; @@ -139,7 +139,7 @@ class TransferTuple : public AbstractTupleTransfer * @param createdDataPath * @param tupleTransferFunctions */ -COMPLEXCORE_EXPORT void AddTupleTransferInstance(DataStructure& dataStructure, const DataPath& selectedDataPath, const DataPath& createdDataPath, +SIMPLNXCORE_EXPORT void AddTupleTransferInstance(DataStructure& dataStructure, const DataPath& selectedDataPath, const DataPath& createdDataPath, std::vector>& tupleTransferFunctions); -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp index 032cf25650..073ba9d6a3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.cpp @@ -1,10 +1,10 @@ #include "UncertainRegularGridSampleSurfaceMesh.hpp" -#include "complex/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataArray.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- UncertainRegularGridSampleSurfaceMesh::UncertainRegularGridSampleSurfaceMesh(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp similarity index 70% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp index 50b9998023..76c4b929ed 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SampleSurfaceMesh.hpp" - -namespace complex +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/SampleSurfaceMesh.hpp" + +namespace nx::core { -struct COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshInputValues +struct SIMPLNXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshInputValues { uint64 SeedValue; VectorUInt64Parameter::ValueType Dimensions; @@ -31,7 +31,7 @@ struct COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshInputValues * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMesh : public SampleSurfaceMesh +class SIMPLNXCORE_EXPORT UncertainRegularGridSampleSurfaceMesh : public SampleSurfaceMesh { public: UncertainRegularGridSampleSurfaceMesh(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -56,4 +56,4 @@ class COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMesh : public SampleSu const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp index e6674585f5..ecaf8c8bbf 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp @@ -1,17 +1,17 @@ #include "WriteAbaqusHexahedron.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp similarity index 69% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp index 13732cb1ec..637ca65a79 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT WriteAbaqusHexahedronInputValues +struct SIMPLNXCORE_EXPORT WriteAbaqusHexahedronInputValues { int32 HourglassStiffness; StringParameter::ValueType JobName; @@ -29,7 +29,7 @@ struct COMPLEXCORE_EXPORT WriteAbaqusHexahedronInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT WriteAbaqusHexahedron +class SIMPLNXCORE_EXPORT WriteAbaqusHexahedron { public: WriteAbaqusHexahedron(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteAbaqusHexahedronInputValues* inputValues); @@ -53,4 +53,4 @@ class COMPLEXCORE_EXPORT WriteAbaqusHexahedron const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp index d87c41b954..b8c88b3db9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp @@ -1,11 +1,11 @@ #include "WriteAvizoRectilinearCoordinate.hpp" -#include "complex/Common/Bit.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Common/Bit.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- WriteAvizoRectilinearCoordinate::WriteAvizoRectilinearCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -52,7 +52,7 @@ Result<> WriteAvizoRectilinearCoordinate::generateHeader(FILE* outputFile) const fprintf(outputFile, "Parameters {\n"); fprintf(outputFile, " DREAM3DParams {\n"); - fprintf(outputFile, " Author \"DREAM.3D ComplexCore Version 7.0.0\",\n"); + fprintf(outputFile, " Author \"DREAM.3D SimplnxCore Version 7.0.0\",\n"); const std::time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); const std::string timeString = std::ctime(¤tTime); fprintf(outputFile, " DateTime \"%s\"\n", timeString.substr(0, timeString.length() - 1).c_str()); // remove the \n character from the time string diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp index 69e1616767..d21b928acd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/AvizoWriter.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/AvizoWriter.hpp" -namespace complex +namespace nx::core { /** * @class WriteAvizoRectilinearCoordinate * @brief This filter writes out a native Avizo Rectilinear Coordinate data file. */ -class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinate : public AvizoWriter +class SIMPLNXCORE_EXPORT WriteAvizoRectilinearCoordinate : public AvizoWriter { public: WriteAvizoRectilinearCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); @@ -28,4 +28,4 @@ class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinate : public AvizoWriter Result<> writeData(FILE* outputFile) const override; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp index 4a6053b92c..263d2091e5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp @@ -1,12 +1,12 @@ #include "WriteAvizoUniformCoordinate.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" #include #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- WriteAvizoUniformCoordinate::WriteAvizoUniformCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, @@ -52,7 +52,7 @@ Result<> WriteAvizoUniformCoordinate::generateHeader(FILE* outputFile) const fprintf(outputFile, "Parameters {\n"); fprintf(outputFile, " DREAM3DParams {\n"); - fprintf(outputFile, " Author \"DREAM.3D ComplexCore Version 7.0.0\",\n"); + fprintf(outputFile, " Author \"DREAM.3D SimplnxCore Version 7.0.0\",\n"); const std::time_t currentTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); const std::string timeString = std::ctime(¤tTime); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp index e2f214f26f..79c1b55ff3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/AvizoWriter.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/AvizoWriter.hpp" -namespace complex +namespace nx::core { /** * @class WriteAvizoUniformCoordinate * @brief This filter writes out a native Avizo Uniform Coordinate data file. */ -class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinate : public AvizoWriter +class SIMPLNXCORE_EXPORT WriteAvizoUniformCoordinate : public AvizoWriter { public: WriteAvizoUniformCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); @@ -28,4 +28,4 @@ class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinate : public AvizoWriter Result<> writeData(FILE* outputFile) const override; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.cpp index 3f67f5933c..93b6b12e06 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.cpp @@ -1,14 +1,14 @@ #include "WriteLosAlamosFFT.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -42,7 +42,7 @@ Result<> WriteLosAlamosFFT::operator()() // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(m_InputValues->OutputFile.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(m_InputValues->OutputFile.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.hpp similarity index 71% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.hpp index 3787108998..fe2a53cedd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT WriteLosAlamosFFTInputValues +struct SIMPLNXCORE_EXPORT WriteLosAlamosFFTInputValues { FileSystemPathParameter::ValueType OutputFile; DataPath FeatureIdsArrayPath; @@ -26,7 +26,7 @@ struct COMPLEXCORE_EXPORT WriteLosAlamosFFTInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT WriteLosAlamosFFT +class SIMPLNXCORE_EXPORT WriteLosAlamosFFT { public: WriteLosAlamosFFT(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteLosAlamosFFTInputValues* inputValues); @@ -48,4 +48,4 @@ class COMPLEXCORE_EXPORT WriteLosAlamosFFT const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteStlFile.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteStlFile.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteStlFile.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteStlFile.cpp index b00aa33c4f..f98550fc7a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteStlFile.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteStlFile.cpp @@ -1,11 +1,11 @@ #include "WriteStlFile.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- WriteStlFile::WriteStlFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteStlFileInputValues* inputValues) @@ -37,7 +37,7 @@ Result<> WriteStlFile::operator()() const std::filesystem::path outputPath = m_InputValues->OutputStlDirectory; // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(outputPath); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(outputPath); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteStlFile.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteStlFile.hpp similarity index 69% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteStlFile.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteStlFile.hpp index ff1d14cb80..489c3c0efa 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteStlFile.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteStlFile.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT WriteStlFileInputValues +struct SIMPLNXCORE_EXPORT WriteStlFileInputValues { bool GroupByFeature; FileSystemPathParameter::ValueType OutputStlDirectory; @@ -29,7 +29,7 @@ struct COMPLEXCORE_EXPORT WriteStlFileInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT WriteStlFile +class SIMPLNXCORE_EXPORT WriteStlFile { public: WriteStlFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteStlFileInputValues* inputValues); @@ -51,4 +51,4 @@ class COMPLEXCORE_EXPORT WriteStlFile const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp index d761fb0fb7..68863141b3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp @@ -1,13 +1,13 @@ #include "WriteVtkRectilinearGrid.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -298,7 +298,7 @@ void WriteVtkRectilinearGrid::writeVtkHeader(FILE* outputFile) const const usize zPoints = geom.getNumZCells() + 1; fprintf(outputFile, "# vtk DataFile Version 2.0\n"); - fprintf(outputFile, "Data set from DREAM.3D ComplexCore version 7.0.0\n"); + fprintf(outputFile, "Data set from DREAM.3D SimplnxCore version 7.0.0\n"); if(m_InputValues->WriteBinaryFile) { fprintf(outputFile, "BINARY\n"); @@ -326,7 +326,7 @@ Result<> WriteVtkRectilinearGrid::writeCoords(FILE* outputFile, const std::strin d = idx * step + min; if constexpr(endian::little == endian::native) { - d = complex::byteswap(d); + d = nx::core::byteswap(d); } data[idx] = d; } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp index 8afb8ec936..1d8ffeed6f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -namespace complex +namespace nx::core { class ImageGeom; class IDataArray; -struct COMPLEXCORE_EXPORT WriteVtkRectilinearGridInputValues +struct SIMPLNXCORE_EXPORT WriteVtkRectilinearGridInputValues { FileSystemPathParameter::ValueType OutputFile; bool WriteBinaryFile; @@ -26,7 +26,7 @@ struct COMPLEXCORE_EXPORT WriteVtkRectilinearGridInputValues * @brief This filter ... */ -class COMPLEXCORE_EXPORT WriteVtkRectilinearGrid +class SIMPLNXCORE_EXPORT WriteVtkRectilinearGrid { public: WriteVtkRectilinearGrid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteVtkRectilinearGridInputValues* inputValues); @@ -65,4 +65,4 @@ class COMPLEXCORE_EXPORT WriteVtkRectilinearGrid const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignGeometries.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignGeometries.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.cpp index f32ddf7fa5..dbbc694ce5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignGeometries.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.cpp @@ -1,20 +1,20 @@ #include "AlignGeometries.hpp" -#include "complex/DataStructure/Geometry/EdgeGeom.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry3D.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/Geometry/EdgeGeom.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry3D.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -368,7 +368,7 @@ void translateGeometry(IGeometry& geometry, const FloatVec3& translation) } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -502,4 +502,4 @@ Result AlignGeometries::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignGeometries.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignGeometries.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp index bf88d65367..116e0622a2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignGeometries.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometries.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT AlignGeometries : public IFilter +class SIMPLNXCORE_EXPORT AlignGeometries : public IFilter { public: AlignGeometries() = default; @@ -26,7 +26,7 @@ class COMPLEXCORE_EXPORT AlignGeometries : public IFilter static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -94,6 +94,6 @@ class COMPLEXCORE_EXPORT AlignGeometries : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AlignGeometries, "87fa9e07-6c66-45b0-80a0-cf80cc0def5d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AlignGeometries, "87fa9e07-6c66-45b0-80a0-cf80cc0def5d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp index b56d80aece..f6a74bc4c8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp @@ -1,17 +1,17 @@ #include "AlignSectionsFeatureCentroidFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp" +#include "SimplnxCore/Filters/Algorithms/AlignSectionsFeatureCentroid.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include @@ -21,16 +21,16 @@ namespace { // Error Code constants -constexpr complex::int32 k_InputRepresentationTypeError = -68001; -constexpr complex::int32 k_OutputRepresentationTypeError = -68002; -constexpr complex::int32 k_InputComponentDimensionError = -68003; -constexpr complex::int32 k_InputComponentCountError = -68004; -constexpr complex::int32 k_InconsistentTupleCount = -68063; -constexpr complex::int32 k_OutOfRangeReferenceSliceValue = -68064; +constexpr nx::core::int32 k_InputRepresentationTypeError = -68001; +constexpr nx::core::int32 k_OutputRepresentationTypeError = -68002; +constexpr nx::core::int32 k_InputComponentDimensionError = -68003; +constexpr nx::core::int32 k_InputComponentCountError = -68004; +constexpr nx::core::int32 k_InconsistentTupleCount = -68063; +constexpr nx::core::int32 k_OutOfRangeReferenceSliceValue = -68064; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string AlignSectionsFeatureCentroidFilter::name() const @@ -109,7 +109,7 @@ IFilter::PreflightResult AlignSectionsFeatureCentroidFilter::preflightImpl(const PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -137,7 +137,7 @@ IFilter::PreflightResult AlignSectionsFeatureCentroidFilter::preflightImpl(const // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, cellDataGroupPath, {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, cellDataGroupPath, {}); // Return both the resultOutputActions and the preflightUpdatedValues via std::move() return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -189,4 +189,4 @@ Result AlignSectionsFeatureCentroidFilter::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp index b2c98536bf..d02f7d204c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class AlignSectionsFeatureCentroidFilter * * @brief This filter will .... */ -class COMPLEXCORE_EXPORT AlignSectionsFeatureCentroidFilter : public IFilter +class SIMPLNXCORE_EXPORT AlignSectionsFeatureCentroidFilter : public IFilter { public: AlignSectionsFeatureCentroidFilter() = default; @@ -34,7 +34,7 @@ class COMPLEXCORE_EXPORT AlignSectionsFeatureCentroidFilter : public IFilter static inline constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,6 +104,6 @@ class COMPLEXCORE_EXPORT AlignSectionsFeatureCentroidFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AlignSectionsFeatureCentroidFilter, "b83f9bae-9ccf-4932-96c3-7f2fdb091452"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AlignSectionsFeatureCentroidFilter, "b83f9bae-9ccf-4932-96c3-7f2fdb091452"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsListFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsListFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp index db975edc03..97c5c8df45 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsListFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp @@ -1,23 +1,23 @@ #include "AlignSectionsListFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AlignSectionsList.hpp" +#include "SimplnxCore/Filters/Algorithms/AlignSectionsList.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string AlignSectionsListFilter::name() const @@ -80,7 +80,7 @@ IFilter::PreflightResult AlignSectionsListFilter::preflightImpl(const DataStruct auto pSelectedImageGeometryPathValue = filterArgs.value(k_SelectedImageGeometry_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const ImageGeom& imageGeom = dataStructure.getDataRefAs(pSelectedImageGeometryPathValue); @@ -97,7 +97,7 @@ IFilter::PreflightResult AlignSectionsListFilter::preflightImpl(const DataStruct // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, imageGeom.getCellDataPath(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, imageGeom.getCellDataPath(), {}); return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; } @@ -114,7 +114,7 @@ Result<> AlignSectionsListFilter::executeImpl(DataStructure& dataStructure, cons return AlignSectionsList(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsListFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsListFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp index 9c0a6b2061..124d6f3103 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AlignSectionsListFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class AlignSectionsListFilter * @brief This filter will apply the cell shifts from a user specified txt file to each section of the Image Geometry */ -class COMPLEXCORE_EXPORT AlignSectionsListFilter : public IFilter +class SIMPLNXCORE_EXPORT AlignSectionsListFilter : public IFilter { public: AlignSectionsListFilter() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT AlignSectionsListFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,7 +99,7 @@ class COMPLEXCORE_EXPORT AlignSectionsListFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AlignSectionsListFilter, "6c0e9fcf-bea2-4939-999e-e26379ed7aad"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AlignSectionsListFilter, "6c0e9fcf-bea2-4939-999e-e26379ed7aad"); /* LEGACY UUID FOR THIS FILTER accf8f6c-0551-5da3-9a3d-e4be41c3985c */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AppendImageGeometryZSliceFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AppendImageGeometryZSliceFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp index 2c72abe8b3..0abcb98d09 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AppendImageGeometryZSliceFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp @@ -1,29 +1,29 @@ #include "AppendImageGeometryZSliceFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp" #include "FindArrayStatisticsFilter.hpp" +#include "SimplnxCore/Filters/Algorithms/AppendImageGeometryZSlice.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string AppendImageGeometryZSliceFilter::name() const @@ -297,4 +297,4 @@ Result AppendImageGeometryZSliceFilter::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AppendImageGeometryZSliceFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AppendImageGeometryZSliceFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp index 1a7e9354a6..7fe7bdc95d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AppendImageGeometryZSliceFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class AppendImageGeometryZSliceFilter * @brief This filter allows the user to append an Image Geometry onto the "end" of another Image Geometry. */ -class COMPLEXCORE_EXPORT AppendImageGeometryZSliceFilter : public IFilter +class SIMPLNXCORE_EXPORT AppendImageGeometryZSliceFilter : public IFilter { public: AppendImageGeometryZSliceFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT AppendImageGeometryZSliceFilter : public IFilter static inline constexpr StringLiteral k_NewGeometry_Key = "new_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT AppendImageGeometryZSliceFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, AppendImageGeometryZSliceFilter, "c62c5c89-5ea8-4948-99ca-51cbc5b54b05"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, AppendImageGeometryZSliceFilter, "c62c5c89-5ea8-4948-99ca-51cbc5b54b05"); /* LEGACY UUID FOR THIS FILTER 52b2918a-4fb5-57aa-97d4-ccc084b89572 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApplyTransformationToGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ApplyTransformationToGeometryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp index bea1204106..49b08284ad 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApplyTransformationToGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp @@ -1,45 +1,45 @@ #include "ApplyTransformationToGeometryFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp" - -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Actions/CopyDataObjectAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Actions/RenameDataAction.hpp" -#include "complex/Filter/Actions/UpdateImageGeomAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" -#include "complex/Utilities/ImageRotationUtilities.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" - -#include "complex/Utilities/StringUtilities.hpp" - -using namespace complex; +#include "SimplnxCore/Filters/Algorithms/ApplyTransformationToGeometry.hpp" + +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Actions/CopyDataObjectAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Actions/RenameDataAction.hpp" +#include "simplnx/Filter/Actions/UpdateImageGeomAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" +#include "simplnx/Utilities/ImageRotationUtilities.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" + +#include "simplnx/Utilities/StringUtilities.hpp" + +using namespace nx::core; namespace { const std::string K_UNKNOWN_PRECOMPUTED_MATRIX_STR = "Precomputed transformation matrix unknown during preflight."; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ApplyTransformationToGeometryFilter::name() const @@ -144,7 +144,7 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons auto pCellAttributeMatrixPath = filterArgs.value(k_CellAttributeMatrixPath_Key); auto pTranslateGeometryToGlobalOrigin = filterArgs.value(k_TranslateGeometryToGlobalOrigin_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -359,8 +359,8 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons // These values should have been updated during the preflightImpl(...) method const auto* srcImageGeomPtr = dataStructure.getDataAs(srcImagePath); - preflightUpdatedValues.push_back({"Input Geometry Info", complex::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeomPtr->getDimensions(), srcImageGeomPtr->getSpacing(), - srcImageGeomPtr->getOrigin(), srcImageGeomPtr->getUnits())}); + preflightUpdatedValues.push_back({"Input Geometry Info", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeomPtr->getDimensions(), srcImageGeomPtr->getSpacing(), + srcImageGeomPtr->getOrigin(), srcImageGeomPtr->getUnits())}); if(pTransformationMatrixTypeValue == k_PrecomputedTransformationMatrixIdx) { @@ -370,7 +370,7 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons { preflightUpdatedValues.push_back( {"Transformed Image Geometry Info", - complex::GeometryHelpers::Description::GenerateGeometryInfo(dims, CreateImageGeometryAction::SpacingType{spacing[0], spacing[1], spacing[2]}, origin, srcImageGeomPtr->getUnits())}); + nx::core::GeometryHelpers::Description::GenerateGeometryInfo(dims, CreateImageGeometryAction::SpacingType{spacing[0], spacing[1], spacing[2]}, origin, srcImageGeomPtr->getUnits())}); } } @@ -380,7 +380,7 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons { for(const auto& childPath : childPaths.value()) { - const std::string copiedChildName = complex::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + const std::string copiedChildName = nx::core::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); const DataPath copiedChildPath = DataPath::FromString(copiedChildName).value(); if(dataStructure.getDataAs(childPath) != nullptr) { @@ -390,7 +390,7 @@ IFilter::PreflightResult ApplyTransformationToGeometryFilter::preflightImpl(cons { for(const auto& sourcePath : pathsToBeCopied.value()) { - const std::string createdPathName = complex::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + const std::string createdPathName = nx::core::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); allCreatedPaths.push_back(DataPath::FromString(createdPathName).value()); } } @@ -475,7 +475,7 @@ Result ApplyTransformationToGeometryFilter::FromSIMPLJson(const nlohm results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TransformationMatrixTypeKey, k_TransformationType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolationTypeKey, k_InterpolationType_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseDataArraySelectionKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseDataArraySelectionKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ManualTransformationMatrixKey, k_ManualTransformationMatrix_Key)); results.push_back(SIMPLConversion::Convert2Parameters(args, json, SIMPL::k_RotationAxisKey, SIMPL::k_RotationAngleKey, k_Rotation_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_TranslationKey, k_Translation_Key)); @@ -485,10 +485,10 @@ Result ApplyTransformationToGeometryFilter::FromSIMPLJson(const nlohm results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GeometryToTransformnKey, k_SelectedImageGeometry_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixPathKey, k_CellAttributeMatrixPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataArraySelectionKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataArraySelectionKey, "@SIMPLNX_PARAMETER_KEY@")); Result<> conversionResult = MergeResults(std::move(results)); return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApplyTransformationToGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ApplyTransformationToGeometryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp index 39f256f244..6225b03f8b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApplyTransformationToGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ApplyTransformationToGeometryFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ApplyTransformationToGeometryFilter : public IFilter +class SIMPLNXCORE_EXPORT ApplyTransformationToGeometryFilter : public IFilter { public: ApplyTransformationToGeometryFilter() = default; @@ -36,7 +36,7 @@ class COMPLEXCORE_EXPORT ApplyTransformationToGeometryFilter : public IFilter static inline constexpr StringLiteral k_CellAttributeMatrixPath_Key = "cell_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,7 +106,7 @@ class COMPLEXCORE_EXPORT ApplyTransformationToGeometryFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ApplyTransformationToGeometryFilter, "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ApplyTransformationToGeometryFilter, "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe"); /* LEGACY UUID FOR THIS FILTER c681caf4-22f2-5885-bbc9-a0476abc72eb */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApproximatePointCloudHull.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ApproximatePointCloudHull.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.cpp index 5ac9adae70..1940b83df0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApproximatePointCloudHull.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.cpp @@ -1,18 +1,18 @@ #include "ApproximatePointCloudHull.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { @@ -326,4 +326,4 @@ Result ApproximatePointCloudHull::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApproximatePointCloudHull.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ApproximatePointCloudHull.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp index e667d30581..eacf9a9ffb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ApproximatePointCloudHull.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHull.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ApproximatePointCloudHull * @brief */ -class COMPLEXCORE_EXPORT ApproximatePointCloudHull : public IFilter +class SIMPLNXCORE_EXPORT ApproximatePointCloudHull : public IFilter { public: ApproximatePointCloudHull() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT ApproximatePointCloudHull : public IFilter static inline constexpr StringLiteral k_HullVertexGeomPath_Key = "hull_vertex_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,6 +99,6 @@ class COMPLEXCORE_EXPORT ApproximatePointCloudHull : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ApproximatePointCloudHull, "c19203b7-2217-4e52-bff4-7f611695421a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ApproximatePointCloudHull, "c19203b7-2217-4e52-bff4-7f611695421a"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp index 8826ee2b8a..4904fd439f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp @@ -1,22 +1,22 @@ #include "ArrayCalculatorFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ArrayCalculator.hpp" -#include "ComplexCore/utils/ICalculatorArray.hpp" +#include "SimplnxCore/Filters/Algorithms/ArrayCalculator.hpp" +#include "SimplnxCore/utils/ICalculatorArray.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/CalculatorParameter.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/CalculatorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ArrayCalculatorFilter::name() const @@ -81,7 +81,7 @@ IFilter::PreflightResult ArrayCalculatorFilter::preflightImpl(const DataStructur auto outputGroupPath = pCalculatedArrayPath.getParent(); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // parse the infix expression @@ -180,7 +180,7 @@ IFilter::PreflightResult ArrayCalculatorFilter::preflightImpl(const DataStructur } return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; -} // namespace complex +} // namespace nx::core //------------------------------------------------------------------------------ Result<> ArrayCalculatorFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, @@ -216,7 +216,7 @@ Result ArrayCalculatorFilter::FromSIMPLJson(const nlohmann::json& jso std::vector> results; // results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SelectedAttributeMatrixKey, - // "@COMPLEX_PARAMETER_KEY@")); + // "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertTopParameters(args, json, k_CalculatorParameter_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ScalarTypeKey, k_ScalarType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CalculatedArrayKey, k_CalculatedArray_Key)); @@ -225,4 +225,4 @@ Result ArrayCalculatorFilter::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp index ea0e5b1101..7e1b070dd5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ArrayCalculatorFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ArrayCalculatorFilter : public IFilter +class SIMPLNXCORE_EXPORT ArrayCalculatorFilter : public IFilter { public: ArrayCalculatorFilter() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT ArrayCalculatorFilter : public IFilter static inline constexpr StringLiteral k_CalculatedArray_Key = "calculated_array"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,7 +99,7 @@ class COMPLEXCORE_EXPORT ArrayCalculatorFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ArrayCalculatorFilter, "eea49b17-0db2-5bbc-80ef-f44249cc8d55"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ArrayCalculatorFilter, "eea49b17-0db2-5bbc-80ef-f44249cc8d55"); /* LEGACY UUID FOR THIS FILTER {7ff0ebb3-7b0d-5ff7-b9d8-5147031aca10} */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateArrayHistogramFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateArrayHistogramFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp index 8df55a851e..cd1f492922 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateArrayHistogramFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp @@ -1,21 +1,21 @@ #include "CalculateArrayHistogramFilter.hpp" #include "Algorithms/CalculateArrayHistogram.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CalculateArrayHistogramFilter::name() const @@ -61,7 +61,7 @@ Parameters CalculateArrayHistogramFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Arrays"}); params.insert(std::make_unique(k_SelectedArrayPaths_Key, "Input Data Arrays", "The list of arrays to calculate histogram(s) for", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllNumericTypes())); + nx::core::GetAllNumericTypes())); params.insertSeparator(Parameters::Separator{"Output Set Up"}); params.insertLinkableParameter( std::make_unique(k_NewDataGroup_Key, "Create New DataGroup for Histograms", "Whether or not to store the calculated histogram(s) in a new DataGroup", true)); @@ -95,12 +95,12 @@ IFilter::PreflightResult CalculateArrayHistogramFilter::preflightImpl(const Data auto pNewDataGroupValue = filterArgs.value(k_NewDataGroup_Key); auto pDataGroupNameValue = filterArgs.value(k_DataGroupName_Key); auto pSelectedArrayPathsValue = filterArgs.value(k_SelectedArrayPaths_Key); - auto pNewDataGroupNameValue = filterArgs.value(k_NewDataGroupName_Key); // sanity check if is Attribute matrix after impending complex update + auto pNewDataGroupNameValue = filterArgs.value(k_NewDataGroupName_Key); // sanity check if is Attribute matrix after impending simplnx update auto pHistogramSuffix = filterArgs.value(k_HistoName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -121,7 +121,7 @@ IFilter::PreflightResult CalculateArrayHistogramFilter::preflightImpl(const Data { childPath = pDataGroupNameValue.createChildPath((dataArray->getName() + pHistogramSuffix)); } - auto createArrayAction = std::make_unique(complex::DataType::float64, std::vector{static_cast(pNumberOfBinsValue)}, std::vector{2}, childPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float64, std::vector{static_cast(pNumberOfBinsValue)}, std::vector{2}, childPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -201,4 +201,4 @@ Result CalculateArrayHistogramFilter::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateArrayHistogramFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateArrayHistogramFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp index abd3cbd9c5..83d06ff868 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateArrayHistogramFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CalculateArrayHistogram * @brief This filter calculate the frequency histogram of a data structure */ -class COMPLEXCORE_EXPORT CalculateArrayHistogramFilter : public IFilter +class SIMPLNXCORE_EXPORT CalculateArrayHistogramFilter : public IFilter { public: CalculateArrayHistogramFilter() = default; @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT CalculateArrayHistogramFilter : public IFilter static inline constexpr StringLiteral k_HistoName_Key = "histogram_suffix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,6 +105,6 @@ class COMPLEXCORE_EXPORT CalculateArrayHistogramFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CalculateArrayHistogramFilter, "c6b6d9e5-301d-4767-abf7-530f5ef5007d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CalculateArrayHistogramFilter, "c6b6d9e5-301d-4767-abf7-530f5ef5007d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateFeatureSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateFeatureSizesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp index 75103e9950..2e8151b5f6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateFeatureSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp @@ -1,29 +1,29 @@ #include "CalculateFeatureSizesFilter.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { -constexpr complex::int32 k_MissingGeometry = -73225; -constexpr complex::int32 k_MissingFeatureIds = -74789; -constexpr complex::int32 k_MissingFeatureAttributeMatrix = -74769; -constexpr complex::int32 k_BadFeatureCount = -78231; -constexpr complex::float32 k_PI = numbers::pi_v; +constexpr nx::core::int32 k_MissingGeometry = -73225; +constexpr nx::core::int32 k_MissingFeatureIds = -74789; +constexpr nx::core::int32 k_MissingFeatureAttributeMatrix = -74769; +constexpr nx::core::int32 k_BadFeatureCount = -78231; +constexpr nx::core::float32 k_PI = numbers::pi_v; } // namespace std::string CalculateFeatureSizesFilter::name() const @@ -325,4 +325,4 @@ Result CalculateFeatureSizesFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateFeatureSizesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateFeatureSizesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp index 188784a4c6..62c59fd399 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateFeatureSizesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CalculateFeatureSizesFilter * @brief */ -class COMPLEXCORE_EXPORT CalculateFeatureSizesFilter : public IFilter +class SIMPLNXCORE_EXPORT CalculateFeatureSizesFilter : public IFilter { public: CalculateFeatureSizesFilter() = default; @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT CalculateFeatureSizesFilter : public IFilter static inline constexpr StringLiteral k_NumElementsPath_Key = "num_elements_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class COMPLEXCORE_EXPORT CalculateFeatureSizesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CalculateFeatureSizesFilter, "c666ee17-ca58-4969-80d0-819986c72485"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CalculateFeatureSizesFilter, "c666ee17-ca58-4969-80d0-819986c72485"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateTriangleAreasFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateTriangleAreasFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp index 09c765b9c5..e44b14f6e6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateTriangleAreasFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp @@ -1,23 +1,23 @@ #include "CalculateTriangleAreasFilter.hpp" -#include "complex/Common/Range.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { -constexpr complex::int32 k_MissingFeatureAttributeMatrix = -75769; +constexpr nx::core::int32 k_MissingFeatureAttributeMatrix = -75769; /** * @brief The CalculateAreasImpl class implements a threaded algorithm that computes the area of each @@ -67,7 +67,7 @@ class CalculateAreasImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CalculateTriangleAreasFilter::name() const @@ -129,7 +129,7 @@ IFilter::PreflightResult CalculateTriangleAreasFilter::preflightImpl(const DataS std::vector preflightUpdatedValues; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // The parameter will have validated that the Triangle Geometry exists and is the correct type const TriangleGeom* triangleGeom = dataStructure.getDataAs(pTriangleGeometryDataPath); @@ -145,7 +145,7 @@ IFilter::PreflightResult CalculateTriangleAreasFilter::preflightImpl(const DataS { DataPath createArrayDataPath = pTriangleGeometryDataPath.createChildPath(faceAttributeMatrix->getName()).createChildPath(pCalculatedAreasName); // Create the face areas DataArray Action and store it into the resultOutputActions - auto createArrayAction = std::make_unique(complex::DataType::float64, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{1}, createArrayDataPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float64, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{1}, createArrayDataPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -197,4 +197,4 @@ Result CalculateTriangleAreasFilter::FromSIMPLJson(const nlohmann::js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateTriangleAreasFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateTriangleAreasFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp index cd9d5cad99..17a9f3bc0e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CalculateTriangleAreasFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CalculateTriangleAreasFilter * @brief This filter will compute the area for each triangle within a TriangleGeometry */ -class COMPLEXCORE_EXPORT CalculateTriangleAreasFilter : public IFilter +class SIMPLNXCORE_EXPORT CalculateTriangleAreasFilter : public IFilter { public: CalculateTriangleAreasFilter() = default; @@ -28,7 +28,7 @@ class COMPLEXCORE_EXPORT CalculateTriangleAreasFilter : public IFilter static inline constexpr StringLiteral k_CalculatedAreasDataPath_Key = "triangle_areas_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT CalculateTriangleAreasFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CalculateTriangleAreasFilter, "b149addd-c0c8-4010-a264-596005eaf2a5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CalculateTriangleAreasFilter, "b149addd-c0c8-4010-a264-596005eaf2a5"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ChangeAngleRepresentation.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ChangeAngleRepresentation.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.cpp index 250b4c199b..fe1cd0087a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ChangeAngleRepresentation.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.cpp @@ -1,19 +1,19 @@ #include "ChangeAngleRepresentation.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -53,7 +53,7 @@ class ChangeAngleRepresentationImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ChangeAngleRepresentation::name() const @@ -134,11 +134,11 @@ Result<> ChangeAngleRepresentation::executeImpl(DataStructure& dataStructure, co float conversionFactor = 1.0f; if(pConversionTypeValue == EulerAngleConversionType::DegreesToRadians) { - conversionFactor = static_cast(complex::numbers::pi / 180.0f); + conversionFactor = static_cast(nx::core::numbers::pi / 180.0f); } else if(pConversionTypeValue == EulerAngleConversionType::RadiansToDegrees) { - conversionFactor = static_cast(180.0f / complex::numbers::pi); + conversionFactor = static_cast(180.0f / nx::core::numbers::pi); } // Parallel algorithm to find duplicate nodes @@ -148,7 +148,7 @@ Result<> ChangeAngleRepresentation::executeImpl(DataStructure& dataStructure, co return {}; } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ChangeAngleRepresentation.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ChangeAngleRepresentation.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp index 681a535d44..846a1207b2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ChangeAngleRepresentation.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentation.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ChangeAngleRepresentation * @brief This filter will convert angles from Degrees to Radians or vice-versa */ -class COMPLEXCORE_EXPORT ChangeAngleRepresentation : public IFilter +class SIMPLNXCORE_EXPORT ChangeAngleRepresentation : public IFilter { public: ChangeAngleRepresentation() = default; @@ -28,7 +28,7 @@ class COMPLEXCORE_EXPORT ChangeAngleRepresentation : public IFilter static inline constexpr StringLiteral k_AnglesArrayPath_Key = "angles_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT ChangeAngleRepresentation : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ChangeAngleRepresentation, "565e06e2-6fd0-4232-89c4-ee672926d565"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ChangeAngleRepresentation, "565e06e2-6fd0-4232-89c4-ee672926d565"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineAttributeArraysFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineAttributeArraysFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp index a0002182c6..b3975b234b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineAttributeArraysFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp @@ -1,21 +1,21 @@ #include "CombineAttributeArraysFilter.hpp" -#include "ComplexCore/Filters/Algorithms/CombineAttributeArrays.hpp" +#include "SimplnxCore/Filters/Algorithms/CombineAttributeArrays.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CombineAttributeArraysFilter::name() const @@ -90,7 +90,7 @@ IFilter::PreflightResult CombineAttributeArraysFilter::preflightImpl(const DataS PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -99,12 +99,12 @@ IFilter::PreflightResult CombineAttributeArraysFilter::preflightImpl(const DataS return {MakeErrorResult(-66005, "Please select arrays to combine")}; } - bool result = complex::CheckArraysAreSameType(dataStructure, selectedDataArrayPathsValue); + bool result = nx::core::CheckArraysAreSameType(dataStructure, selectedDataArrayPathsValue); if(!result) { return {MakeErrorResult(-66006, "All selected arrays must be of the same type")}; } - result = complex::CheckArraysHaveSameTupleCount(dataStructure, selectedDataArrayPathsValue); + result = nx::core::CheckArraysHaveSameTupleCount(dataStructure, selectedDataArrayPathsValue); if(!result) { return {MakeErrorResult(-66007, "All selected arrays must have the same number of tuples")}; @@ -155,7 +155,7 @@ Result<> CombineAttributeArraysFilter::executeImpl(DataStructure& dataStructure, return CombineAttributeArrays(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineAttributeArraysFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineAttributeArraysFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp index 55108cc87d..e0df493f9d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineAttributeArraysFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CombineAttributeArraysFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT CombineAttributeArraysFilter : public IFilter +class SIMPLNXCORE_EXPORT CombineAttributeArraysFilter : public IFilter { public: CombineAttributeArraysFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT CombineAttributeArraysFilter : public IFilter static inline constexpr StringLiteral k_StackedDataArrayName_Key = "stacked_data_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class COMPLEXCORE_EXPORT CombineAttributeArraysFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CombineAttributeArraysFilter, "2436b614-e96d-47f0-9f6f-41d6fe97acd4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CombineAttributeArraysFilter, "2436b614-e96d-47f0-9f6f-41d6fe97acd4"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineStlFilesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineStlFilesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp index eb26c3b435..99dc52fe85 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineStlFilesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp @@ -1,24 +1,24 @@ #include "CombineStlFilesFilter.hpp" -#include "ComplexCore/Filters/Algorithms/CombineStlFiles.hpp" +#include "SimplnxCore/Filters/Algorithms/CombineStlFiles.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CombineStlFilesFilter::name() const @@ -91,7 +91,7 @@ IFilter::PreflightResult CombineStlFilesFilter::preflightImpl(const DataStructur auto pVertexAttributeMatrixNameValue = filterArgs.value(k_VertexAttributeMatrixName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector stlFiles; @@ -112,7 +112,7 @@ IFilter::PreflightResult CombineStlFilesFilter::preflightImpl(const DataStructur auto faceNormalsPath = createTriangleGeometryAction->getFaceDataPath().createChildPath(pFaceNormalsArrayNameValue); resultOutputActions.value().appendAction(std::move(createTriangleGeometryAction)); - auto createArrayAction = std::make_unique(complex::DataType::float64, std::vector{1}, std::vector{3}, faceNormalsPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float64, std::vector{1}, std::vector{3}, faceNormalsPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -158,4 +158,4 @@ Result CombineStlFilesFilter::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineStlFilesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineStlFilesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp index 5fc1d54724..331e6e6168 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CombineStlFilesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CombineStlFilesFilter * @brief This filter will combine all of the STL files from a given directory into a single triangle geometry */ -class COMPLEXCORE_EXPORT CombineStlFilesFilter : public IFilter +class SIMPLNXCORE_EXPORT CombineStlFilesFilter : public IFilter { public: CombineStlFilesFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT CombineStlFilesFilter : public IFilter static inline constexpr StringLiteral k_VertexAttributeMatrixName_Key = "vertex_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT CombineStlFilesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CombineStlFilesFilter, "76b56f80-fcbe-4d48-a34d-a73d0fc6e5ae"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CombineStlFilesFilter, "76b56f80-fcbe-4d48-a34d-a73d0fc6e5ae"); /* LEGACY UUID FOR THIS FILTER 71d46128-1d2d-58fd-9924-1714695768c3 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeFeatureRectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeFeatureRectFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp index 80b74cfb54..3c2edc399c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeFeatureRectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp @@ -1,19 +1,19 @@ #include "ComputeFeatureRectFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ComputeFeatureRect.hpp" +#include "SimplnxCore/Filters/Algorithms/ComputeFeatureRect.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ComputeFeatureRectFilter::name() const @@ -52,7 +52,7 @@ Parameters ComputeFeatureRectFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Data Objects"}); params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{{"FeatureIds"}}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_FeatureDataAttributeMatrixPath_Key, "Feature Data Attribute Matrix", "The path to the feature data attribute matrix associated with the input feature ids array", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); @@ -96,7 +96,7 @@ IFilter::PreflightResult ComputeFeatureRectFilter::preflightImpl(const DataStruc } } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; auto createArrayAction = std::make_unique(DataType::uint32, tDims, std::vector{6}, featureRectArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); @@ -142,4 +142,4 @@ Result ComputeFeatureRectFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeFeatureRectFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeFeatureRectFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp index dde535b2ec..92aff32df1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeFeatureRectFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ComputeFeatureRectFilter @@ -13,7 +13,7 @@ namespace complex * This data can be important for finding the smallest encompassing volume. The values are given in pixel * coordinates. */ -class COMPLEXCORE_EXPORT ComputeFeatureRectFilter : public IFilter +class SIMPLNXCORE_EXPORT ComputeFeatureRectFilter : public IFilter { public: ComputeFeatureRectFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT ComputeFeatureRectFilter : public IFilter static inline constexpr StringLiteral k_FeatureDataAttributeMatrixPath_Key = "feature_data_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT ComputeFeatureRectFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ComputeFeatureRectFilter, "bf947c45-8610-44c9-917a-405e88f73fe7"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ComputeFeatureRectFilter, "bf947c45-8610-44c9-917a-405e88f73fe7"); /* LEGACY UUID FOR THIS FILTER 6eda8dbf-dbd8-562a-ae1a-f2904157c189 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeMomentInvariants2DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeMomentInvariants2DFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp index 19aa0bdc9c..247184edfc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeMomentInvariants2DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp @@ -1,23 +1,23 @@ #include "ComputeMomentInvariants2DFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp" +#include "SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ComputeMomentInvariants2DFilter::name() const @@ -97,7 +97,7 @@ IFilter::PreflightResult ComputeMomentInvariants2DFilter::preflightImpl(const Da const DataPath omega2Path = pFeatureAttributeMatrixPathValue.createChildPath(pOmega2ArrayNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto& imageGeometry = dataStructure.getDataRefAs(pGeometryPathValue); @@ -190,4 +190,4 @@ Result ComputeMomentInvariants2DFilter::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeMomentInvariants2DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeMomentInvariants2DFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp index 8afca644d5..3aed8c1d40 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ComputeMomentInvariants2DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ComputeMomentInvariants2DFilter * @brief This filter computes the 2D Omega-1 and Omega 2 values from the Central Moments matrix and optionally will normalize the values to a unit circle and also optionally save the Central Moments * matrix as a DataArray to the Cell Feature Attribute Matrix. */ -class COMPLEXCORE_EXPORT ComputeMomentInvariants2DFilter : public IFilter +class SIMPLNXCORE_EXPORT ComputeMomentInvariants2DFilter : public IFilter { public: ComputeMomentInvariants2DFilter() = default; @@ -36,7 +36,7 @@ class COMPLEXCORE_EXPORT ComputeMomentInvariants2DFilter : public IFilter static inline constexpr StringLiteral k_CentralMomentsArrayPath_Key = "central_moments_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,7 +106,7 @@ class COMPLEXCORE_EXPORT ComputeMomentInvariants2DFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ComputeMomentInvariants2DFilter, "650aa454-130c-406e-a9df-80b99f89e03c"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ComputeMomentInvariants2DFilter, "650aa454-130c-406e-a9df-80b99f89e03c"); /* LEGACY UUID FOR THIS FILTER 27a132b2-a592-519a-8cb7-38599a7f28ec */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConditionalSetValue.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValue.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ConditionalSetValue.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValue.cpp index 297ee1e0f6..ee8d725308 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConditionalSetValue.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValue.cpp @@ -1,19 +1,19 @@ #include "ConditionalSetValue.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -57,7 +57,7 @@ struct ReplaceValueInArrayFunctor }; } // namespace -namespace complex +namespace nx::core { std::string ConditionalSetValue::name() const @@ -102,7 +102,7 @@ Parameters ConditionalSetValue::parameters() const params.insertSeparator(Parameters::Separator{"Required Input Data"}); params.insert( - std::make_unique(k_SelectedArrayPath_Key, "Attribute Array", "The complete path to array that will have values replaced", DataPath{}, complex::GetAllDataTypes())); + std::make_unique(k_SelectedArrayPath_Key, "Attribute Array", "The complete path to array that will have values replaced", DataPath{}, nx::core::GetAllDataTypes())); params.linkParameters(k_UseConditional_Key, k_RemoveValue_Key, false); params.linkParameters(k_UseConditional_Key, k_ConditionalArrayPath_Key, true); @@ -142,7 +142,7 @@ IFilter::PreflightResult ConditionalSetValue::preflightImpl(const DataStructure& // Validate that the Conditional Array is of the correct type const IDataArray* dataObject = dataStructure.getDataAs(pConditionalPath); - if(dataObject->getDataType() != complex::DataType::boolean && dataObject->getDataType() != complex::DataType::uint8 && dataObject->getDataType() != complex::DataType::int8) + if(dataObject->getDataType() != nx::core::DataType::boolean && dataObject->getDataType() != nx::core::DataType::uint8 && dataObject->getDataType() != nx::core::DataType::int8) { return {MakeErrorResult( ::k_IncorrectInputArrayType, fmt::format("Conditional Array must be of type [Bool|UInt8|Int8]. The object at path '{}' is '{}'", pConditionalPath.toString(), dataObject->getTypeName()))}; @@ -231,4 +231,4 @@ Result ConditionalSetValue::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConditionalSetValue.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValue.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ConditionalSetValue.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValue.hpp index 97621a50b4..56a1815cf8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConditionalSetValue.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValue.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ConditionalSetValue * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ConditionalSetValue : public IFilter +class SIMPLNXCORE_EXPORT ConditionalSetValue : public IFilter { public: ConditionalSetValue() = default; @@ -33,7 +33,7 @@ class COMPLEXCORE_EXPORT ConditionalSetValue : public IFilter static inline constexpr StringLiteral k_InvertMask_Key = "invert_mask"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,6 +105,6 @@ class COMPLEXCORE_EXPORT ConditionalSetValue : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ConditionalSetValue, "bad9b7bd-1dc9-4f21-a889-6520e7a41881"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ConditionalSetValue, "bad9b7bd-1dc9-4f21-a889-6520e7a41881"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertColorToGrayScaleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertColorToGrayScaleFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp index 324bc8fb68..b91fc16454 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertColorToGrayScaleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp @@ -1,24 +1,24 @@ #include "ConvertColorToGrayScaleFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.hpp" +#include "SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ConvertColorToGrayScaleFilter::name() const @@ -94,7 +94,7 @@ IFilter::PreflightResult ConvertColorToGrayScaleFilter::preflightImpl(const Data PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -142,7 +142,7 @@ IFilter::PreflightResult ConvertColorToGrayScaleFilter::preflightImpl(const Data inputPathVector.back() = outputArrayName; outputDataArrayPath = DataPath(inputPathVector); resultOutputActions.value().appendAction( - std::make_unique(complex::DataType::uint8, inputArray->getIDataStoreRef().getTupleShape(), std::vector(1, 1), outputDataArrayPath)); + std::make_unique(nx::core::DataType::uint8, inputArray->getIDataStoreRef().getTupleShape(), std::vector(1, 1), outputDataArrayPath)); } // Return both the resultOutputActions and the preflightUpdatedValues via std::move() @@ -174,7 +174,7 @@ Result<> ConvertColorToGrayScaleFilter::executeImpl(DataStructure& dataStructure return ConvertColorToGrayScale(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertColorToGrayScaleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertColorToGrayScaleFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp index aa249923a0..779c677273 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertColorToGrayScaleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ConvertColorToGrayScaleFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter +class SIMPLNXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter { public: ConvertColorToGrayScaleFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter static inline constexpr StringLiteral k_OutputArrayPrefix_Key = "output_array_prefix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT ConvertColorToGrayScaleFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ConvertColorToGrayScaleFilter, "d938a2aa-fee2-4db9-aa2f-2c34a9736580"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ConvertColorToGrayScaleFilter, "d938a2aa-fee2-4db9-aa2f-2c34a9736580"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertDataFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp index fb96e43021..392695b5b3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp @@ -1,23 +1,23 @@ #include "ConvertDataFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ConvertData.hpp" +#include "SimplnxCore/Filters/Algorithms/ConvertData.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ConvertDataFilter::name() const @@ -85,7 +85,7 @@ IFilter::PreflightResult ConvertDataFilter::preflightImpl(const DataStructure& d DataType const pScalarType = StringToDataType(GetAllDataTypesAsStrings()[pScalarTypeIndex]); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; auto* inputArrayPtr = dataStructure.getDataAs(pInputArrayPath); if(inputArrayPtr == nullptr) @@ -166,4 +166,4 @@ Result ConvertDataFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertDataFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp index 67ec68e10a..859b966f41 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ConvertDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ConvertDataFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ConvertDataFilter : public IFilter +class SIMPLNXCORE_EXPORT ConvertDataFilter : public IFilter { public: ConvertDataFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT ConvertDataFilter : public IFilter static inline constexpr StringLiteral k_DeleteOriginal_Key = "delete_original_array"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class COMPLEXCORE_EXPORT ConvertDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ConvertDataFilter, "6dc586cc-59fb-4ee8-90ff-2d3587da12f5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ConvertDataFilter, "6dc586cc-59fb-4ee8-90ff-2d3587da12f5"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyDataObjectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyDataObjectFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp index 9e4b538f99..cf1f5fd366 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyDataObjectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp @@ -1,18 +1,18 @@ #include "CopyDataObjectFilter.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/Filter/Actions/CopyDataObjectAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/MultiPathSelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/Filter/Actions/CopyDataObjectAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/MultiPathSelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -100,7 +100,7 @@ IFilter::PreflightResult CopyDataObjectFilter::preflightImpl(const DataStructure { for(const auto& sourcePath : pathsToBeCopied.value()) { - std::string createdPathName = complex::StringUtilities::replace(sourcePath.toString(), dataArrayPath.getTargetName(), newTargetName); + std::string createdPathName = nx::core::StringUtilities::replace(sourcePath.toString(), dataArrayPath.getTargetName(), newTargetName); allCreatedPaths.push_back(DataPath::FromString(createdPathName).value()); } } @@ -158,4 +158,4 @@ Result CopyDataObjectFilter::FromSIMPLJson(const nlohmann::json& json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyDataObjectFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyDataObjectFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp index 1d1bc32dbc..71f04469a3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyDataObjectFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CopyDataObjectFilter : public IFilter +class SIMPLNXCORE_EXPORT CopyDataObjectFilter : public IFilter { public: CopyDataObjectFilter() = default; @@ -27,7 +27,7 @@ class COMPLEXCORE_EXPORT CopyDataObjectFilter : public IFilter static inline constexpr StringLiteral k_NewPathSuffix_Key = "new_path_suffix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -95,6 +95,6 @@ class COMPLEXCORE_EXPORT CopyDataObjectFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CopyDataObjectFilter, "ac8d51d8-9167-5628-a060-95a8863a76b1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CopyDataObjectFilter, "ac8d51d8-9167-5628-a060-95a8863a76b1"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyFeatureArrayToElementArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyFeatureArrayToElementArray.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.cpp index 2ddd05edbf..86e29849f3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyFeatureArrayToElementArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.cpp @@ -1,19 +1,19 @@ #include "CopyFeatureArrayToElementArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -70,7 +70,7 @@ class CopyFeatureArrayToElementArrayImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -112,7 +112,7 @@ Parameters CopyFeatureArrayToElementArray::parameters() const params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_SelectedFeatureArrayPath_Key, "Feature Data to Copy to Element Data", "The DataPath to the feature data that should be copied to the cell level", MultiArraySelectionParameter::ValueType{}, - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::Any}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::Any}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Input Cell Data Data"}); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, @@ -137,12 +137,12 @@ IFilter::PreflightResult CopyFeatureArrayToElementArray::preflightImpl(const Dat const auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); const auto createdArraySuffix = filterArgs.value(k_CreatedArraySuffix_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pSelectedFeatureArrayPathsValue.empty()) { - return MakePreflightErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, "You must select at least one feature data array to copy to an element data array."); + return MakePreflightErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, "You must select at least one feature data array to copy to an element data array."); } auto tupleValidityCheck = dataStructure.validateNumberOfTuples(pSelectedFeatureArrayPathsValue); @@ -222,4 +222,4 @@ Result CopyFeatureArrayToElementArray::FromSIMPLJson(const nlohmann:: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyFeatureArrayToElementArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyFeatureArrayToElementArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp index 6e20f54aef..0b2f40b4f6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CopyFeatureArrayToElementArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CopyFeatureArrayToElementArray @@ -14,7 +14,7 @@ namespace complex * so if the user wants to display a spatial map of a Feature level attribute, * this Filter will transfer that information down to the Element level. */ -class COMPLEXCORE_EXPORT CopyFeatureArrayToElementArray : public IFilter +class SIMPLNXCORE_EXPORT CopyFeatureArrayToElementArray : public IFilter { public: CopyFeatureArrayToElementArray() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT CopyFeatureArrayToElementArray : public IFilter static inline constexpr StringLiteral k_CreatedArraySuffix_Key = "created_array_suffix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,6 +102,6 @@ class COMPLEXCORE_EXPORT CopyFeatureArrayToElementArray : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CopyFeatureArrayToElementArray, "4c8c976a-993d-438b-bd8e-99f71114b9a1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CopyFeatureArrayToElementArray, "4c8c976a-993d-438b-bd8e-99f71114b9a1"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateAttributeMatrixFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateAttributeMatrixFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp index 9cdc24715d..3afbc7a10c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateAttributeMatrixFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp @@ -1,13 +1,13 @@ #include "CreateAttributeMatrixFilter.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" - -namespace complex +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" + +namespace nx::core { std::string CreateAttributeMatrixFilter::name() const { @@ -107,4 +107,4 @@ Result CreateAttributeMatrixFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateAttributeMatrixFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateAttributeMatrixFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp index b049b9b7ff..41e90ab924 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateAttributeMatrixFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Filter/Parameters.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Filter/Parameters.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CreateAttributeMatrixFilter : public IFilter +class SIMPLNXCORE_EXPORT CreateAttributeMatrixFilter : public IFilter { public: CreateAttributeMatrixFilter() = default; @@ -27,7 +27,7 @@ class COMPLEXCORE_EXPORT CreateAttributeMatrixFilter : public IFilter static inline constexpr StringLiteral k_TupleDims_Key = "tuple_dimensions"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT CreateAttributeMatrixFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateAttributeMatrixFilter, "a6a28355-ee69-4874-bcac-76ed427423ed"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateAttributeMatrixFilter, "a6a28355-ee69-4874-bcac-76ed427423ed"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp index 08f17ae15d..8928662852 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.cpp @@ -1,20 +1,20 @@ #include "CreateDataArray.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataStoreFormatParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataStoreFormatParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -31,7 +31,7 @@ void CreateAndInitArray(DataStructure& data, const DataPath& path, const std::st } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CreateDataArray::name() const @@ -113,7 +113,7 @@ IFilter::PreflightResult CreateDataArray::preflightImpl(const DataStructure& dat auto tableData = filterArgs.value(k_TupleDims_Key); auto dataFormat = filterArgs.value(k_DataFormat_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; if(initValue.empty()) { @@ -261,4 +261,4 @@ Result CreateDataArray::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp index 810988d43b..e45e7dc3ac 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArray.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CreateDataArray : public IFilter +class SIMPLNXCORE_EXPORT CreateDataArray : public IFilter { public: CreateDataArray() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT CreateDataArray : public IFilter static inline constexpr StringLiteral k_DataFormat_Key = "data_format"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,6 +99,6 @@ class COMPLEXCORE_EXPORT CreateDataArray : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateDataArray, "67041f9b-bdc6-4122-acc6-c9fe9280e90d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateDataArray, "67041f9b-bdc6-4122-acc6-c9fe9280e90d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataGroup.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroup.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataGroup.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroup.cpp index 1397a21788..9de5c15150 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataGroup.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroup.cpp @@ -1,12 +1,12 @@ #include "CreateDataGroup.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Filter/Actions/CreateDataGroupAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Filter/Actions/CreateDataGroupAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -namespace complex +namespace nx::core { std::string CreateDataGroup::name() const { @@ -86,4 +86,4 @@ Result CreateDataGroup::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataGroup.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroup.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataGroup.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroup.hpp index de488fee95..cd18da06d1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataGroup.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroup.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Filter/Parameters.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Filter/Parameters.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CreateDataGroup : public IFilter +class SIMPLNXCORE_EXPORT CreateDataGroup : public IFilter { public: CreateDataGroup() = default; @@ -26,7 +26,7 @@ class COMPLEXCORE_EXPORT CreateDataGroup : public IFilter static inline constexpr StringLiteral k_DataObjectPath = "data_object_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -97,6 +97,6 @@ class COMPLEXCORE_EXPORT CreateDataGroup : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateDataGroup, "e7d2f9b8-4131-4b28-a843-ea3c6950f101"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateDataGroup, "e7d2f9b8-4131-4b28-a843-ea3c6950f101"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateFeatureArrayFromElementArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArray.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateFeatureArrayFromElementArray.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArray.cpp index a611e8851c..b32afa3da7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateFeatureArrayFromElementArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArray.cpp @@ -1,19 +1,19 @@ #include "CreateFeatureArrayFromElementArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/DataObjectUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Utilities/DataObjectUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -77,7 +77,7 @@ struct CopyCellDataFunctor }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CreateFeatureArrayFromElementArray::name() const @@ -117,7 +117,7 @@ Parameters CreateFeatureArrayFromElementArray::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Element Data"}); params.insert( - std::make_unique(k_SelectedCellArrayPath_Key, "Element Data to Copy to Feature Data", "Element Data to Copy to Feature Data", DataPath{}, complex::GetAllDataTypes())); + std::make_unique(k_SelectedCellArrayPath_Key, "Element Data to Copy to Feature Data", "Element Data to Copy to Feature Data", DataPath{}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); @@ -148,7 +148,7 @@ IFilter::PreflightResult CreateFeatureArrayFromElementArray::preflightImpl(const const auto& selectedCellArray = dataStructure.getDataRefAs(pSelectedCellArrayPathValue); const IDataStore& selectedCellArrayStore = selectedCellArray.getIDataStoreRef(); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Get the target Attribute Matrix that the output array will be stored with @@ -223,4 +223,4 @@ Result CreateFeatureArrayFromElementArray::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateFeatureArrayFromElementArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArray.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateFeatureArrayFromElementArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArray.hpp index c3405d88d1..19a0485ee4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateFeatureArrayFromElementArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArray.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CreateFeatureArrayFromElementArray * @brief This filter will .... */ -class COMPLEXCORE_EXPORT CreateFeatureArrayFromElementArray : public IFilter +class SIMPLNXCORE_EXPORT CreateFeatureArrayFromElementArray : public IFilter { public: CreateFeatureArrayFromElementArray() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT CreateFeatureArrayFromElementArray : public IFilter static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class COMPLEXCORE_EXPORT CreateFeatureArrayFromElementArray : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateFeatureArrayFromElementArray, "50e1be47-b027-4f40-8f70-1283682ee3e7"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateFeatureArrayFromElementArray, "50e1be47-b027-4f40-8f70-1283682ee3e7"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateGeometryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp index c50caaa92c..adcdf8e90f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp @@ -1,31 +1,31 @@ #include "CreateGeometryFilter.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/Actions/CreateGeometry1DAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Filter/Actions/CreateGeometry3DAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateRectGridGeometryAction.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataObjectUtilities.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/Actions/CreateGeometry1DAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry3DAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateRectGridGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataObjectUtilities.hpp" #include #include using namespace std::string_literals; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { namespace @@ -220,7 +220,7 @@ IFilter::PreflightResult CreateGeometryFilter::preflightImpl(const DataStructure auto pArrayHandling = filterArgs.value(k_ArrayHandling_Key); auto pMoveArrays = pArrayHandling == k_MoveArray; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // collect arguments common to multiple geometry types all at once @@ -479,4 +479,4 @@ Result<> CreateGeometryFilter::executeImpl(DataStructure& data, const Arguments& } return warningResults; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateGeometryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp index 3c753ea0e9..c6347fe0a2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CreateGeometryFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT CreateGeometryFilter : public IFilter +class SIMPLNXCORE_EXPORT CreateGeometryFilter : public IFilter { public: CreateGeometryFilter() = default; @@ -134,6 +134,6 @@ class COMPLEXCORE_EXPORT CreateGeometryFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateGeometryFilter, "24768170-5b90-4a9d-82ac-9aeecd9f892e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateGeometryFilter, "24768170-5b90-4a9d-82ac-9aeecd9f892e"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateImageGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateImageGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.cpp index bea68b4b44..c87fad533b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateImageGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.cpp @@ -1,23 +1,23 @@ #include "CreateImageGeometry.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include using namespace std::string_literals; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string CreateImageGeometry::name() const @@ -114,7 +114,7 @@ IFilter::PreflightResult CreateImageGeometry::preflightImpl(const DataStructure& pImageGeometryPath, CreateImageGeometryAction::DimensionType({pDimensionsValue[0], pDimensionsValue[1], pDimensionsValue[2]}), pOriginValue, pSpacingValue, cellDataName); // Assign the createImageGeometryAction to the Result::actions vector via a push_back - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; resultOutputActions.value().appendAction(std::move(createImageGeometryAction)); IFilter::PreflightResult preflightResult; @@ -143,7 +143,7 @@ Result<> CreateImageGeometry::executeImpl(DataStructure& data, const Arguments& ***************************************************************************/ return {}; } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateImageGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateImageGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp index 34c4bffe9f..1892f826a6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateImageGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometry.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class CreateImageGeometry * @brief This filter will .... */ -class COMPLEXCORE_EXPORT CreateImageGeometry : public IFilter +class SIMPLNXCORE_EXPORT CreateImageGeometry : public IFilter { public: CreateImageGeometry() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT CreateImageGeometry : public IFilter static inline constexpr StringLiteral k_CellDataName_Key = "cell_data_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT CreateImageGeometry : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateImageGeometry, "c4320659-1a84-461d-939e-c7c10229a504"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateImageGeometry, "c4320659-1a84-461d-939e-c7c10229a504"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropImageGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CropImageGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp index d5bb035021..f4c66b1e8c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropImageGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp @@ -1,34 +1,34 @@ #include "CropImageGeometry.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Actions/CopyDataObjectAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Actions/RenameDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" -#include "complex/Utilities/SamplingUtils.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" - -#include "complex/Utilities/StringUtilities.hpp" - -using namespace complex; +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Actions/CopyDataObjectAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Actions/RenameDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Utilities/SamplingUtils.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" + +#include "simplnx/Utilities/StringUtilities.hpp" + +using namespace nx::core; namespace { @@ -212,7 +212,7 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d auto zMax = maxVoxels[2]; auto zMin = minVoxels[2]; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -328,11 +328,11 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d } // Store the preflight updated value(s) into the preflightUpdatedValues vector using the appropriate methods. - preflightUpdatedValues.push_back({"Input Geometry Info", complex::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), - srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); + preflightUpdatedValues.push_back({"Input Geometry Info", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), + srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); preflightUpdatedValues.push_back( {"Cropped Image Geometry Info", - complex::GeometryHelpers::Description::GenerateGeometryInfo(geomDims, CreateImageGeometryAction::SpacingType{spacing[0], spacing[1], spacing[2]}, targetOrigin, srcImageGeom->getUnits())}); + nx::core::GeometryHelpers::Description::GenerateGeometryInfo(geomDims, CreateImageGeometryAction::SpacingType{spacing[0], spacing[1], spacing[2]}, targetOrigin, srcImageGeom->getUnits())}); } // This section covers the option of renumbering the Feature Data where we need to do a // similar creation of the Data Arrays based on the arrays in the Source Image Geometry's @@ -379,7 +379,7 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d { for(const auto& childPath : childPaths.value()) { - std::string copiedChildName = complex::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + std::string copiedChildName = nx::core::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); DataPath copiedChildPath = DataPath::FromString(copiedChildName).value(); if(dataStructure.getDataAs(childPath) != nullptr) { @@ -389,7 +389,7 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d { for(const auto& sourcePath : pathsToBeCopied.value()) { - std::string createdPathName = complex::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + std::string createdPathName = nx::core::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); allCreatedPaths.push_back(DataPath::FromString(createdPathName).value()); } } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropImageGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CropImageGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp index f2f5f46908..93d6eff946 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropImageGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CropImageGeometry : public IFilter +class SIMPLNXCORE_EXPORT CropImageGeometry : public IFilter { public: CropImageGeometry() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT CropImageGeometry : public IFilter static inline constexpr StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class COMPLEXCORE_EXPORT CropImageGeometry : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CropImageGeometry, "e6476737-4aa7-48ba-a702-3dfab82c96e2"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CropImageGeometry, "e6476737-4aa7-48ba-a702-3dfab82c96e2"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropVertexGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CropVertexGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp index d5e5336611..ee2855c0cb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropVertexGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.cpp @@ -1,20 +1,20 @@ #include "CropVertexGeometry.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -namespace complex +namespace nx::core { namespace { @@ -86,7 +86,7 @@ Parameters CropVertexGeometry::parameters() const params.insert(std::make_unique(k_MinPos_Key, "Min Pos", "Minimum vertex position", std::vector{0, 0, 0}, std::vector{"X", "Y", "Z"})); params.insert(std::make_unique(k_MaxPos_Key, "Max Pos", "Maximum vertex position", std::vector{0, 0, 0}, std::vector{"X", "Y", "Z"})); params.insert(std::make_unique(k_TargetArrayPaths_Key, "Vertex Data Arrays to crop", "The complete path to all the vertex data arrays to crop", std::vector(), - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); return params; } @@ -270,4 +270,4 @@ Result CropVertexGeometry::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropVertexGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/CropVertexGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp index 803b7c59a0..aee15add58 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CropVertexGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometry.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CropVertexGeometry : public IFilter +class SIMPLNXCORE_EXPORT CropVertexGeometry : public IFilter { public: CropVertexGeometry() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT CropVertexGeometry : public IFilter static inline constexpr StringLiteral k_VertexDataName_Key = "vertex_data_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT CropVertexGeometry : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CropVertexGeometry, "8b16452f-f75e-4918-9460-d3914fdc0d08"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CropVertexGeometry, "8b16452f-f75e-4918-9460-d3914fdc0d08"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/DeleteData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteData.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/DeleteData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteData.cpp index 85790b3532..5fd0546052 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/DeleteData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteData.cpp @@ -1,13 +1,13 @@ #include "DeleteData.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/MultiPathSelectionParameter.hpp" +#include "simplnx/Parameters/MultiPathSelectionParameter.hpp" /**The commented out code in this filter and the header is set up to offer deeper control * of the dataStructure. The current state of the dataStructure abstracts the underlying data graph @@ -17,7 +17,7 @@ * well. */ -namespace complex +namespace nx::core { namespace { @@ -218,4 +218,4 @@ Result DeleteData::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/DeleteData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteData.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/DeleteData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteData.hpp index 5609f8c2d6..6f59a4d886 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/DeleteData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteData.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT DeleteData : public IFilter +class SIMPLNXCORE_EXPORT DeleteData : public IFilter { public: DeleteData() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT DeleteData : public IFilter // static inline constexpr StringLiteral k_DeletionType_Key = "deletion_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,6 +102,6 @@ class COMPLEXCORE_EXPORT DeleteData : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, DeleteData, "bf286740-e987-49fe-a7c8-6e566e3a0606"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, DeleteData, "bf286740-e987-49fe-a7c8-6e566e3a0606"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp index 2cfbe56f89..2e6b793d13 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp @@ -1,24 +1,24 @@ #include "ErodeDilateBadDataFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ErodeDilateBadData.hpp" +#include "SimplnxCore/Filters/Algorithms/ErodeDilateBadData.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -98,7 +98,7 @@ IFilter::PreflightResult ErodeDilateBadDataFilter::preflightImpl(const DataStruc PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -109,7 +109,7 @@ IFilter::PreflightResult ErodeDilateBadDataFilter::preflightImpl(const DataStruc // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pFeatureIdsArrayPathValue.getParent(), pIgnoredDataArrayPathsValue); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pFeatureIdsArrayPathValue.getParent(), pIgnoredDataArrayPathsValue); // Return both the resultOutputActions and the preflightUpdatedValues via std::move() return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -166,4 +166,4 @@ Result ErodeDilateBadDataFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp index 56ac09b272..044e32bae3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ErodeDilateBadDataFilter @@ -13,7 +13,7 @@ namespace complex * copying neighbor data into the voxel with featureId = 0. See the Markdown for * a more comprehensive explanation */ -class COMPLEXCORE_EXPORT ErodeDilateBadDataFilter : public IFilter +class SIMPLNXCORE_EXPORT ErodeDilateBadDataFilter : public IFilter { public: ErodeDilateBadDataFilter() = default; @@ -36,7 +36,7 @@ class COMPLEXCORE_EXPORT ErodeDilateBadDataFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,6 +106,6 @@ class COMPLEXCORE_EXPORT ErodeDilateBadDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ErodeDilateBadDataFilter, "7f2f7378-580e-4337-8c04-a29e7883db0b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ErodeDilateBadDataFilter, "7f2f7378-580e-4337-8c04-a29e7883db0b"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp index 09dded154e..1883cdfc14 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp @@ -1,21 +1,21 @@ #include "ErodeDilateCoordinationNumberFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp" +#include "SimplnxCore/Filters/Algorithms/ErodeDilateCoordinationNumber.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ErodeDilateCoordinationNumberFilter::name() const @@ -92,7 +92,7 @@ IFilter::PreflightResult ErodeDilateCoordinationNumberFilter::preflightImpl(cons PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -142,4 +142,4 @@ Result ErodeDilateCoordinationNumberFilter::FromSIMPLJson(const nlohm return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp index fb632771c3..0d4eb400fc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ErodeDilateCoordinationNumberFilter * @brief This **Filter** will smooth the interface between *good* and *bad* data. */ -class COMPLEXCORE_EXPORT ErodeDilateCoordinationNumberFilter : public IFilter +class SIMPLNXCORE_EXPORT ErodeDilateCoordinationNumberFilter : public IFilter { public: ErodeDilateCoordinationNumberFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT ErodeDilateCoordinationNumberFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT ErodeDilateCoordinationNumberFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ErodeDilateCoordinationNumberFilter, "e4553e82-ab82-49d7-993c-8b55b15c7724"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ErodeDilateCoordinationNumberFilter, "e4553e82-ab82-49d7-993c-8b55b15c7724"); /* LEGACY UUID FOR THIS FILTER d26e85ff-7e52-53ae-b095-b1d969c9e73c */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateMaskFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateMaskFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp index 497ee5d36b..d740e91fe6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateMaskFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp @@ -1,21 +1,21 @@ #include "ErodeDilateMaskFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ErodeDilateMask.hpp" +#include "SimplnxCore/Filters/Algorithms/ErodeDilateMask.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ErodeDilateMaskFilter::name() const @@ -89,7 +89,7 @@ IFilter::PreflightResult ErodeDilateMaskFilter::preflightImpl(const DataStructur PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -145,4 +145,4 @@ Result ErodeDilateMaskFilter::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateMaskFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateMaskFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp index ad36beaf08..e722fc16e5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ErodeDilateMaskFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ErodeDilateMaskFilter @@ -13,7 +13,7 @@ namespace complex * If the mask is _dilated_, the **Filter** grows the *true* regions by one **Cell** in an iterative sequence for a user defined number of iterations. */ -class COMPLEXCORE_EXPORT ErodeDilateMaskFilter : public IFilter +class SIMPLNXCORE_EXPORT ErodeDilateMaskFilter : public IFilter { public: ErodeDilateMaskFilter() = default; @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT ErodeDilateMaskFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,7 +105,7 @@ class COMPLEXCORE_EXPORT ErodeDilateMaskFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ErodeDilateMaskFilter, "cab66cd1-f64c-42b4-8f94-18f0835a967f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ErodeDilateMaskFilter, "cab66cd1-f64c-42b4-8f94-18f0835a967f"); /* LEGACY UUID FOR THIS FILTER 4fff1aa6-4f62-56c4-8ee9-8e28ec2fcbba */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExecuteProcessFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExecuteProcessFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp index a189d75554..6c63b12027 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExecuteProcessFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp @@ -1,20 +1,20 @@ #include "ExecuteProcessFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ExecuteProcess.hpp" +#include "SimplnxCore/Filters/Algorithms/ExecuteProcess.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ExecuteProcessFilter::name() const @@ -79,7 +79,7 @@ IFilter::PreflightResult ExecuteProcessFilter::preflightImpl(const DataStructure auto pTimeoutValue = filterArgs.value(k_Timeout_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector arguments = ExecuteProcess::splitArgumentsString(pArgumentsValue); @@ -129,4 +129,4 @@ Result ExecuteProcessFilter::FromSIMPLJson(const nlohmann::json& json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExecuteProcessFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExecuteProcessFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp index 41e6bba502..f221acff50 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExecuteProcessFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ExecuteProcessFilter * @brief This filter allows the user to execute any application, program, shell script or any other executable program on the computer system as an external process */ -class COMPLEXCORE_EXPORT ExecuteProcessFilter : public IFilter +class SIMPLNXCORE_EXPORT ExecuteProcessFilter : public IFilter { public: ExecuteProcessFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT ExecuteProcessFilter : public IFilter static inline constexpr StringLiteral k_OutputLogFile_Key = "output_log_file"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,7 +100,7 @@ class COMPLEXCORE_EXPORT ExecuteProcessFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ExecuteProcessFilter, "fb511a70-2175-4595-8c11-d1b5b6794221"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ExecuteProcessFilter, "fb511a70-2175-4595-8c11-d1b5b6794221"); /* LEGACY UUID FOR THIS FILTER 8a2308ec-86cd-5636-9a0a-6c7d383e9e7f */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractComponentAsArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractComponentAsArrayFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp index 6de43eb3fc..cd05555076 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractComponentAsArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp @@ -1,23 +1,23 @@ #include "ExtractComponentAsArrayFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ExtractComponentAsArray.hpp" +#include "SimplnxCore/Filters/Algorithms/ExtractComponentAsArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Actions/RenameDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Actions/RenameDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ExtractComponentAsArrayFilter::name() const @@ -63,7 +63,7 @@ Parameters ExtractComponentAsArrayFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Input DataArray"}); params.insert( - std::make_unique(k_SelectedArrayPath_Key, "Multicomponent Attribute Array", "The array to extract componenets from", DataPath{}, complex::GetAllNumericTypes())); + std::make_unique(k_SelectedArrayPath_Key, "Multicomponent Attribute Array", "The array to extract componenets from", DataPath{}, nx::core::GetAllNumericTypes())); params.insertSeparator(Parameters::Separator{"Created DataArray"}); params.insert(std::make_unique(k_NewArrayPath_Key, "Scalar Attribute Array", "The DataArray to store the extracted components", "Extracted Component")); @@ -91,7 +91,7 @@ IFilter::PreflightResult ExtractComponentAsArrayFilter::preflightImpl(const Data auto pNewArrayPathValue = pSelectedArrayPathValue.getParent().createChildPath(filterArgs.value(k_NewArrayPath_Key)); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto& selectedArray = dataStructure.getDataRefAs(pSelectedArrayPathValue); @@ -183,12 +183,12 @@ Result ExtractComponentAsArrayFilter::FromSIMPLJson(const nlohmann::j if(json.contains(SIMPL::k_ReducedArrayArrayNameKey.str())) { - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedArrayArrayNameKey, "@COMPLEX_PARAMETER_KEY@")); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SaveRemovedComponentKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReducedArrayArrayNameKey, "@SIMPLNX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SaveRemovedComponentKey, "@SIMPLNX_PARAMETER_KEY@")); } Result<> conversionResult = MergeResults(std::move(results)); return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractComponentAsArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractComponentAsArrayFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp index 0602d76bdc..cc658f27b8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractComponentAsArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ExtractComponentAsArrayFilter * @brief This filter will extract components of an array either to a new array or * delete it. */ -class COMPLEXCORE_EXPORT ExtractComponentAsArrayFilter : public IFilter +class SIMPLNXCORE_EXPORT ExtractComponentAsArrayFilter : public IFilter { public: ExtractComponentAsArrayFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT ExtractComponentAsArrayFilter : public IFilter static inline constexpr StringLiteral k_NewArrayPath_Key = "new_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class COMPLEXCORE_EXPORT ExtractComponentAsArrayFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ExtractComponentAsArrayFilter, "fcc1c1cc-c37a-40fc-97fa-ce40201d34e3"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ExtractComponentAsArrayFilter, "fcc1c1cc-c37a-40fc-97fa-ce40201d34e3"); /* LEGACY UUID FOR THIS FILTER 79d59b85-01e8-5c4a-a6e1-3fd3e2ceffb4 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp index d015277465..67c57151de 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.cpp @@ -1,24 +1,24 @@ #include "ExtractInternalSurfacesFromTriangleGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -91,7 +91,7 @@ struct RemoveFlaggedVerticesFunctor } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -420,4 +420,4 @@ Result ExtractInternalSurfacesFromTriangleGeometry::FromSIMPLJson(con return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp index 5d9e480bb8..a60743df47 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometry : public IFilter +class SIMPLNXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometry : public IFilter { public: ExtractInternalSurfacesFromTriangleGeometry() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometry : public IF static inline constexpr StringLiteral k_FaceDataName_Key = "face_data_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT ExtractInternalSurfacesFromTriangleGeometry : public IF Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ExtractInternalSurfacesFromTriangleGeometry, "e020f76f-a77f-4999-8bf1-9b7529f06d0a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ExtractInternalSurfacesFromTriangleGeometry, "e020f76f-a77f-4999-8bf1-9b7529f06d0a"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractVertexGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractVertexGeometryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp index 07da8cdf49..0df535b486 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractVertexGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp @@ -1,22 +1,22 @@ #include "ExtractVertexGeometryFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ExtractVertexGeometry.hpp" - -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Actions/MoveDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" - -using namespace complex; +#include "SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.hpp" + +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Actions/MoveDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" + +using namespace nx::core; namespace { @@ -29,7 +29,7 @@ inline constexpr int32 k_MissingInputArray = -72442; inline constexpr int32 k_MissingOrIncorrectGoodVoxelsArray = -72443; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ExtractVertexGeometryFilter::name() const @@ -81,7 +81,7 @@ Parameters ExtractVertexGeometryFilter::parameters() const params.insert(std::make_unique(k_IncludedDataArrayPaths_Key, "Included Attribute Arrays", "The arrays to copy/move to the vertex array", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Output Vertex Geometry"}); params.insert( @@ -116,7 +116,7 @@ IFilter::PreflightResult ExtractVertexGeometryFilter::preflightImpl(const DataSt auto pVertexAttrMatrixNameValue = filterArgs.value(k_VertexAttrMatrixName_Key); auto pSharedVertexListNameValue = filterArgs.value(k_SharedVertexListName_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; const ExtractVertexGeometry::ArrayHandlingType arrayHandlingType = static_cast(pArrayHandlingValue); @@ -133,7 +133,7 @@ IFilter::PreflightResult ExtractVertexGeometryFilter::preflightImpl(const DataSt // Validate the GoodVoxels/Mask Array combination if(pUseGoodVoxelsValue) { - const complex::IDataArray* goodVoxelsArray = dataStructure.getDataAs(pMaskArrayPathValue); + const nx::core::IDataArray* goodVoxelsArray = dataStructure.getDataAs(pMaskArrayPathValue); if(nullptr == goodVoxelsArray) { return {nonstd::make_unexpected(std::vector{Error{k_MissingOrIncorrectGoodVoxelsArray, fmt::format("Mask array is not located at path: '{}'", pMaskArrayPathValue.toString())}})}; @@ -210,4 +210,4 @@ Result<> ExtractVertexGeometryFilter::executeImpl(DataStructure& dataStructure, return ExtractVertexGeometry(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractVertexGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractVertexGeometryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp index 3db49d6dc0..74d383974e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExtractVertexGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ExtractVertexGeometryFilter @@ -13,7 +13,7 @@ namespace complex * geometry into a new VertexGeometry. The user is given the option to copy or move cell arrays * over to the newly created VertexGeometry. */ -class COMPLEXCORE_EXPORT ExtractVertexGeometryFilter : public IFilter +class SIMPLNXCORE_EXPORT ExtractVertexGeometryFilter : public IFilter { public: ExtractVertexGeometryFilter() = default; @@ -99,6 +99,6 @@ class COMPLEXCORE_EXPORT ExtractVertexGeometryFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ExtractVertexGeometryFilter, "621a71ca-124b-4471-ad1a-02f05ffba099"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ExtractVertexGeometryFilter, "621a71ca-124b-4471-ad1a-02f05ffba099"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureFaceCurvatureFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureFaceCurvatureFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp index d60eb6b2d7..ee74a730b6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureFaceCurvatureFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp @@ -1,25 +1,25 @@ #include "FeatureFaceCurvatureFilter.hpp" -#include "ComplexCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp" -#include "ComplexCore/Filters/Algorithms/FindNRingNeighbors.hpp" - -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" +#include "SimplnxCore/Filters/Algorithms/CalculateTriangleGroupCurvatures.hpp" +#include "SimplnxCore/Filters/Algorithms/FindNRingNeighbors.hpp" + +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" #include "fmt/format.h" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FeatureFaceCurvatureFilter::name() const @@ -152,7 +152,7 @@ IFilter::PreflightResult FeatureFaceCurvatureFilter::preflightImpl(const DataStr // auto* dataArray = dataStructure.getDataAs(triangles->getFaceAttributeMatrixDataPath()); IArray::ShapeType tupleShape = triangleMatrix->getShape(); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; { @@ -301,7 +301,7 @@ Result<> FeatureFaceCurvatureFilter::executeImpl(DataStructure& dataStructure, c * of tasks that equal the number of cores on the machine. We spend a lot of overhead spinning up new threads to do each * task. This takes much longer (3x longer) in some cases */ -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE std::shared_ptr g(new tbb::task_group); ss = fmt::format("Adding {} Feature Faces to the work queue....", maxFaceId); messageHandler(ss); @@ -320,7 +320,7 @@ Result<> FeatureFaceCurvatureFilter::executeImpl(DataStructure& dataStructure, c surfaceMeshWeingartenMatrixArray, triangleGeom, surfaceMeshFaceLabelsArray, surfaceMeshFaceNormalsArray, surfaceMeshTriangleCentroidsArray, messageHandler, shouldCancel); -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE { g->run(func); } @@ -333,7 +333,7 @@ Result<> FeatureFaceCurvatureFilter::executeImpl(DataStructure& dataStructure, c #endif } -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE ss = fmt::format("Waiting on computations to complete."); messageHandler(ss); g->wait(); // Wait for all the threads to complete before moving on. @@ -342,4 +342,4 @@ Result<> FeatureFaceCurvatureFilter::executeImpl(DataStructure& dataStructure, c // return FillBadData(dataStructure, messageHandler, shouldCancel, &inputValues)(); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureFaceCurvatureFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureFaceCurvatureFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp index 3618726b24..621b791a7b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureFaceCurvatureFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FeatureFaceCurvatureFilter * @brief This filter will replace data using data from surrounding voxels. See more * at the help file. */ -class COMPLEXCORE_EXPORT FeatureFaceCurvatureFilter : public IFilter +class SIMPLNXCORE_EXPORT FeatureFaceCurvatureFilter : public IFilter { public: using FaceIds_t = std::vector; @@ -113,6 +113,6 @@ class COMPLEXCORE_EXPORT FeatureFaceCurvatureFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FeatureFaceCurvatureFilter, "56165fa5-dd80-4f9e-9e13-1c516f65060f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FeatureFaceCurvatureFilter, "56165fa5-dd80-4f9e-9e13-1c516f65060f"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FillBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FillBadDataFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp index 5dd1acc213..85a52e8b5f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FillBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp @@ -1,22 +1,22 @@ #include "FillBadDataFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FillBadData.hpp" +#include "SimplnxCore/Filters/Algorithms/FillBadData.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FillBadDataFilter::name() const @@ -70,7 +70,7 @@ Parameters FillBadDataFilter::parameters() const params.insert(std::make_unique(k_IgnoredDataArrayPaths_Key, "Attribute Arrays to Ignore", "The list of arrays to ignore when performing the algorithm", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_StoreAsNewPhase_Key, k_CellPhasesArrayPath_Key, true); @@ -98,7 +98,7 @@ IFilter::PreflightResult FillBadDataFilter::preflightImpl(const DataStructure& d MakeErrorResult(-16500, fmt::format("Minimum Allowed Defect Size must be at least 1. Value given was {}", pMinAllowedDefectSizeValue)); } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -165,4 +165,4 @@ Result FillBadDataFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FillBadDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FillBadDataFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp index b761f2d5d1..ec43bb4afd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FillBadDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FillBadDataFilter * @brief This filter will replace data using data from surrounding voxels. See more * at the help file. */ -class COMPLEXCORE_EXPORT FillBadDataFilter : public IFilter +class SIMPLNXCORE_EXPORT FillBadDataFilter : public IFilter { public: FillBadDataFilter() = default; @@ -34,7 +34,7 @@ class COMPLEXCORE_EXPORT FillBadDataFilter : public IFilter static inline constexpr StringLiteral k_SelectedCellDataGroup_Key = "selected_cell_data_group"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,6 +105,6 @@ class COMPLEXCORE_EXPORT FillBadDataFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FillBadDataFilter, "a59eb864-9e6b-40bb-9292-e5281b0b4f3e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FillBadDataFilter, "a59eb864-9e6b-40bb-9292-e5281b0b4f3e"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindArrayStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindArrayStatisticsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp index 19581bedd1..3dae1dee7c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindArrayStatisticsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp @@ -1,25 +1,25 @@ #include "FindArrayStatisticsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindArrayStatistics.hpp" +#include "SimplnxCore/Filters/Algorithms/FindArrayStatistics.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/Math/StatisticsCalculations.hpp" +#include "simplnx/Utilities/Math/StatisticsCalculations.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -152,7 +152,7 @@ OutputActions CreateCompatibleArrays(const DataStructure& data, const Arguments& } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindArrayStatisticsFilter::name() const @@ -181,7 +181,7 @@ std::string FindArrayStatisticsFilter::humanName() const //------------------------------------------------------------------------------ std::vector FindArrayStatisticsFilter::defaultTags() const { - return {className(), "ComplexCore", "Statistics"}; + return {className(), "SimplnxCore", "Statistics"}; } //------------------------------------------------------------------------------ @@ -192,7 +192,7 @@ Parameters FindArrayStatisticsFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Required Input Data"}); params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Compute Statistics", "Input Attribute Array for which to compute statistics", DataPath{}, - complex::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); + nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert( std::make_unique(k_DestinationAttributeMatrix_Key, "Destination Attribute Matrix", "Attribute Matrix in which to store the computed statistics", DataPath{})); @@ -524,4 +524,4 @@ Result FindArrayStatisticsFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindArrayStatisticsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindArrayStatisticsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp index f1e1c6989c..ca8b9c112f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindArrayStatisticsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindArrayStatisticsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindArrayStatisticsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindArrayStatisticsFilter : public IFilter { public: FindArrayStatisticsFilter() = default; @@ -63,7 +63,7 @@ class COMPLEXCORE_EXPORT FindArrayStatisticsFilter : public IFilter static inline constexpr StringLiteral k_NumUniqueValues_Key = "number_unique_values"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -133,6 +133,6 @@ class COMPLEXCORE_EXPORT FindArrayStatisticsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindArrayStatisticsFilter, "645ecae2-cb30-4b53-8165-c9857dfa754f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindArrayStatisticsFilter, "645ecae2-cb30-4b53-8165-c9857dfa754f"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBiasedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBiasedFeaturesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp index ee06878bcf..ac13671e8f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBiasedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp @@ -1,21 +1,21 @@ #include "FindBiasedFeaturesFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindBiasedFeatures.hpp" +#include "SimplnxCore/Filters/Algorithms/FindBiasedFeatures.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindBiasedFeaturesFilter::name() const @@ -90,7 +90,7 @@ IFilter::PreflightResult FindBiasedFeaturesFilter::preflightImpl(const DataStruc auto pBiasedFeaturesArrayNameValue = filterArgs.value(k_BiasedFeaturesArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector cellFeatureArrayDataPaths = {pCentroidsArrayPathValue, pSurfaceFeaturesArrayPathValue}; @@ -156,4 +156,4 @@ Result FindBiasedFeaturesFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBiasedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBiasedFeaturesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp index f338f32872..e3d7845360 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBiasedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindBiasedFeaturesFilter * @brief This filter determines which Features are biased by the outer surfaces of the sample. */ -class COMPLEXCORE_EXPORT FindBiasedFeaturesFilter : public IFilter +class SIMPLNXCORE_EXPORT FindBiasedFeaturesFilter : public IFilter { public: FindBiasedFeaturesFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT FindBiasedFeaturesFilter : public IFilter static inline constexpr StringLiteral k_BiasedFeaturesArrayName_Key = "biased_features_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class COMPLEXCORE_EXPORT FindBiasedFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindBiasedFeaturesFilter, "d46f2fd7-dc68-4b57-bca3-693016512b2f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindBiasedFeaturesFilter, "d46f2fd7-dc68-4b57-bca3-693016512b2f"); /* LEGACY UUID FOR THIS FILTER 450c2f00-9ddf-56e1-b4c1-0e74e7ad2349 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryCellsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryCellsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp index 88964358da..c8f9dc8a23 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryCellsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp @@ -1,22 +1,22 @@ #include "FindBoundaryCellsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindBoundaryCells.hpp" +#include "SimplnxCore/Filters/Algorithms/FindBoundaryCells.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindBoundaryCellsFilter::name() const @@ -87,7 +87,7 @@ IFilter::PreflightResult FindBoundaryCellsFilter::preflightImpl(const DataStruct const DataPath boundaryCellsArrayPath = pFeatureIdsArrayPathValue.getParent().createChildPath(pBoundaryCellsArrayNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto& featureIds = dataStructure.getDataRefAs(pFeatureIdsArrayPathValue); @@ -149,4 +149,4 @@ Result FindBoundaryCellsFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryCellsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryCellsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp index 2d701fa5c9..5e008b2911 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryCellsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindBoundaryCellsFilter * @brief This filter will determine, for each Cell, the number of neighboring Cells that are owned by a different Feature. */ -class COMPLEXCORE_EXPORT FindBoundaryCellsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindBoundaryCellsFilter : public IFilter { public: FindBoundaryCellsFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT FindBoundaryCellsFilter : public IFilter static inline constexpr StringLiteral k_BoundaryCellsArrayName_Key = "boundary_cells_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT FindBoundaryCellsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindBoundaryCellsFilter, "a1dd1c29-9152-4648-836c-3b6967e32600"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindBoundaryCellsFilter, "a1dd1c29-9152-4648-836c-3b6967e32600"); /* LEGACY UUID FOR THIS FILTER 8a1106d4-c67f-5e09-a02a-b2e9b99d031e */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryElementFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryElementFractionsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp index 4df6dfbdc6..8ae1c51c86 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryElementFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp @@ -1,19 +1,19 @@ #include "FindBoundaryElementFractionsFilter.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindBoundaryElementFractionsFilter::name() const @@ -82,7 +82,7 @@ IFilter::PreflightResult FindBoundaryElementFractionsFilter::preflightImpl(const auto pBoundaryCellFractionsArrayPathValue = filterArgs.value(k_BoundaryCellFractionsArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector numTuples = dataStructure.getDataAs(pFeatureDataAMPathValue)->getShape(); @@ -152,4 +152,4 @@ Result FindBoundaryElementFractionsFilter::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryElementFractionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryElementFractionsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.hpp index 9ed63b0b51..77ce2cf625 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindBoundaryElementFractionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindBoundaryElementFractionsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindBoundaryElementFractionsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindBoundaryElementFractionsFilter : public IFilter { public: FindBoundaryElementFractionsFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT FindBoundaryElementFractionsFilter : public IFilter static inline constexpr StringLiteral k_BoundaryCellFractionsArrayName_Key = "boundary_cell_fractions_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,7 +100,7 @@ class COMPLEXCORE_EXPORT FindBoundaryElementFractionsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindBoundaryElementFractionsFilter, "f268dab6-9a31-498e-8502-338cd7a549b4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindBoundaryElementFractionsFilter, "f268dab6-9a31-498e-8502-338cd7a549b4"); /* LEGACY UUID FOR THIS FILTER 6357243e-41a6-52c4-be2d-2f6894c39fcc */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindDifferencesMap.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMap.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindDifferencesMap.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMap.cpp index 664e4a05d1..fe211d4a0a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindDifferencesMap.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMap.cpp @@ -1,19 +1,19 @@ #include "FindDifferencesMap.hpp" -#include "complex/DataStructure/AbstractDataStore.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/AbstractDataStore.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { @@ -159,7 +159,7 @@ std::string FindDifferencesMap::humanName() const //------------------------------------------------------------------------------ std::vector FindDifferencesMap::defaultTags() const { - return {className(), "Statistics", "ComplexCore"}; + return {className(), "Statistics", "SimplnxCore"}; } //------------------------------------------------------------------------------ @@ -225,7 +225,7 @@ IFilter::PreflightResult FindDifferencesMap::preflightImpl(const DataStructure& if(firstInputArray->getNumberOfComponents() != secondInputArray->getNumberOfComponents()) { std::string ss = fmt::format("Selected Attribute Arrays must have the same component dimensions"); - return {nonstd::make_unexpected(std::vector{Error{complex::k_ComponentCountMismatchError, ss}})}; + return {nonstd::make_unexpected(std::vector{Error{nx::core::k_ComponentCountMismatchError, ss}})}; } // validate the number of tuples @@ -243,7 +243,7 @@ IFilter::PreflightResult FindDifferencesMap::preflightImpl(const DataStructure& firstInputArray->getDataFormat()); // - complex::Result actions; + nx::core::Result actions; actions.value().appendAction(std::move(action)); actions.m_Warnings = warnings; @@ -288,4 +288,4 @@ Result FindDifferencesMap::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindDifferencesMap.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMap.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindDifferencesMap.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMap.hpp index e9fc998578..c5a3b9ac58 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindDifferencesMap.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMap.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindDifferencesMap * @brief */ -class COMPLEXCORE_EXPORT FindDifferencesMap : public IFilter +class SIMPLNXCORE_EXPORT FindDifferencesMap : public IFilter { public: FindDifferencesMap() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT FindDifferencesMap : public IFilter static inline constexpr StringLiteral k_DifferenceMapArrayPath_Key = "difference_map_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT FindDifferencesMap : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindDifferencesMap, "5a0ee5b5-c135-4535-85d0-9c2058943099"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindDifferencesMap, "5a0ee5b5-c135-4535-85d0-9c2058943099"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindEuclideanDistMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindEuclideanDistMapFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp index 83c254cac9..c13d42f075 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindEuclideanDistMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp @@ -1,22 +1,22 @@ #include "FindEuclideanDistMapFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindEuclideanDistMap.hpp" +#include "SimplnxCore/Filters/Algorithms/FindEuclideanDistMap.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindEuclideanDistMapFilter::name() const @@ -120,7 +120,7 @@ IFilter::PreflightResult FindEuclideanDistMapFilter::preflightImpl(const DataStr PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Get the Cell Data Array so we get the tuple shape correct const auto* cellDataArray = dataStructure.getDataAs(pFeatureIdsArrayPathValue); @@ -236,4 +236,4 @@ Result FindEuclideanDistMapFilter::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindEuclideanDistMapFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindEuclideanDistMapFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp index 547d5f8020..6919956b54 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindEuclideanDistMapFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindEuclideanDistMapFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindEuclideanDistMapFilter : public IFilter +class SIMPLNXCORE_EXPORT FindEuclideanDistMapFilter : public IFilter { public: FindEuclideanDistMapFilter() = default; @@ -36,7 +36,7 @@ class COMPLEXCORE_EXPORT FindEuclideanDistMapFilter : public IFilter static inline constexpr StringLiteral k_NearestNeighborsArrayName_Key = "nearest_neighbors_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class COMPLEXCORE_EXPORT FindEuclideanDistMapFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindEuclideanDistMapFilter, "ba9ae8f6-443e-41d3-bb45-a08a139325c1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindEuclideanDistMapFilter, "ba9ae8f6-443e-41d3-bb45-a08a139325c1"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureCentroidsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp index fb47a1566c..91f2ad4125 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp @@ -1,22 +1,22 @@ #include "FindFeatureCentroidsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindFeatureCentroids.hpp" +#include "SimplnxCore/Filters/Algorithms/FindFeatureCentroids.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeatureCentroidsFilter::name() const @@ -86,7 +86,7 @@ IFilter::PreflightResult FindFeatureCentroidsFilter::preflightImpl(const DataStr PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -151,4 +151,4 @@ Result FindFeatureCentroidsFilter::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureCentroidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureCentroidsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp index dbc0abb7cd..b03a4b3d4a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureCentroidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeatureCentroidsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindFeatureCentroidsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindFeatureCentroidsFilter : public IFilter { public: FindFeatureCentroidsFilter() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT FindFeatureCentroidsFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT FindFeatureCentroidsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeatureCentroidsFilter, "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeatureCentroidsFilter, "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureClusteringFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureClusteringFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp index 8521070a77..6a313d173c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureClusteringFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp @@ -1,26 +1,26 @@ #include "FindFeatureClusteringFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindFeatureClustering.hpp" - -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "SimplnxCore/Filters/Algorithms/FindFeatureClustering.hpp" + +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeatureClusteringFilter::name() const @@ -121,7 +121,7 @@ IFilter::PreflightResult FindFeatureClusteringFilter::preflightImpl(const DataSt const DataPath clusteringListPath = pFeaturePhasesArrayPathValue.getParent().createChildPath(pClusteringListArrayNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector featureDataArrays = {pEquivalentDiametersArrayPathValue, pFeaturePhasesArrayPathValue, pCentroidsArrayPathValue}; @@ -235,11 +235,11 @@ Result FindFeatureClusteringFilter::FromSIMPLJson(const nlohmann::jso results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ClusteringListArrayNameKey, k_ClusteringListArrayName_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewEnsembleArrayArrayNameKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewEnsembleArrayArrayNameKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaxMinArrayNameKey, k_MaxMinArrayName_Key)); Result<> conversionResult = MergeResults(std::move(results)); return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureClusteringFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureClusteringFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp index 8470f1a638..a09294f6f7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeatureClusteringFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeatureClusteringFilter * @brief This filter determines the radial distribution function (RDF), as a histogram, of a given set of Features. */ -class COMPLEXCORE_EXPORT FindFeatureClusteringFilter : public IFilter +class SIMPLNXCORE_EXPORT FindFeatureClusteringFilter : public IFilter { public: FindFeatureClusteringFilter() = default; @@ -41,7 +41,7 @@ class COMPLEXCORE_EXPORT FindFeatureClusteringFilter : public IFilter static inline constexpr StringLiteral k_MaxMinArrayName_Key = "max_min_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -111,7 +111,7 @@ class COMPLEXCORE_EXPORT FindFeatureClusteringFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeatureClusteringFilter, "d6e01678-3a03-433f-89ad-4e9adf1f9a45"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeatureClusteringFilter, "d6e01678-3a03-433f-89ad-4e9adf1f9a45"); /* LEGACY UUID FOR THIS FILTER a1e9cf6d-2d1b-573e-98b8-0314c993d2b6 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesBinaryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesBinaryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp index 7ea71b344f..54ee0e40db 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesBinaryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp @@ -1,19 +1,19 @@ #include "FindFeaturePhasesBinaryFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeaturePhasesBinaryFilter::name() const @@ -80,7 +80,7 @@ IFilter::PreflightResult FindFeaturePhasesBinaryFilter::preflightImpl(const Data auto pFeaturePhasesArrayNameValue = filterArgs.value(k_FeaturePhasesArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto cellDataAM = dataStructure.getDataAs(pCellDataAMPathValue); @@ -107,7 +107,7 @@ Result<> FindFeaturePhasesBinaryFilter::executeImpl(DataStructure& dataStructure } catch(const std::out_of_range& exception) { // This really should NOT be happening as the path was verified during preflight BUT we may be calling this from - // somewhere else that is NOT going through the normal complex::IFilter API of Preflight and Execute + // somewhere else that is NOT going through the normal nx::core::IFilter API of Preflight and Execute std::string message = fmt::format("Mask Array DataPath does not exist or is not of the correct type (Bool | UInt8) {}", filterArgs.value(k_MaskArrayPath_Key).toString()); return MakeErrorResult(-53800, message); } @@ -155,4 +155,4 @@ Result FindFeaturePhasesBinaryFilter::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesBinaryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesBinaryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.hpp index 488e20fcfd..1c190c68ab 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesBinaryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeaturePhasesBinaryFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindFeaturePhasesBinaryFilter : public IFilter +class SIMPLNXCORE_EXPORT FindFeaturePhasesBinaryFilter : public IFilter { public: FindFeaturePhasesBinaryFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT FindFeaturePhasesBinaryFilter : public IFilter static inline constexpr StringLiteral k_CellDataAMPath_Key = "cell_data_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,7 +100,7 @@ class COMPLEXCORE_EXPORT FindFeaturePhasesBinaryFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeaturePhasesBinaryFilter, "16010080-a913-443a-b5b3-bd43391fe3c0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeaturePhasesBinaryFilter, "16010080-a913-443a-b5b3-bd43391fe3c0"); /* LEGACY UUID FOR THIS FILTER 64d20c7b-697c-5ff1-9d1d-8a27b071f363 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp index e6722a4ace..f2c62937ca 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp @@ -1,19 +1,19 @@ #include "FindFeaturePhasesFilter.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindFeaturePhasesFilter::name() const @@ -81,7 +81,7 @@ IFilter::PreflightResult FindFeaturePhasesFilter::preflightImpl(const DataStruct auto pCellFeatureAMPathValue = filterArgs.value(k_CellFeaturesAttributeMatrixPath_Key); auto pFeaturePhasesArrayPathValue = pCellFeatureAMPathValue.createChildPath(filterArgs.value(k_FeaturePhasesArrayName_Key)); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; if(dataStructure.getDataAs(pFeatureIdsArrayPathValue) == nullptr) { @@ -188,4 +188,4 @@ Result FindFeaturePhasesFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.hpp index 5d80abef60..2101bdb629 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindFeaturePhasesFilter @@ -15,7 +15,7 @@ namespace complex * any Element can be used to determine the Ensemble of the Feature that owns * that Element. */ -class COMPLEXCORE_EXPORT FindFeaturePhasesFilter : public IFilter +class SIMPLNXCORE_EXPORT FindFeaturePhasesFilter : public IFilter { public: FindFeaturePhasesFilter() = default; @@ -34,7 +34,7 @@ class COMPLEXCORE_EXPORT FindFeaturePhasesFilter : public IFilter static inline constexpr StringLiteral k_CellFeaturesAttributeMatrixPath_Key = "cell_features_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,6 +104,6 @@ class COMPLEXCORE_EXPORT FindFeaturePhasesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindFeaturePhasesFilter, "da5bb20e-4a8e-49d9-9434-fbab7bc434fc"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeaturePhasesFilter, "da5bb20e-4a8e-49d9-9434-fbab7bc434fc"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindLargestCrossSectionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindLargestCrossSectionsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp index c75b83a09b..ee41e4ac1f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindLargestCrossSectionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp @@ -1,23 +1,23 @@ #include "FindLargestCrossSectionsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindLargestCrossSections.hpp" +#include "SimplnxCore/Filters/Algorithms/FindLargestCrossSections.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindLargestCrossSectionsFilter::name() const @@ -90,7 +90,7 @@ IFilter::PreflightResult FindLargestCrossSectionsFilter::preflightImpl(const Dat DataPath largestCrossSectionPath = pCellFeatureAttributeMatrixPath.createChildPath(pLargestCrossSectionsArrayNameValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; { @@ -122,7 +122,7 @@ Result<> FindLargestCrossSectionsFilter::executeImpl(DataStructure& dataStructur return FindLargestCrossSections(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core namespace { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindLargestCrossSectionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindLargestCrossSectionsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp index 65b4fddb5a..95bb56fe2f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindLargestCrossSectionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindLargestCrossSectionsFilter * @brief This filter will find the largest cross sections of an image geometry. */ -class COMPLEXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter { public: FindLargestCrossSectionsFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT FindLargestCrossSectionsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindLargestCrossSectionsFilter, "18ba2f7a-4e3a-4547-bd8c-b0955d542a9f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindLargestCrossSectionsFilter, "18ba2f7a-4e3a-4547-bd8c-b0955d542a9f"); /* LEGACY UUID FOR THIS FILTER 9f77b4a9-6416-5220-a688-115f4e14c90d */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborListStatistics.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborListStatistics.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp index 26a3fae949..d6881bba4a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborListStatistics.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.cpp @@ -1,20 +1,20 @@ #include "FindNeighborListStatistics.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NeighborListSelectionParameter.hpp" -#include "complex/Utilities/Math/StatisticsCalculations.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NeighborListSelectionParameter.hpp" +#include "simplnx/Utilities/Math/StatisticsCalculations.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -namespace complex +namespace nx::core { namespace { @@ -266,7 +266,7 @@ Parameters FindNeighborListStatistics::parameters() const params.insertSeparator(Parameters::Separator{"Required Data Objects"}); params.insert( - std::make_unique(k_InputArray_Key, "NeighborList to Compute Statistics", "Input Data Array to compute statistics", DataPath(), complex::GetAllDataTypes())); + std::make_unique(k_InputArray_Key, "NeighborList to Compute Statistics", "Input Data Array to compute statistics", DataPath(), nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); params.insert(std::make_unique(k_Length_Key, "Length", "Path to create the Length array during calculations", "Length")); @@ -450,4 +450,4 @@ Result FindNeighborListStatistics::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborListStatistics.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborListStatistics.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp index 5a00332b55..8f3f78d69c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborListStatistics.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatistics.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindNeighborListStatistics * @brief */ -class COMPLEXCORE_EXPORT FindNeighborListStatistics : public IFilter +class SIMPLNXCORE_EXPORT FindNeighborListStatistics : public IFilter { public: FindNeighborListStatistics() = default; @@ -42,7 +42,7 @@ class COMPLEXCORE_EXPORT FindNeighborListStatistics : public IFilter static inline constexpr StringLiteral k_Summation_Key = "summation"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -112,6 +112,6 @@ class COMPLEXCORE_EXPORT FindNeighborListStatistics : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindNeighborListStatistics, "270a824e-414b-455e-bb7e-b38a0848990d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindNeighborListStatistics, "270a824e-414b-455e-bb7e-b38a0848990d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborhoodsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborhoodsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp index 15dc6d2a5d..89d5963b60 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborhoodsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp @@ -2,21 +2,21 @@ #include "Algorithms/FindNeighborhoods.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindNeighborhoodsFilter::name() const @@ -101,7 +101,7 @@ IFilter::PreflightResult FindNeighborhoodsFilter::preflightImpl(const DataStruct PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Get the Feature Phases Array and get its TupleShape auto tupleValidityCheck = dataStructure.validateNumberOfTuples({pEquivalentDiametersArrayPathValue, pFeaturePhasesArrayPathValue, pCentroidsArrayPathValue}); @@ -188,4 +188,4 @@ Result FindNeighborhoodsFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborhoodsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborhoodsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp index 8beac95e8c..a6215b2196 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighborhoodsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindNeighborhoodsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindNeighborhoodsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindNeighborhoodsFilter : public IFilter { public: FindNeighborhoodsFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT FindNeighborhoodsFilter : public IFilter static inline constexpr StringLiteral k_NeighborhoodListArrayName_Key = "neighborhood_list_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,6 +104,6 @@ class COMPLEXCORE_EXPORT FindNeighborhoodsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindNeighborhoodsFilter, "924c10e3-2f39-4c08-9d7a-7fe029f74f6d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindNeighborhoodsFilter, "924c10e3-2f39-4c08-9d7a-7fe029f74f6d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighbors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighbors.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp index daf359f29b..e89d9a3619 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.cpp @@ -1,23 +1,23 @@ #include "FindNeighbors.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindNeighbors::name() const @@ -247,7 +247,7 @@ Result<> FindNeighbors::executeImpl(DataStructure& data, const Arguments& args, { progInt = static_cast(i) / static_cast(totalFeatures) * 100.0f; std::string message = fmt::format("Initializing Neighbor Lists || {:2.0f}% Complete", progInt); - messageHandler(complex::IFilter::ProgressMessage{complex::IFilter::Message::Type::Info, message, static_cast(progInt)}); + messageHandler(nx::core::IFilter::ProgressMessage{nx::core::IFilter::Message::Type::Info, message, static_cast(progInt)}); start = std::chrono::steady_clock::now(); } @@ -277,7 +277,7 @@ Result<> FindNeighbors::executeImpl(DataStructure& data, const Arguments& args, { progInt = static_cast(j) / static_cast(totalPoints) * 100.0f; std::string message = fmt::format("Determining Neighbor Lists || {:2.0f}% Complete", progInt); - messageHandler(complex::IFilter::ProgressMessage{complex::IFilter::Message::Type::Info, message, static_cast(progInt)}); + messageHandler(nx::core::IFilter::ProgressMessage{nx::core::IFilter::Message::Type::Info, message, static_cast(progInt)}); start = std::chrono::steady_clock::now(); } @@ -366,7 +366,7 @@ Result<> FindNeighbors::executeImpl(DataStructure& data, const Arguments& args, { progInt = static_cast(i) / static_cast(totalFeatures) * 100.0f; std::string message = fmt::format("Calculating Surface Areas || {:2.0f}% Complete", progInt); - messageHandler(complex::IFilter::ProgressMessage{complex::IFilter::Message::Type::Info, message, static_cast(progInt)}); + messageHandler(nx::core::IFilter::ProgressMessage{nx::core::IFilter::Message::Type::Info, message, static_cast(progInt)}); start = std::chrono::steady_clock::now(); } if(shouldCancel) @@ -454,4 +454,4 @@ Result FindNeighbors::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighbors.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighbors.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp index 85cc58a894..650d73c480 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighbors.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT FindNeighbors : public IFilter +class SIMPLNXCORE_EXPORT FindNeighbors : public IFilter { public: FindNeighbors() = default; @@ -33,7 +33,7 @@ class COMPLEXCORE_EXPORT FindNeighbors : public IFilter static inline constexpr StringLiteral k_SurfaceFeatures_Key = "surface_features"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT FindNeighbors : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindNeighbors, "7177e88c-c3ab-4169-abe9-1fdaff20e598"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindNeighbors, "7177e88c-c3ab-4169-abe9-1fdaff20e598"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNumFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNumFeaturesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp index 46619e7a18..6d42a88040 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNumFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp @@ -1,19 +1,19 @@ #include "FindNumFeaturesFilter.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindNumFeaturesFilter::name() const @@ -52,7 +52,7 @@ Parameters FindNumFeaturesFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Objects: Feature Data"}); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Feature Phases", "Array specifying which Ensemble each Feature belongs", - DataPath({"DataContainer", "FeatureData", "Phases"}), complex::GetAllDataTypes())); + DataPath({"DataContainer", "FeatureData", "Phases"}), nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Required Objects: Ensemble Data"}); params.insert(std::make_unique(k_EnsembleAttributeMatrixPath_Key, "Ensemble Attribute Matrix", @@ -80,7 +80,7 @@ IFilter::PreflightResult FindNumFeaturesFilter::preflightImpl(const DataStructur auto pNumFeaturesArrayPathValue = pEnsembleDataPathValue.createChildPath(filterArgs.value(k_NumFeaturesArrayPath_Key)); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto* cellEnsembleData = dataStructure.getDataAs(pEnsembleDataPathValue); @@ -137,4 +137,4 @@ Result FindNumFeaturesFilter::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNumFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNumFeaturesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp index 65a1da10d0..950ae92ef8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindNumFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindNumFeaturesFilter * @brief This filter will create a new array containing the number of features */ -class COMPLEXCORE_EXPORT FindNumFeaturesFilter : public IFilter +class SIMPLNXCORE_EXPORT FindNumFeaturesFilter : public IFilter { public: FindNumFeaturesFilter() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT FindNumFeaturesFilter : public IFilter static inline constexpr StringLiteral k_NumFeaturesArrayPath_Key = "num_features_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,7 +99,7 @@ class COMPLEXCORE_EXPORT FindNumFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindNumFeaturesFilter, "ec3388de-d7a7-4cf6-94f4-81061b0863c8"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindNumFeaturesFilter, "ec3388de-d7a7-4cf6-94f4-81061b0863c8"); /* LEGACY UUID FOR THIS FILTER 529743cf-d5d5-5d5a-a79f-95c84a5ddbb5 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp index 5498aa09ff..5e65f13e86 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp @@ -1,22 +1,22 @@ #include "FindSurfaceAreaToVolumeFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp" +#include "SimplnxCore/Filters/Algorithms/FindSurfaceAreaToVolume.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindSurfaceAreaToVolumeFilter::name() const @@ -92,7 +92,7 @@ IFilter::PreflightResult FindSurfaceAreaToVolumeFilter::preflightImpl(const Data PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Get the Cell Data Array so we get the tuple shape correct const auto* featureDataArray = dataStructure.getDataAs(pNumCellsArrayPathValue); @@ -175,4 +175,4 @@ Result FindSurfaceAreaToVolumeFilter::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp index 733a76a7ed..aa2f9a3697 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindSurfaceAreaToVolumeFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindSurfaceAreaToVolumeFilter : public IFilter +class SIMPLNXCORE_EXPORT FindSurfaceAreaToVolumeFilter : public IFilter { public: FindSurfaceAreaToVolumeFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT FindSurfaceAreaToVolumeFilter : public IFilter static inline constexpr StringLiteral k_SphericityArrayName_Key = "sphericity_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class COMPLEXCORE_EXPORT FindSurfaceAreaToVolumeFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindSurfaceAreaToVolumeFilter, "94e83e4f-797d-4594-b130-3819b7676f01"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindSurfaceAreaToVolumeFilter, "94e83e4f-797d-4594-b130-3819b7676f01"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceFeatures.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp index 528bb91e05..7b2373397a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.cpp @@ -1,21 +1,21 @@ #include "FindSurfaceFeatures.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -191,7 +191,7 @@ void findSurfaceFeatures2D(DataStructure& dataStructure, const DataPath& feature } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindSurfaceFeatures::name() const @@ -270,7 +270,7 @@ IFilter::PreflightResult FindSurfaceFeatures::preflightImpl(const DataStructure& return {MakeErrorResult(-1000, fmt::format("Image Geometry at path '{}' must be either 3D or 2D", pFeatureGeometryPathValue.toString()))}; } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector tupleDims = std::vector{1}; @@ -356,4 +356,4 @@ Result FindSurfaceFeatures::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceFeatures.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceFeatures.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp index 7fbe1754fd..77ac4f5e29 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindSurfaceFeatures.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeatures.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindSurfaceFeatures @@ -26,7 +26,7 @@ namespace complex * Note: If there are voxels within the volume that have Feature ID=0 then any feature touching * those voxels will be considered a Surface feature. */ -class COMPLEXCORE_EXPORT FindSurfaceFeatures : public IFilter +class SIMPLNXCORE_EXPORT FindSurfaceFeatures : public IFilter { public: FindSurfaceFeatures() = default; @@ -46,7 +46,7 @@ class COMPLEXCORE_EXPORT FindSurfaceFeatures : public IFilter static inline constexpr StringLiteral k_SurfaceFeaturesArrayPath_Key = "surface_features_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -116,6 +116,6 @@ class COMPLEXCORE_EXPORT FindSurfaceFeatures : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindSurfaceFeatures, "0893e490-5d24-4c21-95e7-e8372baa8948"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindSurfaceFeatures, "0893e490-5d24-4c21-95e7-e8372baa8948"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomCentroidsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp index 54cbabd6d3..def60e29e4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp @@ -1,18 +1,18 @@ #include "FindTriangleGeomCentroidsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp" +#include "SimplnxCore/Filters/Algorithms/FindTriangleGeomCentroids.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindTriangleGeomCentroidsFilter::name() const @@ -53,7 +53,7 @@ Parameters FindTriangleGeomCentroidsFilter::parameters() const GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Required Face Data"}); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixName_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), @@ -79,7 +79,7 @@ IFilter::PreflightResult FindTriangleGeomCentroidsFilter::preflightImpl(const Da PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Ensure the Face Feature Attribute Matrix is really an AttributeMatrix const auto* featureAttrMatrix = dataStructure.getDataAs(pFeatureAttributeMatrixPath); @@ -93,7 +93,7 @@ IFilter::PreflightResult FindTriangleGeomCentroidsFilter::preflightImpl(const Da { auto createdArrayName = filterArgs.value(k_CentroidsArrayName_Key); DataPath createdArrayPath = pFeatureAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::float32, featureAttrMatrix->getShape(), std::vector{3}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, featureAttrMatrix->getShape(), std::vector{3}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -118,4 +118,4 @@ Result<> FindTriangleGeomCentroidsFilter::executeImpl(DataStructure& dataStructu return FindTriangleGeomCentroids(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomCentroidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomCentroidsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp index 60b8554b3e..88ecfe9a57 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomCentroidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindTriangleGeomCentroidsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindTriangleGeomCentroidsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindTriangleGeomCentroidsFilter : public IFilter { public: FindTriangleGeomCentroidsFilter() = default; @@ -93,6 +93,6 @@ class COMPLEXCORE_EXPORT FindTriangleGeomCentroidsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindTriangleGeomCentroidsFilter, "074c0523-ab7a-4097-b0c3-c4dcbfb9a05e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindTriangleGeomCentroidsFilter, "074c0523-ab7a-4097-b0c3-c4dcbfb9a05e"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp similarity index 87% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomSizesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp index ffd474f656..1da3caf8e1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp @@ -1,19 +1,19 @@ #include "FindTriangleGeomSizesFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindTriangleGeomSizes.hpp" +#include "SimplnxCore/Filters/Algorithms/FindTriangleGeomSizes.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindTriangleGeomSizesFilter::name() const @@ -54,7 +54,7 @@ Parameters FindTriangleGeomSizesFilter::parameters() const GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Required Face Data"}); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixName_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), @@ -80,7 +80,7 @@ IFilter::PreflightResult FindTriangleGeomSizesFilter::preflightImpl(const DataSt PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Ensure the Face Feature Attribute Matrix is really an AttributeMatrix const auto* featureAttrMatrix = dataStructure.getDataAs(pFeatureAttributeMatrixPath); @@ -94,7 +94,7 @@ IFilter::PreflightResult FindTriangleGeomSizesFilter::preflightImpl(const DataSt { auto createdArrayName = filterArgs.value(k_VolumesArrayName_Key); DataPath createdArrayPath = pFeatureAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::float32, featureAttrMatrix->getShape(), std::vector{1}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, featureAttrMatrix->getShape(), std::vector{1}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -119,4 +119,4 @@ Result<> FindTriangleGeomSizesFilter::executeImpl(DataStructure& dataStructure, return FindTriangleGeomSizes(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomSizesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomSizesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp index 4c7b3ce686..ef32badee8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindTriangleGeomSizesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindTriangleGeomSizesFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindTriangleGeomSizesFilter : public IFilter +class SIMPLNXCORE_EXPORT FindTriangleGeomSizesFilter : public IFilter { public: FindTriangleGeomSizesFilter() = default; @@ -93,6 +93,6 @@ class COMPLEXCORE_EXPORT FindTriangleGeomSizesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindTriangleGeomSizesFilter, "a979bd9b-834e-4497-84b0-ab7a8add341a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindTriangleGeomSizesFilter, "a979bd9b-834e-4497-84b0-ab7a8add341a"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVertexToTriangleDistancesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVertexToTriangleDistancesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp index 9dcbf00ae7..faff8a2818 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVertexToTriangleDistancesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp @@ -1,27 +1,27 @@ #include "FindVertexToTriangleDistancesFilter.hpp" -#include "ComplexCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp" +#include "SimplnxCore/Filters/Algorithms/FindVertexToTriangleDistances.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { inline constexpr StringLiteral k_TriangleBounds("Triangle Bounds"); } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindVertexToTriangleDistancesFilter::name() const @@ -92,7 +92,7 @@ IFilter::PreflightResult FindVertexToTriangleDistancesFilter::preflightImpl(cons PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -110,18 +110,18 @@ IFilter::PreflightResult FindVertexToTriangleDistancesFilter::preflightImpl(cons const DataPath vertexDataPath = pVertexGeometryDataPath.createChildPath(vertexGeomPtr->getVertexAttributeMatrix()->getName()); - auto createDistancesArrayAction = std::make_unique(complex::DataType::float32, std::vector{vertexGeomPtr->getNumberOfVertices()}, std::vector{1}, + auto createDistancesArrayAction = std::make_unique(nx::core::DataType::float32, std::vector{vertexGeomPtr->getNumberOfVertices()}, std::vector{1}, vertexDataPath.createChildPath(pDistancesDataName)); resultOutputActions.value().appendAction(std::move(createDistancesArrayAction)); - auto createClosestTriangleIdArrayAction = std::make_unique(complex::DataType::int64, std::vector{vertexGeomPtr->getNumberOfVertices()}, std::vector{1}, + auto createClosestTriangleIdArrayAction = std::make_unique(nx::core::DataType::int64, std::vector{vertexGeomPtr->getNumberOfVertices()}, std::vector{1}, vertexDataPath.createChildPath(pClosestTriangleIdDataName)); resultOutputActions.value().appendAction(std::move(createClosestTriangleIdArrayAction)); // Create temp array then deferred delete auto tempTriBoundsDataPath = DataPath({::k_TriangleBounds}); auto createTriBoundsArrayAction = - std::make_unique(complex::DataType::float32, std::vector{triangleGeomPtr->getNumberOfFaces()}, std::vector{6}, tempTriBoundsDataPath); + std::make_unique(nx::core::DataType::float32, std::vector{triangleGeomPtr->getNumberOfFaces()}, std::vector{6}, tempTriBoundsDataPath); resultOutputActions.value().appendAction(std::move(createTriBoundsArrayAction)); auto removeTempArrayAction = std::make_unique(tempTriBoundsDataPath); @@ -179,4 +179,4 @@ Result FindVertexToTriangleDistancesFilter::FromSIMPLJson(const nlohm return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVertexToTriangleDistancesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVertexToTriangleDistancesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp index 076feb9e43..4867a5c174 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVertexToTriangleDistancesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindVertexToTriangleDistancesFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT FindVertexToTriangleDistancesFilter : public IFilter +class SIMPLNXCORE_EXPORT FindVertexToTriangleDistancesFilter : public IFilter { public: FindVertexToTriangleDistancesFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT FindVertexToTriangleDistancesFilter : public IFilter static inline constexpr StringLiteral k_ClosestTriangleIdArrayPath_Key = "closest_triangle_id_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT FindVertexToTriangleDistancesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindVertexToTriangleDistancesFilter, "af60518e-5fdb-45f2-9028-cd7787016830"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindVertexToTriangleDistancesFilter, "af60518e-5fdb-45f2-9028-cd7787016830"); /* LEGACY UUID FOR THIS FILTER fcdde553-36b4-5731-bc88-fc499806cb4e */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVolFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVolFractionsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp index 949a6bccc4..54a48f9b29 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVolFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp @@ -1,19 +1,19 @@ #include "FindVolFractionsFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string FindVolFractionsFilter::name() const @@ -83,7 +83,7 @@ IFilter::PreflightResult FindVolFractionsFilter::preflightImpl(const DataStructu const auto& cellPhasesArray = dataStructure.getDataRefAs(pCellPhasesArrayPathValue); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto* cellEnsembleData = dataStructure.getDataAs(pCellEnsembleAttributeMatrixPathValue); @@ -152,4 +152,4 @@ Result FindVolFractionsFilter::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVolFractionsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVolFractionsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp index 8f87762b8e..31325b62ba 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindVolFractionsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class FindVolFractionsFilter * @brief This filter will calculate the volume fraction for each Ensemble */ -class COMPLEXCORE_EXPORT FindVolFractionsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindVolFractionsFilter : public IFilter { public: FindVolFractionsFilter() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT FindVolFractionsFilter : public IFilter static inline constexpr StringLiteral k_VolFractionsArrayPath_Key = "vol_fractions_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,7 +99,7 @@ class COMPLEXCORE_EXPORT FindVolFractionsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, FindVolFractionsFilter, "340b3433-193a-4287-a7d2-794e1bce061b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindVolFractionsFilter, "340b3433-193a-4287-a7d2-794e1bce061b"); /* LEGACY UUID FOR THIS FILTER 68246a67-7f32-5c80-815a-bec82008d7bc */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateColorTableFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateColorTableFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp index c97c63e300..40b59f3e44 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateColorTableFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp @@ -2,20 +2,20 @@ #include "Algorithms/GenerateColorTable.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GenerateColorTableParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Parameters/GenerateColorTableParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -27,7 +27,7 @@ inline constexpr int32 k_MissingInputArray = -72442; inline constexpr int32 k_MissingOrIncorrectGoodVoxelsArray = -72443; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateColorTableFilter::name() const @@ -70,7 +70,7 @@ Parameters GenerateColorTableFilter::parameters() const params.insertSeparator({"Required Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPath_Key, "Data Array", "The complete path to the data array from which to create the rgb array by applying the selected preset color scheme", DataPath{}, - complex::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); + nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Whether to assign a black color to 'bad' Elements", false)); @@ -105,7 +105,7 @@ IFilter::PreflightResult GenerateColorTableFilter::preflightImpl(const DataStruc auto pUseGoodVoxelsValue = filterArgs.value(k_UseMask_Key); auto pGoodVoxelsArrayPathValue = filterArgs.value(k_MaskArrayPath_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto& dataArray = dataStructure.getDataRefAs(pSelectedDataArrayPathValue); @@ -121,7 +121,7 @@ IFilter::PreflightResult GenerateColorTableFilter::preflightImpl(const DataStruc { goodVoxelsPath = filterArgs.value(k_MaskArrayPath_Key); - const complex::IDataArray* goodVoxelsArray = dataStructure.getDataAs(goodVoxelsPath); + const nx::core::IDataArray* goodVoxelsArray = dataStructure.getDataAs(goodVoxelsPath); if(nullptr == goodVoxelsArray) { return {nonstd::make_unexpected(std::vector{Error{k_MissingOrIncorrectGoodVoxelsArray, fmt::format("Mask array is not located at path: '{}'", goodVoxelsPath.toString())}})}; @@ -186,4 +186,4 @@ Result GenerateColorTableFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateColorTableFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateColorTableFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp index 78a94a32ff..06b1e3a112 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateColorTableFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateColorTableFilter @@ -13,7 +13,7 @@ namespace complex * Each element of the input array is normalized and converted to a color based on where * the value falls in the spectrum of the selected color preset. */ -class COMPLEXCORE_EXPORT GenerateColorTableFilter : public IFilter +class SIMPLNXCORE_EXPORT GenerateColorTableFilter : public IFilter { public: GenerateColorTableFilter() = default; @@ -34,7 +34,7 @@ class COMPLEXCORE_EXPORT GenerateColorTableFilter : public IFilter static inline constexpr StringLiteral k_InvalidColorValue_Key = "invalid_color_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,6 +104,6 @@ class COMPLEXCORE_EXPORT GenerateColorTableFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateColorTableFilter, "d1731177-4d70-41c0-9334-566a0b482796"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateColorTableFilter, "d1731177-4d70-41c0-9334-566a0b482796"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateVectorColorsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateVectorColorsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp index 368a10827b..2fb5bc1985 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateVectorColorsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp @@ -1,25 +1,25 @@ #include "GenerateVectorColorsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/GenerateVectorColors.hpp" +#include "SimplnxCore/Filters/Algorithms/GenerateVectorColors.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { const DataPath k_MaskArrayPath = DataPath({"mask array"}); } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string GenerateVectorColorsFilter::name() const @@ -92,7 +92,7 @@ IFilter::PreflightResult GenerateVectorColorsFilter::preflightImpl(const DataStr auto pCellVectorColorsArrayNameValue = filterArgs.value(k_CellVectorColorsArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector vectorsTupShape = dataStructure.getDataAs(pVectorsArrayPathValue)->getTupleShape(); @@ -159,4 +159,4 @@ Result GenerateVectorColorsFilter::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateVectorColorsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateVectorColorsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.hpp index 042d2f7342..b46a35a77e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/GenerateVectorColorsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class GenerateVectorColorsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT GenerateVectorColorsFilter : public IFilter +class SIMPLNXCORE_EXPORT GenerateVectorColorsFilter : public IFilter { public: GenerateVectorColorsFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT GenerateVectorColorsFilter : public IFilter static inline constexpr StringLiteral k_CellVectorColorsArrayName_Key = "cell_vector_colors_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,7 +100,7 @@ class COMPLEXCORE_EXPORT GenerateVectorColorsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, GenerateVectorColorsFilter, "1a35650d-a9f5-4ea2-af70-5b9ce894e45f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, GenerateVectorColorsFilter, "1a35650d-a9f5-4ea2-af70-5b9ce894e45f"); /* LEGACY UUID FOR THIS FILTER ef28de7e-5bdd-57c2-9318-60ba0dfaf7bc */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IdentifySample.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/IdentifySample.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp index 813322f414..93c0c890c2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IdentifySample.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.cpp @@ -1,16 +1,16 @@ #include "IdentifySample.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -namespace complex +namespace nx::core { namespace { @@ -268,7 +268,7 @@ Parameters IdentifySample::parameters() const params.insert(std::make_unique(k_ImageGeom_Key, "Image Geometry", "DataPath to the target ImageGeom", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the mask array defining what is sample and what is not", DataPath(), - ArraySelectionParameter::AllowedTypes{complex::DataType::boolean, complex::DataType::uint8}, + ArraySelectionParameter::AllowedTypes{nx::core::DataType::boolean, nx::core::DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); return params; } @@ -335,4 +335,4 @@ Result IdentifySample::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IdentifySample.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/IdentifySample.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp index 03883a6a68..e41a4b3d95 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IdentifySample.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySample.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT IdentifySample : public IFilter +class SIMPLNXCORE_EXPORT IdentifySample : public IFilter { public: IdentifySample() = default; @@ -26,7 +26,7 @@ class COMPLEXCORE_EXPORT IdentifySample : public IFilter static inline constexpr StringLiteral k_MaskArrayPath_Key = "mask_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -94,6 +94,6 @@ class COMPLEXCORE_EXPORT IdentifySample : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, IdentifySample, "94d47495-5a89-4c7f-a0ee-5ff20e6bd273"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, IdentifySample, "94d47495-5a89-4c7f-a0ee-5ff20e6bd273"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImageContouringFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ImageContouringFilter.cpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImageContouringFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ImageContouringFilter.cpp index 98f49da935..92267160d2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImageContouringFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ImageContouringFilter.cpp @@ -1,23 +1,23 @@ #include "ImageContouringFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ImageContouring.hpp" - -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" - -using namespace complex; +#include "SimplnxCore/Filters/Algorithms/ImageContouring.hpp" + +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" + +using namespace nx::core; namespace { const std::string k_VertexNormals = "VertexNormals"; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ImageContouringFilter::name() const @@ -85,7 +85,7 @@ IFilter::PreflightResult ImageContouringFilter::preflightImpl(const DataStructur auto pTriangleGeomName = filterArgs.value(k_NewTriangleGeometryName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Create the Triangle Geometry action and store it @@ -96,7 +96,7 @@ IFilter::PreflightResult ImageContouringFilter::preflightImpl(const DataStructur resultOutputActions.value().appendAction(std::move(createTriangleGeometryAction)); // Create the face Normals DataArray action and store it - auto createArrayAction = std::make_unique(complex::DataType::float32, std::vector{static_cast(1)}, std::vector{static_cast(3)}, vertexNormalsPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, std::vector{static_cast(1)}, std::vector{static_cast(3)}, vertexNormalsPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -116,4 +116,4 @@ Result<> ImageContouringFilter::executeImpl(DataStructure& dataStructure, const return ImageContouring(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImageContouringFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ImageContouringFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImageContouringFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ImageContouringFilter.hpp index a1889e0290..130080be5d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImageContouringFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ImageContouringFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ImageContouringFilter * @brief This filter will draw a 3 dimensional contouring line through an Image Geometry based on an input value. */ -class COMPLEXCORE_EXPORT ImageContouringFilter : public IFilter +class SIMPLNXCORE_EXPORT ImageContouringFilter : public IFilter { public: ImageContouringFilter() = default; @@ -94,6 +94,6 @@ class COMPLEXCORE_EXPORT ImageContouringFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ImageContouringFilter, "c15b1af6-c43d-44ba-b180-f0130afafc8e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ImageContouringFilter, "c15b1af6-c43d-44ba-b180-f0130afafc8e"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.cpp index cdc32675bf..273a4156ab 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.cpp @@ -1,16 +1,16 @@ #include "InitializeData.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include @@ -20,7 +20,7 @@ #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -363,7 +363,7 @@ struct ValidateMultiInputFunctor }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string InitializeData::name() const @@ -401,7 +401,7 @@ Parameters InitializeData::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_ArrayPath_Key, "Any Component Array", "The data array in which to initialize the data", DataPath{}, complex::GetAllDataTypes())); + params.insert(std::make_unique(k_ArrayPath_Key, "Any Component Array", "The data array in which to initialize the data", DataPath{}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Data Initialization"}); params.insertLinkableParameter(std::make_unique(k_InitType_Key, "Initialization Type", "Method for determining the what values of the data in the array should be initialized to", @@ -464,7 +464,7 @@ IFilter::PreflightResult InitializeData::preflightImpl(const DataStructure& data auto seedArrayNameValue = args.value(k_SeedArrayName_Key); auto initializeTypeValue = static_cast(args.value(k_InitType_Key)); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto& iDataArray = data.getDataRefAs(args.value(k_ArrayPath_Key)); @@ -669,4 +669,4 @@ Result<> InitializeData::executeImpl(DataStructure& data, const Arguments& args, return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp index 801d4c8a61..8a8d8b6cb8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeData.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT InitializeData : public IFilter +class SIMPLNXCORE_EXPORT InitializeData : public IFilter { public: InitializeData() = default; @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT InitializeData : public IFilter private: uint64 m_Seed = 0; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, InitializeData, "01c82d15-ba52-4ffa-a7a5-487ee5a613f5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, InitializeData, "01c82d15-ba52-4ffa-a7a5-487ee5a613f5"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeImageGeomCellData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeImageGeomCellData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.cpp index 0b64fbb632..6d7b9405cd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeImageGeomCellData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.cpp @@ -1,18 +1,18 @@ #include "InitializeImageGeomCellData.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/AbstractDataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/AbstractDataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include @@ -22,7 +22,7 @@ #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -150,7 +150,7 @@ struct InitializeArrayFunctor }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string InitializeImageGeomCellData::name() const @@ -208,7 +208,7 @@ Parameters InitializeImageGeomCellData::parameters() const params.insertSeparator(Parameters::Separator{"Required Data Objects"}); params.insert(std::make_unique(k_CellArrayPaths_Key, "Cell Arrays", "The cell data arrays in which to initialize a sub-volume to zeros", std::vector{}, - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The geometry containing the cell data for which to initialize", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); @@ -309,7 +309,7 @@ IFilter::PreflightResult InitializeImageGeomCellData::preflightImpl(const DataSt return {nonstd::make_unexpected(std::move(errors))}; } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; { auto createAction = std::make_unique(DataType::uint64, std::vector{1}, std::vector{1}, DataPath({pSeedArrayNameValue})); @@ -406,4 +406,4 @@ Result InitializeImageGeomCellData::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeImageGeomCellData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeImageGeomCellData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp index e975b2fdf2..2552173f78 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InitializeImageGeomCellData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellData.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT InitializeImageGeomCellData : public IFilter +class SIMPLNXCORE_EXPORT InitializeImageGeomCellData : public IFilter { public: InitializeImageGeomCellData() = default; @@ -40,7 +40,7 @@ class COMPLEXCORE_EXPORT InitializeImageGeomCellData : public IFilter }; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -113,6 +113,6 @@ class COMPLEXCORE_EXPORT InitializeImageGeomCellData : public IFilter private: uint64 m_Seed = 0; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, InitializeImageGeomCellData, "447b8909-661f-446a-8c1f-72e0cb568fcf"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, InitializeImageGeomCellData, "447b8909-661f-446a-8c1f-72e0cb568fcf"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp index 9375003d95..a25334eea3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp @@ -1,27 +1,27 @@ #include "InterpolatePointCloudToRegularGridFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/Filter/Actions/CopyArrayInstanceAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/Filter/Actions/CopyArrayInstanceAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { @@ -536,7 +536,7 @@ Result InterpolatePointCloudToRegularGridFilter::FromSIMPLJson(const results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolationTechniqueKey, k_InterpolationTechnique_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelSizeKey, k_KernelSize_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SigmasKey, k_GaussianSigmas_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedDataContainerNameKey, k_InterpolatedGroup_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VoxelIndicesArrayPathKey, k_VoxelIndices_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_Mask_Key)); @@ -544,12 +544,12 @@ Result InterpolatePointCloudToRegularGridFilter::FromSIMPLJson(const results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ArraysToCopyKey, k_CopyArrays_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedAttributeMatrixNameKey, k_InterpolatedGroup_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_KernelDistancesArrayNameKey, k_KernelDistancesArray_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedSuffixKey, "@COMPLEX_PARAMETER_KEY@")); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CopySuffixKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_InterpolatedSuffixKey, "@SIMPLNX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CopySuffixKey, "@SIMPLNX_PARAMETER_KEY@")); Result<> conversionResult = MergeResults(std::move(results)); return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp index ce884e027f..11d4e3dd30 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class InterpolatePointCloudToRegularGridFilter * @brief This Filter interpolates the values of arrays stored in a Vertex Geometry onto a user-selected Image Geometry. */ -class COMPLEXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilter +class SIMPLNXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilter { public: InterpolatePointCloudToRegularGridFilter() = default; @@ -42,7 +42,7 @@ class COMPLEXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilt static inline constexpr uint64 k_Gaussian = 1; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -110,6 +110,6 @@ class COMPLEXCORE_EXPORT InterpolatePointCloudToRegularGridFilter : public IFilt */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, InterpolatePointCloudToRegularGridFilter, "996c4464-08f0-4268-a8a6-f9796c88cf58"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, InterpolatePointCloudToRegularGridFilter, "996c4464-08f0-4268-a8a6-f9796c88cf58"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IterativeClosestPointFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/IterativeClosestPointFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp index c67212d7c0..e5d7fd70da 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IterativeClosestPointFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp @@ -1,20 +1,20 @@ #include "IterativeClosestPointFilter.hpp" -#include "ComplexCore/utils/nanoflann.hpp" +#include "SimplnxCore/utils/nanoflann.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { @@ -319,4 +319,4 @@ Result IterativeClosestPointFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IterativeClosestPointFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/IterativeClosestPointFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp index a900a009d3..9cfbce254b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/IterativeClosestPointFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT IterativeClosestPointFilter : public IFilter +class SIMPLNXCORE_EXPORT IterativeClosestPointFilter : public IFilter { public: IterativeClosestPointFilter() = default; @@ -28,7 +28,7 @@ class COMPLEXCORE_EXPORT IterativeClosestPointFilter : public IFilter static inline constexpr StringLiteral k_TransformArrayPath_Key = "transform_array"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -96,6 +96,6 @@ class COMPLEXCORE_EXPORT IterativeClosestPointFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, IterativeClosestPointFilter, "3a206668-fa44-418d-b78e-9fd803b8fb98"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, IterativeClosestPointFilter, "3a206668-fa44-418d-b78e-9fd803b8fb98"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMeansFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/KMeansFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp index 5f0a973233..27ffd24071 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMeansFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp @@ -1,34 +1,34 @@ #include "KMeansFilter.hpp" -#include "ComplexCore/Filters/Algorithms/KMeans.hpp" - -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/KUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "SimplnxCore/Filters/Algorithms/KMeans.hpp" + +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/KUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { const std::string k_MaskName = "temp_mask"; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string KMeansFilter::name() const @@ -82,7 +82,7 @@ Parameters KMeansFilter::parameters() const ChoicesParameter::Choices{"Euclidean", "Squared Euclidean", "Manhattan", "Cosine", "Pearson", "Squared Pearson"})); // sequence dependent DO NOT REORDER params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Cluster", "The array to cluster from", DataPath{}, complex::GetAllNumericTypes())); + params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Cluster", "The array to cluster from", DataPath{}, nx::core::GetAllNumericTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Cluster Ids Array Name", "name of the ids array to be created in Attribute Array to Cluster's parent group", @@ -116,7 +116,7 @@ IFilter::PreflightResult KMeansFilter::preflightImpl(const DataStructure& dataSt auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto clusterArray = dataStructure.getDataAs(pSelectedArrayPathValue); @@ -236,4 +236,4 @@ Result KMeansFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMeansFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/KMeansFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp index 1ac9f7b8c1..24a352dce0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMeansFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class KMeansFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT KMeansFilter : public IFilter +class SIMPLNXCORE_EXPORT KMeansFilter : public IFilter { public: KMeansFilter() = default; @@ -37,7 +37,7 @@ class COMPLEXCORE_EXPORT KMeansFilter : public IFilter static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,7 +107,7 @@ class COMPLEXCORE_EXPORT KMeansFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, KMeansFilter, "b8682b04-ccc0-49a2-9ced-32d5f5c512f3"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, KMeansFilter, "b8682b04-ccc0-49a2-9ced-32d5f5c512f3"); /* LEGACY UUID FOR THIS FILTER b56a04de-0ca0-509d-809f-52219fca9c98 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMedoidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/KMedoidsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp index 4b219fb14e..db3340e5c0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMedoidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp @@ -1,34 +1,34 @@ #include "KMedoidsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/KMedoids.hpp" - -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/KUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "SimplnxCore/Filters/Algorithms/KMedoids.hpp" + +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/KUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { const std::string k_MaskName = "temp_mask"; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string KMedoidsFilter::name() const @@ -81,7 +81,7 @@ Parameters KMedoidsFilter::parameters() const ChoicesParameter::Choices{"Euclidean", "Squared Euclidean", "Manhattan", "Cosine", "Pearson", "Squared Pearson"})); // sequence dependent DO NOT REORDER params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Cluster", "The array to find the medoids for", DataPath{}, complex::GetAllNumericTypes())); + params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Cluster", "The array to find the medoids for", DataPath{}, nx::core::GetAllNumericTypes())); params.insertSeparator(Parameters::Separator{"Created Data Objects"}); params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Cluster Ids Array Name", "name of the ids array to be created in Attribute Array to Cluster's parent group", @@ -116,7 +116,7 @@ IFilter::PreflightResult KMedoidsFilter::preflightImpl(const DataStructure& data auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto clusterArray = dataStructure.getDataAs(pSelectedArrayPathValue); @@ -236,4 +236,4 @@ Result KMedoidsFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMedoidsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/KMedoidsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp index 1bd91689ca..67abba935f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/KMedoidsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class KMedoidsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT KMedoidsFilter : public IFilter +class SIMPLNXCORE_EXPORT KMedoidsFilter : public IFilter { public: KMedoidsFilter() = default; @@ -37,7 +37,7 @@ class COMPLEXCORE_EXPORT KMedoidsFilter : public IFilter static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,7 +107,7 @@ class COMPLEXCORE_EXPORT KMedoidsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, KMedoidsFilter, "7643cb64-bcb9-4867-b85a-bf158cd0f54a"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, KMedoidsFilter, "7643cb64-bcb9-4867-b85a-bf158cd0f54a"); /* LEGACY UUID FOR THIS FILTER f7486aa6-3049-5be7-8511-ae772b70c90b */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LaplacianSmoothingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/LaplacianSmoothingFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp index 6e4be9c3eb..97161f7814 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LaplacianSmoothingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp @@ -1,20 +1,20 @@ #include "LaplacianSmoothingFilter.hpp" -#include "ComplexCore/Filters/Algorithms/LaplacianSmoothing.hpp" +#include "SimplnxCore/Filters/Algorithms/LaplacianSmoothing.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string LaplacianSmoothingFilter::name() const @@ -109,7 +109,7 @@ IFilter::PreflightResult LaplacianSmoothingFilter::preflightImpl(const DataStruc auto pSurfaceQuadPointLambdaValue = filterArgs.value(k_SurfaceQuadPointLambda_Key); auto pSurfaceMeshNodeTypeArrayPathValue = filterArgs.value(k_SurfaceMeshNodeTypeArrayPath_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -121,7 +121,7 @@ IFilter::PreflightResult LaplacianSmoothingFilter::preflightImpl(const DataStruc Result<> LaplacianSmoothingFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - complex::LaplacianSmoothingInputValues inputValues; + nx::core::LaplacianSmoothingInputValues inputValues; inputValues.pTriangleGeometryDataPath = filterArgs.value(k_TriangleGeometryDataPath_Key); inputValues.pIterationSteps = filterArgs.value(k_IterationSteps_Key); @@ -181,4 +181,4 @@ Result LaplacianSmoothingFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LaplacianSmoothingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/LaplacianSmoothingFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp index 9047e35d66..8bab0d4e79 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LaplacianSmoothingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class LaplacianSmoothingFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT LaplacianSmoothingFilter : public IFilter +class SIMPLNXCORE_EXPORT LaplacianSmoothingFilter : public IFilter { public: LaplacianSmoothingFilter() = default; @@ -38,7 +38,7 @@ class COMPLEXCORE_EXPORT LaplacianSmoothingFilter : public IFilter static inline constexpr StringLiteral k_SurfaceMeshFaceLabelsArrayPath_Key = "surface_mesh_face_labels_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class COMPLEXCORE_EXPORT LaplacianSmoothingFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, LaplacianSmoothingFilter, "0dd0916e-9305-4a7b-98cf-a6cfb97cb501"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, LaplacianSmoothingFilter, "0dd0916e-9305-4a7b-98cf-a6cfb97cb501"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MapPointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MapPointCloudToRegularGridFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp index 1ee526500a..4b3e51d748 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MapPointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp @@ -1,23 +1,23 @@ #include "MapPointCloudToRegularGridFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { @@ -403,7 +403,7 @@ Result MapPointCloudToRegularGridFilter::FromSIMPLJson(const nlohmann results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_SamplingGridTypeKey, k_SamplingGridType_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_GridDimensionsKey, k_GridDimensions_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ImageDataContainerPathKey, k_ExistingImageGeometry_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, "@COMPLEX_PARAMETER_KEY@")); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, "@SIMPLNX_PARAMETER_KEY@")); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseMaskKey, k_UseMask_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_MaskArrayPathKey, k_MaskPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_VoxelIndicesArrayPathKey, k_VoxelIndices_Key)); @@ -413,4 +413,4 @@ Result MapPointCloudToRegularGridFilter::FromSIMPLJson(const nlohmann return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MapPointCloudToRegularGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MapPointCloudToRegularGridFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp index d2cceb8012..e923855397 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MapPointCloudToRegularGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class MapPointCloudToRegularGridFilter * @brief */ -class COMPLEXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter +class SIMPLNXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter { public: MapPointCloudToRegularGridFilter() = default; @@ -36,7 +36,7 @@ class COMPLEXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter static inline constexpr StringLiteral k_CellDataName_Key = "cell_data_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -104,6 +104,6 @@ class COMPLEXCORE_EXPORT MapPointCloudToRegularGridFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, MapPointCloudToRegularGridFilter, "af53ac60-092f-4e4a-9e13-57f0034ce2c7"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, MapPointCloudToRegularGridFilter, "af53ac60-092f-4e4a-9e13-57f0034ce2c7"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MinNeighbors.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MinNeighbors.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp index e953e4d58f..06851a8e36 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MinNeighbors.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.cpp @@ -1,20 +1,20 @@ #include "MinNeighbors.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -namespace complex +namespace nx::core { namespace { @@ -49,7 +49,7 @@ void assignBadPoints(DataStructure& data, const Arguments& args, const std::atom // This was checked up in the execute function (which is called before this function) // so if we got this far then all should be good with the return. We might get // an empty vector<> but that is OK. - std::vector cellDataArrayPaths = complex::GetAllChildDataPaths(data, cellDataAttrMatrix, DataObject::Type::DataArray).value(); + std::vector cellDataArrayPaths = nx::core::GetAllChildDataPaths(data, cellDataAttrMatrix, DataObject::Type::DataArray).value(); std::array dims = { static_cast(udims[0]), @@ -363,7 +363,7 @@ IFilter::PreflightResult MinNeighbors::preflightImpl(const DataStructure& dataSt auto numNeighborsPath = args.value(k_NumNeighbors_Key); auto minNumNeighbors = args.value(k_MinNumNeighbors_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -396,9 +396,9 @@ IFilter::PreflightResult MinNeighbors::preflightImpl(const DataStructure& dataSt // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, featureIdsPath.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, featureIdsPath.getParent(), {}); // Feature Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, numNeighborsPath.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, numNeighborsPath.getParent(), {}); // Return both the resultOutputActions and the preflightUpdatedValues via std::move() return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -445,7 +445,7 @@ Result<> MinNeighbors::executeImpl(DataStructure& data, const Arguments& args, c } auto cellDataAttrMatrix = args.value(MinNeighbors::k_CellDataAttributeMatrix_Key); - auto result = complex::GetAllChildDataPaths(data, cellDataAttrMatrix, DataObject::Type::DataArray); + auto result = nx::core::GetAllChildDataPaths(data, cellDataAttrMatrix, DataObject::Type::DataArray); if(!result.has_value()) { return MakeErrorResult(-5556, fmt::format("Error fetching all Data Arrays from Group '{}'", cellDataAttrMatrix.toString())); @@ -470,9 +470,9 @@ Result<> MinNeighbors::executeImpl(DataStructure& data, const Arguments& args, c value ? count++ : count = count; } std::string message = fmt::format("Feature Count Changed: Previous: {} New: {}", currentFeatureCount, count); - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, message}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); - complex::RemoveInactiveObjects(data, cellFeatureGroupPath, activeObjects, featureIdsArray, currentFeatureCount); + nx::core::RemoveInactiveObjects(data, cellFeatureGroupPath, activeObjects, featureIdsArray, currentFeatureCount); return {}; } @@ -511,4 +511,4 @@ Result MinNeighbors::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MinNeighbors.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MinNeighbors.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp index 1acc4f78ed..f0c6fae4c6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MinNeighbors.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighbors.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT MinNeighbors : public IFilter +class SIMPLNXCORE_EXPORT MinNeighbors : public IFilter { public: MinNeighbors() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT MinNeighbors : public IFilter static inline constexpr StringLiteral k_CellDataAttributeMatrix_Key = "cell_attribute_matrix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class COMPLEXCORE_EXPORT MinNeighbors : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, MinNeighbors, "4ab5153f-6014-4e6d-bbd6-194068620389"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, MinNeighbors, "4ab5153f-6014-4e6d-bbd6-194068620389"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MoveData.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MoveData.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp index 512bdbd8c8..7fcb2d213b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MoveData.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.cpp @@ -1,14 +1,14 @@ #include "MoveData.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/Filter/Actions/MoveDataAction.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/Filter/Actions/MoveDataAction.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/MultiPathSelectionParameter.hpp" +#include "simplnx/Parameters/MultiPathSelectionParameter.hpp" -namespace complex +namespace nx::core { namespace { @@ -122,4 +122,4 @@ Result MoveData::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MoveData.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MoveData.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp index af0c3d0ff2..212ffdebd9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MoveData.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveData.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT MoveData : public IFilter +class SIMPLNXCORE_EXPORT MoveData : public IFilter { public: MoveData() = default; @@ -25,7 +25,7 @@ class COMPLEXCORE_EXPORT MoveData : public IFilter static inline constexpr StringLiteral k_NewParent_Key = "new_parent"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -93,6 +93,6 @@ class COMPLEXCORE_EXPORT MoveData : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, MoveData, "651e5894-ab7c-4176-b7f0-ea466c521753"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, MoveData, "651e5894-ab7c-4176-b7f0-ea466c521753"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MultiThresholdObjects.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MultiThresholdObjects.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp index 4c3f98428f..4399609232 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MultiThresholdObjects.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.cpp @@ -1,21 +1,21 @@ #include "MultiThresholdObjects.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayThresholdsParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/DataTypeParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/ArrayThreshold.hpp" -#include "complex/Utilities/FilterUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayThresholdsParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataTypeParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/ArrayThreshold.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { namespace { @@ -23,7 +23,7 @@ template class ThresholdFilterHelper { public: - ThresholdFilterHelper(complex::ArrayThreshold::ComparisonType compType, complex::ArrayThreshold::ComparisonValue compValue, std::vector& output) + ThresholdFilterHelper(nx::core::ArrayThreshold::ComparisonType compType, nx::core::ArrayThreshold::ComparisonValue compValue, std::vector& output) : m_ComparisonOperator(compType) , m_ComparisonValue(compValue) , m_Output(output) @@ -115,8 +115,8 @@ class ThresholdFilterHelper } private: - complex::ArrayThreshold::ComparisonType m_ComparisonOperator; - complex::ArrayThreshold::ComparisonValue m_ComparisonValue; + nx::core::ArrayThreshold::ComparisonType m_ComparisonOperator; + nx::core::ArrayThreshold::ComparisonValue m_ComparisonValue; std::vector& m_Output; public: @@ -145,7 +145,7 @@ struct ExecuteThresholdHelper * @param inverse */ template -void InsertThreshold(usize numItems, DataArray& currentArray, complex::IArrayThreshold::UnionOperator unionOperator, std::vector& newArrayPtr, bool inverse, T trueValue, T falseValue) +void InsertThreshold(usize numItems, DataArray& currentArray, nx::core::IArrayThreshold::UnionOperator unionOperator, std::vector& newArrayPtr, bool inverse, T trueValue, T falseValue) { for(usize i = 0; i < numItems; i++) { @@ -155,7 +155,7 @@ void InsertThreshold(usize numItems, DataArray& currentArray, complex::IArray newArrayPtr[i] = (newArrayPtr[i] == trueValue) ? falseValue : trueValue; } - if(complex::IArrayThreshold::UnionOperator::Or == unionOperator) + if(nx::core::IArrayThreshold::UnionOperator::Or == unionOperator) { currentArray[i] = (currentArray[i] == trueValue || newArrayPtr[i] == trueValue) ? trueValue : falseValue; } @@ -183,9 +183,9 @@ void ThresholdValue(std::shared_ptr& comparisonValue, DataStruct size_t totalTuples = outputResultArray.getNumberOfTuples(); std::vector tempResultVector(totalTuples, falseValue); - complex::ArrayThreshold::ComparisonType compOperator = comparisonValue->getComparisonType(); - complex::ArrayThreshold::ComparisonValue compValue = comparisonValue->getComparisonValue(); - complex::IArrayThreshold::UnionOperator unionOperator = comparisonValue->getUnionOperator(); + nx::core::ArrayThreshold::ComparisonType compOperator = comparisonValue->getComparisonType(); + nx::core::ArrayThreshold::ComparisonValue compValue = comparisonValue->getComparisonValue(); + nx::core::IArrayThreshold::UnionOperator unionOperator = comparisonValue->getUnionOperator(); DataPath inputDataArrayPath = comparisonValue->getArrayPath(); @@ -600,4 +600,4 @@ Result MultiThresholdObjects::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MultiThresholdObjects.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/MultiThresholdObjects.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp index 9e1076677d..aefd6655ba 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/MultiThresholdObjects.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjects.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT MultiThresholdObjects : public IFilter +class SIMPLNXCORE_EXPORT MultiThresholdObjects : public IFilter { public: MultiThresholdObjects() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT MultiThresholdObjects : public IFilter static inline constexpr StringLiteral k_CreatedMaskType_Key = "created_mask_type"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class COMPLEXCORE_EXPORT MultiThresholdObjects : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, MultiThresholdObjects, "4246245e-1011-4add-8436-0af6bed19228"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, MultiThresholdObjects, "4246245e-1011-4add-8436-0af6bed19228"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/NearestPointFuseRegularGridsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/NearestPointFuseRegularGridsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp index 4fa811d811..81325ea861 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/NearestPointFuseRegularGridsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp @@ -1,25 +1,25 @@ #include "NearestPointFuseRegularGridsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp" +#include "SimplnxCore/Filters/Algorithms/NearestPointFuseRegularGrids.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string NearestPointFuseRegularGridsFilter::name() const @@ -96,7 +96,7 @@ IFilter::PreflightResult NearestPointFuseRegularGridsFilter::preflightImpl(const auto pReferenceCellAttributeMatrixPathValue = filterArgs.value(k_ReferenceCellAttributeMatrixPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto* sampleAM = dataStructure.getDataAs(pSamplingCellAttributeMatrixPathValue); @@ -181,4 +181,4 @@ Result NearestPointFuseRegularGridsFilter::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp index fccfffc37d..2ba55bebd3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class NearestPointFuseRegularGridsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT NearestPointFuseRegularGridsFilter : public IFilter +class SIMPLNXCORE_EXPORT NearestPointFuseRegularGridsFilter : public IFilter { public: NearestPointFuseRegularGridsFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT NearestPointFuseRegularGridsFilter : public IFilter static inline constexpr StringLiteral k_FillValue_Key = "fill_value"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class COMPLEXCORE_EXPORT NearestPointFuseRegularGridsFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, NearestPointFuseRegularGridsFilter, "c8746bf8-fa5f-48b0-8a47-11023402e543"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, NearestPointFuseRegularGridsFilter, "c8746bf8-fa5f-48b0-8a47-11023402e543"); /* LEGACY UUID FOR THIS FILTER cbaf9e68-5ded-560c-9440-509289100ea8 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PartitionGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/PartitionGeometryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp index 18a8f3bd06..2fb2d96800 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PartitionGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp @@ -1,24 +1,24 @@ #include "PartitionGeometryFilter.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/GeometryUtilities.hpp" - -using namespace complex; +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/GeometryUtilities.hpp" + +using namespace nx::core; namespace { @@ -207,7 +207,7 @@ Result GeneratePartitioningSchemeInfo(const Geom& } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string PartitionGeometryFilter::name() const @@ -442,7 +442,7 @@ IFilter::PreflightResult PartitionGeometryFilter::preflightImpl(const DataStruct return {ConvertResultTo(std::move(ConvertResult(std::move(psInfo))), {})}; } - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; DataPath dap = pInputGeomCellAMPathValue.createChildPath(pPartitionIdsArrayNameValue); auto action = std::make_unique(DataType::int32, attrMatrix.getShape(), std::vector{1}, dap); @@ -741,4 +741,4 @@ Result<> PartitionGeometryFilter::executeImpl(DataStructure& dataStructure, cons return PartitionGeometry(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PartitionGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/PartitionGeometryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp index 6652ee51ee..9d7685011a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PartitionGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.hpp @@ -2,16 +2,16 @@ #include "Algorithms/PartitionGeometry.hpp" -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class PartitionGeometryFilter @@ -31,7 +31,7 @@ namespace complex * possible, using this mode, to create a partitioning scheme that does not completely fit the input geometry. * In this case, the out-of-bounds value is used to label those particular cells/vertices. */ -class COMPLEXCORE_EXPORT PartitionGeometryFilter : public IFilter +class SIMPLNXCORE_EXPORT PartitionGeometryFilter : public IFilter { public: PartitionGeometryFilter() = default; @@ -164,7 +164,7 @@ class COMPLEXCORE_EXPORT PartitionGeometryFilter : public IFilter Result generateNodeBasedPSInfo(const DataStructure& dataStructure, const Arguments& filterArgs, const DataPath& geometryToPartitionPath, const DataPath& attrMatrixPath) const; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, PartitionGeometryFilter, "aad29ebc-bf1c-5dd3-ad25-0f7f8907a02d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, PartitionGeometryFilter, "aad29ebc-bf1c-5dd3-ad25-0f7f8907a02d"); /* LEGACY UUID FOR THIS FILTER {aad29ebc-bf1c-5dd3-ad25-0f7f8907a02d} */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PointSampleTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/PointSampleTriangleGeometryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp index bf21db4ddc..10ae8bb537 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PointSampleTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp @@ -1,25 +1,25 @@ #include "PointSampleTriangleGeometryFilter.hpp" -#include "ComplexCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp" +#include "SimplnxCore/Filters/Algorithms/PointSampleTriangleGeometry.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CopyArrayInstanceAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CopyArrayInstanceAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string PointSampleTriangleGeometryFilter::name() const @@ -48,7 +48,7 @@ std::string PointSampleTriangleGeometryFilter::humanName() const //------------------------------------------------------------------------------ std::vector PointSampleTriangleGeometryFilter::defaultTags() const { - return {className(), "ComplexCore", "Geometry", "TriangleGeometry", "Resample"}; + return {className(), "SimplnxCore", "Geometry", "TriangleGeometry", "Resample"}; } //------------------------------------------------------------------------------ @@ -77,7 +77,7 @@ Parameters PointSampleTriangleGeometryFilter::parameters() const params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Face Attribute Arrays to Transfer", "The paths to the Face Attribute Arrays to transfer to the created Vertex Geometry where the mask is false, if Use Mask is checked", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Objects"}); @@ -119,7 +119,7 @@ IFilter::PreflightResult PointSampleTriangleGeometryFilter::preflightImpl(const PreflightResult preflightResult; - complex::Result resultOutputActions = {}; + nx::core::Result resultOutputActions = {}; std::vector preflightUpdatedValues; @@ -246,4 +246,4 @@ Result PointSampleTriangleGeometryFilter::FromSIMPLJson(const nlohman return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp index 4b65eac6e4..85eea5b10d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class PointSampleTriangleGeometryFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT PointSampleTriangleGeometryFilter : public IFilter +class SIMPLNXCORE_EXPORT PointSampleTriangleGeometryFilter : public IFilter { public: PointSampleTriangleGeometryFilter() = default; @@ -40,7 +40,7 @@ class COMPLEXCORE_EXPORT PointSampleTriangleGeometryFilter : public IFilter static inline constexpr StringLiteral k_SeedArrayName_Key = "seed_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -110,6 +110,6 @@ class COMPLEXCORE_EXPORT PointSampleTriangleGeometryFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, PointSampleTriangleGeometryFilter, "ee34ef95-aa04-4ad3-8232-5783a880d279"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, PointSampleTriangleGeometryFilter, "ee34ef95-aa04-4ad3-8232-5783a880d279"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/QuickSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/QuickSurfaceMeshFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp index 1b77670c06..f561b42e2c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/QuickSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp @@ -1,26 +1,26 @@ #include "QuickSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/Algorithms/QuickSurfaceMesh.hpp" +#include "SimplnxCore/Filters/Algorithms/QuickSurfaceMesh.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CopyArrayInstanceAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CopyArrayInstanceAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string QuickSurfaceMeshFilter::name() const @@ -71,7 +71,7 @@ Parameters QuickSurfaceMeshFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique( k_SelectedDataArrayPaths_Key, "Attribute Arrays to Transfer", "The paths to the Arrays specifying which Cell Attribute Arrays to transfer to the created Triangle Geometry", - MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); params.insert( @@ -120,7 +120,7 @@ IFilter::PreflightResult QuickSurfaceMeshFilter::preflightImpl(const DataStructu DataPath pFaceGroupDataPath = pTriangleGeometryPath.createChildPath(pFaceGroupDataName); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto* gridGeom = dataStructure.getDataAs(pGridGeomDataPath); @@ -142,13 +142,13 @@ IFilter::PreflightResult QuickSurfaceMeshFilter::preflightImpl(const DataStructu } // Create the face NodesType DataArray action and store it { - auto createArrayAction = std::make_unique(complex::DataType::int8, std::vector{1}, std::vector{1}, + auto createArrayAction = std::make_unique(nx::core::DataType::int8, std::vector{1}, std::vector{1}, pTriangleGeometryPath.createChildPath(pVertexGroupDataName).createChildPath(pNodeTypesName), dataStoreFormat); resultOutputActions.value().appendAction(std::move(createArrayAction)); } // Create the face Labels DataArray action and store it { - auto createArrayAction = std::make_unique(complex::DataType::int32, std::vector{numElements}, std::vector{2}, + auto createArrayAction = std::make_unique(nx::core::DataType::int32, std::vector{numElements}, std::vector{2}, pTriangleGeometryPath.createChildPath(pFaceGroupDataName).createChildPath(pFaceLabelsName), dataStoreFormat); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -179,7 +179,7 @@ IFilter::PreflightResult QuickSurfaceMeshFilter::preflightImpl(const DataStructu Result<> QuickSurfaceMeshFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - complex::QuickSurfaceMeshInputValues inputValues; + nx::core::QuickSurfaceMeshInputValues inputValues; inputValues.GenerateTripleLines = filterArgs.value(k_GenerateTripleLines_Key); inputValues.FixProblemVoxels = filterArgs.value(k_FixProblemVoxels_Key); @@ -201,7 +201,7 @@ Result<> QuickSurfaceMeshFilter::executeImpl(DataStructure& dataStructure, const } inputValues.CreatedDataArrayPaths = createdDataPaths; - return complex::QuickSurfaceMesh(dataStructure, &inputValues, shouldCancel, messageHandler)(); + return nx::core::QuickSurfaceMesh(dataStructure, &inputValues, shouldCancel, messageHandler)(); } namespace @@ -242,4 +242,4 @@ Result QuickSurfaceMeshFilter::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/QuickSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/QuickSurfaceMeshFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp index 0e89300e0e..71681fc84f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/QuickSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class QuickSurfaceMeshFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT QuickSurfaceMeshFilter : public IFilter +class SIMPLNXCORE_EXPORT QuickSurfaceMeshFilter : public IFilter { public: QuickSurfaceMeshFilter() = default; @@ -41,7 +41,7 @@ class COMPLEXCORE_EXPORT QuickSurfaceMeshFilter : public IFilter static inline constexpr StringLiteral k_FaceFeatureAttributeMatrixName_Key = "face_feature_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -111,6 +111,6 @@ class COMPLEXCORE_EXPORT QuickSurfaceMeshFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, QuickSurfaceMeshFilter, "13dd00bd-ad49-4e04-95eb-3267952fd6e5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, QuickSurfaceMeshFilter, "13dd00bd-ad49-4e04-95eb-3267952fd6e5"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp index 8e4872e07c..1be8a3d3a9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp @@ -1,24 +1,24 @@ #include "ReadBinaryCTNorthstarFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp" - -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "SimplnxCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp" + +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -316,7 +316,7 @@ Result>, ReadBinaryCTNorthstarF } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ ReadBinaryCTNorthstarFilter::ReadBinaryCTNorthstarFilter() @@ -497,7 +497,7 @@ IFilter::PreflightResult ReadBinaryCTNorthstarFilter::preflightImpl(const DataSt s_HeaderCache[m_InstanceId].DataFilePaths = dataFiles; // Set the output actions - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; auto createImageGeometryAction = std::make_unique(pImageGeometryPathValue, importedGeometryInfo.Dimensions, importedGeometryInfo.Origin, importedGeometryInfo.Spacing, pCellAttributeMatrixNameValue); resultOutputActions.value().appendAction(std::move(createImageGeometryAction)); @@ -589,4 +589,4 @@ Result ReadBinaryCTNorthstarFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp index 4c5ca447c2..33b3fbc568 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" +#include "simplnx/Filter/FilterTraits.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { /** * @class ReadBinaryCTNorthstarFilter @@ -20,7 +20,7 @@ namespace complex * files are in the same directory as the .nsihdr files. */ -class COMPLEXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter { public: ReadBinaryCTNorthstarFilter(); @@ -43,7 +43,7 @@ class COMPLEXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter static inline constexpr StringLiteral k_EndVoxelCoord_Key = "end_voxel_coord"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -123,7 +123,7 @@ class COMPLEXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter private: int32 m_InstanceId; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadBinaryCTNorthstarFilter, "5469af5c-368a-465b-87b7-7c0dfdf73666"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadBinaryCTNorthstarFilter, "5469af5c-368a-465b-87b7-7c0dfdf73666"); /* LEGACY UUID FOR THIS FILTER f2259481-5011-5f22-9fcb-c92fb6f8be10 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadCSVFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadCSVFileFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp index 484400eeca..7054ff6721 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadCSVFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp @@ -1,29 +1,29 @@ #include "ReadCSVFileFilter.hpp" -#include "ComplexCore/utils/CSVDataParser.hpp" - -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/ReadCSVFileParameter.hpp" -#include "complex/Utilities/FileUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "SimplnxCore/utils/CSVDataParser.hpp" + +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/ReadCSVFileParameter.hpp" +#include "simplnx/Utilities/FileUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; using ParsersVector = std::vector>; using StringVector = std::vector; @@ -132,57 +132,57 @@ Result createParsers(const DataTypeVector& dataTypes, const std:: switch(dataType) { - case complex::DataType::int8: { + case nx::core::DataType::int8: { Int8Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::uint8: { + case nx::core::DataType::uint8: { UInt8Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::int16: { + case nx::core::DataType::int16: { Int16Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::uint16: { + case nx::core::DataType::uint16: { UInt16Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::int32: { + case nx::core::DataType::int32: { Int32Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::uint32: { + case nx::core::DataType::uint32: { UInt32Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::int64: { + case nx::core::DataType::int64: { Int64Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::uint64: { + case nx::core::DataType::uint64: { UInt64Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::float32: { + case nx::core::DataType::float32: { Float32Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::float64: { + case nx::core::DataType::float64: { Float64Array& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; } - case complex::DataType::boolean: { + case nx::core::DataType::boolean: { BoolArray& data = dataStructure.getDataRefAs(arrayPath); dataParsers[i] = std::make_unique(data, name, i); break; @@ -311,7 +311,7 @@ IFilter::PreflightResult readHeaders(const std::string& inputFilePath, usize hea } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ ReadCSVFileFilter::ReadCSVFileFilter() @@ -404,7 +404,7 @@ IFilter::PreflightResult ReadCSVFileFilter::preflightImpl(const DataStructure& d std::string inputFilePath = readCSVData.inputFilePath; ReadCSVData::HeaderMode headerMode = readCSVData.headerMode; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Validate the input file path if(inputFilePath.empty()) @@ -722,4 +722,4 @@ Result ReadCSVFileFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadCSVFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadCSVFileFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp index ff913c75fa..465c0d816a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadCSVFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.hpp @@ -1,27 +1,27 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" class AbstractDataParser; -namespace complex +namespace nx::core { /** * @class ReadCSVFileFilter - * @brief This filter reads CSV data from any text-based file and imports the data into complex-style arrays. + * @brief This filter reads CSV data from any text-based file and imports the data into simplnx-style arrays. * The user uses the parameter user interface to specify which file to import, how the data is formatted, what to call * each array, and what type each array should be. * - * Note:* This filter is intended to read data that is column-oriented, such that each created complex array + * Note:* This filter is intended to read data that is column-oriented, such that each created simplnx array * corresponds to a column of data in the CSV file. Therefore, this filter will only import scalar arrays. * If multiple columns are in fact different components of the same array, then the columns may be imported as * separate arrays and then combined in the correct order using the Combine Attribute Arrays filter. */ -class COMPLEXCORE_EXPORT ReadCSVFileFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadCSVFileFilter : public IFilter { public: ReadCSVFileFilter(); @@ -40,7 +40,7 @@ class COMPLEXCORE_EXPORT ReadCSVFileFilter : public IFilter static inline constexpr StringLiteral k_CreatedDataGroup_Key = "created_data_group"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -114,6 +114,6 @@ class COMPLEXCORE_EXPORT ReadCSVFileFilter : public IFilter private: int32 m_InstanceId; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadCSVFileFilter, "373be1f8-31cf-49f6-aa5d-e356f4f3f261"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadCSVFileFilter, "373be1f8-31cf-49f6-aa5d-e356f4f3f261"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp index b98dccb68c..590e7c86f9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp @@ -1,26 +1,26 @@ #include "ReadDREAM3DFilter.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Filter/Actions/ImportH5ObjectPathsAction.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Pipeline/Pipeline.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Filter/Actions/ImportH5ObjectPathsAction.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace { -constexpr complex::StringLiteral k_ImportedPipeline = "Imported Pipeline"; -constexpr complex::int32 k_NoImportPathError = -1; -constexpr complex::int32 k_FailedOpenFileReaderError = -25; +constexpr nx::core::StringLiteral k_ImportedPipeline = "Imported Pipeline"; +constexpr nx::core::int32 k_NoImportPathError = -1; +constexpr nx::core::int32 k_FailedOpenFileReaderError = -25; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadDREAM3DFilter::name() const @@ -74,7 +74,7 @@ IFilter::PreflightResult ReadDREAM3DFilter::preflightImpl(const DataStructure& d { return {nonstd::make_unexpected(std::vector{Error{k_NoImportPathError, "Import file path not provided."}})}; } - complex::HDF5::FileReader fileReader(importData.FilePath); + nx::core::HDF5::FileReader fileReader(importData.FilePath); if(!fileReader.isValid()) { return {nonstd::make_unexpected(std::vector{Error{k_FailedOpenFileReaderError, "Failed to open the HDF5 file at the specified path."}})}; @@ -126,4 +126,4 @@ Result ReadDREAM3DFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp index 2a38f5c035..e9f9b94050 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Filter/Parameters.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Filter/Parameters.hpp" -namespace complex +namespace nx::core { /** * @class ReadDREAM3DFilter * @brief The ReadDREAM3DFilter is an IFilter class designed to import data * from a target DREAM.3D file. */ -class COMPLEXCORE_EXPORT ReadDREAM3DFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadDREAM3DFilter : public IFilter { public: ReadDREAM3DFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT ReadDREAM3DFilter : public IFilter static inline constexpr StringLiteral k_ImportFileData = "import_file_data"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class COMPLEXCORE_EXPORT ReadDREAM3DFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadDREAM3DFilter, "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadDREAM3DFilter, "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp similarity index 95% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp index 8d3cf6ec45..2138459a20 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp @@ -2,18 +2,18 @@ #include "Algorithms/ReadDeformKeyFileV12.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -21,7 +21,7 @@ std::atomic_int32_t s_InstanceId = 0; std::map s_HeaderCache; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ ReadDeformKeyFileV12Filter::ReadDeformKeyFileV12Filter() @@ -102,7 +102,7 @@ IFilter::PreflightResult ReadDeformKeyFileV12Filter::preflightImpl(const DataStr // Declare the preflightResult variable PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; DataPath vertexDataPath = pQuadGeomPathValue.createChildPath(pVertexAMNameValue); @@ -212,4 +212,4 @@ Result ReadDeformKeyFileV12Filter::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp index 0b896f14aa..0569fa4314 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp @@ -1,21 +1,21 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { /** * @class ReadDeformKeyFileV12Filter * @brief This filter will... */ -class COMPLEXCORE_EXPORT ReadDeformKeyFileV12Filter : public IFilter +class SIMPLNXCORE_EXPORT ReadDeformKeyFileV12Filter : public IFilter { public: ReadDeformKeyFileV12Filter(); @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT ReadDeformKeyFileV12Filter : public IFilter static inline constexpr StringLiteral k_CellAMName_Key = "cell_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class COMPLEXCORE_EXPORT ReadDeformKeyFileV12Filter : public IFilter private: int32 m_InstanceId; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadDeformKeyFileV12Filter, "22c421c3-573c-4125-883c-4d95bd6e3bcb"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadDeformKeyFileV12Filter, "22c421c3-573c-4125-883c-4d95bd6e3bcb"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5Dataset.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5Dataset.cpp index b28b9388f8..d356c300df 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5Dataset.cpp @@ -1,20 +1,20 @@ #include "ReadHDF5Dataset.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/ReadHDF5DatasetParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/Parsing/HDF5/H5.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" -#include "complex/Utilities/StringUtilities.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/ReadHDF5DatasetParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/Parsing/HDF5/H5.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace fs = std::filesystem; namespace @@ -45,7 +45,7 @@ std::vector createDimensionVector(const std::string& cDimsStr) } template -Result<> fillDataStore(DataArray& dataArray, const DataPath& dataArrayPath, const complex::HDF5::DatasetReader& datasetReader) +Result<> fillDataStore(DataArray& dataArray, const DataPath& dataArrayPath, const nx::core::HDF5::DatasetReader& datasetReader) { using StoreType = DataStore; StoreType& dataStore = dataArray.template getIDataStoreRefAs(); @@ -60,7 +60,7 @@ Result<> fillDataStore(DataArray& dataArray, const DataPath& dataArrayPath, c } template -Result<> fillOocDataStore(DataArray& dataArray, const DataPath& dataArrayPath, const complex::HDF5::DatasetReader& datasetReader) +Result<> fillOocDataStore(DataArray& dataArray, const DataPath& dataArrayPath, const nx::core::HDF5::DatasetReader& datasetReader) { if(Memory::GetTotalMemory() <= dataArray.getSize() * sizeof(T)) { @@ -82,7 +82,7 @@ Result<> fillOocDataStore(DataArray& dataArray, const DataPath& dataArrayPath } template -Result<> fillDataArray(DataStructure& dataStructure, const DataPath& dataArrayPath, const complex::HDF5::DatasetReader& datasetReader) +Result<> fillDataArray(DataStructure& dataStructure, const DataPath& dataArrayPath, const nx::core::HDF5::DatasetReader& datasetReader) { auto& dataArray = dataStructure.getDataRefAs>(dataArrayPath); if(dataArray.getDataFormat().empty()) @@ -96,7 +96,7 @@ Result<> fillDataArray(DataStructure& dataStructure, const DataPath& dataArrayPa } } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReadHDF5Dataset::name() const @@ -154,7 +154,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat auto inputFile = pImportHDF5FileValue.inputFile; auto datasetImportInfoList = pImportHDF5FileValue.datasets; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(inputFile.empty()) @@ -187,7 +187,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat const AttributeMatrix* parentAM = pSelectedAttributeMatrixValue.has_value() ? dataStructure.getDataAs(pSelectedAttributeMatrixValue.value()) : nullptr; int err = 0; - complex::HDF5::FileReader h5FileReader(inputFilePath); + nx::core::HDF5::FileReader h5FileReader(inputFilePath); hid_t fileId = h5FileReader.getId(); if(fileId < 0) { @@ -203,7 +203,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat } // Read dataset into DREAM.3D structure - complex::HDF5::DatasetReader datasetReader = h5FileReader.openDataset(datasetPath); + nx::core::HDF5::DatasetReader datasetReader = h5FileReader.openDataset(datasetPath); std::vector dims = datasetReader.getDimensions(); std::string objectName = datasetReader.getName(); @@ -272,7 +272,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat } } - // NOTE: When complex implements the AttributeMatrix, the user entered tuple dimensions should be optional in lieu of an attribute matrix as the selected data path/parent. + // NOTE: When simplnx implements the AttributeMatrix, the user entered tuple dimensions should be optional in lieu of an attribute matrix as the selected data path/parent. stream << "\n"; stream << " Total HDF5 Dataset Element Count: " << hdf5TotalElements << "\n"; stream << "-------------------------------------------\n"; @@ -340,7 +340,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat nonstd::make_unexpected(std::vector{Error{-20015, fmt::format("The selected datatset '{}' with type '{}' is not a supported type for importing. Please select a different data set", datasetPath, fmt::underlying(datasetReader.getType()))}})}; } - DataType dataType = complex::HDF5::toCommonType(type.value()).value(); + DataType dataType = nx::core::HDF5::toCommonType(type.value()).value(); auto action = std::make_unique(dataType, tDims, cDims, dataArrayPath); resultOutputActions.value().appendAction(std::move(action)); } @@ -359,7 +359,7 @@ Result<> ReadHDF5Dataset::executeImpl(DataStructure& dataStructure, const Argume fs::path inputFilePath(inputFile); auto datasetImportInfoList = pImportHDF5FileValue.datasets; - complex::HDF5::FileReader h5FileReader(inputFilePath); + nx::core::HDF5::FileReader h5FileReader(inputFilePath); hid_t fileId = h5FileReader.getId(); if(fileId < 0) { @@ -370,7 +370,7 @@ Result<> ReadHDF5Dataset::executeImpl(DataStructure& dataStructure, const Argume for(const auto& datasetImportInfo : datasetImportInfoList) { std::string datasetPath = datasetImportInfo.dataSetPath; - complex::HDF5::DatasetReader datasetReader = h5FileReader.openDataset(datasetPath); + nx::core::HDF5::DatasetReader datasetReader = h5FileReader.openDataset(datasetPath); std::string objectName = datasetReader.getName(); // Read dataset into DREAM.3D structure @@ -379,43 +379,43 @@ Result<> ReadHDF5Dataset::executeImpl(DataStructure& dataStructure, const Argume auto type = datasetReader.getType(); switch(type) { - case complex::HDF5::Type::float32: { + case nx::core::HDF5::Type::float32: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::float64: { + case nx::core::HDF5::Type::float64: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::int8: { + case nx::core::HDF5::Type::int8: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::int16: { + case nx::core::HDF5::Type::int16: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::int32: { + case nx::core::HDF5::Type::int32: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::int64: { + case nx::core::HDF5::Type::int64: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::uint8: { + case nx::core::HDF5::Type::uint8: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::uint16: { + case nx::core::HDF5::Type::uint16: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::uint32: { + case nx::core::HDF5::Type::uint32: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } - case complex::HDF5::Type::uint64: { + case nx::core::HDF5::Type::uint64: { fillArrayResults = fillDataArray(dataStructure, dataArrayPath, datasetReader); break; } @@ -456,4 +456,4 @@ Result ReadHDF5Dataset::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5Dataset.hpp similarity index 87% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5Dataset.hpp index 42439281c7..4da8b95bf1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5Dataset.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Filter/Parameters.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Filter/Parameters.hpp" -namespace complex +namespace nx::core { /** * @class ReadHDF5Dataset * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ReadHDF5Dataset : public IFilter +class SIMPLNXCORE_EXPORT ReadHDF5Dataset : public IFilter { public: ReadHDF5Dataset() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT ReadHDF5Dataset : public IFilter static inline constexpr StringLiteral k_ImportHDF5File_Key = "import_hd_f5_file"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,6 +99,6 @@ class COMPLEXCORE_EXPORT ReadHDF5Dataset : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadHDF5Dataset, "8027f145-c7d5-4589-900e-b909fb3a059c"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadHDF5Dataset, "8027f145-c7d5-4589-900e-b909fb3a059c"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp index 4c12b2bbd4..826effd149 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp @@ -1,25 +1,25 @@ #include "ReadRawBinaryFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ReadRawBinary.hpp" +#include "SimplnxCore/Filters/Algorithms/ReadRawBinary.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { constexpr int32 k_RbrZeroComponentsError = -391; constexpr int32 k_RbrNumComponentsError = -392; @@ -214,4 +214,4 @@ Result ReadRawBinaryFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp index 424d6bd79a..7ddd253f7b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadRawBinaryFilter @@ -16,7 +16,7 @@ namespace complex * this filter is simply reading the data into a pre-allocated array * interpreted as the user defines. */ -class COMPLEXCORE_EXPORT ReadRawBinaryFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadRawBinaryFilter : public IFilter { public: ReadRawBinaryFilter() = default; @@ -38,7 +38,7 @@ class COMPLEXCORE_EXPORT ReadRawBinaryFilter : public IFilter static inline constexpr StringLiteral k_CreatedAttributeArrayPath_Key = "created_attribute_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,6 +108,6 @@ class COMPLEXCORE_EXPORT ReadRawBinaryFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadRawBinaryFilter, "dd159366-5f12-42db-af6d-a33592ae8a89"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadRawBinaryFilter, "dd159366-5f12-42db-af6d-a33592ae8a89"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp index facb673e9a..d270a1193d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp @@ -1,28 +1,28 @@ #include "ReadStlFileFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ReadStlFile.hpp" -#include "ComplexCore/utils/StlUtilities.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "SimplnxCore/Filters/Algorithms/ReadStlFile.hpp" +#include "SimplnxCore/utils/StlUtilities.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -108,7 +108,7 @@ IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& d PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -163,7 +163,7 @@ IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& d auto faceNormalsPath = createTriangleGeometryAction->getFaceDataPath().createChildPath(faceNormalsName); resultOutputActions.value().appendAction(std::move(createTriangleGeometryAction)); // Create the face Normals DataArray action and store it - auto createArrayAction = std::make_unique(complex::DataType::float64, std::vector{static_cast(numTriangles)}, std::vector{3}, faceNormalsPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float64, std::vector{static_cast(numTriangles)}, std::vector{3}, faceNormalsPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); // Store the preflight updated value(s) into the preflightUpdatedValues vector using @@ -228,4 +228,4 @@ Result ReadStlFileFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp index 13e612eeb9..13d5ac0761 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @brief ReadStlFileFilter This filter will read a Binary STL file into a Triangle * Geometry including the Normal Vector for each face. The actual algorithm is - * contained in the ComplexCore/Filters/Algorithms/ReadStlFile + * contained in the SimplnxCore/Filters/Algorithms/ReadStlFile * */ -class COMPLEXCORE_EXPORT ReadStlFileFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadStlFileFilter : public IFilter { public: ReadStlFileFilter() = default; @@ -37,7 +37,7 @@ class COMPLEXCORE_EXPORT ReadStlFileFilter : public IFilter static inline constexpr StringLiteral k_FaceNormalsName_Key = "face_normals_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class COMPLEXCORE_EXPORT ReadStlFileFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadStlFileFilter, "2f64bd45-9d28-4254-9e07-6aa7c6d3d015"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadStlFileFilter, "2f64bd45-9d28-4254-9e07-6aa7c6d3d015"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp index 7c1ef5ff4b..d5c9c27128 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp @@ -1,28 +1,28 @@ #include "ReadTextDataArrayFilter.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataStoreFormatParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/Parsing/Text/CsvParser.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataStoreFormatParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/Parsing/Text/CsvParser.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { std::string ReadTextDataArrayFilter::name() const { @@ -98,7 +98,7 @@ IFilter::PreflightResult ReadTextDataArrayFilter::preflightImpl(const DataStruct auto tableData = args.value(k_NTuplesKey); auto dataFormat = args.value(k_DataFormat_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector tupleDims = {}; @@ -153,52 +153,52 @@ Result<> ReadTextDataArrayFilter::executeImpl(DataStructure& data, const Argumen auto choiceIndex = args.value(k_DelimiterChoiceKey); auto path = args.value(k_DataArrayKey); - char delimiter = complex::CsvParser::IndexToDelimiter(choiceIndex); + char delimiter = nx::core::CsvParser::IndexToDelimiter(choiceIndex); switch(numericType) { case NumericType::int8: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::uint8: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::int16: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::uint16: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::int32: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::uint32: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::int64: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::uint64: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::float32: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } case NumericType::float64: { - auto dataArray = complex::ArrayFromPath(data, path); + auto dataArray = nx::core::ArrayFromPath(data, path); return CsvParser::ReadFile(inputFilePath, *dataArray, skipLines, delimiter); } default: - return MakeErrorResult(-1001, fmt::format("ReadTextDataArrayFilter: Parameter NumericType which has a value of '{}' does not match any in complex.", to_underlying(numericType))); + return MakeErrorResult(-1001, fmt::format("ReadTextDataArrayFilter: Parameter NumericType which has a value of '{}' does not match any in simplnx.", to_underlying(numericType))); } } @@ -233,4 +233,4 @@ Result ReadTextDataArrayFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp index cede28a94e..5fb0c8e55f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT ReadTextDataArrayFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadTextDataArrayFilter : public IFilter { public: ReadTextDataArrayFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT ReadTextDataArrayFilter : public IFilter static inline constexpr StringLiteral k_AdvancedOptions_Key = "advanced_options"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT ReadTextDataArrayFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadTextDataArrayFilter, "25f7df3e-ca3e-4634-adda-732c0e56efd4"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadTextDataArrayFilter, "25f7df3e-ca3e-4634-adda-732c0e56efd4"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp index de92aec18a..010fc131bb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp @@ -1,21 +1,21 @@ #include "ReadVolumeGraphicsFileFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp" +#include "SimplnxCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -339,7 +339,7 @@ std::map s_HeaderCache; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ ReadVolumeGraphicsFileFilter::ReadVolumeGraphicsFileFilter() @@ -423,7 +423,7 @@ IFilter::PreflightResult ReadVolumeGraphicsFileFilter::preflightImpl(const DataS HeaderMetadata metadata = metadataResult.value(); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; auto createImageGeometryAction = std::make_unique( pNewImageGeometryPathValue, CreateImageGeometryAction::DimensionType{metadata.Dimensions[0], metadata.Dimensions[1], metadata.Dimensions[2]}, CreateImageGeometryAction::OriginType{0, 0, 0}, @@ -487,4 +487,4 @@ Result ReadVolumeGraphicsFileFilter::FromSIMPLJson(const nlohmann::js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp index 109e603f34..4399f8e22f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReadVolumeGraphicsFileFilter @@ -16,7 +16,7 @@ namespace complex * is read to find out the dimensions, spacing and units of the data. The name of the .vol * file is also contained in the .vgi file. */ -class COMPLEXCORE_EXPORT ReadVolumeGraphicsFileFilter : public IFilter +class SIMPLNXCORE_EXPORT ReadVolumeGraphicsFileFilter : public IFilter { public: ReadVolumeGraphicsFileFilter(); @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT ReadVolumeGraphicsFileFilter : public IFilter static inline constexpr StringLiteral k_DensityArrayName_Key = "density_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -120,6 +120,6 @@ class COMPLEXCORE_EXPORT ReadVolumeGraphicsFileFilter : public IFilter private: int32 m_InstanceId; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReadVolumeGraphicsFileFilter, "dfd93665-b455-499a-abed-36ae7dbcdf57"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReadVolumeGraphicsFileFilter, "dfd93665-b455-499a-abed-36ae7dbcdf57"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp index e496070d72..eaefcf7dea 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp @@ -1,24 +1,24 @@ #include "RegularGridSampleSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp" +#include "SimplnxCore/Filters/Algorithms/RegularGridSampleSurfaceMesh.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string RegularGridSampleSurfaceMeshFilter::name() const @@ -70,7 +70,7 @@ Parameters RegularGridSampleSurfaceMeshFilter::parameters() const params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The geometry to be sampled onto grid", DataPath{}, GeometrySelectionParameter::AllowedTypes{GeometrySelectionParameter::AllowedType ::Triangle})); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Array specifying which Features are on either side of each Face", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Created Objects"}); params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "The name and path for the image geometry to be created", DataPath{})); @@ -100,7 +100,7 @@ IFilter::PreflightResult RegularGridSampleSurfaceMeshFilter::preflightImpl(const auto pFeatureIdsArrayNameValue = filterArgs.value(k_FeatureIdsArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector tupleDims = {static_cast(pDimensionsValue[0]), static_cast(pDimensionsValue[1]), static_cast(pDimensionsValue[2])}; @@ -195,4 +195,4 @@ Result RegularGridSampleSurfaceMeshFilter::FromSIMPLJson(const nlohma return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp index c389a998ea..e0c54f74ff 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RegularGridSampleSurfaceMeshFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : public IFilter +class SIMPLNXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : public IFilter { public: RegularGridSampleSurfaceMeshFilter() = default; @@ -35,7 +35,7 @@ class COMPLEXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : public IFilter static inline constexpr StringLiteral k_CellAMName_Key = "cell_attribute_matrix_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -105,7 +105,7 @@ class COMPLEXCORE_EXPORT RegularGridSampleSurfaceMeshFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RegularGridSampleSurfaceMeshFilter, "7d061fe1-7c88-45ef-a7ee-f8ab027c8e85"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RegularGridSampleSurfaceMeshFilter, "7d061fe1-7c88-45ef-a7ee-f8ab027c8e85"); /* LEGACY UUID FOR THIS FILTER 0df3da89-9106-538e-b1a9-6bbf1cf0aa92 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp index 258d4061af..ba4747c782 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp @@ -1,32 +1,32 @@ #include "RemoveFlaggedFeaturesFilter.hpp" #include "Algorithms/RemoveFlaggedFeatures.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" - -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" - -using namespace complex; +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" + +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" + +using namespace nx::core; namespace { const std::string k_boundsName = "tempBounds"; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string RemoveFlaggedFeaturesFilter::name() const @@ -85,7 +85,7 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_IgnoredDataArrayPaths_Key, "Attribute Arrays to Ignore", "The list of arrays to ignore when removing flagged features", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_Functionality_Key, k_CreatedImageGeometryPrefix_Key, std::make_any(to_underlying(Functionality::Extract))); @@ -116,7 +116,7 @@ IFilter::PreflightResult RemoveFlaggedFeaturesFilter::preflightImpl(const DataSt auto fillGaps = filterArgs.value(k_FillRemovedFeatures_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto* featureIdsPtr = dataStructure.getDataAs(pFeatureIdsArrayPathValue); @@ -168,9 +168,9 @@ IFilter::PreflightResult RemoveFlaggedFeaturesFilter::preflightImpl(const DataSt { // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pFeatureIdsArrayPathValue.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pFeatureIdsArrayPathValue.getParent(), {}); // Feature Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pFlaggedFeaturesArrayPathValue.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pFlaggedFeaturesArrayPathValue.getParent(), {}); } return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -224,4 +224,4 @@ Result RemoveFlaggedFeaturesFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp index b7b2664c77..281d6947f7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RemoveFlaggedFeaturesFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT RemoveFlaggedFeaturesFilter : public IFilter +class SIMPLNXCORE_EXPORT RemoveFlaggedFeaturesFilter : public IFilter { public: RemoveFlaggedFeaturesFilter() = default; @@ -33,7 +33,7 @@ class COMPLEXCORE_EXPORT RemoveFlaggedFeaturesFilter : public IFilter static inline constexpr StringLiteral k_IgnoredDataArrayPaths_Key = "ignored_data_array_paths"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,6 +103,6 @@ class COMPLEXCORE_EXPORT RemoveFlaggedFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RemoveFlaggedFeaturesFilter, "6e8cc6ec-8b9b-402e-9deb-85bd1cdba743"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RemoveFlaggedFeaturesFilter, "6e8cc6ec-8b9b-402e-9deb-85bd1cdba743"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedVertices.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedVertices.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp index 2aa9588d77..cde3a0faef 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedVertices.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.cpp @@ -1,26 +1,26 @@ #include "RemoveFlaggedVertices.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CopyDataObjectAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CopyDataObjectAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -57,7 +57,7 @@ struct RemoveFlaggedVerticesFunctor }; } // namespace -namespace complex +namespace nx::core { std::string RemoveFlaggedVertices::name() const @@ -112,7 +112,7 @@ IFilter::PreflightResult RemoveFlaggedVertices::preflightImpl(const DataStructur auto maskArrayPath = filterArgs.value(k_MaskPath_Key); auto reducedVertexPath = filterArgs.value(k_ReducedVertexGeometryPath_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector dataArrayPaths; @@ -185,7 +185,7 @@ IFilter::PreflightResult RemoveFlaggedVertices::preflightImpl(const DataStructur { for(const auto& childPath : childPaths.value()) { - const std::string copiedChildName = complex::StringUtilities::replace(childPath.toString(), vertexGeomPath.getTargetName(), reducedVertexPath.getTargetName()); + const std::string copiedChildName = nx::core::StringUtilities::replace(childPath.toString(), vertexGeomPath.getTargetName(), reducedVertexPath.getTargetName()); const DataPath copiedChildPath = DataPath::FromString(copiedChildName).value(); if(dataStructure.getDataAs(childPath) != nullptr) { @@ -195,7 +195,7 @@ IFilter::PreflightResult RemoveFlaggedVertices::preflightImpl(const DataStructur { for(const auto& sourcePath : pathsToBeCopied.value()) { - const std::string createdPathName = complex::StringUtilities::replace(sourcePath.toString(), vertexGeomPath.getTargetName(), reducedVertexPath.getTargetName()); + const std::string createdPathName = nx::core::StringUtilities::replace(sourcePath.toString(), vertexGeomPath.getTargetName(), reducedVertexPath.getTargetName()); allCreatedPaths.push_back(DataPath::FromString(createdPathName).value()); } } @@ -234,7 +234,7 @@ Result<> RemoveFlaggedVertices::executeImpl(DataStructure& data, const Arguments reducedVertexGeom.resizeVertexList(numVerticesToKeep); reducedVertexGeom.getVertexAttributeMatrix()->resizeTuples(tDims); - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, fmt::format("Copying vertices to reduced geometry")}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, fmt::format("Copying vertices to reduced geometry")}); size_t keepIndex = 0; // Loop over each vertex and only copy the vertices that were *NOT* flagged for removal @@ -261,7 +261,7 @@ Result<> RemoveFlaggedVertices::executeImpl(DataStructure& data, const Arguments const DataPath destinationPath = reducedVertexGeom.getVertexAttributeMatrixDataPath().createChildPath(src.getName()); auto& dest = data.getDataRefAs(destinationPath); - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, fmt::format("Copying source array '{}' to reduced geometry vertex data.", src.getName())}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, fmt::format("Copying source array '{}' to reduced geometry vertex data.", src.getName())}); ExecuteDataFunction(RemoveFlaggedVerticesFunctor{}, src.getDataType(), src, dest, mask, numVerticesToKeep); } @@ -293,4 +293,4 @@ Result RemoveFlaggedVertices::FromSIMPLJson(const nlohmann::json& jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedVertices.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedVertices.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp index dcc0788a1a..594ddd2305 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveFlaggedVertices.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVertices.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RemoveFlaggedVertices * @brief This filter will remove specified vertices from the specified geometry. */ -class COMPLEXCORE_EXPORT RemoveFlaggedVertices : public IFilter +class SIMPLNXCORE_EXPORT RemoveFlaggedVertices : public IFilter { public: RemoveFlaggedVertices() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT RemoveFlaggedVertices : public IFilter static inline constexpr StringLiteral k_ReducedVertexGeometryPath_Key = "reduced_vertex"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -99,6 +99,6 @@ class COMPLEXCORE_EXPORT RemoveFlaggedVertices : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RemoveFlaggedVertices, "46099b4c-ef90-4fb3-b5e9-6c8c543c5be1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RemoveFlaggedVertices, "46099b4c-ef90-4fb3-b5e9-6c8c543c5be1"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp index 38ee3c9a6b..ae3a0da6e4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp @@ -1,23 +1,23 @@ #include "RemoveMinimumSizeFeaturesFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { using FeatureIdsArrayType = Int32Array; @@ -369,14 +369,14 @@ IFilter::PreflightResult RemoveMinimumSizeFeaturesFilter::preflightImpl(const Da } // Create the preflightResult object - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Throw a warning to inform the user that the neighbor list arrays could be deleted by this filter std::string ss = fmt::format("If this filter modifies the Cell Level Array '{}', all arrays of type NeighborList will be deleted from the feature data group '{}'. These arrays are:\n", featureIdsPath.toString(), featureGroupDataPath.toString()); - auto result = complex::GetAllChildDataPaths(data, featureGroupDataPath, DataObject::Type::NeighborList); + auto result = nx::core::GetAllChildDataPaths(data, featureGroupDataPath, DataObject::Type::NeighborList); if(!result.has_value()) { return {nonstd::make_unexpected( @@ -392,7 +392,7 @@ IFilter::PreflightResult RemoveMinimumSizeFeaturesFilter::preflightImpl(const Da // Inform users that the following arrays are going to be modified in place // Feature Data is going to be modified - complex::AppendDataObjectModifications(data, resultOutputActions.value().modifiedActions, featureGroupDataPath, {}); + nx::core::AppendDataObjectModifications(data, resultOutputActions.value().modifiedActions, featureGroupDataPath, {}); resultOutputActions.warnings().push_back(Warning{k_NeighborListRemoval, ss}); @@ -464,9 +464,9 @@ Result<> RemoveMinimumSizeFeaturesFilter::executeImpl(DataStructure& dataStructu } } std::string message = fmt::format("Feature Count Changed: Previous: {} New: {}", currentFeatureCount, count); - messageHandler(complex::IFilter::Message{complex::IFilter::Message::Type::Info, message}); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); - complex::RemoveInactiveObjects(dataStructure, cellFeatureGroupPath, activeObjects, featureIdsArrayRef, currentFeatureCount); + nx::core::RemoveInactiveObjects(dataStructure, cellFeatureGroupPath, activeObjects, featureIdsArrayRef, currentFeatureCount); return {}; } @@ -503,4 +503,4 @@ Result RemoveMinimumSizeFeaturesFilter::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp index 9069d6d19f..0c1feb237e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RemoveMinimumSizeFeaturesFilter * @brief */ -class COMPLEXCORE_EXPORT RemoveMinimumSizeFeaturesFilter : public IFilter +class SIMPLNXCORE_EXPORT RemoveMinimumSizeFeaturesFilter : public IFilter { public: RemoveMinimumSizeFeaturesFilter() = default; @@ -33,7 +33,7 @@ class COMPLEXCORE_EXPORT RemoveMinimumSizeFeaturesFilter : public IFilter static inline constexpr StringLiteral k_PhaseNumber_Key = "phase_number"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT RemoveMinimumSizeFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RemoveMinimumSizeFeaturesFilter, "074472d3-ba8d-4a1a-99f2-2d56a0d082a0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RemoveMinimumSizeFeaturesFilter, "074472d3-ba8d-4a1a-99f2-2d56a0d082a0"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RenameDataObject.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RenameDataObject.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp index 909e860362..b2454fa2a2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RenameDataObject.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.cpp @@ -1,23 +1,23 @@ #include "RenameDataObject.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Filter/Actions/RenameDataAction.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Filter/Actions/RenameDataAction.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { constexpr int32 k_EmptyParameterError = -520; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -126,4 +126,4 @@ Result RenameDataObject::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RenameDataObject.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RenameDataObject.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp index 10b0492ca8..0712195f54 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RenameDataObject.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObject.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RenameDataObject * @brief RenameDataObject class is used to rename any DataObject. */ -class COMPLEXCORE_EXPORT RenameDataObject : public IFilter +class SIMPLNXCORE_EXPORT RenameDataObject : public IFilter { public: RenameDataObject() = default; @@ -29,7 +29,7 @@ class COMPLEXCORE_EXPORT RenameDataObject : public IFilter static inline constexpr StringLiteral k_NewName_Key = "new_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,6 +100,6 @@ class COMPLEXCORE_EXPORT RenameDataObject : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RenameDataObject, "911a3aa9-d3c2-4f66-9451-8861c4b726d5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RenameDataObject, "911a3aa9-d3c2-4f66-9451-8861c4b726d5"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp index 9f3f602b1d..f65fc37b7b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp @@ -1,22 +1,22 @@ #include "ReplaceElementAttributesWithNeighborValuesFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp" +#include "SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReplaceElementAttributesWithNeighborValuesFilter::name() const @@ -63,7 +63,7 @@ Parameters ReplaceElementAttributesWithNeighborValuesFilter::parameters() const params.insert(std::make_unique(k_SelectedImageGeometry_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_ComparisonDataPath, "Input Comparison Array", "The DataPath to the input array to use for comparison", DataPath{}, - complex::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); + nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); return params; } @@ -80,13 +80,13 @@ IFilter::PreflightResult ReplaceElementAttributesWithNeighborValuesFilter::prefl { auto pComparisonDataPath = filterArgs.value(k_ComparisonDataPath); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pComparisonDataPath.getParent(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, pComparisonDataPath.getParent(), {}); return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; } @@ -134,4 +134,4 @@ Result ReplaceElementAttributesWithNeighborValuesFilter::FromSIMPLJso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp index 676658f288..e47e52c755 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReplaceElementAttributesWithNeighborValuesFilter * @brief This filter will replace values based on neighbor values. More information can * be found in the help file located in docs/ReplaceElementAttributesWithNeighborValuesFilter.md */ -class COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : public IFilter +class SIMPLNXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : public IFilter { public: ReplaceElementAttributesWithNeighborValuesFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : publ static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class COMPLEXCORE_EXPORT ReplaceElementAttributesWithNeighborValuesFilter : publ */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReplaceElementAttributesWithNeighborValuesFilter, "65128c53-d3be-4a69-a559-32a48d603884"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReplaceElementAttributesWithNeighborValuesFilter, "65128c53-d3be-4a69-a559-32a48d603884"); /* LEGACY UUID FOR THIS FILTER 17410178-4e5f-58b9-900e-8194c69200ab */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleImageGeomFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp index 44ba7640cc..475e6c6716 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp @@ -1,32 +1,32 @@ #include "ResampleImageGeomFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ResampleImageGeom.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/Filter/Actions/CopyDataObjectAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Actions/RenameDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/AttributeMatrixSelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" - -#include "complex/Utilities/StringUtilities.hpp" - -using namespace complex; +#include "SimplnxCore/Filters/Algorithms/ResampleImageGeom.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/Filter/Actions/CopyDataObjectAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Actions/RenameDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/AttributeMatrixSelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" + +#include "simplnx/Utilities/StringUtilities.hpp" + +using namespace nx::core; namespace { @@ -41,7 +41,7 @@ const ChoicesParameter::ValueType k_ExactDimensionsModeIndex = 2; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ResampleImageGeomFilter::name() const @@ -144,7 +144,7 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct auto cellFeatureAmPath = filterArgs.value(k_FeatureAttributeMatrix_Key); auto srcImagePath = filterArgs.value(k_SelectedImageGeometry_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pResamplingModeValue == k_ScalingModeIndex) @@ -181,8 +181,8 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct const auto* srcImageGeom = dataStructure.getDataAs(srcImagePath); - complex::SizeVec3 srcDimensions = srcImageGeom->getDimensions(); - complex::FloatVec3 srcSpacing = srcImageGeom->getSpacing(); + nx::core::SizeVec3 srcDimensions = srcImageGeom->getDimensions(); + nx::core::FloatVec3 srcSpacing = srcImageGeom->getSpacing(); auto srcOrigin = srcImageGeom->getOrigin().toContainer>(); // This section ensures that if the spacing is set in such a way that we have at @@ -256,9 +256,9 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct } // Store the preflight updated value(s) into the preflightUpdatedValues vector using - preflightUpdatedValues.push_back({"Input Geometry Info", complex::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), - srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); - preflightUpdatedValues.push_back({"Resampled Image Geometry Info", complex::GeometryHelpers::Description::GenerateGeometryInfo(geomDims, pSpacingValue, srcOrigin, srcImageGeom->getUnits())}); + preflightUpdatedValues.push_back({"Input Geometry Info", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), + srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); + preflightUpdatedValues.push_back({"Resampled Image Geometry Info", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(geomDims, pSpacingValue, srcOrigin, srcImageGeom->getUnits())}); } // This section covers the option of renumbering the Feature Data where we need to do a @@ -306,7 +306,7 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct { for(const auto& childPath : childPaths.value()) { - std::string copiedChildName = complex::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + std::string copiedChildName = nx::core::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); DataPath copiedChildPath = DataPath::FromString(copiedChildName).value(); if(dataStructure.getDataAs(childPath) != nullptr) { @@ -316,7 +316,7 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct { for(const auto& sourcePath : pathsToBeCopied.value()) { - std::string createdPathName = complex::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + std::string createdPathName = nx::core::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); allCreatedPaths.push_back(DataPath::FromString(createdPathName).value()); } } @@ -335,7 +335,7 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct // Inform users that the following arrays are going to be modified in place // Cell Data is going to be modified - complex::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, srcImageGeom->getCellDataPath(), {}); + nx::core::AppendDataObjectModifications(dataStructure, resultOutputActions.value().modifiedActions, srcImageGeom->getCellDataPath(), {}); } // Return both the resultOutputActions and the preflightUpdatedValues via std::move() @@ -428,4 +428,4 @@ Result ResampleImageGeomFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleImageGeomFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp index 97f9fb163a..14d70fd5e1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ResampleImageGeomFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ResampleImageGeomFilter : public IFilter +class SIMPLNXCORE_EXPORT ResampleImageGeomFilter : public IFilter { public: ResampleImageGeomFilter() = default; @@ -36,7 +36,7 @@ class COMPLEXCORE_EXPORT ResampleImageGeomFilter : public IFilter static inline constexpr StringLiteral k_SelectedImageGeometry_Key = "selected_image_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -106,6 +106,6 @@ class COMPLEXCORE_EXPORT ResampleImageGeomFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ResampleImageGeomFilter, "9783ea2c-4cf7-46de-ab21-b40d91a48c5b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ResampleImageGeomFilter, "9783ea2c-4cf7-46de-ab21-b40d91a48c5b"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleRectGridToImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleRectGridToImageGeomFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp index 28b04ce5f0..463d31d096 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleRectGridToImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp @@ -1,29 +1,29 @@ #include "ResampleRectGridToImageGeomFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/CreateNeighborListAction.hpp" -#include "complex/Filter/Actions/CreateStringArrayAction.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" - -#include "complex/Utilities/GeometryHelpers.hpp" - -using namespace complex; - -namespace complex +#include "SimplnxCore/Filters/Algorithms/ResampleRectGridToImageGeom.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/CreateNeighborListAction.hpp" +#include "simplnx/Filter/Actions/CreateStringArrayAction.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" + +#include "simplnx/Utilities/GeometryHelpers.hpp" + +using namespace nx::core; + +namespace nx::core { //------------------------------------------------------------------------------ std::string ResampleRectGridToImageGeomFilter::name() const @@ -246,4 +246,4 @@ Result ResampleRectGridToImageGeomFilter::FromSIMPLJson(const nlohman return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp index 33fc1ff769..ecb8a9f567 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ResampleRectGridToImageGeomFilter * @brief This filter will re-sample an existing RectilinearGrid onto a regular grid (Image Geometry) and copy cell data into the newly created Image Geometry Data Container during the process. */ -class COMPLEXCORE_EXPORT ResampleRectGridToImageGeomFilter : public IFilter +class SIMPLNXCORE_EXPORT ResampleRectGridToImageGeomFilter : public IFilter { public: ResampleRectGridToImageGeomFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT ResampleRectGridToImageGeomFilter : public IFilter static inline constexpr StringLiteral k_ImageGeomCellAttributeMatrix_Key = "image_geom_cell_attribute_matrix"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT ResampleRectGridToImageGeomFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ResampleRectGridToImageGeomFilter, "28ed3258-41b2-45a0-8f37-6574264650f9"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ResampleRectGridToImageGeomFilter, "28ed3258-41b2-45a0-8f37-6574264650f9"); /* LEGACY UUID FOR THIS FILTER 77befd69-4536-5856-9f81-02996d038f73 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReverseTriangleWindingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReverseTriangleWindingFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp index 518eb9e3af..72b9c06a60 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReverseTriangleWindingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp @@ -1,14 +1,14 @@ #include "ReverseTriangleWindingFilter.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -49,7 +49,7 @@ class ReverseWindingImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ReverseTriangleWindingFilter::name() const @@ -104,7 +104,7 @@ IFilter::UniquePointer ReverseTriangleWindingFilter::clone() const IFilter::PreflightResult ReverseTriangleWindingFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Return both the resultOutputActions and the preflightUpdatedValues via std::move() @@ -144,4 +144,4 @@ Result ReverseTriangleWindingFilter::FromSIMPLJson(const nlohmann::js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReverseTriangleWindingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ReverseTriangleWindingFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp index a11ea886af..07d6ec0382 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReverseTriangleWindingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ReverseTriangleWindingFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ReverseTriangleWindingFilter : public IFilter +class SIMPLNXCORE_EXPORT ReverseTriangleWindingFilter : public IFilter { public: ReverseTriangleWindingFilter() = default; @@ -26,7 +26,7 @@ class COMPLEXCORE_EXPORT ReverseTriangleWindingFilter : public IFilter // Parameter Keys /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,7 +98,7 @@ class COMPLEXCORE_EXPORT ReverseTriangleWindingFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ReverseTriangleWindingFilter, "f11a45e9-c169-4227-85b0-0fb0108e47de"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ReverseTriangleWindingFilter, "f11a45e9-c169-4227-85b0-0fb0108e47de"); /* LEGACY UUID FOR THIS FILTER 9b9fb9e1-074d-54b6-a6ce-0be21ab4496d */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RobustAutomaticThreshold.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RobustAutomaticThreshold.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp index dfb365d63c..b4d634162c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RobustAutomaticThreshold.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.cpp @@ -1,17 +1,17 @@ #include "RobustAutomaticThreshold.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -97,7 +97,7 @@ void FindThreshold(const IDataArray& inputObject, const Float32Array& gradMagnit } } // namespace -namespace complex +namespace nx::core { std::string RobustAutomaticThreshold::name() const { @@ -121,7 +121,7 @@ std::string RobustAutomaticThreshold::humanName() const //------------------------------------------------------------------------------ std::vector RobustAutomaticThreshold::defaultTags() const { - return {className(), "ComplexCore", "Threshold"}; + return {className(), "SimplnxCore", "Threshold"}; } Parameters RobustAutomaticThreshold::parameters() const @@ -130,7 +130,7 @@ Parameters RobustAutomaticThreshold::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); // Input cannot be bool array - params.insert(std::make_unique(k_InputArrayPath, "Input Array", "DataArray to Threshold", DataPath(), complex::GetAllNumericTypes(), + params.insert(std::make_unique(k_InputArrayPath, "Input Array", "DataArray to Threshold", DataPath(), nx::core::GetAllNumericTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_GradientMagnitudePath, "Gradient Magnitude Data", "The complete path to the Array specifying the gradient magnitude of the Input Array", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -230,4 +230,4 @@ Result RobustAutomaticThreshold::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RobustAutomaticThreshold.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RobustAutomaticThreshold.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp index 2d7f0987f6..25ce1af8b7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RobustAutomaticThreshold.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThreshold.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT RobustAutomaticThreshold : public IFilter +class SIMPLNXCORE_EXPORT RobustAutomaticThreshold : public IFilter { public: RobustAutomaticThreshold() = default; @@ -24,7 +24,7 @@ class COMPLEXCORE_EXPORT RobustAutomaticThreshold : public IFilter static inline constexpr StringLiteral k_ArrayCreationPath = "created_mask_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -92,6 +92,6 @@ class COMPLEXCORE_EXPORT RobustAutomaticThreshold : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RobustAutomaticThreshold, "ade392e6-f0da-4cf3-bf11-dfe69e200b49"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RobustAutomaticThreshold, "ade392e6-f0da-4cf3-bf11-dfe69e200b49"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RotateSampleRefFrameFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RotateSampleRefFrameFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp index 6dc6167494..13e2e5d94d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RotateSampleRefFrameFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp @@ -1,34 +1,34 @@ #include "RotateSampleRefFrameFilter.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/Common/Range.hpp" -#include "complex/Common/Range3D.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/Filter/Actions/CopyDataObjectAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Actions/RenameDataAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" -#include "complex/Utilities/ImageRotationUtilities.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelData3DAlgorithm.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/Common/Range3D.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/Filter/Actions/CopyDataObjectAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Actions/RenameDataAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" +#include "simplnx/Utilities/ImageRotationUtilities.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelData3DAlgorithm.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include @@ -41,12 +41,12 @@ #include #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; -using namespace complex::ImageRotationUtilities; +using namespace nx::core; +using namespace nx::core::ImageRotationUtilities; namespace { @@ -288,7 +288,7 @@ Result ConvertRotationTableToRotationMatrix(const std::vector(k_CreatedImageGeometry_Key); auto pRemoveOriginalGeometry = filterArgs.value(k_RemoveOriginalGeometry_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -450,9 +450,9 @@ IFilter::PreflightResult RotateSampleRefFrameFilter::preflightImpl(const DataStr // These values should have been updated during the preflightImpl(...) method const auto* srcImageGeom = dataStructure.getDataAs(srcImagePath); - preflightUpdatedValues.push_back({"Input Geometry Info", complex::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), - srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); - preflightUpdatedValues.push_back({"Rotated Image Geometry Info", complex::GeometryHelpers::Description::GenerateGeometryInfo( + preflightUpdatedValues.push_back({"Input Geometry Info", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), + srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); + preflightUpdatedValues.push_back({"Rotated Image Geometry Info", nx::core::GeometryHelpers::Description::GenerateGeometryInfo( dims, CreateImageGeometryAction::SpacingType{spacing[0], spacing[1], spacing[2]}, origin, srcImageGeom->getUnits())}); } @@ -462,7 +462,7 @@ IFilter::PreflightResult RotateSampleRefFrameFilter::preflightImpl(const DataStr { for(const auto& childPath : childPaths.value()) { - std::string copiedChildName = complex::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + std::string copiedChildName = nx::core::StringUtilities::replace(childPath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); DataPath copiedChildPath = DataPath::FromString(copiedChildName).value(); if(dataStructure.getDataAs(childPath) != nullptr) { @@ -472,7 +472,7 @@ IFilter::PreflightResult RotateSampleRefFrameFilter::preflightImpl(const DataStr { for(const auto& sourcePath : pathsToBeCopied.value()) { - std::string createdPathName = complex::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); + std::string createdPathName = nx::core::StringUtilities::replace(sourcePath.toString(), srcImagePath.getTargetName(), destImagePath.getTargetName()); allCreatedPaths.push_back(DataPath::FromString(createdPathName).value()); } } @@ -595,4 +595,4 @@ Result RotateSampleRefFrameFilter::FromSIMPLJson(const nlohmann::json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RotateSampleRefFrameFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RotateSampleRefFrameFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp index dfa6c68492..3b1e636749 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RotateSampleRefFrameFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class RotateSampleRefFrameFilter * @brief */ -class COMPLEXCORE_EXPORT RotateSampleRefFrameFilter : public IFilter +class SIMPLNXCORE_EXPORT RotateSampleRefFrameFilter : public IFilter { public: RotateSampleRefFrameFilter() = default; @@ -40,7 +40,7 @@ class COMPLEXCORE_EXPORT RotateSampleRefFrameFilter : public IFilter static inline constexpr StringLiteral k_RemoveOriginalGeometry_Key = "remove_original_geometry"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -111,6 +111,6 @@ class COMPLEXCORE_EXPORT RotateSampleRefFrameFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, RotateSampleRefFrameFilter, "d2451dc1-a5a1-4ac2-a64d-7991669dcffc"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, RotateSampleRefFrameFilter, "d2451dc1-a5a1-4ac2-a64d-7991669dcffc"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ScalarSegmentFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ScalarSegmentFeaturesFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp index c1bbeec607..abfd988497 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ScalarSegmentFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp @@ -1,20 +1,20 @@ #include "ScalarSegmentFeaturesFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ScalarSegmentFeatures.hpp" +#include "SimplnxCore/Filters/Algorithms/ScalarSegmentFeatures.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; #define CX_DEFAULT_CONSTRUCTORS(className) \ className(const className&) = delete; \ @@ -34,7 +34,7 @@ inline constexpr int32 k_MissingGeomError = -440; } // namespace -namespace complex +namespace nx::core { std::string ScalarSegmentFeaturesFilter::name() const @@ -77,7 +77,7 @@ Parameters ScalarSegmentFeaturesFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); params.insert(std::make_unique(k_GridGeomPath_Key, "Grid Geometry", "DataPath to target Grid Geometry", DataPath{})); - params.insert(std::make_unique(k_InputArrayPathKey, "Scalar Array to Segment", "Path to the DataArray to segment", DataPath(), complex::GetIntegerDataTypes(), + params.insert(std::make_unique(k_InputArrayPathKey, "Scalar Array to Segment", "Path to the DataArray to segment", DataPath(), nx::core::GetIntegerDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); @@ -150,7 +150,7 @@ IFilter::PreflightResult ScalarSegmentFeaturesFilter::preflightImpl(const DataSt // Good Voxels if(useGoodVoxels) { - const complex::IDataArray* goodVoxelsArrayPtr = dataStructure.getDataAs(goodVoxelsPath); + const nx::core::IDataArray* goodVoxelsArrayPtr = dataStructure.getDataAs(goodVoxelsPath); if(nullptr == goodVoxelsArrayPtr) { return {nonstd::make_unexpected(std::vector{Error{k_MissingOrIncorrectGoodVoxelsArray, fmt::format("Mask array is not located at path: '{}'", goodVoxelsPath.toString())}})}; @@ -201,7 +201,7 @@ Result<> ScalarSegmentFeaturesFilter::executeImpl(DataStructure& data, const Arg inputValues.pCellFeaturesPath = inputValues.pGridGeomPath.createChildPath(args.value(k_CellFeaturePathKey)); inputValues.pActiveArrayPath = inputValues.pCellFeaturesPath.createChildPath(args.value(k_ActiveArrayPathKey)); - complex::ScalarSegmentFeatures filterAlgorithm(data, &inputValues, shouldCancel, messageHandler); + nx::core::ScalarSegmentFeatures filterAlgorithm(data, &inputValues, shouldCancel, messageHandler); Result<> result = filterAlgorithm(); return result; } @@ -241,4 +241,4 @@ Result ScalarSegmentFeaturesFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ScalarSegmentFeaturesFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ScalarSegmentFeaturesFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp index a7282cd2a4..e11fcad848 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ScalarSegmentFeaturesFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp @@ -1,21 +1,21 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class ScalarSegmentFeaturesFilter * @brief */ -class COMPLEXCORE_EXPORT ScalarSegmentFeaturesFilter : public IFilter +class SIMPLNXCORE_EXPORT ScalarSegmentFeaturesFilter : public IFilter { public: ScalarSegmentFeaturesFilter() = default; @@ -39,7 +39,7 @@ class COMPLEXCORE_EXPORT ScalarSegmentFeaturesFilter : public IFilter static inline constexpr StringLiteral k_RandomizeFeatures_Key = "randomize_features"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -107,6 +107,6 @@ class COMPLEXCORE_EXPORT ScalarSegmentFeaturesFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ScalarSegmentFeaturesFilter, "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ScalarSegmentFeaturesFilter, "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SetImageGeomOriginScalingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SetImageGeomOriginScalingFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp index c014d83801..e851e645cc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SetImageGeomOriginScalingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp @@ -1,19 +1,19 @@ #include "SetImageGeomOriginScalingFilter.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Actions/UpdateImageGeomAction.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Actions/UpdateImageGeomAction.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -88,7 +88,7 @@ IFilter::PreflightResult SetImageGeomOriginScalingFilter::preflightImpl(const Da FloatVec3 originVec = FloatVec3(origin[0], origin[1], origin[2]); FloatVec3 spacingVec = FloatVec3(spacing[0], spacing[1], spacing[2]); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -108,11 +108,11 @@ IFilter::PreflightResult SetImageGeomOriginScalingFilter::preflightImpl(const Da const auto* srcImageGeom = dataStructure.getDataAs(imageGeomPath); // Store the preflight updated value(s) into the preflightUpdatedValues vector using the appropriate methods. - preflightUpdatedValues.push_back({"Input Geometry [Before Update]", complex::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), - srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); + preflightUpdatedValues.push_back({"Input Geometry [Before Update]", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), srcImageGeom->getSpacing(), + srcImageGeom->getOrigin(), srcImageGeom->getUnits())}); preflightUpdatedValues.push_back( - {"Image Geometry [After Update]", complex::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), spacingVec, originVec, srcImageGeom->getUnits())}); + {"Image Geometry [After Update]", nx::core::GeometryHelpers::Description::GenerateGeometryInfo(srcImageGeom->getDimensions(), spacingVec, originVec, srcImageGeom->getUnits())}); return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; } @@ -152,4 +152,4 @@ Result SetImageGeomOriginScalingFilter::FromSIMPLJson(const nlohmann: return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SetImageGeomOriginScalingFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SetImageGeomOriginScalingFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp index 4372a2ec4c..a29f794d62 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SetImageGeomOriginScalingFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp @@ -1,18 +1,18 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include #include #include -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT SetImageGeomOriginScalingFilter : public IFilter +class SIMPLNXCORE_EXPORT SetImageGeomOriginScalingFilter : public IFilter { public: SetImageGeomOriginScalingFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT SetImageGeomOriginScalingFilter : public IFilter static inline constexpr StringLiteral k_Spacing_Key = "spacing"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT SetImageGeomOriginScalingFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, SetImageGeomOriginScalingFilter, "057bc7fd-c84a-4902-9397-87e51b1b1fe0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, SetImageGeomOriginScalingFilter, "057bc7fd-c84a-4902-9397-87e51b1b1fe0"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SharedFeatureFaceFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SharedFeatureFaceFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp index c9d1f1e931..6baa9a0133 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SharedFeatureFaceFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp @@ -1,18 +1,18 @@ #include "SharedFeatureFaceFilter.hpp" -#include "ComplexCore/Filters/Algorithms/SharedFeatureFace.hpp" +#include "SimplnxCore/Filters/Algorithms/SharedFeatureFace.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string SharedFeatureFaceFilter::name() const @@ -56,7 +56,7 @@ Parameters SharedFeatureFaceFilter::parameters() const params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, - ArraySelectionParameter::AllowedTypes{complex::DataType::int32})); + ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); params.insertSeparator(Parameters::Separator{"Created Face Data Arrays"}); params.insert(std::make_unique(k_FeatureFaceIdsArrayName_Key, "Feature Face Ids", "The name of the calculated Feature Face Ids DataArray", "SharedFeatureFaceId")); @@ -93,7 +93,7 @@ IFilter::PreflightResult SharedFeatureFaceFilter::preflightImpl(const DataStruct PreflightResult preflightResult; const std::vector tDims = {1}; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; // Create the Face Data/FeatureIds Array { @@ -108,7 +108,7 @@ IFilter::PreflightResult SharedFeatureFaceFilter::preflightImpl(const DataStruct DataPath faceDataGroupPath = DataPath(faceDataGroupPathVector); DataPath createdArrayPath = faceDataGroupPath.createChildPath(featureFaceIdsArrayName); - auto createArrayAction = std::make_unique(complex::DataType::int32, faceLabelDataArray->getTupleShape(), std::vector{1}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::int32, faceLabelDataArray->getTupleShape(), std::vector{1}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -120,7 +120,7 @@ IFilter::PreflightResult SharedFeatureFaceFilter::preflightImpl(const DataStruct { auto createdArrayName = filterArgs.value(k_FeatureNumTrianglesArrayName_Key); DataPath createdArrayPath = grainBoundaryAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::int32, tDims, std::vector{1}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::int32, tDims, std::vector{1}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -128,7 +128,7 @@ IFilter::PreflightResult SharedFeatureFaceFilter::preflightImpl(const DataStruct { auto createdArrayName = filterArgs.value(k_FeatureFaceLabelsArrayName_Key); DataPath createdArrayPath = grainBoundaryAttributeMatrixPath.createChildPath(createdArrayName); - auto createArrayAction = std::make_unique(complex::DataType::int32, tDims, std::vector{2}, createdArrayPath); + auto createArrayAction = std::make_unique(nx::core::DataType::int32, tDims, std::vector{2}, createdArrayPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -165,4 +165,4 @@ Result<> SharedFeatureFaceFilter::executeImpl(DataStructure& dataStructure, cons return SharedFeatureFace(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SharedFeatureFaceFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SharedFeatureFaceFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp index f9421ca613..752e7b3273 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SharedFeatureFaceFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class SharedFeatureFaceFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT SharedFeatureFaceFilter : public IFilter +class SIMPLNXCORE_EXPORT SharedFeatureFaceFilter : public IFilter { public: SharedFeatureFaceFilter() = default; @@ -96,6 +96,6 @@ class COMPLEXCORE_EXPORT SharedFeatureFaceFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, SharedFeatureFaceFilter, "aaf7a258-fc92-48d7-9d06-ba317a3769e8"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, SharedFeatureFaceFilter, "aaf7a258-fc92-48d7-9d06-ba317a3769e8"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SilhouetteFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SilhouetteFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp index a15bc690d1..5d289b2448 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SilhouetteFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp @@ -1,30 +1,30 @@ #include "SilhouetteFilter.hpp" -#include "ComplexCore/Filters/Algorithms/Silhouette.hpp" +#include "SimplnxCore/Filters/Algorithms/Silhouette.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/KUtilities.hpp" +#include "simplnx/Utilities/KUtilities.hpp" -using namespace complex; +using namespace nx::core; namespace { const std::string k_MaskName = "temp_mask"; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string SilhouetteFilter::name() const @@ -73,7 +73,7 @@ Parameters SilhouetteFilter::parameters() const ChoicesParameter::Choices{"Euclidean", "Squared Euclidean", "Manhattan", "Cosine", "Pearson", "Squared Pearson"})); // sequence dependent DO NOT REORDER params.insertSeparator(Parameters::Separator{"Required Objects"}); - params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Silhouette", "The DataPath to the input DataArray", DataPath{}, complex::GetAllNumericTypes())); + params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Silhouette", "The DataPath to the input DataArray", DataPath{}, nx::core::GetAllNumericTypes())); params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cluster Ids", "The DataPath to the DataArray that specifies which cluster each point belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32})); @@ -103,7 +103,7 @@ IFilter::PreflightResult SilhouetteFilter::preflightImpl(const DataStructure& da auto pSilhouetteArrayPathValue = filterArgs.value(k_SilhouetteArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto clusterArray = dataStructure.getDataAs(pSelectedArrayPathValue); @@ -186,4 +186,4 @@ Result SilhouetteFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SilhouetteFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SilhouetteFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp index 07ddcc1816..40eabfd2db 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SilhouetteFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class SilhouetteFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT SilhouetteFilter : public IFilter +class SIMPLNXCORE_EXPORT SilhouetteFilter : public IFilter { public: SilhouetteFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT SilhouetteFilter : public IFilter static inline constexpr StringLiteral k_SilhouetteArrayPath_Key = "silhouette_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class COMPLEXCORE_EXPORT SilhouetteFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, SilhouetteFilter, "520de667-5ff0-4e8d-bb70-a3b6122cf4ba"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, SilhouetteFilter, "520de667-5ff0-4e8d-bb70-a3b6122cf4ba"); /* LEGACY UUID FOR THIS FILTER f84d4d69-9ea5-54b6-a71c-df76d76d50cf */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SplitAttributeArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SplitAttributeArrayFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp index e960344f9c..b1a41c4c79 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SplitAttributeArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp @@ -1,23 +1,23 @@ #include "SplitAttributeArrayFilter.hpp" -#include "ComplexCore/Filters/Algorithms/SplitAttributeArray.hpp" +#include "SimplnxCore/Filters/Algorithms/SplitAttributeArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string SplitAttributeArrayFilter::name() const @@ -86,7 +86,7 @@ IFilter::PreflightResult SplitAttributeArrayFilter::preflightImpl(const DataStru auto pSelectComponents = filterArgs.value(k_SelectComponents_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto* inputArray = dataStructure.getDataAs(pInputArrayPath); @@ -190,4 +190,4 @@ Result SplitAttributeArrayFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SplitAttributeArrayFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SplitAttributeArrayFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp index 64665d74fb..b8e9dff3d6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SplitAttributeArrayFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class SplitAttributeArrayFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT SplitAttributeArrayFilter : public IFilter +class SIMPLNXCORE_EXPORT SplitAttributeArrayFilter : public IFilter { public: SplitAttributeArrayFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT SplitAttributeArrayFilter : public IFilter static inline constexpr StringLiteral k_ComponentsToExtract_Key = "components_to_extract"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,6 +101,6 @@ class COMPLEXCORE_EXPORT SplitAttributeArrayFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, SplitAttributeArrayFilter, "55da791f-4d1c-4413-8673-742f27d2b22b"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, SplitAttributeArrayFilter, "55da791f-4d1c-4413-8673-742f27d2b22b"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SurfaceNetsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SurfaceNetsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp index 4b71c5b58d..bea52a7bef 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SurfaceNetsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp @@ -1,27 +1,27 @@ #include "SurfaceNetsFilter.hpp" -#include "ComplexCore/Filters/Algorithms/SurfaceNets.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry1D.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/Filter/Actions/CopyArrayInstanceAction.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateGeometry2DAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" - -using namespace complex; - -namespace complex +#include "SimplnxCore/Filters/Algorithms/SurfaceNets.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry1D.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/Filter/Actions/CopyArrayInstanceAction.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateGeometry2DAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" + +using namespace nx::core; + +namespace nx::core { //------------------------------------------------------------------------------ std::string SurfaceNetsFilter::name() const @@ -73,7 +73,7 @@ Parameters SurfaceNetsFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique( k_SelectedDataArrayPaths_Key, "Attribute Arrays to Transfer", "The paths to the Arrays specifying which Cell Attribute Arrays to transfer to the created Triangle Geometry", - MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); params.insert( @@ -125,7 +125,7 @@ IFilter::PreflightResult SurfaceNetsFilter::preflightImpl(const DataStructure& d DataPath pFaceGroupDataPath = pTriangleGeometryPath.createChildPath(pFaceGroupDataName); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; const auto* gridGeom = dataStructure.getDataAs(pGridGeomDataPath); @@ -147,13 +147,13 @@ IFilter::PreflightResult SurfaceNetsFilter::preflightImpl(const DataStructure& d } // Create the face NodesType DataArray action and store it { - auto createArrayAction = std::make_unique(complex::DataType::int8, std::vector{1}, std::vector{1}, + auto createArrayAction = std::make_unique(nx::core::DataType::int8, std::vector{1}, std::vector{1}, pTriangleGeometryPath.createChildPath(pVertexGroupDataName).createChildPath(pNodeTypesName), dataStoreFormat); resultOutputActions.value().appendAction(std::move(createArrayAction)); } // Create the face Labels DataArray action and store it { - auto createArrayAction = std::make_unique(complex::DataType::int32, std::vector{numElements}, std::vector{2}, + auto createArrayAction = std::make_unique(nx::core::DataType::int32, std::vector{numElements}, std::vector{2}, pTriangleGeometryPath.createChildPath(pFaceGroupDataName).createChildPath(pFaceLabelsName), dataStoreFormat); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -209,4 +209,4 @@ Result<> SurfaceNetsFilter::executeImpl(DataStructure& dataStructure, const Argu return SurfaceNets(dataStructure, messageHandler, shouldCancel, &inputValues)(); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SurfaceNetsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/SurfaceNetsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp index 9765dbccce..c4aec7a2a5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/SurfaceNetsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class SurfaceNetsFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT SurfaceNetsFilter : public IFilter +class SIMPLNXCORE_EXPORT SurfaceNetsFilter : public IFilter { public: SurfaceNetsFilter() = default; @@ -107,7 +107,7 @@ class COMPLEXCORE_EXPORT SurfaceNetsFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, SurfaceNetsFilter, "13ddf0bd-af49-4e0f-95fb-3267952fd6e5"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, SurfaceNetsFilter, "13ddf0bd-af49-4e0f-95fb-3267952fd6e5"); /* LEGACY UUID FOR THIS FILTER 07b49e30-3900-5c34-862a-f1fb48bad568 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleCentroidFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp index d85ea848c6..9b770df050 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp @@ -1,24 +1,24 @@ #include "TriangleCentroidFilter.hpp" -#include "ComplexCore/Filters/Algorithms/TriangleCentroid.hpp" +#include "SimplnxCore/Filters/Algorithms/TriangleCentroid.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { -constexpr complex::int32 k_MissingFeatureAttributeMatrix = -75969; +constexpr nx::core::int32 k_MissingFeatureAttributeMatrix = -75969; } -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string TriangleCentroidFilter::name() const @@ -81,7 +81,7 @@ IFilter::PreflightResult TriangleCentroidFilter::preflightImpl(const DataStructu std::vector preflightUpdatedValues; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; const auto* triangleGeom = dataStructure.getDataAs(pTriangleGeometryDataPath); // Get the Face AttributeMatrix from the Geometry (It should have been set at construction of the Triangle Geometry) @@ -95,7 +95,7 @@ IFilter::PreflightResult TriangleCentroidFilter::preflightImpl(const DataStructu { DataPath createArrayDataPath = pTriangleGeometryDataPath.createChildPath(faceAttributeMatrix->getName()).createChildPath(pCentroidsArrayName); // Create the face areas DataArray Action and store it into the resultOutputActions - auto createArrayAction = std::make_unique(complex::DataType::float32, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{3}, createArrayDataPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float32, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{3}, createArrayDataPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -138,4 +138,4 @@ Result TriangleCentroidFilter::FromSIMPLJson(const nlohmann::json& js return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleCentroidFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleCentroidFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp index d197537fac..9a95f3b487 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleCentroidFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class TriangleCentroidFilter * @brief This **Filter** computes the centroid of each **Triangle** in a **Triangle Geometry** by calculating the average position of all 3 **Vertices** that make up the **Triangle**. */ -class COMPLEXCORE_EXPORT TriangleCentroidFilter : public IFilter +class SIMPLNXCORE_EXPORT TriangleCentroidFilter : public IFilter { public: TriangleCentroidFilter() = default; @@ -28,7 +28,7 @@ class COMPLEXCORE_EXPORT TriangleCentroidFilter : public IFilter static inline constexpr StringLiteral k_CentroidsArrayName_Key = "centroids_array_name"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,7 +98,7 @@ class COMPLEXCORE_EXPORT TriangleCentroidFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, TriangleCentroidFilter, "5d7156ae-3e0a-4db0-a792-552f492e8911"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, TriangleCentroidFilter, "5d7156ae-3e0a-4db0-a792-552f492e8911"); /* LEGACY UUID FOR THIS FILTER 7aa33007-4186-5d7f-ba9d-d0a561b3351d */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleDihedralAngleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleDihedralAngleFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp index cc0e7c337e..184b3b9486 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleDihedralAngleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp @@ -1,26 +1,26 @@ #include "TriangleDihedralAngleFilter.hpp" -#include "complex/Common/Constants.hpp" -#include "complex/Common/Range.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/Constants.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; namespace { constexpr float64 k_radToDeg = Constants::k_180OverPiD; // used for translating radians to degrees -constexpr complex::int32 k_MissingFeatureAttributeMatrix = -76970; +constexpr nx::core::int32 k_MissingFeatureAttributeMatrix = -76970; /** * @brief The CalculateAreasImpl class implements a threaded algorithm that computes the normal of each @@ -104,7 +104,7 @@ class CalculateDihedralAnglesImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string TriangleDihedralAngleFilter::name() const @@ -165,7 +165,7 @@ IFilter::PreflightResult TriangleDihedralAngleFilter::preflightImpl(const DataSt auto pTriangleGeometryDataPath = filterArgs.value(k_TGeometryDataPath_Key); auto pMinDihedralAnglesName = filterArgs.value(k_SurfaceMeshTriangleDihedralAnglesArrayName_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -185,7 +185,7 @@ IFilter::PreflightResult TriangleDihedralAngleFilter::preflightImpl(const DataSt { DataPath createArrayDataPath = pTriangleGeometryDataPath.createChildPath(faceAttributeMatrix->getName()).createChildPath(pMinDihedralAnglesName); // Create the face areas DataArray Action and store it into the resultOutputActions - auto createArrayAction = std::make_unique(complex::DataType::float64, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{1}, createArrayDataPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float64, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{1}, createArrayDataPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -235,4 +235,4 @@ Result TriangleDihedralAngleFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleDihedralAngleFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleDihedralAngleFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp index 7635e2ccc1..0bea85acaf 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleDihedralAngleFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class TriangleDihedralAngleFilter * @brief This filter will create a list of all dihedral angles ordered from smallest angle to largest from a **TriangleGeom** object */ -class COMPLEXCORE_EXPORT TriangleDihedralAngleFilter : public IFilter +class SIMPLNXCORE_EXPORT TriangleDihedralAngleFilter : public IFilter { public: TriangleDihedralAngleFilter() = default; @@ -28,7 +28,7 @@ class COMPLEXCORE_EXPORT TriangleDihedralAngleFilter : public IFilter static inline constexpr StringLiteral k_TGeometryDataPath_Key = "tri_geometry_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT TriangleDihedralAngleFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, TriangleDihedralAngleFilter, "dd42c521-4ae5-485d-ad35-d1276547d2f1"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, TriangleDihedralAngleFilter, "dd42c521-4ae5-485d-ad35-d1276547d2f1"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleNormalFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleNormalFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp index ba3e124e62..01e77cbd0e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleNormalFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp @@ -1,22 +1,22 @@ #include "TriangleNormalFilter.hpp" -#include "complex/Common/Range.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/Math/MatrixMath.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Common/Range.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Utilities/Math/MatrixMath.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -using namespace complex; +using namespace nx::core; namespace { -constexpr complex::int32 k_MissingFeatureAttributeMatrix = -75969; +constexpr nx::core::int32 k_MissingFeatureAttributeMatrix = -75969; /** * @brief The CalculateAreasImpl class implements a threaded algorithm that computes the normal of each @@ -70,7 +70,7 @@ class CalculateNormalsImpl }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string TriangleNormalFilter::name() const @@ -133,7 +133,7 @@ IFilter::PreflightResult TriangleNormalFilter::preflightImpl(const DataStructure std::vector preflightUpdatedValues; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; const auto* triangleGeom = dataStructure.getDataAs(pTriangleGeometryDataPath); // Get the Face AttributeMatrix from the Geometry (It should have been set at construction of the Triangle Geometry) @@ -147,7 +147,7 @@ IFilter::PreflightResult TriangleNormalFilter::preflightImpl(const DataStructure { DataPath createArrayDataPath = pTriangleGeometryDataPath.createChildPath(faceAttributeMatrix->getName()).createChildPath(pNormalsArrayName); // Create the face areas DataArray Action and store it into the resultOutputActions - auto createArrayAction = std::make_unique(complex::DataType::float64, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{3}, createArrayDataPath); + auto createArrayAction = std::make_unique(nx::core::DataType::float64, std::vector{triangleGeom->getNumberOfFaces()}, std::vector{3}, createArrayDataPath); resultOutputActions.value().appendAction(std::move(createArrayAction)); } @@ -199,4 +199,4 @@ Result TriangleNormalFilter::FromSIMPLJson(const nlohmann::json& json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleNormalFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleNormalFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp index 05cefd54a6..687b1394f3 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/TriangleNormalFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class TriangleNormalFilter * @brief This filter calculates the normals for each face of a **TriangleGeom** object */ -class COMPLEXCORE_EXPORT TriangleNormalFilter : public IFilter +class SIMPLNXCORE_EXPORT TriangleNormalFilter : public IFilter { public: TriangleNormalFilter() = default; @@ -28,7 +28,7 @@ class COMPLEXCORE_EXPORT TriangleNormalFilter : public IFilter static inline constexpr StringLiteral k_TriGeometryDataPath_Key = "tri_geometry_data_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -98,6 +98,6 @@ class COMPLEXCORE_EXPORT TriangleNormalFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, TriangleNormalFilter, "8133d419-1919-4dbf-a5bf-1c97282ba63f"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, TriangleNormalFilter, "8133d419-1919-4dbf-a5bf-1c97282ba63f"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp index 1551440dc9..db64f0ac0e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp @@ -1,26 +1,26 @@ #include "UncertainRegularGridSampleSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateAttributeMatrixAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" - -#include "complex/Utilities/SIMPLConversion.hpp" +#include "SimplnxCore/Filters/Algorithms/UncertainRegularGridSampleSurfaceMesh.hpp" + +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" + +#include "simplnx/Utilities/SIMPLConversion.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string UncertainRegularGridSampleSurfaceMeshFilter::name() const @@ -78,7 +78,7 @@ Parameters UncertainRegularGridSampleSurfaceMeshFilter::parameters() const params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The geometry to be sampled onto grid", DataPath{}, GeometrySelectionParameter::AllowedTypes{GeometrySelectionParameter::AllowedType ::Triangle})); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Array specifying which Features are on either side of each Face", DataPath{}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); params.insertSeparator(Parameters::Separator{"Created Objects"}); params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "The name and path for the image geometry to be created", DataPath{})); @@ -112,7 +112,7 @@ IFilter::PreflightResult UncertainRegularGridSampleSurfaceMeshFilter::preflightI auto pSeedArrayNameValue = filterArgs.value(k_SeedArrayName_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; std::vector tupleDims = {static_cast(pDimensionsValue[0]), static_cast(pDimensionsValue[1]), static_cast(pDimensionsValue[2])}; @@ -210,4 +210,4 @@ Result UncertainRegularGridSampleSurfaceMeshFilter::FromSIMPLJson(con return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp index 790427a34c..a4dba729ce 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class UncertainRegularGridSampleSurfaceMeshFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshFilter : public IFilter +class SIMPLNXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshFilter : public IFilter { public: UncertainRegularGridSampleSurfaceMeshFilter() = default; @@ -38,7 +38,7 @@ class COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshFilter : public IF static inline constexpr StringLiteral k_Dimensions_Key = "dimensions"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -108,7 +108,7 @@ class COMPLEXCORE_EXPORT UncertainRegularGridSampleSurfaceMeshFilter : public IF */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, UncertainRegularGridSampleSurfaceMeshFilter, "c594cc3b-3f45-43b1-9030-1aa56c755fc8"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, UncertainRegularGridSampleSurfaceMeshFilter, "c594cc3b-3f45-43b1-9030-1aa56c755fc8"); /* LEGACY UUID FOR THIS FILTER 75cfeb9b-cd4b-5a20-a344-4170b39bbfaf */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp index 2252742266..461bedc891 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp @@ -1,32 +1,32 @@ #include "WriteASCIIDataFilter.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/OStreamUtilities.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/OStreamUtilities.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { // Error Code constants -constexpr complex::int32 k_UnmatchingTupleCountError = -51001; +constexpr nx::core::int32 k_UnmatchingTupleCountError = -51001; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteASCIIDataFilter::name() const @@ -81,7 +81,7 @@ Parameters WriteASCIIDataFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Attribute Arrays to Export", "Output arrays to be written as ASCII representations", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_OutputStyle_Key, k_MaxValPerLine_Key, std::make_any(to_underlying(OutputStyle::MultipleFiles))); @@ -109,7 +109,7 @@ IFilter::PreflightResult WriteASCIIDataFilter::preflightImpl(const DataStructure // Declare the preflightResult variable PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -178,7 +178,7 @@ Result<> WriteASCIIDataFilter::executeImpl(DataStructure& dataStructure, const A auto outputPath = atomicFile.tempFilePath(); // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(outputPath.parent_path()); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(outputPath.parent_path()); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; @@ -249,4 +249,4 @@ Result WriteASCIIDataFilter::FromSIMPLJson(const nlohmann::json& json return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp index 60d9f90d7c..9d0c4d34dd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteASCIIDataFilter * @brief This filter will export data from **DataArray** as "plaintext" to one or more files according to selection parameters */ -class COMPLEXCORE_EXPORT WriteASCIIDataFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteASCIIDataFilter : public IFilter { public: WriteASCIIDataFilter() = default; @@ -48,7 +48,7 @@ class COMPLEXCORE_EXPORT WriteASCIIDataFilter : public IFilter static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -118,6 +118,6 @@ class COMPLEXCORE_EXPORT WriteASCIIDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteASCIIDataFilter, "06c8bfe8-2b42-4956-aca3-580bc0620716"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteASCIIDataFilter, "06c8bfe8-2b42-4956-aca3-580bc0620716"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp index 28f43ba61a..d1b864eddd 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp @@ -1,22 +1,22 @@ #include "WriteAbaqusHexahedronFilter.hpp" -#include "ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp" +#include "SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteAbaqusHexahedronFilter::name() const @@ -86,7 +86,7 @@ IFilter::PreflightResult WriteAbaqusHexahedronFilter::preflightImpl(const DataSt auto pHexahedralGeometryPathValue = filterArgs.value(k_ImageGeometryPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; // Check Output Path @@ -151,4 +151,4 @@ Result WriteAbaqusHexahedronFilter::FromSIMPLJson(const nlohmann::jso return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp index 527cd7e24d..f3b7ff4e1c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteAbaqusHexahedronFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT WriteAbaqusHexahedronFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteAbaqusHexahedronFilter : public IFilter { public: WriteAbaqusHexahedronFilter() = default; @@ -32,7 +32,7 @@ class COMPLEXCORE_EXPORT WriteAbaqusHexahedronFilter : public IFilter static inline constexpr StringLiteral k_FeatureIdsArrayPath_Key = "feature_ids_array_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,7 +102,7 @@ class COMPLEXCORE_EXPORT WriteAbaqusHexahedronFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteAbaqusHexahedronFilter, "4bc81b8c-1594-409a-89eb-3ea8d8f061b0"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteAbaqusHexahedronFilter, "4bc81b8c-1594-409a-89eb-3ea8d8f061b0"); /* LEGACY UUID FOR THIS FILTER 0559aa37-c5ad-549a-82d4-bff4bfcb6cc6 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp index c730b93d4b..f1f34be6c1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp @@ -1,24 +1,24 @@ #include "WriteAvizoRectilinearCoordinateFilter.hpp" -#include "ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp" +#include "SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteAvizoRectilinearCoordinateFilter::name() const @@ -85,7 +85,7 @@ IFilter::PreflightResult WriteAvizoRectilinearCoordinateFilter::preflightImpl(co auto pUnitsValue = filterArgs.value(k_Units_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -137,4 +137,4 @@ Result WriteAvizoRectilinearCoordinateFilter::FromSIMPLJson(const nlo return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp index 3ccda46af3..f60c705aa0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteAvizoRectilinearCoordinateFilter * @brief This filter writes out a native Avizo Rectilinear Coordinate data file */ -class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : public IFilter { public: WriteAvizoRectilinearCoordinateFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : public IFilter static inline constexpr StringLiteral k_Units_Key = "units"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteAvizoRectilinearCoordinateFilter, "58661ea8-0322-44af-a48e-1dc80e999376"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteAvizoRectilinearCoordinateFilter, "58661ea8-0322-44af-a48e-1dc80e999376"); /* LEGACY UUID FOR THIS FILTER 2861f4b4-8d50-5e69-9575-68c9d35f1256 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp index 736f748e2c..b82e99437d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp @@ -1,24 +1,24 @@ #include "WriteAvizoUniformCoordinateFilter.hpp" -#include "ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp" +#include "SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteAvizoUniformCoordinateFilter::name() const @@ -85,7 +85,7 @@ IFilter::PreflightResult WriteAvizoUniformCoordinateFilter::preflightImpl(const auto pUnitsValue = filterArgs.value(k_Units_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; return {std::move(resultOutputActions), std::move(preflightUpdatedValues)}; @@ -137,4 +137,4 @@ Result WriteAvizoUniformCoordinateFilter::FromSIMPLJson(const nlohman return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp index 3c3e6aefe0..f5688f2a67 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteAvizoUniformCoordinateFilter * @brief This filter writes out a native Avizo Uniform Coordinate data file */ -class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinateFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteAvizoUniformCoordinateFilter : public IFilter { public: WriteAvizoUniformCoordinateFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinateFilter : public IFilter static inline constexpr StringLiteral k_Units_Key = "units"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinateFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteAvizoUniformCoordinateFilter, "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteAvizoUniformCoordinateFilter, "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212"); /* LEGACY UUID FOR THIS FILTER 339f1349-9236-5023-9a56-c82fb8eafd12 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp index 6134f5fcb8..2da4f24771 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp @@ -1,20 +1,20 @@ #include "WriteBinaryDataFilter.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/OStreamUtilities.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/OStreamUtilities.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -34,7 +34,7 @@ struct ByteSwapArray }; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteBinaryDataFilter::name() const @@ -81,7 +81,7 @@ Parameters WriteBinaryDataFilter::parameters() const params.insertSeparator(Parameters::Separator{"Required Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Attribute Arrays to Export", "The arrays to be exported to a binary file", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, - complex::GetAllDataTypes())); + nx::core::GetAllDataTypes())); return params; } @@ -103,7 +103,7 @@ IFilter::PreflightResult WriteBinaryDataFilter::preflightImpl(const DataStructur PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -132,7 +132,7 @@ Result<> WriteBinaryDataFilter::executeImpl(DataStructure& dataStructure, const fs::path dirPath(filterArgs.value(k_OutputPath_Key)); // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path - Result<> createDirectoriesResult = complex::CreateOutputDirectories(dirPath); + Result<> createDirectoriesResult = nx::core::CreateOutputDirectories(dirPath); if(createDirectoriesResult.invalid()) { return createDirectoriesResult; @@ -146,4 +146,4 @@ Result<> WriteBinaryDataFilter::executeImpl(DataStructure& dataStructure, const filterArgs.value(k_FileExtension_Key), true); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp index 95e0ff6e5f..3164b3bb93 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteBinaryDataFilter * @brief This filter will export data as binary (either big or little endian). */ -class COMPLEXCORE_EXPORT WriteBinaryDataFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteBinaryDataFilter : public IFilter { public: WriteBinaryDataFilter() = default; @@ -100,6 +100,6 @@ class COMPLEXCORE_EXPORT WriteBinaryDataFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteBinaryDataFilter, "06912cbc-9745-4098-8d44-c674974d2ca8"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteBinaryDataFilter, "06912cbc-9745-4098-8d44-c674974d2ca8"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp index 96f8a5cbb0..12e42bc3d0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp @@ -1,25 +1,25 @@ #include "WriteDREAM3DFilter.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Pipeline/Pipeline.hpp" -#include "complex/Pipeline/PipelineFilter.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/PipelineFilter.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; namespace { -constexpr complex::int32 k_NoExportPathError = -1; -constexpr complex::int32 k_FailedFindPipelineError = -15; +constexpr nx::core::int32 k_NoExportPathError = -1; +constexpr nx::core::int32 k_FailedFindPipelineError = -15; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteDREAM3DFilter::name() const @@ -139,4 +139,4 @@ Result WriteDREAM3DFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp index 0e5137a796..24270398a5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.hpp @@ -1,20 +1,20 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Filter/Parameters.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Filter/Parameters.hpp" -namespace complex +namespace nx::core { /** * @class WriteDREAM3DFilter * @brief The WriteDREAM3DFilter is an IFilter class designed to export the * DataStructure to a target HDF5 file. */ -class COMPLEXCORE_EXPORT WriteDREAM3DFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteDREAM3DFilter : public IFilter { public: WriteDREAM3DFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT WriteDREAM3DFilter : public IFilter static inline constexpr StringLiteral k_WriteXdmf = "write_xdmf_file"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -102,6 +102,6 @@ class COMPLEXCORE_EXPORT WriteDREAM3DFilter : public IFilter Result<> executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteDREAM3DFilter, "b3a95784-2ced-41ec-8d3d-0242ac130003"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteDREAM3DFilter, "b3a95784-2ced-41ec-8d3d-0242ac130003"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp index 4ee04f6ab8..282d8667bf 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp @@ -1,27 +1,27 @@ #include "WriteFeatureDataCSVFilter.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/OStreamUtilities.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/OStreamUtilities.hpp" #include -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteFeatureDataCSVFilter::name() const @@ -84,7 +84,7 @@ IFilter::PreflightResult WriteFeatureDataCSVFilter::preflightImpl(const DataStru { PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; @@ -188,4 +188,4 @@ Result WriteFeatureDataCSVFilter::FromSIMPLJson(const nlohmann::json& return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp index 9ed6247502..8e0d9a9a7e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteFeatureDataCSVFilter * @brief This filter will export feature data as ASCII to a single file using choice delimiter */ -class COMPLEXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter { public: WriteFeatureDataCSVFilter() = default; @@ -40,7 +40,7 @@ class COMPLEXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter static inline constexpr StringLiteral k_CellFeatureAttributeMatrixPath_Key = "cell_feature_attribute_matrix_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -110,6 +110,6 @@ class COMPLEXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteFeatureDataCSVFilter, "d734293f-3017-4699-b458-c05aca078b96"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteFeatureDataCSVFilter, "d734293f-3017-4699-b458-c05aca078b96"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp index 10736f372d..4ddcac6bf6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp @@ -1,22 +1,22 @@ #include "WriteLosAlamosFFTFilter.hpp" -#include "ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp" +#include "SimplnxCore/Filters/Algorithms/WriteLosAlamosFFT.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteLosAlamosFFTFilter::name() const @@ -88,7 +88,7 @@ IFilter::PreflightResult WriteLosAlamosFFTFilter::preflightImpl(const DataStruct auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; usize fIdsTupCount = dataStructure.getDataAs(pFeatureIdsArrayPathValue)->getNumberOfTuples(); @@ -150,4 +150,4 @@ Result WriteLosAlamosFFTFilter::FromSIMPLJson(const nlohmann::json& j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp index 953c7572ae..e957ed94bb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteLosAlamosFFTFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT WriteLosAlamosFFTFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteLosAlamosFFTFilter : public IFilter { public: WriteLosAlamosFFTFilter() = default; @@ -31,7 +31,7 @@ class COMPLEXCORE_EXPORT WriteLosAlamosFFTFilter : public IFilter static inline constexpr StringLiteral k_ImageGeomPath = "image_geom_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -101,7 +101,7 @@ class COMPLEXCORE_EXPORT WriteLosAlamosFFTFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteLosAlamosFFTFilter, "9d5ffeba-4339-49d2-a519-5743fbd5e7a9"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteLosAlamosFFTFilter, "9d5ffeba-4339-49d2-a519-5743fbd5e7a9"); /* LEGACY UUID FOR THIS FILTER 158ebe9e-f772-57e2-ac1b-71ff213cf890 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp index 9c9db2145b..1b423f1fc7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp @@ -1,24 +1,24 @@ #include "WriteStlFileFilter.hpp" -#include "ComplexCore/Filters/Algorithms/WriteStlFile.hpp" +#include "SimplnxCore/Filters/Algorithms/WriteStlFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Actions/EmptyAction.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Actions/EmptyAction.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteStlFileFilter::name() const @@ -97,7 +97,7 @@ IFilter::PreflightResult WriteStlFileFilter::preflightImpl(const DataStructure& // auto pFaceNormalsPathValue = filterArgs.value(k_FaceNormalsPath_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; auto* triangleGeom = dataStructure.getDataAs(pTriangleGeomPathValue); @@ -171,4 +171,4 @@ Result WriteStlFileFilter::FromSIMPLJson(const nlohmann::json& json) return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp index 907bab1d88..2c28da6aee 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteStlFileFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT WriteStlFileFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteStlFileFilter : public IFilter { public: WriteStlFileFilter() = default; @@ -33,7 +33,7 @@ class COMPLEXCORE_EXPORT WriteStlFileFilter : public IFilter // static inline constexpr StringLiteral k_FaceNormalsPath_Key = "face_normals_path"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -103,7 +103,7 @@ class COMPLEXCORE_EXPORT WriteStlFileFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteStlFileFilter, "54a293f4-1366-46ca-b284-fe5965545dd2"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteStlFileFilter, "54a293f4-1366-46ca-b284-fe5965545dd2"); /* LEGACY UUID FOR THIS FILTER b9134758-d5e5-59dd-9907-28d23e0e0143 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp index deea8b06ff..a34dc7ebdc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.cpp @@ -1,23 +1,23 @@ #include "WriteVtkRectilinearGridFilter.hpp" -#include "ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp" +#include "SimplnxCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp" -#include "complex/Common/AtomicFile.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Common/AtomicFile.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Utilities/SIMPLConversion.hpp" +#include "simplnx/Utilities/SIMPLConversion.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string WriteVtkRectilinearGridFilter::name() const @@ -82,7 +82,7 @@ IFilter::PreflightResult WriteVtkRectilinearGridFilter::preflightImpl(const Data auto pSelectedDataArrayPathsValue = filterArgs.value(k_SelectedDataArrayPaths_Key); PreflightResult preflightResult; - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; std::vector preflightUpdatedValues; if(pSelectedDataArrayPathsValue.empty()) @@ -159,4 +159,4 @@ Result WriteVtkRectilinearGridFilter::FromSIMPLJson(const nlohmann::j return ConvertResultTo(std::move(conversionResult), std::move(args)); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp index 149c6e6568..cc891e6166 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { /** * @class WriteVtkRectilinearGridFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT WriteVtkRectilinearGridFilter : public IFilter +class SIMPLNXCORE_EXPORT WriteVtkRectilinearGridFilter : public IFilter { public: WriteVtkRectilinearGridFilter() = default; @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT WriteVtkRectilinearGridFilter : public IFilter static inline constexpr StringLiteral k_SelectedDataArrayPaths_Key = "selected_data_array_paths"; /** - * @brief Reads SIMPL json and converts it complex Arguments. + * @brief Reads SIMPL json and converts it simplnx Arguments. * @param json * @return Result */ @@ -100,7 +100,7 @@ class COMPLEXCORE_EXPORT WriteVtkRectilinearGridFilter : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, WriteVtkRectilinearGridFilter, "58a4d758-c5ff-43d3-a394-1508ad00a0d2"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, WriteVtkRectilinearGridFilter, "58a4d758-c5ff-43d3-a394-1508ad00a0d2"); /* LEGACY UUID FOR THIS FILTER a043bd66-2681-5126-82e1-5fdc46694bf4 */ diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp new file mode 100644 index 0000000000..1f9bd98fdf --- /dev/null +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp @@ -0,0 +1,248 @@ +#pragma once + +#include "simplnx/Plugin/AbstractPlugin.hpp" + +#include + +#include +#include + +// clang-format off +#include "SimplnxCore/Filters/AlignGeometries.hpp" +#include "SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp" +#include "SimplnxCore/Filters/AlignSectionsListFilter.hpp" +#include "SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp" +#include "SimplnxCore/Filters/ApproximatePointCloudHull.hpp" +#include "SimplnxCore/Filters/ArrayCalculatorFilter.hpp" +#include "SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp" +#include "SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp" +#include "SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp" +#include "SimplnxCore/Filters/ChangeAngleRepresentation.hpp" +#include "SimplnxCore/Filters/CombineAttributeArraysFilter.hpp" +#include "SimplnxCore/Filters/ConditionalSetValue.hpp" +#include "SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp" +#include "SimplnxCore/Filters/ConvertDataFilter.hpp" +#include "SimplnxCore/Filters/CopyDataObjectFilter.hpp" +#include "SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp" +#include "SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp" +#include "SimplnxCore/Filters/CreateDataArray.hpp" +#include "SimplnxCore/Filters/CreateDataGroup.hpp" +#include "SimplnxCore/Filters/CreateFeatureArrayFromElementArray.hpp" +#include "SimplnxCore/Filters/CreateImageGeometry.hpp" +#include "SimplnxCore/Filters/CropImageGeometry.hpp" +#include "SimplnxCore/Filters/CropVertexGeometry.hpp" +#include "SimplnxCore/Filters/DeleteData.hpp" +#include "SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp" +#include "SimplnxCore/Filters/ErodeDilateMaskFilter.hpp" +#include "SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp" +#include "SimplnxCore/Filters/ExecuteProcessFilter.hpp" +#include "SimplnxCore/Filters/WriteDREAM3DFilter.hpp" +#include "SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp" +#include "SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp" +#include "SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp" +#include "SimplnxCore/Filters/FillBadDataFilter.hpp" +#include "SimplnxCore/Filters/FindArrayStatisticsFilter.hpp" +#include "SimplnxCore/Filters/FindBoundaryCellsFilter.hpp" +#include "SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp" +#include "SimplnxCore/Filters/FindDifferencesMap.hpp" +#include "SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp" +#include "SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp" +#include "SimplnxCore/Filters/FindFeaturePhasesFilter.hpp" +#include "SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.hpp" +#include "SimplnxCore/Filters/FindNeighborhoodsFilter.hpp" +#include "SimplnxCore/Filters/FindNeighborListStatistics.hpp" +#include "SimplnxCore/Filters/FindNeighbors.hpp" +#include "SimplnxCore/Filters/FindNumFeaturesFilter.hpp" +#include "SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp" +#include "SimplnxCore/Filters/FindSurfaceFeatures.hpp" +#include "SimplnxCore/Filters/FindVolFractionsFilter.hpp" +#include "SimplnxCore/Filters/GenerateColorTableFilter.hpp" +#include "SimplnxCore/Filters/IdentifySample.hpp" +#include "SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp" +#include "SimplnxCore/Filters/ReadCSVFileFilter.hpp" +#include "SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp" +#include "SimplnxCore/Filters/ReadDREAM3DFilter.hpp" +#include "SimplnxCore/Filters/ReadHDF5Dataset.hpp" +#include "SimplnxCore/Filters/ReadTextDataArrayFilter.hpp" +#include "SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp" +#include "SimplnxCore/Filters/InitializeImageGeomCellData.hpp" +#include "SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp" +#include "SimplnxCore/Filters/IterativeClosestPointFilter.hpp" +#include "SimplnxCore/Filters/LaplacianSmoothingFilter.hpp" +#include "SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp" +#include "SimplnxCore/Filters/MinNeighbors.hpp" +#include "SimplnxCore/Filters/MoveData.hpp" +#include "SimplnxCore/Filters/MultiThresholdObjects.hpp" +#include "SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp" +#include "SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp" +#include "SimplnxCore/Filters/ReadRawBinaryFilter.hpp" +#include "SimplnxCore/Filters/RemoveFlaggedVertices.hpp" +#include "SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp" +#include "SimplnxCore/Filters/RenameDataObject.hpp" +#include "SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp" +#include "SimplnxCore/Filters/ResampleImageGeomFilter.hpp" +#include "SimplnxCore/Filters/RobustAutomaticThreshold.hpp" +#include "SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp" +#include "SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp" +#include "SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp" +#include "SimplnxCore/Filters/SplitAttributeArrayFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/Filters/TriangleCentroidFilter.hpp" +#include "SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp" +#include "SimplnxCore/Filters/TriangleNormalFilter.hpp" +#include "SimplnxCore/Filters/WriteASCIIDataFilter.hpp" +#include "SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp" +#include "SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp" +#include "SimplnxCore/Filters/ExecuteProcessFilter.hpp" +#include "SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp" +#include "SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp" +#include "SimplnxCore/Filters/ComputeFeatureRectFilter.hpp" +#include "SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp" +#include "SimplnxCore/Filters/WriteStlFileFilter.hpp" +#include "SimplnxCore/Filters/AddBadDataFilter.hpp" +#include "SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp" +#include "SimplnxCore/Filters/FindFeatureClusteringFilter.hpp" +#include "SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp" +#include "SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp" +#include "SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp" +#include "SimplnxCore/Filters/CombineStlFilesFilter.hpp" +#include "SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" +#include "SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" +#include "SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp" +#include "SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" +#include "SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp" +#include "SimplnxCore/Filters/FindBoundaryElementFractionsFilter.hpp" +#include "SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp" +#include "SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp" +#include "SimplnxCore/Filters/GenerateVectorColorsFilter.hpp" +#include "SimplnxCore/Filters/KMedoidsFilter.hpp" +#include "SimplnxCore/Filters/KMeansFilter.hpp" +#include "SimplnxCore/Filters/SilhouetteFilter.hpp" +// @@__HEADER__TOKEN__DO__NOT__DELETE__@@ + +namespace nx::core +{ + static const AbstractPlugin::SIMPLMapType k_SIMPL_to_SimplnxCore + { + // syntax std::make_pair {Dream3d UUID , Dream3dnx UUID, {}}}, // dream3d-class-name + {nx::core::Uuid::FromString("886f8b46-51b6-5682-a289-6febd10b7ef0").value(), {nx::core::FilterTraits::uuid, &AlignSectionsFeatureCentroidFilter::FromSIMPLJson}}, // AlignSectionsFeatureCentroid + {nx::core::Uuid::FromString("ce1ee404-0336-536c-8aad-f9641c9458be").value(), {nx::core::FilterTraits::uuid, &AlignGeometries::FromSIMPLJson}}, // AlignGeometries + {nx::core::Uuid::FromString("accf8f6c-0551-5da3-9a3d-e4be41c3985c").value(), {nx::core::FilterTraits::uuid, &AlignSectionsListFilter::FromSIMPLJson}}, // AlignSectionsListFilter + {nx::core::Uuid::FromString("7ff0ebb3-7b0d-5ff7-b9d8-5147031aca10").value(), {nx::core::FilterTraits::uuid, &ArrayCalculatorFilter::FromSIMPLJson}}, // ArrayCalculatorFilter + {nx::core::Uuid::FromString("c681caf4-22f2-5885-bbc9-a0476abc72eb").value(), {nx::core::FilterTraits::uuid, &ApplyTransformationToGeometryFilter::FromSIMPLJson}}, // ApplyTransformationToGeometry + {nx::core::Uuid::FromString("fab669ad-66c6-5a39-bdb7-fc47b94311ed").value(), {nx::core::FilterTraits::uuid, &ApproximatePointCloudHull::FromSIMPLJson}}, // ApproximatePointCloudHull + {nx::core::Uuid::FromString("289f0d8c-29ab-5fbc-91bd-08aac01e37c5").value(), {nx::core::FilterTraits::uuid, &CalculateArrayHistogramFilter::FromSIMPLJson}}, // CalculateArrayHistogram + {nx::core::Uuid::FromString("656f144c-a120-5c3b-bee5-06deab438588").value(), {nx::core::FilterTraits::uuid, &CalculateFeatureSizesFilter::FromSIMPLJson}}, // FindSizes + {nx::core::Uuid::FromString("a9900cc3-169e-5a1b-bcf4-7569e1950d41").value(), {nx::core::FilterTraits::uuid, &CalculateTriangleAreasFilter::FromSIMPLJson}}, // TriangleAreaFilter + {nx::core::Uuid::FromString("f7bc0e1e-0f50-5fe0-a9e7-510b6ed83792").value(), {nx::core::FilterTraits::uuid, &ChangeAngleRepresentation::FromSIMPLJson}}, // ChangeAngleRepresentation + {nx::core::Uuid::FromString("a6b50fb0-eb7c-5d9b-9691-825d6a4fe772").value(), {nx::core::FilterTraits::uuid, &CombineAttributeArraysFilter::FromSIMPLJson}}, // CombineAttributeArrays + //{nx::core::Uuid::FromString("47cafe63-83cc-5826-9521-4fb5bea684ef").value(), {nx::core::FilterTraits::uuid, &ConditionalSetValue::FromSIMPLJson}}, // ConditionalSetValue + {nx::core::Uuid::FromString("eb5a89c4-4e71-59b1-9719-d10a652d961e").value(), {nx::core::FilterTraits::uuid, &ConvertColorToGrayScaleFilter::FromSIMPLJson}}, // ConvertColorToGrayScale + {nx::core::Uuid::FromString("f4ba5fa4-bb5c-5dd1-9429-0dd86d0ecb37").value(), {nx::core::FilterTraits::uuid, &ConvertDataFilter::FromSIMPLJson}}, // ConvertData + {nx::core::Uuid::FromString("a37f2e24-7400-5005-b9a7-b2224570cbe9").value(), {nx::core::FilterTraits::uuid, &ConditionalSetValue::FromSIMPLJson}}, // ReplaceValueInArray + {nx::core::Uuid::FromString("99836b75-144b-5126-b261-b411133b5e8a").value(), {nx::core::FilterTraits::uuid, &CopyFeatureArrayToElementArray::FromSIMPLJson}}, // CopyFeatureArrayToElementArray + {nx::core::Uuid::FromString("93375ef0-7367-5372-addc-baa019b1b341").value(), {nx::core::FilterTraits::uuid, &CreateAttributeMatrixFilter::FromSIMPLJson}}, // CreateAttributeMatrix + {nx::core::Uuid::FromString("77f392fb-c1eb-57da-a1b1-e7acf9239fb8").value(), {nx::core::FilterTraits::uuid, &CreateDataArray::FromSIMPLJson}}, // CreateDataArray + {nx::core::Uuid::FromString("816fbe6b-7c38-581b-b149-3f839fb65b93").value(), {nx::core::FilterTraits::uuid, &CreateDataGroup::FromSIMPLJson}}, // CreateDataContainer + {nx::core::Uuid::FromString("94438019-21bb-5b61-a7c3-66974b9a34dc").value(), {nx::core::FilterTraits::uuid, &CreateFeatureArrayFromElementArray::FromSIMPLJson}}, // CreateFeatureArrayFromElementArray + {nx::core::Uuid::FromString("f2132744-3abb-5d66-9cd9-c9a233b5c4aa").value(), {nx::core::FilterTraits::uuid, &CreateImageGeometry::FromSIMPLJson}}, // CreateImageGeometry + {nx::core::Uuid::FromString("baa4b7fe-31e5-5e63-a2cb-0bb9d844cfaf").value(), {nx::core::FilterTraits::uuid, &CropImageGeometry::FromSIMPLJson}}, // CropImageGeometry + {nx::core::Uuid::FromString("f28cbf07-f15a-53ca-8c7f-b41a11dae6cc").value(), {nx::core::FilterTraits::uuid, &CropVertexGeometry::FromSIMPLJson}}, // CropVertexGeometry + {nx::core::Uuid::FromString("7b1c8f46-90dd-584a-b3ba-34e16958a7d0").value(), {nx::core::FilterTraits::uuid, &DeleteData::FromSIMPLJson}}, // RemoveArrays + {nx::core::Uuid::FromString("3fcd4c43-9d75-5b86-aad4-4441bc914f37").value(), {nx::core::FilterTraits::uuid, &WriteDREAM3DFilter::FromSIMPLJson}}, // DataContainerWriter + {nx::core::Uuid::FromString("52a069b4-6a46-5810-b0ec-e0693c636034").value(), {nx::core::FilterTraits::uuid, &ExtractInternalSurfacesFromTriangleGeometry::FromSIMPLJson}}, // ExtractInternalSurfacesFromTriangleGeometry + {nx::core::Uuid::FromString("737b8d5a-8622-50f9-9a8a-bfdb57608891").value(), {nx::core::FilterTraits::uuid, &WriteFeatureDataCSVFilter::FromSIMPLJson}}, // FeatureDataCSVWriter + {nx::core::Uuid::FromString("bf35f515-294b-55ed-8c69-211b7e69cb56").value(), {nx::core::FilterTraits::uuid, &FindArrayStatisticsFilter::FromSIMPLJson}}, // FindArrayStatistics + {nx::core::Uuid::FromString("8a1106d4-c67f-5e09-a02a-b2e9b99d031e").value(), {nx::core::FilterTraits::uuid, &FindBoundaryCellsFilter::FromSIMPLJson}}, // FindBoundaryCellsFilter + {nx::core::Uuid::FromString("450c2f00-9ddf-56e1-b4c1-0e74e7ad2349").value(), {nx::core::FilterTraits::uuid, &FindBiasedFeaturesFilter::FromSIMPLJson}}, // FindBiasedFeaturesFilter + {nx::core::Uuid::FromString("29086169-20ce-52dc-b13e-824694d759aa").value(), {nx::core::FilterTraits::uuid, &FindDifferencesMap::FromSIMPLJson}}, // FindDifferenceMap + {nx::core::Uuid::FromString("933e4b2d-dd61-51c3-98be-00548ba783a3").value(), {nx::core::FilterTraits::uuid, &FindEuclideanDistMapFilter::FromSIMPLJson}}, // FindEuclideanDistMap + {nx::core::Uuid::FromString("6f8ca36f-2995-5bd3-8672-6b0b80d5b2ca").value(), {nx::core::FilterTraits::uuid, &FindFeatureCentroidsFilter::FromSIMPLJson}}, // FindFeatureCentroids + {nx::core::Uuid::FromString("6334ce16-cea5-5643-83b5-9573805873fa").value(), {nx::core::FilterTraits::uuid, &FindFeaturePhasesFilter::FromSIMPLJson}}, // FindFeaturePhases + {nx::core::Uuid::FromString("64d20c7b-697c-5ff1-9d1d-8a27b071f363").value(), {nx::core::FilterTraits::uuid, &FindFeaturePhasesBinaryFilter::FromSIMPLJson}}, // FindFeaturePhasesBinary + {nx::core::Uuid::FromString("697ed3de-db33-5dd1-a64b-04fb71e7d63e").value(), {nx::core::FilterTraits::uuid, &FindNeighborhoodsFilter::FromSIMPLJson}}, // FindNeighborhoods + {nx::core::Uuid::FromString("73ee33b6-7622-5004-8b88-4d145514fb6a").value(), {nx::core::FilterTraits::uuid, &FindNeighborListStatistics::FromSIMPLJson}}, // FindNeighborListStatistics + {nx::core::Uuid::FromString("97cf66f8-7a9b-5ec2-83eb-f8c4c8a17bac").value(), {nx::core::FilterTraits::uuid, &FindNeighbors::FromSIMPLJson}}, // FindNeighbors + {nx::core::Uuid::FromString("529743cf-d5d5-5d5a-a79f-95c84a5ddbb5").value(), {nx::core::FilterTraits::uuid, &FindNumFeaturesFilter::FromSIMPLJson}}, // FindNumFeatures + {nx::core::Uuid::FromString("5d586366-6b59-566e-8de1-57aa9ae8a91c").value(), {nx::core::FilterTraits::uuid, &FindSurfaceAreaToVolumeFilter::FromSIMPLJson}}, // FindSurfaceAreaToVolume + {nx::core::Uuid::FromString("d2b0ae3d-686a-5dc0-a844-66bc0dc8f3cb").value(), {nx::core::FilterTraits::uuid, &FindSurfaceFeatures::FromSIMPLJson}}, // FindSurfaceFeatures + {nx::core::Uuid::FromString("68246a67-7f32-5c80-815a-bec82008d7bc").value(), {nx::core::FilterTraits::uuid, &FindVolFractionsFilter::FromSIMPLJson}}, // FindVolFractions + {nx::core::Uuid::FromString("0d0a6535-6565-51c5-a3fc-fbc00008606d").value(), {nx::core::FilterTraits::uuid, &GenerateColorTableFilter::FromSIMPLJson}}, // GenerateColorTable + {nx::core::Uuid::FromString("0e8c0818-a3fb-57d4-a5c8-7cb8ae54a40a").value(), {nx::core::FilterTraits::uuid, &IdentifySample::FromSIMPLJson}}, // IdentifySample + {nx::core::Uuid::FromString("f2259481-5011-5f22-9fcb-c92fb6f8be10").value(), {nx::core::FilterTraits::uuid, &ReadBinaryCTNorthstarFilter::FromSIMPLJson}}, // ImportBinaryCTNorthstarFilter + {nx::core::Uuid::FromString("bdb978bc-96bf-5498-972c-b509c38b8d50").value(), {nx::core::FilterTraits::uuid, &ReadCSVFileFilter::FromSIMPLJson}}, // ReadASCIIData + {nx::core::Uuid::FromString("043cbde5-3878-5718-958f-ae75714df0df").value(), {nx::core::FilterTraits::uuid, &ReadDREAM3DFilter::FromSIMPLJson}}, // DataContainerReader + {nx::core::Uuid::FromString("9e98c3b0-5707-5a3b-b8b5-23ef83b02896").value(), {nx::core::FilterTraits::uuid, &ReadHDF5Dataset::FromSIMPLJson}}, // ImportHDF5Dataset + {nx::core::Uuid::FromString("a7007472-29e5-5d0a-89a6-1aed11b603f8").value(), {nx::core::FilterTraits::uuid, &ReadTextDataArrayFilter::FromSIMPLJson}}, // ImportAsciDataArray + {nx::core::Uuid::FromString("5fa10d81-94b4-582b-833f-8eabe659069e").value(), {nx::core::FilterTraits::uuid, &ReadVolumeGraphicsFileFilter::FromSIMPLJson}}, // ImportVolumeGraphicsFileFilter + {nx::core::Uuid::FromString("dfab9921-fea3-521c-99ba-48db98e43ff8").value(), {nx::core::FilterTraits::uuid, &InitializeImageGeomCellData::FromSIMPLJson}}, // InitializeData + {nx::core::Uuid::FromString("4b551c15-418d-5081-be3f-d3aeb62408e5").value(), {nx::core::FilterTraits::uuid, &InterpolatePointCloudToRegularGridFilter::FromSIMPLJson}}, // InterpolatePointCloudToRegularGrid + {nx::core::Uuid::FromString("6c8fb24b-5b12-551c-ba6d-ae2fa7724764").value(), {nx::core::FilterTraits::uuid, &IterativeClosestPointFilter::FromSIMPLJson}}, // IterativeClosestPoint + {nx::core::Uuid::FromString("601c4885-c218-5da6-9fc7-519d85d241ad").value(), {nx::core::FilterTraits::uuid, &LaplacianSmoothingFilter::FromSIMPLJson}}, // LaplacianSmoothing + {nx::core::Uuid::FromString("9fe34deb-99e1-5f3a-a9cc-e90c655b47ee").value(), {nx::core::FilterTraits::uuid, &MapPointCloudToRegularGridFilter::FromSIMPLJson}}, // MapPointCloudToRegularGrid + {nx::core::Uuid::FromString("dab5de3c-5f81-5bb5-8490-73521e1183ea").value(), {nx::core::FilterTraits::uuid, &MinNeighbors::FromSIMPLJson}}, // MinNeighbors + {nx::core::Uuid::FromString("fe2cbe09-8ae1-5bea-9397-fd5741091fdb").value(), {nx::core::FilterTraits::uuid, &MoveData::FromSIMPLJson}}, // MoveData + {nx::core::Uuid::FromString("014b7300-cf36-5ede-a751-5faf9b119dae").value(), {nx::core::FilterTraits::uuid, &MultiThresholdObjects::FromSIMPLJson}}, // MultiThresholdObjects + {nx::core::Uuid::FromString("686d5393-2b02-5c86-b887-dd81a8ae80f2").value(), {nx::core::FilterTraits::uuid, &MultiThresholdObjects::FromSIMPLJson}}, // MultiThresholdObjects2 + {nx::core::Uuid::FromString("119861c5-e303-537e-b210-2e62936222e9").value(), {nx::core::FilterTraits::uuid, &PointSampleTriangleGeometryFilter::FromSIMPLJson}}, // PointSampleTriangleGeometry + {nx::core::Uuid::FromString("07b49e30-3900-5c34-862a-f1fb48bad568").value(), {nx::core::FilterTraits::uuid, &QuickSurfaceMeshFilter::FromSIMPLJson}}, // QuickSurfaceMesh + {nx::core::Uuid::FromString("0791f556-3d73-5b1e-b275-db3f7bb6850d").value(), {nx::core::FilterTraits::uuid, &ReadRawBinaryFilter::FromSIMPLJson}}, // RawBinaryReader + {nx::core::Uuid::FromString("379ccc67-16dd-530a-984f-177db2314bac").value(), {nx::core::FilterTraits::uuid, &RemoveFlaggedVertices::FromSIMPLJson}}, // RemoveFlaggedVertices + {nx::core::Uuid::FromString("53ac1638-8934-57b8-b8e5-4b91cdda23ec").value(), {nx::core::FilterTraits::uuid, &RemoveMinimumSizeFeaturesFilter::FromSIMPLJson}}, // MinSize + {nx::core::Uuid::FromString("53a5f731-2858-5e3e-bd43-8f2cf45d90ec").value(), {nx::core::FilterTraits::uuid, &RenameDataObject::FromSIMPLJson}}, // RenameAttributeArray + {nx::core::Uuid::FromString("ee29e6d6-1f59-551b-9350-a696523261d5").value(), {nx::core::FilterTraits::uuid, &RenameDataObject::FromSIMPLJson}}, // RenameAttributeMatrix + {nx::core::Uuid::FromString("d53c808f-004d-5fac-b125-0fffc8cc78d6").value(), {nx::core::FilterTraits::uuid, &RenameDataObject::FromSIMPLJson}}, // RenameDataContainer + {nx::core::Uuid::FromString("3062fc2c-76b2-5c50-92b7-edbbb424c41d").value(), {nx::core::FilterTraits::uuid, &RobustAutomaticThreshold::FromSIMPLJson}}, // RobustAutomaticThreshold + {nx::core::Uuid::FromString("2c5edebf-95d8-511f-b787-90ee2adf485c").value(), {nx::core::FilterTraits::uuid, &ScalarSegmentFeaturesFilter::FromSIMPLJson}}, // ScalarSegmentFeatures + {nx::core::Uuid::FromString("6d3a3852-6251-5d2e-b749-6257fd0d8951").value(), {nx::core::FilterTraits::uuid, &SetImageGeomOriginScalingFilter::FromSIMPLJson}}, // SetOriginResolutionImageGeom + {nx::core::Uuid::FromString("5ecf77f4-a38a-52ab-b4f6-0fb8a9c5cb9c").value(), {nx::core::FilterTraits::uuid, &SplitAttributeArrayFilter::FromSIMPLJson}}, // SplitAttributeArray + {nx::core::Uuid::FromString("980c7bfd-20b2-5711-bc3b-0190b9096c34").value(), {nx::core::FilterTraits::uuid, &ReadStlFileFilter::FromSIMPLJson}}, // ReadStlFile + {nx::core::Uuid::FromString("5fbf9204-2c6c-597b-856a-f4612adbac38").value(), {nx::core::FilterTraits::uuid, &WriteASCIIDataFilter::FromSIMPLJson}}, // WriteASCIIData + {nx::core::Uuid::FromString("0541c5eb-1976-5797-9468-be50a93d44e2").value(), {nx::core::FilterTraits::uuid, &TriangleDihedralAngleFilter::FromSIMPLJson}}, // TriangleDihedralAngleFilter + {nx::core::Uuid::FromString("928154f6-e4bc-5a10-a9dd-1abb6a6c0f6b").value(), {nx::core::FilterTraits::uuid, &TriangleNormalFilter::FromSIMPLJson}}, // TriangleNormalFilter + {nx::core::Uuid::FromString("088ef69b-ca98-51a9-97ac-369862015d71").value(), {nx::core::FilterTraits::uuid, &CopyDataObjectFilter::FromSIMPLJson}}, // CopyObject + {nx::core::Uuid::FromString("79d59b85-01e8-5c4a-a6e1-3fd3e2ceffb4").value(), {nx::core::FilterTraits::uuid, &ExtractComponentAsArrayFilter::FromSIMPLJson}}, // ExtractComponentAsArray + {nx::core::Uuid::FromString("8a2308ec-86cd-5636-9a0a-6c7d383e9e7f").value(), {nx::core::FilterTraits::uuid, &ExecuteProcessFilter::FromSIMPLJson}}, // ExecuteProcessFilter + {nx::core::Uuid::FromString("1b4b9941-62e4-52f2-9918-15d48147ab88").value(), {nx::core::FilterTraits::uuid, &ExtractComponentAsArrayFilter::FromSIMPLJson}}, // RemoveComponentFromArray + {nx::core::Uuid::FromString("7aa33007-4186-5d7f-ba9d-d0a561b3351d").value(), {nx::core::FilterTraits::uuid, &TriangleCentroidFilter::FromSIMPLJson}}, // TriangleCentroid + {nx::core::Uuid::FromString("1966e540-759c-5798-ae26-0c6a3abc65c0").value(), {nx::core::FilterTraits::uuid, &ResampleImageGeomFilter::FromSIMPLJson}}, // ResampleImageGeom + {nx::core::Uuid::FromString("e25d9b4c-2b37-578c-b1de-cf7032b5ef19").value(), {nx::core::FilterTraits::uuid, &RotateSampleRefFrameFilter::FromSIMPLJson}}, // RotateSampleRefFrame + {nx::core::Uuid::FromString("30ae0a1e-3d94-5dab-b279-c5727ab5d7ff").value(), {nx::core::FilterTraits::uuid, &FillBadDataFilter::FromSIMPLJson}}, // FillBadData + {nx::core::Uuid::FromString("7aa33007-4186-5d7f-ba9d-d0a561b3351d").value(), {nx::core::FilterTraits::uuid, {}}}, // TriangleCentroid + {nx::core::Uuid::FromString("17410178-4e5f-58b9-900e-8194c69200ab").value(), {nx::core::FilterTraits::uuid, &ReplaceElementAttributesWithNeighborValuesFilter::FromSIMPLJson}}, // ReplaceElementAttributesWithNeighborValues + {nx::core::Uuid::FromString("4fff1aa6-4f62-56c4-8ee9-8e28ec2fcbba").value(), {nx::core::FilterTraits::uuid, &ErodeDilateMaskFilter::FromSIMPLJson}}, // ErodeDilateMask + {nx::core::Uuid::FromString("d26e85ff-7e52-53ae-b095-b1d969c9e73c").value(), {nx::core::FilterTraits::uuid, &ErodeDilateCoordinationNumberFilter::FromSIMPLJson}}, // ErodeDilateCoordinationNumber + {nx::core::Uuid::FromString("3adfe077-c3c9-5cd0-ad74-cf5f8ff3d254").value(), {nx::core::FilterTraits::uuid, &ErodeDilateBadDataFilter::FromSIMPLJson}}, // ErodeDilateBadData + {nx::core::Uuid::FromString("a8463056-3fa7-530b-847f-7f4cb78b8602").value(), {nx::core::FilterTraits::uuid, &RemoveFlaggedFeaturesFilter::FromSIMPLJson}}, // RemoveFlaggedFeatures + {nx::core::Uuid::FromString("e0555de5-bdc6-5bea-ba2f-aacfbec0a022").value(), {nx::core::FilterTraits::uuid, &RemoveFlaggedFeaturesFilter::FromSIMPLJson}}, // ExtractFlaggedFeatures + {nx::core::Uuid::FromString("27a132b2-a592-519a-8cb7-38599a7f28ec").value(), {nx::core::FilterTraits::uuid, &ComputeMomentInvariants2DFilter::FromSIMPLJson}}, // ComputeMomentInvariants2D + {nx::core::Uuid::FromString("fcdde553-36b4-5731-bc88-fc499806cb4e").value(), {nx::core::FilterTraits::uuid, &FindVertexToTriangleDistancesFilter::FromSIMPLJson}}, // FindVertexToTriangleDistances + {nx::core::Uuid::FromString("c681caf4-22f2-5885-bbc9-a0476abc72eb").value(), {nx::core::FilterTraits::uuid, {}}}, // ApplyTransformationToGeometry + {nx::core::Uuid::FromString("6eda8dbf-dbd8-562a-ae1a-f2904157c189").value(), {nx::core::FilterTraits::uuid, &ComputeFeatureRectFilter::FromSIMPLJson}}, // ComputeFeatureRect + {nx::core::Uuid::FromString("9f77b4a9-6416-5220-a688-115f4e14c90d").value(), {nx::core::FilterTraits::uuid, &FindLargestCrossSectionsFilter::FromSIMPLJson}}, // FindLargestCrossSections + {nx::core::Uuid::FromString("b9134758-d5e5-59dd-9907-28d23e0e0143").value(), {nx::core::FilterTraits::uuid, &WriteStlFileFilter::FromSIMPLJson}}, // WriteStlFile + {nx::core::Uuid::FromString("ac99b706-d1e0-5f78-9246-fbbe1efd93d2").value(), {nx::core::FilterTraits::uuid, &AddBadDataFilter::FromSIMPLJson}}, // AddBadData + {nx::core::Uuid::FromString("52b2918a-4fb5-57aa-97d4-ccc084b89572").value(), {nx::core::FilterTraits::uuid, &AppendImageGeometryZSliceFilter::FromSIMPLJson}}, // AppendImageGeometryZSlice + {nx::core::Uuid::FromString("a1e9cf6d-2d1b-573e-98b8-0314c993d2b6").value(), {nx::core::FilterTraits::uuid, &FindFeatureClusteringFilter::FromSIMPLJson}}, // FindFeatureClustering + {nx::core::Uuid::FromString("0559aa37-c5ad-549a-82d4-bff4bfcb6cc6").value(), {nx::core::FilterTraits::uuid, &WriteAbaqusHexahedronFilter::FromSIMPLJson}}, // AbaqusHexahedronWriter + {nx::core::Uuid::FromString("cbaf9e68-5ded-560c-9440-509289100ea8").value(), {nx::core::FilterTraits::uuid, &NearestPointFuseRegularGridsFilter::FromSIMPLJson}}, // NearestPointFuseRegularGrids + {nx::core::Uuid::FromString("77befd69-4536-5856-9f81-02996d038f73").value(), {nx::core::FilterTraits::uuid, &ResampleRectGridToImageGeomFilter::FromSIMPLJson}}, // ResampleRectGridToImageGeom + {nx::core::Uuid::FromString("71d46128-1d2d-58fd-9924-1714695768c3").value(), {nx::core::FilterTraits::uuid, &CombineStlFilesFilter::FromSIMPLJson}}, // CombineStlFiles + {nx::core::Uuid::FromString("339f1349-9236-5023-9a56-c82fb8eafd12").value(), {nx::core::FilterTraits::uuid, &WriteAvizoUniformCoordinateFilter::FromSIMPLJson}}, // AvizoUniformCoordinateWriter + {nx::core::Uuid::FromString("2861f4b4-8d50-5e69-9575-68c9d35f1256").value(), {nx::core::FilterTraits::uuid, &WriteAvizoRectilinearCoordinateFilter::FromSIMPLJson}}, // AvizoRectilinearCoordinateWriter + {nx::core::Uuid::FromString("a043bd66-2681-5126-82e1-5fdc46694bf4").value(), {nx::core::FilterTraits::uuid, &WriteVtkRectilinearGridFilter::FromSIMPLJson}}, // VtkRectilinearGridWriter + {nx::core::Uuid::FromString("0df3da89-9106-538e-b1a9-6bbf1cf0aa92").value(), {nx::core::FilterTraits::uuid, &RegularGridSampleSurfaceMeshFilter::FromSIMPLJson}}, // RegularGridSampleSurfaceMesh + {nx::core::Uuid::FromString("75cfeb9b-cd4b-5a20-a344-4170b39bbfaf").value(), {nx::core::FilterTraits::uuid, &UncertainRegularGridSampleSurfaceMeshFilter::FromSIMPLJson}}, // UncertainRegularGridSampleSurfaceMesh + {nx::core::Uuid::FromString("6357243e-41a6-52c4-be2d-2f6894c39fcc").value(), {nx::core::FilterTraits::uuid, &FindBoundaryElementFractionsFilter::FromSIMPLJson}}, // FindBoundaryElementFractions + {nx::core::Uuid::FromString("9b9fb9e1-074d-54b6-a6ce-0be21ab4496d").value(), {nx::core::FilterTraits::uuid, &ReverseTriangleWindingFilter::FromSIMPLJson}}, // ReverseTriangleWinding + {nx::core::Uuid::FromString("158ebe9e-f772-57e2-ac1b-71ff213cf890").value(), {nx::core::FilterTraits::uuid, &WriteLosAlamosFFTFilter::FromSIMPLJson}}, // LosAlamosFFTWriter + {nx::core::Uuid::FromString("ef28de7e-5bdd-57c2-9318-60ba0dfaf7bc").value(), {nx::core::FilterTraits::uuid, &GenerateVectorColorsFilter::FromSIMPLJson}}, // GenerateVectorColors + {nx::core::Uuid::FromString("3c6337da-e232-4420-a5ca-451496748d88").value(), {nx::core::FilterTraits::uuid, &ReadDeformKeyFileV12Filter::FromSIMPLJson}}, // ImportDeformKeyFileV12Filter + {nx::core::Uuid::FromString("f7486aa6-3049-5be7-8511-ae772b70c90b").value(), {nx::core::FilterTraits::uuid, &KMedoidsFilter::FromSIMPLJson}}, // KMedoids + {nx::core::Uuid::FromString("b56a04de-0ca0-509d-809f-52219fca9c98").value(), {nx::core::FilterTraits::uuid, &KMeansFilter::FromSIMPLJson}}, // KMeans + {nx::core::Uuid::FromString("f84d4d69-9ea5-54b6-a71c-df76d76d50cf").value(), {nx::core::FilterTraits::uuid, &SilhouetteFilter::FromSIMPLJson}}, // Silhouette + // @@__MAP__UPDATE__TOKEN__DO__NOT__DELETE__@@ + }; + +} // namespace nx::core +// clang-format on diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.cpp new file mode 100644 index 0000000000..4ec9ea633a --- /dev/null +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.cpp @@ -0,0 +1,30 @@ +#include "SimplnxCorePlugin.hpp" +#include "SimplnxCoreLegacyUUIDMapping.hpp" + +#include "SimplnxCore/SimplnxCore_filter_registration.hpp" + +using namespace nx::core; + +namespace +{ +constexpr AbstractPlugin::IdType k_ID = *Uuid::FromString("05cc618b-781f-4ac0-b9ac-43f26ce1854f"); +} // namespace + +SimplnxCorePlugin::SimplnxCorePlugin() +: AbstractPlugin(k_ID, "SimplnxCore", "Description", "BlueQuartz Software") +{ + std::vector filterFuncs = ::GetPluginFilterList(); + for(const auto& filterFunc : filterFuncs) + { + addFilter(filterFunc); + } +} + +SimplnxCorePlugin::~SimplnxCorePlugin() = default; + +AbstractPlugin::SIMPLMapType SimplnxCorePlugin::getSimplToSimplnxMap() const +{ + return nx::core::k_SIMPL_to_SimplnxCore; +} + +SIMPLNX_DEF_PLUGIN(SimplnxCorePlugin) diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.hpp new file mode 100644 index 0000000000..17c21e26f1 --- /dev/null +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCorePlugin.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include "SimplnxCore/SimplnxCore_export.hpp" + +#include "simplnx/Plugin/AbstractPlugin.hpp" + +class SIMPLNXCORE_EXPORT SimplnxCorePlugin : public nx::core::AbstractPlugin +{ +public: + SimplnxCorePlugin(); + ~SimplnxCorePlugin() override; + + SimplnxCorePlugin(const SimplnxCorePlugin&) = delete; + SimplnxCorePlugin(SimplnxCorePlugin&&) = delete; + + SimplnxCorePlugin& operator=(const SimplnxCorePlugin&) = delete; + SimplnxCorePlugin& operator=(SimplnxCorePlugin&&) = delete; + + /** + * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to + * their simplnx counterpart + * @return SIMPLMapType + */ + SIMPLMapType getSimplToSimplnxMap() const override; +}; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/LICENSE.txt b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/LICENSE.txt similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/LICENSE.txt rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/LICENSE.txt diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellFlag.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellFlag.cpp similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellFlag.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellFlag.cpp diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellFlag.h b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellFlag.h similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellFlag.h rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellFlag.h diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellMap.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellMap.cpp similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellMap.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellMap.cpp diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellMap.h b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellMap.h similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMCellMap.h rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMCellMap.h diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryGL.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryGL.cpp similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryGL.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryGL.cpp diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryGL.h b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryGL.h similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryGL.h rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryGL.h diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryOBJ.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryOBJ.cpp similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryOBJ.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryOBJ.cpp diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryOBJ.h b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryOBJ.h similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMGeometryOBJ.h rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMGeometryOBJ.h diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMSurfaceNet.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMSurfaceNet.cpp similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMSurfaceNet.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMSurfaceNet.cpp diff --git a/src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMSurfaceNet.h b/src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMSurfaceNet.h similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/SurfaceNets/MMSurfaceNet.h rename to src/Plugins/SimplnxCore/src/SimplnxCore/SurfaceNets/MMSurfaceNet.h diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ABSOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ABSOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ABSOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ABSOperator.cpp index 519f172e50..41b5b3bd31 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ABSOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ABSOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/ABSOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/ABSOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ABSOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ABSOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ABSOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ABSOperator.hpp index 913bb3528f..1048bb44db 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ABSOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ABSOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT ABSOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT ABSOperator : public UnaryOperator { public: using Self = ABSOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT ABSOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ACosOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ACosOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ACosOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ACosOperator.cpp index 0400376e02..0cd8872ba1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ACosOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ACosOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/ACosOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/ACosOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ACosOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ACosOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ACosOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ACosOperator.hpp index 6ddf10aab9..89e7a3e554 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ACosOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ACosOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT ACosOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT ACosOperator : public UnaryOperator { public: using Self = ACosOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT ACosOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ASinOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ASinOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ASinOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ASinOperator.cpp index dd97575e00..924e62d393 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ASinOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ASinOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/ASinOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/ASinOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ASinOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ASinOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ASinOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ASinOperator.hpp index a0801b551b..869dc07c9c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ASinOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ASinOperator.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT ASinOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT ASinOperator : public UnaryOperator { public: using Self = ASinOperator; @@ -39,4 +39,4 @@ class COMPLEXCORE_EXPORT ASinOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ATanOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ATanOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ATanOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ATanOperator.cpp index 110f6978ee..29e9dc8bd4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ATanOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ATanOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/ATanOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/ATanOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ATanOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ATanOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ATanOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ATanOperator.hpp index c376c0c1ca..71690e142f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ATanOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ATanOperator.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT ATanOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT ATanOperator : public UnaryOperator { public: using Self = ATanOperator; @@ -39,4 +39,4 @@ class COMPLEXCORE_EXPORT ATanOperator : public UnaryOperator private: }; -} // namespace complex \ No newline at end of file +} // namespace nx::core \ No newline at end of file diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/AdditionOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AdditionOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/AdditionOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/AdditionOperator.cpp index 2e0c669026..759f0fafc6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/AdditionOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AdditionOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/AdditionOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/AdditionOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/AdditionOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AdditionOperator.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/AdditionOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/AdditionOperator.hpp index ec55e2670e..63ebf83833 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/AdditionOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AdditionOperator.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT AdditionOperator : public BinaryOperator +class SIMPLNXCORE_EXPORT AdditionOperator : public BinaryOperator { public: using Self = AdditionOperator; @@ -39,4 +39,4 @@ class COMPLEXCORE_EXPORT AdditionOperator : public BinaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/AvizoWriter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AvizoWriter.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/AvizoWriter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/AvizoWriter.cpp index 542f7191e9..9279b4469c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/AvizoWriter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AvizoWriter.cpp @@ -1,9 +1,9 @@ #include "AvizoWriter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- AvizoWriter::AvizoWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/AvizoWriter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AvizoWriter.hpp similarity index 72% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/AvizoWriter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/AvizoWriter.hpp index 64799d9da6..055bfb09e8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/AvizoWriter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/AvizoWriter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -namespace complex +namespace nx::core { -struct COMPLEXCORE_EXPORT AvizoWriterInputValues +struct SIMPLNXCORE_EXPORT AvizoWriterInputValues { FileSystemPathParameter::ValueType OutputFile; bool WriteBinaryFile; @@ -25,7 +25,7 @@ struct COMPLEXCORE_EXPORT AvizoWriterInputValues * @brief This filter writes out a native Avizo Uniform Coordinate data file. */ -class COMPLEXCORE_EXPORT AvizoWriter +class SIMPLNXCORE_EXPORT AvizoWriter { public: AvizoWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); @@ -50,4 +50,4 @@ class COMPLEXCORE_EXPORT AvizoWriter const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/BinaryOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/BinaryOperator.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/BinaryOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/BinaryOperator.cpp index e013bff286..fde52052c1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/BinaryOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/BinaryOperator.cpp @@ -1,8 +1,8 @@ -#include "ComplexCore/utils/BinaryOperator.hpp" -#include "ComplexCore/utils/LeftParenthesisItem.hpp" -#include "ComplexCore/utils/RightParenthesisItem.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/utils/LeftParenthesisItem.hpp" +#include "SimplnxCore/utils/RightParenthesisItem.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/BinaryOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/BinaryOperator.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/BinaryOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/BinaryOperator.hpp index b8aebb4093..8f8b1fe93a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/BinaryOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/BinaryOperator.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/utils/CalculatorOperator.hpp" +#include "SimplnxCore/utils/CalculatorOperator.hpp" -#include "complex/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataPath.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT BinaryOperator : public CalculatorOperator +class SIMPLNXCORE_EXPORT BinaryOperator : public CalculatorOperator { public: using Self = BinaryOperator; @@ -41,4 +41,4 @@ class COMPLEXCORE_EXPORT BinaryOperator : public CalculatorOperator BinaryOperator& operator=(BinaryOperator&&) = delete; // Move Assignment Not Implemented }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CSVDataParser.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CSVDataParser.hpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CSVDataParser.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CSVDataParser.hpp index 023de3207b..463c961700 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CSVDataParser.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CSVDataParser.hpp @@ -29,11 +29,11 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" -using namespace complex; +using namespace nx::core; class AbstractDataParser { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorArray.hpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorArray.hpp index d97140a2ec..92998d95b2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorArray.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/ICalculatorArray.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/ICalculatorArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -namespace complex +namespace nx::core { template -class COMPLEXCORE_EXPORT CalculatorArray : public ICalculatorArray +class SIMPLNXCORE_EXPORT CalculatorArray : public ICalculatorArray { public: using Self = CalculatorArray; @@ -166,4 +166,4 @@ class COMPLEXCORE_EXPORT CalculatorArray : public ICalculatorArray CalculatorArray& operator=(CalculatorArray&&) = delete; // Move Assignment Not Implemented }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorItem.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorItem.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorItem.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorItem.cpp index 7a60f6b476..f523fd3122 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorItem.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorItem.cpp @@ -1,9 +1,9 @@ -#include "ComplexCore/utils/CalculatorItem.hpp" -#include "ComplexCore/utils/ICalculatorArray.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" +#include "SimplnxCore/utils/ICalculatorArray.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorItem.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorItem.hpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorItem.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorItem.hpp index 06e52cf257..8b67cf37c2 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorItem.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorItem.hpp @@ -1,12 +1,12 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" #include #include #include -namespace complex +namespace nx::core { class DataStructure; class DataPath; @@ -14,7 +14,7 @@ class DataPath; /** * @brief The CalculatorItem class */ -class COMPLEXCORE_EXPORT CalculatorItem +class SIMPLNXCORE_EXPORT CalculatorItem { public: using Self = CalculatorItem; @@ -96,4 +96,4 @@ class COMPLEXCORE_EXPORT CalculatorItem CalculatorItem& operator=(CalculatorItem&&) = delete; // Move Assignment Not Implemented }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorOperator.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorOperator.cpp index 22dc782f71..159d0a809c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorOperator.cpp @@ -1,8 +1,8 @@ -#include "ComplexCore/utils/CalculatorOperator.hpp" +#include "SimplnxCore/utils/CalculatorOperator.hpp" -#include "complex/Common/Numbers.hpp" +#include "simplnx/Common/Numbers.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorOperator.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorOperator.hpp index 28245e4c54..21b1f4db31 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorOperator.hpp @@ -1,19 +1,19 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Parameters/CalculatorParameter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Parameters/CalculatorParameter.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CalculatorOperator : public CalculatorItem +class SIMPLNXCORE_EXPORT CalculatorOperator : public CalculatorItem { public: enum OperatorType @@ -74,4 +74,4 @@ class COMPLEXCORE_EXPORT CalculatorOperator : public CalculatorItem std::function op); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorSeparator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorSeparator.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorSeparator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorSeparator.cpp index 93bbbc0ff6..0aeb534d8b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorSeparator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorSeparator.cpp @@ -1,6 +1,6 @@ -#include "ComplexCore/utils/CalculatorSeparator.hpp" +#include "SimplnxCore/utils/CalculatorSeparator.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorSeparator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorSeparator.hpp similarity index 80% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorSeparator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorSeparator.hpp index 499aacca4b..baae97889c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CalculatorSeparator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CalculatorSeparator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorItem.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" #include -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CalculatorSeparator : public CalculatorItem +class SIMPLNXCORE_EXPORT CalculatorSeparator : public CalculatorItem { public: using Self = CalculatorSeparator; @@ -31,4 +31,4 @@ class COMPLEXCORE_EXPORT CalculatorSeparator : public CalculatorItem private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CeilOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CeilOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CeilOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CeilOperator.cpp index 641fca2210..c06d6ed3b7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CeilOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CeilOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/CeilOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/CeilOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CeilOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CeilOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CeilOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CeilOperator.hpp index 070364b7c8..3e46d8df8c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CeilOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CeilOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT CeilOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT CeilOperator : public UnaryOperator { public: using Self = CeilOperator; @@ -37,4 +37,4 @@ class COMPLEXCORE_EXPORT CeilOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CommaSeparator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CommaSeparator.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CommaSeparator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CommaSeparator.cpp index d55dbf5982..57bb32cc06 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CommaSeparator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CommaSeparator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/CommaSeparator.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/utils/CommaSeparator.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CommaSeparator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CommaSeparator.hpp similarity index 82% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CommaSeparator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CommaSeparator.hpp index a98bc1bbf4..c58deb63f4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CommaSeparator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CommaSeparator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorSeparator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorSeparator.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT CommaSeparator : public CalculatorSeparator +class SIMPLNXCORE_EXPORT CommaSeparator : public CalculatorSeparator { public: using Self = CommaSeparator; @@ -35,4 +35,4 @@ class COMPLEXCORE_EXPORT CommaSeparator : public CalculatorSeparator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CosOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CosOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CosOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CosOperator.cpp index 82383cb121..9638355e80 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CosOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CosOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/CosOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/CosOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/CosOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CosOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/CosOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/CosOperator.hpp index 6f46d2b315..4f94fcf2a7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/CosOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/CosOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT CosOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT CosOperator : public UnaryOperator { public: using Self = CosOperator; @@ -37,4 +37,4 @@ class COMPLEXCORE_EXPORT CosOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/DivisionOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/DivisionOperator.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/DivisionOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/DivisionOperator.cpp index 70b92b3076..682d3b1333 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/DivisionOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/DivisionOperator.cpp @@ -1,6 +1,6 @@ -#include "ComplexCore/utils/DivisionOperator.hpp" +#include "SimplnxCore/utils/DivisionOperator.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/DivisionOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/DivisionOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/DivisionOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/DivisionOperator.hpp index b4d19d9d90..d9256a6793 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/DivisionOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/DivisionOperator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT DivisionOperator : public BinaryOperator +class SIMPLNXCORE_EXPORT DivisionOperator : public BinaryOperator { public: using Self = DivisionOperator; @@ -35,4 +35,4 @@ class COMPLEXCORE_EXPORT DivisionOperator : public BinaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ExpOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ExpOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ExpOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ExpOperator.cpp index 414c9485d1..216c202041 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ExpOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ExpOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/ExpOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/ExpOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ExpOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ExpOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ExpOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ExpOperator.hpp index 00adeb4c09..73d718e92c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ExpOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ExpOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT ExpOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT ExpOperator : public UnaryOperator { public: using Self = ExpOperator; @@ -37,4 +37,4 @@ class COMPLEXCORE_EXPORT ExpOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/FloorOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/FloorOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/FloorOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/FloorOperator.cpp index dca821fecc..6b6680f757 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/FloorOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/FloorOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/FloorOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/FloorOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/FloorOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/FloorOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/FloorOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/FloorOperator.hpp index 154e2833fa..93e935af96 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/FloorOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/FloorOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT FloorOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT FloorOperator : public UnaryOperator { public: using Self = FloorOperator; @@ -37,4 +37,4 @@ class COMPLEXCORE_EXPORT FloorOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ICalculatorArray.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ICalculatorArray.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ICalculatorArray.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ICalculatorArray.cpp index de692a31e2..6f5cf20da5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ICalculatorArray.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ICalculatorArray.cpp @@ -1,6 +1,6 @@ -#include "ComplexCore/utils/ICalculatorArray.hpp" +#include "SimplnxCore/utils/ICalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/ICalculatorArray.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ICalculatorArray.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/ICalculatorArray.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/ICalculatorArray.hpp index 49db34d7b1..7fc154b438 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/ICalculatorArray.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/ICalculatorArray.hpp @@ -1,15 +1,15 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorItem.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" -#include "complex/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataArray.hpp" #include -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT ICalculatorArray : public CalculatorItem +class SIMPLNXCORE_EXPORT ICalculatorArray : public CalculatorItem { public: enum ValueType @@ -46,4 +46,4 @@ class COMPLEXCORE_EXPORT ICalculatorArray : public CalculatorItem private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/LeftParenthesisItem.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LeftParenthesisItem.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/LeftParenthesisItem.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/LeftParenthesisItem.cpp index 9e0dc4ccbf..83399045ab 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/LeftParenthesisItem.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LeftParenthesisItem.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/LeftParenthesisItem.hpp" -#include "ComplexCore/utils/RightParenthesisItem.hpp" +#include "SimplnxCore/utils/LeftParenthesisItem.hpp" +#include "SimplnxCore/utils/RightParenthesisItem.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/LeftParenthesisItem.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LeftParenthesisItem.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/LeftParenthesisItem.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/LeftParenthesisItem.hpp index a2fb9e988a..4c64891175 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/LeftParenthesisItem.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LeftParenthesisItem.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorItem.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT LeftParenthesisItem : public CalculatorItem +class SIMPLNXCORE_EXPORT LeftParenthesisItem : public CalculatorItem { public: using Self = LeftParenthesisItem; @@ -42,4 +42,4 @@ class COMPLEXCORE_EXPORT LeftParenthesisItem : public CalculatorItem private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/LnOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LnOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/LnOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/LnOperator.cpp index f375d68f99..473c654367 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/LnOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LnOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/LnOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/LnOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/LnOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LnOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/LnOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/LnOperator.hpp index c8b91200ac..992985eb04 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/LnOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LnOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT LnOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT LnOperator : public UnaryOperator { public: using Self = LnOperator; @@ -37,4 +37,4 @@ class COMPLEXCORE_EXPORT LnOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/Log10Operator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/Log10Operator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/Log10Operator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/Log10Operator.cpp index 53b7c1f75c..64413029e6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/Log10Operator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/Log10Operator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/Log10Operator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/Log10Operator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/Log10Operator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/Log10Operator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/Log10Operator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/Log10Operator.hpp index 9854eeff9a..ab053ffa10 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/Log10Operator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/Log10Operator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT Log10Operator : public UnaryOperator +class SIMPLNXCORE_EXPORT Log10Operator : public UnaryOperator { public: using Self = Log10Operator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT Log10Operator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/LogOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LogOperator.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/LogOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/LogOperator.cpp index 1dbf93ddda..3d2ed4d006 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/LogOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LogOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/LogOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/LogOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/LogOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LogOperator.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/LogOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/LogOperator.hpp index 076b3a80e8..9409f158f7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/LogOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/LogOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT LogOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT LogOperator : public UnaryOperator { public: using Self = LogOperator; @@ -39,4 +39,4 @@ class COMPLEXCORE_EXPORT LogOperator : public UnaryOperator LogOperator& operator=(LogOperator&&) = delete; // Move Assignment Not Implemented }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/MultiplicationOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/MultiplicationOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/MultiplicationOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/MultiplicationOperator.cpp index 33b446697e..dc9bf707de 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/MultiplicationOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/MultiplicationOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/MultiplicationOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/MultiplicationOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/MultiplicationOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/MultiplicationOperator.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/MultiplicationOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/MultiplicationOperator.hpp index b9750bd9e6..1d32db39af 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/MultiplicationOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/MultiplicationOperator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT MultiplicationOperator : public BinaryOperator +class SIMPLNXCORE_EXPORT MultiplicationOperator : public BinaryOperator { public: using Self = MultiplicationOperator; @@ -36,4 +36,4 @@ class COMPLEXCORE_EXPORT MultiplicationOperator : public BinaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/NegativeOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/NegativeOperator.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/NegativeOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/NegativeOperator.cpp index ce339671df..29d4f8ce6e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/NegativeOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/NegativeOperator.cpp @@ -1,9 +1,9 @@ -#include "ComplexCore/utils/NegativeOperator.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" -#include "ComplexCore/utils/LeftParenthesisItem.hpp" +#include "SimplnxCore/utils/NegativeOperator.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/LeftParenthesisItem.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/NegativeOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/NegativeOperator.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/NegativeOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/NegativeOperator.hpp index be020c83bb..d0d7419e2f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/NegativeOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/NegativeOperator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT NegativeOperator : public CalculatorOperator +class SIMPLNXCORE_EXPORT NegativeOperator : public CalculatorOperator { public: using Self = NegativeOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT NegativeOperator : public CalculatorOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/PowOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PowOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/PowOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/PowOperator.cpp index 25d263404f..3a6f96cacf 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/PowOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PowOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/PowOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/PowOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/PowOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PowOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/PowOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/PowOperator.hpp index c98080dfdd..f9d89aa0ec 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/PowOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/PowOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT PowOperator : public BinaryOperator +class SIMPLNXCORE_EXPORT PowOperator : public BinaryOperator { public: using Self = PowOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT PowOperator : public BinaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/RightParenthesisItem.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RightParenthesisItem.cpp similarity index 92% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/RightParenthesisItem.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/RightParenthesisItem.cpp index 7c4fdfe3d4..7585c58e4e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/RightParenthesisItem.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RightParenthesisItem.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/RightParenthesisItem.hpp" -#include "ComplexCore/utils/LeftParenthesisItem.hpp" +#include "SimplnxCore/utils/RightParenthesisItem.hpp" +#include "SimplnxCore/utils/LeftParenthesisItem.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/RightParenthesisItem.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RightParenthesisItem.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/RightParenthesisItem.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/RightParenthesisItem.hpp index 4617039e7c..51dad2a493 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/RightParenthesisItem.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RightParenthesisItem.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/CalculatorItem.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT RightParenthesisItem : public CalculatorItem +class SIMPLNXCORE_EXPORT RightParenthesisItem : public CalculatorItem { public: using Self = RightParenthesisItem; @@ -42,4 +42,4 @@ class COMPLEXCORE_EXPORT RightParenthesisItem : public CalculatorItem private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/RootOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RootOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/RootOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/RootOperator.cpp index 880ac70ac3..cf56bbfc4b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/RootOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RootOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/RootOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/RootOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/RootOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RootOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/RootOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/RootOperator.hpp index 99ce6bab07..58b0868bd9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/RootOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/RootOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT RootOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT RootOperator : public UnaryOperator { public: using Self = RootOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT RootOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/SinOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SinOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/SinOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/SinOperator.cpp index f1370b33e3..9484b3ce3e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/SinOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SinOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/SinOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/SinOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/SinOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SinOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/SinOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/SinOperator.hpp index 614c859243..c8e8d57cf1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/SinOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SinOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT SinOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT SinOperator : public UnaryOperator { public: using Self = SinOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT SinOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/SqrtOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SqrtOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/SqrtOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/SqrtOperator.cpp index 09b385d40f..02d17072b1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/SqrtOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SqrtOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/SqrtOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/SqrtOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/SqrtOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SqrtOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/SqrtOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/SqrtOperator.hpp index 482700e3d3..46a174f6f0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/SqrtOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SqrtOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT SqrtOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT SqrtOperator : public UnaryOperator { public: using Self = SqrtOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT SqrtOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/StlUtilities.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/StlUtilities.cpp similarity index 98% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/StlUtilities.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/StlUtilities.cpp index b758800bf9..ccc6b1aae7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/StlUtilities.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/StlUtilities.cpp @@ -1,6 +1,6 @@ #include "StlUtilities.hpp" -using namespace complex; +using namespace nx::core; int32_t StlUtilities::DetermineStlFileType(const fs::path& path) { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/StlUtilities.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/StlUtilities.hpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/StlUtilities.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/StlUtilities.hpp index fee307e810..6136e0d346 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/StlUtilities.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/StlUtilities.hpp @@ -5,7 +5,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace StlConstants { @@ -35,4 +35,4 @@ int32_t DetermineStlFileType(const fs::path& path); */ int32_t NumFacesFromHeader(const fs::path& path); } // namespace StlUtilities -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/SubtractionOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SubtractionOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/SubtractionOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/SubtractionOperator.cpp index 8d06b528ef..6110ce750f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/SubtractionOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SubtractionOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/SubtractionOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/SubtractionOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/SubtractionOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SubtractionOperator.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/SubtractionOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/SubtractionOperator.hpp index 0b94162c32..80b196435e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/SubtractionOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/SubtractionOperator.hpp @@ -1,11 +1,11 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT SubtractionOperator : public BinaryOperator +class SIMPLNXCORE_EXPORT SubtractionOperator : public BinaryOperator { public: using Self = SubtractionOperator; @@ -36,4 +36,4 @@ class COMPLEXCORE_EXPORT SubtractionOperator : public BinaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/TanOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/TanOperator.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/TanOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/TanOperator.cpp index bee6df77e1..e39d1a2d44 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/TanOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/TanOperator.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/utils/TanOperator.hpp" -#include "ComplexCore/utils/CalculatorArray.hpp" +#include "SimplnxCore/utils/TanOperator.hpp" +#include "SimplnxCore/utils/CalculatorArray.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/TanOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/TanOperator.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/TanOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/TanOperator.hpp index 2fdd3c3f8a..5ce8a5ca83 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/TanOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/TanOperator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/UnaryOperator.hpp" +#include "SimplnxCore/SimplnxCore_export.hpp" +#include "SimplnxCore/utils/UnaryOperator.hpp" -namespace complex +namespace nx::core { class CalculatorNumber; -class COMPLEXCORE_EXPORT TanOperator : public UnaryOperator +class SIMPLNXCORE_EXPORT TanOperator : public UnaryOperator { public: using Self = TanOperator; @@ -38,4 +38,4 @@ class COMPLEXCORE_EXPORT TanOperator : public UnaryOperator private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/UnaryOperator.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/UnaryOperator.cpp similarity index 96% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/UnaryOperator.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/UnaryOperator.cpp index 93624fe904..7e0ceb6453 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/UnaryOperator.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/UnaryOperator.cpp @@ -1,13 +1,13 @@ #include "UnaryOperator.hpp" -#include "ComplexCore/Filters/ArrayCalculatorFilter.hpp" -#include "ComplexCore/utils/BinaryOperator.hpp" -#include "ComplexCore/utils/CommaSeparator.hpp" -#include "ComplexCore/utils/LeftParenthesisItem.hpp" -#include "ComplexCore/utils/NegativeOperator.hpp" -#include "ComplexCore/utils/RightParenthesisItem.hpp" +#include "SimplnxCore/Filters/ArrayCalculatorFilter.hpp" +#include "SimplnxCore/utils/BinaryOperator.hpp" +#include "SimplnxCore/utils/CommaSeparator.hpp" +#include "SimplnxCore/utils/LeftParenthesisItem.hpp" +#include "SimplnxCore/utils/NegativeOperator.hpp" +#include "SimplnxCore/utils/RightParenthesisItem.hpp" -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- // diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/UnaryOperator.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/UnaryOperator.hpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/UnaryOperator.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/UnaryOperator.hpp index 6075e02fbc..a3f49a08d8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/utils/UnaryOperator.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/UnaryOperator.hpp @@ -1,14 +1,14 @@ #pragma once -#include "ComplexCore/utils/CalculatorOperator.hpp" -#include "complex/DataStructure/DataPath.hpp" +#include "SimplnxCore/utils/CalculatorOperator.hpp" +#include "simplnx/DataStructure/DataPath.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEXCORE_EXPORT UnaryOperator : public CalculatorOperator +class SIMPLNXCORE_EXPORT UnaryOperator : public CalculatorOperator { public: using Self = UnaryOperator; @@ -53,4 +53,4 @@ class COMPLEXCORE_EXPORT UnaryOperator : public CalculatorOperator std::function op); }; -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/ComplexCore/src/ComplexCore/utils/nanoflann.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/utils/nanoflann.hpp similarity index 100% rename from src/Plugins/ComplexCore/src/ComplexCore/utils/nanoflann.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/utils/nanoflann.hpp diff --git a/src/Plugins/ComplexCore/test/AddBadDataTest.cpp b/src/Plugins/SimplnxCore/test/AddBadDataTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/AddBadDataTest.cpp rename to src/Plugins/SimplnxCore/test/AddBadDataTest.cpp index d4aefb0929..57812c7cb6 100644 --- a/src/Plugins/ComplexCore/test/AddBadDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/AddBadDataTest.cpp @@ -1,12 +1,12 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AddBadDataFilter.hpp" +#include "SimplnxCore/Filters/AddBadDataFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -15,9 +15,9 @@ const DataPath k_CellDataAM = k_ImageGeom.createChildPath(Constants::k_EbsdScanD const DataPath k_EuclideanDistances = k_CellDataAM.createChildPath("GBManhattanDistances"); } // namespace -TEST_CASE("ComplexCore::AddBadDataFilter: Valid Filter Execution", "[ComplexCore][AddBadDataFilter]") +TEST_CASE("SimplnxCore::AddBadDataFilter: Valid Filter Execution", "[SimplnxCore][AddBadDataFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "add_bad_data_test.tar.gz", "add_bad_data_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "add_bad_data_test.tar.gz", "add_bad_data_test"); DataStructure exemplarDataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/add_bad_data_test/6_6_add_bad_data_test.dream3d", unit_test::k_TestFilesDir))); diff --git a/src/Plugins/ComplexCore/test/AlignGeometriesTest.cpp b/src/Plugins/SimplnxCore/test/AlignGeometriesTest.cpp similarity index 83% rename from src/Plugins/ComplexCore/test/AlignGeometriesTest.cpp rename to src/Plugins/SimplnxCore/test/AlignGeometriesTest.cpp index 001585ac8a..90e9f0a0ec 100644 --- a/src/Plugins/ComplexCore/test/AlignGeometriesTest.cpp +++ b/src/Plugins/SimplnxCore/test/AlignGeometriesTest.cpp @@ -1,12 +1,12 @@ -#include "ComplexCore/Filters/AlignGeometries.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/AlignGeometries.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -29,7 +29,7 @@ DataStructure createTestData() } } // namespace -TEST_CASE("ComplexCore::AlignGeometries: Instantiate Filter", "[AlignGeometries]") +TEST_CASE("SimplnxCore::AlignGeometries: Instantiate Filter", "[AlignGeometries]") { AlignGeometries filter; DataStructure dataStructure = createTestData(); @@ -52,7 +52,7 @@ TEST_CASE("ComplexCore::AlignGeometries: Instantiate Filter", "[AlignGeometries] REQUIRE(!executeResult.result.valid()); } -TEST_CASE("ComplexCore::AlignGeometries: Bad Alignment Type", "[AlignGeometries]") +TEST_CASE("SimplnxCore::AlignGeometries: Bad Alignment Type", "[AlignGeometries]") { AlignGeometries filter; DataStructure dataStructure = createTestData(); @@ -68,14 +68,14 @@ TEST_CASE("ComplexCore::AlignGeometries: Bad Alignment Type", "[AlignGeometries] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } -TEST_CASE("ComplexCore::AlignGeometries: Valid Arguments", "[AlignGeometries]") +TEST_CASE("SimplnxCore::AlignGeometries: Valid Arguments", "[AlignGeometries]") { AlignGeometries filter; DataStructure dataStructure = createTestData(); @@ -91,11 +91,11 @@ TEST_CASE("ComplexCore::AlignGeometries: Valid Arguments", "[AlignGeometries]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); auto& movingGeom = dataStructure.getDataRefAs(movingGeomPath); auto& targetGeom = dataStructure.getDataRefAs(targetGeomPath); diff --git a/src/Plugins/ComplexCore/test/AlignSectionsFeatureCentroidTest.cpp b/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/AlignSectionsFeatureCentroidTest.cpp rename to src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp index 976b1fba59..36ebc69013 100644 --- a/src/Plugins/ComplexCore/test/AlignSectionsFeatureCentroidTest.cpp +++ b/src/Plugins/SimplnxCore/test/AlignSectionsFeatureCentroidTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AlignSectionsFeatureCentroidFilter.hpp" -#include "ComplexCore/Filters/ReadTextDataArrayFilter.hpp" - -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp" +#include "SimplnxCore/Filters/ReadTextDataArrayFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -17,11 +17,11 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; -TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][AlignSectionsFeatureCentroidFilter]") +TEST_CASE("SimplnxCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][AlignSectionsFeatureCentroidFilter]") { // We are just going to generate a big number so that we can use that in the output // file path. This tests the creation of intermediate directories that the filter @@ -33,8 +33,8 @@ TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A const DataPath k_ExemplarShiftsPath = k_ExemplarDataContainerPath.createChildPath("Exemplar Shifts"); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_align_sections_feature_centroids.tar.gz", - "6_6_align_sections_feature_centroids"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_align_sections_feature_centroids.tar.gz", + "6_6_align_sections_feature_centroids"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_align_sections_feature_centroids/6_6_align_sections_feature_centroids.dream3d", unit_test::k_TestFilesDir)); @@ -71,11 +71,11 @@ TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } CompareExemplarToGeneratedData(dataStructure, dataStructure, k_CellAttributeMatrix, k_ExemplarDataContainer); @@ -100,7 +100,7 @@ TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // read in the exemplar shift data file args.insertOrAssign(k_InputFileKey, std::make_any( fs::path(fmt::format("{}/6_6_align_sections_feature_centroids/6_6_align_sections_feature_centroids.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); args.insertOrAssign(k_NCompKey, std::make_any(k_NumColumns)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(k_SkipHeaderLines)); @@ -109,11 +109,11 @@ TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Read Computed Shifts File @@ -132,7 +132,7 @@ TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A Arguments args; args.insertOrAssign(k_InputFileKey, std::make_any(computedShiftsFile)); - args.insertOrAssign(k_ScalarTypeKey, std::make_any(complex::NumericType::float32)); + args.insertOrAssign(k_ScalarTypeKey, std::make_any(nx::core::NumericType::float32)); args.insertOrAssign(k_NTuplesKey, std::make_any(k_TupleDims)); args.insertOrAssign(k_NCompKey, std::make_any(k_NumColumns)); args.insertOrAssign(k_NSkipLinesKey, std::make_any(k_SkipHeaderLines)); @@ -141,15 +141,15 @@ TEST_CASE("ComplexCore::AlignSectionsFeatureCentroidFilter", "[Reconstruction][A // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Write out the .dream3d file now -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/align_sections_feature_centroid.dream3d", unit_test::k_BinaryTestOutputDir)); #endif diff --git a/src/Plugins/ComplexCore/test/AlignSectionsListTest.cpp b/src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp similarity index 60% rename from src/Plugins/ComplexCore/test/AlignSectionsListTest.cpp rename to src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp index bf8cfd390d..8bb1a5f528 100644 --- a/src/Plugins/ComplexCore/test/AlignSectionsListTest.cpp +++ b/src/Plugins/SimplnxCore/test/AlignSectionsListTest.cpp @@ -1,32 +1,32 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AlignSectionsListFilter.hpp" +#include "SimplnxCore/Filters/AlignSectionsListFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::AlignSectionsListFilter: Valid filter execution", "[ComplexCore][AlignSectionsListFilter]") +TEST_CASE("SimplnxCore::AlignSectionsListFilter: Valid filter execution", "[SimplnxCore][AlignSectionsListFilter]") { auto app = Application::GetOrCreateInstance(); app->loadPlugins(unit_test::k_BuildDir.view(), true); auto* filterList = app->getFilterList(); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_align_sections_misorientation.tar.gz", - "6_6_align_sections_misorientation"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_align_sections_misorientation.tar.gz", + "6_6_align_sections_misorientation"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); const std::string kDataInputArchive2 = "align_sections.tar.gz"; const std::string kExpectedOutputTopLevel2 = "align_sections_misorientation.txt"; - const complex::UnitTest::TestFileSentinel testDataSentinel2(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, kDataInputArchive2, kExpectedOutputTopLevel2); + const nx::core::UnitTest::TestFileSentinel testDataSentinel2(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, kDataInputArchive2, kExpectedOutputTopLevel2); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_align_sections_misorientation.dream3d", unit_test::k_TestFilesDir)); @@ -36,7 +36,7 @@ TEST_CASE("ComplexCore::AlignSectionsListFilter: Valid filter execution", "[Comp auto baseDataFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - // MultiThreshold Objects Filter (From ComplexCore Plugins) + // MultiThreshold Objects Filter (From SimplnxCore Plugins) SmallIn100::ExecuteMultiThresholdObjects(dataStructure, *filterList); // Align Sections List Filter @@ -49,25 +49,25 @@ TEST_CASE("ComplexCore::AlignSectionsListFilter: Valid filter execution", "[Comp args.insertOrAssign(AlignSectionsListFilter::k_InputFile_Key, std::make_any(fs::path(fmt::format("{}/align_sections_misorientation.txt", unit_test::k_TestFilesDir)))); args.insertOrAssign(AlignSectionsListFilter::k_DREAM3DAlignmentFile_Key, std::make_any(true)); - args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometry_Key, std::make_any(complex::Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometry_Key, std::make_any(nx::core::Constants::k_DataContainerPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, Constants::k_CellAttributeMatrix, Constants::k_ExemplarDataContainer); } -TEST_CASE("ComplexCore::AlignSectionsListFilter: Invalid filter execution", "[ComplexCore][AlignSectionsListFilter]") +TEST_CASE("SimplnxCore::AlignSectionsListFilter: Invalid filter execution", "[SimplnxCore][AlignSectionsListFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "export_files_test.tar.gz", "export_files_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "export_files_test.tar.gz", "export_files_test"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); @@ -78,7 +78,7 @@ TEST_CASE("ComplexCore::AlignSectionsListFilter: Invalid filter execution", "[Co args.insertOrAssign(AlignSectionsListFilter::k_InputFile_Key, std::make_any( fs::path(fmt::format("{}/export_files_test/write_ascii_data_exemplars/float32/0_0_exemplar_0.txt", unit_test::k_TestFilesDir)))); - args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometry_Key, std::make_any(complex::Constants::k_DataContainerPath)); + args.insertOrAssign(AlignSectionsListFilter::k_SelectedImageGeometry_Key, std::make_any(nx::core::Constants::k_DataContainerPath)); SECTION("Invalid DREAM3D Alignment file format") { @@ -91,9 +91,9 @@ TEST_CASE("ComplexCore::AlignSectionsListFilter: Invalid filter execution", "[Co // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } diff --git a/src/Plugins/ComplexCore/test/AppendImageGeometryZSliceTest.cpp b/src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp similarity index 86% rename from src/Plugins/ComplexCore/test/AppendImageGeometryZSliceTest.cpp rename to src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp index 55c3b9df2a..ee5e2db95f 100644 --- a/src/Plugins/ComplexCore/test/AppendImageGeometryZSliceTest.cpp +++ b/src/Plugins/SimplnxCore/test/AppendImageGeometryZSliceTest.cpp @@ -1,20 +1,20 @@ #include -#include "complex/Core/Application.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AppendImageGeometryZSliceFilter.hpp" -#include "ComplexCore/Filters/CropImageGeometry.hpp" -#include "ComplexCore/Filters/RenameDataObject.hpp" +#include "SimplnxCore/Filters/AppendImageGeometryZSliceFilter.hpp" +#include "SimplnxCore/Filters/CropImageGeometry.hpp" +#include "SimplnxCore/Filters/RenameDataObject.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -28,11 +28,11 @@ const DataPath k_SmallIN100Path({k_SmallIN100}); } // namespace -TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: Valid Filter Execution", "[ComplexCore][AppendImageGeometryZSliceFilter]") +TEST_CASE("SimplnxCore::AppendImageGeometryZSliceFilter: Valid Filter Execution", "[SimplnxCore][AppendImageGeometryZSliceFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); // Read in starting/exemplar image geometry const auto exemplarFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = LoadDataStructure(exemplarFilePath); @@ -52,7 +52,7 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // crop input geometry down to top half & save as new geometry { @@ -69,7 +69,7 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" args.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Create a neighborlist and string array for the original input geometry and manually divide them up to the two cropped halves since CropImageGeometry only supports IDataArrays { @@ -131,10 +131,10 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" args.insertOrAssign(AppendImageGeometryZSliceFilter::k_NewGeometry_Key, std::make_any(k_AppendedGeometryPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // rename the cell data attribute matrix for easier comparison with exemplar data RenameDataObject renameFilter; @@ -142,7 +142,7 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" renameArgs.insert(RenameDataObject::k_NewName_Key, std::make_any(k_CellData)); renameArgs.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_AppendedGeometryPath.createChildPath(ImageGeom::k_CellDataName))); auto renameResult = renameFilter.execute(dataStructure, renameArgs); - COMPLEX_RESULT_REQUIRE_VALID(renameResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(renameResult.result) const DataPath appendedCellDataPath = k_AppendedGeometryPath.createChildPath(k_CellData); const usize numAppendedArrays = dataStructure.getDataRefAs(appendedCellDataPath).getSize(); @@ -152,11 +152,11 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: Valid Filter Execution" } } -TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: InValid Filter Execution", "[ComplexCore][AppendImageGeometryZSliceFilter]") +TEST_CASE("SimplnxCore::AppendImageGeometryZSliceFilter: InValid Filter Execution", "[SimplnxCore][AppendImageGeometryZSliceFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar.tar.gz", - "ResampleImageGeom_Exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar.tar.gz", + "ResampleImageGeom_Exemplar.dream3d"); // Read in test image geometries auto geomFilePath = fs::path(fmt::format("{}/ResampleImageGeom_Exemplar.dream3d", unit_test::k_TestFilesDir)); @@ -190,7 +190,7 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: InValid Filter Executio cropArgs.insert(CropImageGeometry::k_RemoveOriginalGeometry_Key, std::make_any(false)); auto cropResult = cropFilter.execute(dataStructure, cropArgs); - COMPLEX_RESULT_REQUIRE_VALID(cropResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(cropResult.result) } { args.insertOrAssign(AppendImageGeometryZSliceFilter::k_InputGeometry_Key, std::make_any(k_InvalidTestGeometryPath1)); @@ -199,8 +199,8 @@ TEST_CASE("ComplexCore::AppendImageGeometryZSliceFilter: InValid Filter Executio } auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/ApplyTransformationToGeometryTest.cpp b/src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp similarity index 66% rename from src/Plugins/ComplexCore/test/ApplyTransformationToGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp index facc456cb5..cc30274434 100644 --- a/src/Plugins/ComplexCore/test/ApplyTransformationToGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ApplyTransformationToGeometryFilter.hpp" +#include "SimplnxCore/Filters/ApplyTransformationToGeometryFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -16,9 +16,9 @@ namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -27,14 +27,14 @@ namespace namespace apply_transformation_to_geometry { -const complex::ChoicesParameter::ValueType k_PrecomputedTransformationMatrixIdx = 1ULL; -const complex::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; -const complex::ChoicesParameter::ValueType k_RotationIdx = 3ULL; -const complex::ChoicesParameter::ValueType k_TranslationIdx = 4ULL; -const complex::ChoicesParameter::ValueType k_ScaleIdx = 5ULL; +const nx::core::ChoicesParameter::ValueType k_PrecomputedTransformationMatrixIdx = 1ULL; +const nx::core::ChoicesParameter::ValueType k_ManualTransformationMatrixIdx = 2ULL; +const nx::core::ChoicesParameter::ValueType k_RotationIdx = 3ULL; +const nx::core::ChoicesParameter::ValueType k_TranslationIdx = 4ULL; +const nx::core::ChoicesParameter::ValueType k_ScaleIdx = 5ULL; -const complex::ChoicesParameter::ValueType k_NearestNeighborInterpolationIdx = 0ULL; -const complex::ChoicesParameter::ValueType k_LinearInterpolationIdx = 1ULL; +const nx::core::ChoicesParameter::ValueType k_NearestNeighborInterpolationIdx = 0ULL; +const nx::core::ChoicesParameter::ValueType k_LinearInterpolationIdx = 1ULL; const std::string k_InputGeometryName("InputData"); const DataPath k_InputCellAttrMatrixPath(DataPath({k_InputGeometryName, "VertexData"})); @@ -56,10 +56,10 @@ const int32 k_CellAttrMatrixUnusedWarning = -5555; } // namespace apply_transformation_to_geometry -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Node", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Translation_Node", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -70,20 +70,20 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Node", " args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) REQUIRE(preflightResult.outputActions.warnings().size() == 1); REQUIRE(preflightResult.outputActions.warnings()[0].code == apply_transformation_to_geometry::k_CellAttrMatrixUnusedWarning); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_translation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif { @@ -93,17 +93,17 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Node", " const auto& calculatedData = dataStructure.getDataRefAs(calculatedPath); UnitTest::CompareDataArrays(exemplarData, calculatedData); } - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_translation.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_translation.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Node", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Rotation_Node", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -114,21 +114,21 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Node", "[Co args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TranslateGeometryToGlobalOrigin_Key, std::make_any(true)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TranslateGeometryToGlobalOrigin_Key, std::make_any(true)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) REQUIRE(preflightResult.outputActions.warnings().size() == 1); REQUIRE(preflightResult.outputActions.warnings()[0].code == apply_transformation_to_geometry::k_CellAttrMatrixUnusedWarning); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_rotation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif { @@ -138,17 +138,17 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Node", "[Co const auto& calculatedData = dataStructure.getDataRefAs(calculatedPath); UnitTest::CompareDataArrays(exemplarData, calculatedData); } - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_rotation.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_rotation.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Node", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Scale_Node", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -159,21 +159,21 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Node", "[Compl args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) REQUIRE(preflightResult.outputActions.warnings().size() == 1); REQUIRE(preflightResult.outputActions.warnings()[0].code == apply_transformation_to_geometry::k_CellAttrMatrixUnusedWarning); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_scale.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -184,17 +184,17 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Node", "[Compl const auto& calculatedData = dataStructure.getDataRefAs(calculatedPath); UnitTest::CompareDataArrays(exemplarData, calculatedData); } - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_scale.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_scale.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Node", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Manual_Node", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -206,23 +206,23 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Node", "[Comp args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, - std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); + std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); // This should reflect the geometry across the x-axis. const DynamicTableParameter::ValueType dynamicTable{{{-1.0, 0, 0, 0}, {0, 1.0, 0, 0}, {0, 0, 1.0, 0}, {0, 0, 0, 1.0}}}; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ManualTransformationMatrix_Key, std::make_any(dynamicTable)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ManualTransformationMatrix_Key, std::make_any(dynamicTable)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) REQUIRE(preflightResult.outputActions.warnings().size() == 1); REQUIRE(preflightResult.outputActions.warnings()[0].code == apply_transformation_to_geometry::k_CellAttrMatrixUnusedWarning); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_manual.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -233,17 +233,17 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Node", "[Comp const auto& calculatedData = dataStructure.getDataRefAs(calculatedPath); UnitTest::CompareDataArrays(exemplarData, calculatedData); } - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_manual.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_manual.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Node", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Precomputed_Node", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -255,22 +255,22 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Node", " args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(apply_transformation_to_geometry::k_InputCellAttrMatrixPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, - std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); + std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); const DataPath precomputedPath({apply_transformation_to_geometry::k_InputGeometryName, "Precomputed AM", "TransformationMatrix"}); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ComputedTransformationMatrix_Key, std::make_any(precomputedPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); REQUIRE(preflightResult.outputActions.warnings().size() == 1); REQUIRE(preflightResult.outputActions.warnings()[0].code == apply_transformation_to_geometry::k_CellAttrMatrixUnusedWarning); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_manual.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -281,20 +281,20 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Node", " const auto& calculatedData = dataStructure.getDataRefAs(calculatedPath); UnitTest::CompareDataArrays(exemplarData, calculatedData); } - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_precomputed.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/ApplyTransformationToGeometryFilter_precomputed.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } /******************************************************************************* * @brief This section is for Image Geometry with Linear Interpolation ******************************************************************************/ -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Image_Linear", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Translation_Image_Linear", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_linear.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -305,21 +305,21 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Image_Li Arguments args; args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TranslateGeometryToGlobalOrigin_Key, std::make_any(true)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TranslateGeometryToGlobalOrigin_Key, std::make_any(true)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_translation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif { @@ -331,10 +331,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Image_Li } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Image_Linear", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Rotation_Image_Linear", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_linear.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -345,20 +345,20 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Image_Linea Arguments args; args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_rotation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif { @@ -370,10 +370,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Image_Linea } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Image_Linear", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Scale_Image_Linear", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_linear.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -384,21 +384,21 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Image_Linear", Arguments args; args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_scale.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -411,10 +411,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Image_Linear", } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Image_Linear", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Manual_Image_Linear", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_linear.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -426,22 +426,22 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Image_Linear" args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, - std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); // This should reflect the geometry across the x-axis. const DynamicTableParameter::ValueType dynamicTable{{{-1.0, 0, 0, 0}, {0, 1.0, 0, 0}, {0, 0, 1.0, 0}, {0, 0, 0, 1.0}}}; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ManualTransformationMatrix_Key, std::make_any(dynamicTable)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ManualTransformationMatrix_Key, std::make_any(dynamicTable)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_manual.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -454,10 +454,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Image_Linear" } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Image_Linear", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Precomputed_Image_Linear", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_linear.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -469,22 +469,22 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Image_Li args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, - std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, std::make_any(apply_transformation_to_geometry::k_LinearInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); const DataPath precomputedPath({apply_transformation_to_geometry::k_InputGeometryName, "Precomputed AM", "TransformationMatrix"}); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ComputedTransformationMatrix_Key, std::make_any(precomputedPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_manual.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -500,10 +500,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Image_Li /******************************************************************************* * @brief This section is for Image Geometry with Nearest Neighbor Interpolation ******************************************************************************/ -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Image_NN", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Translation_Image_NN", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_nn.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -514,22 +514,22 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Image_NN Arguments args; args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_TranslationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, - std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TranslateGeometryToGlobalOrigin_Key, std::make_any(true)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Translation_Key, std::make_any({100.0F, 50.0F, -100.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TranslateGeometryToGlobalOrigin_Key, std::make_any(true)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_translation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif { @@ -541,10 +541,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Translation_Image_NN } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Image_NN", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Rotation_Image_NN", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_nn.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -555,21 +555,21 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Image_NN", Arguments args; args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_RotationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, - std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Rotation_Key, std::make_any({0.0F, 0.0F, 1.0F, 45.0F})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_rotation.dream3d", unit_test::k_BinaryTestOutputDir)); #endif { @@ -581,10 +581,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Rotation_Image_NN", } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Image_NN", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Scale_Image_NN", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_nn.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -595,22 +595,22 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Image_NN", "[C Arguments args; args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, std::make_any(apply_transformation_to_geometry::k_ScaleIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, - std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_Scale_Key, std::make_any({0.5F, 1.5F, 10.0F})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_scale.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -623,10 +623,10 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Scale_Image_NN", "[C } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Image_NN", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Manual_Image_NN", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_nn.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -638,23 +638,23 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Image_NN", "[ args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, - std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); + std::make_any(apply_transformation_to_geometry::k_ManualTransformationMatrixIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, - std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); // This should reflect the geometry across the x-axis. const DynamicTableParameter::ValueType dynamicTable{{{-1.0, 0, 0, 0}, {0, 1.0, 0, 0}, {0, 0, 1.0, 0}, {0, 0, 0, 1.0}}}; - args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ManualTransformationMatrix_Key, std::make_any(dynamicTable)); + args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ManualTransformationMatrix_Key, std::make_any(dynamicTable)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_manual.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -667,7 +667,7 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Manual_Image_NN", "[ } } -TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Image_NN", "[ComplexCore][ApplyTransformationToGeometryFilter]") +TEST_CASE("SimplnxCore::ApplyTransformationToGeometryFilter:Precomputed_Image_NN", "[SimplnxCore][ApplyTransformationToGeometryFilter]") { // { // DataStructure ds; @@ -681,8 +681,8 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Image_NN // auto result = imageGeom->computeCellIndex(coordsOld, oldGeomIndices); // std::cout << oldGeomIndices[0] << ", " << oldGeomIndices[1] << ", " << oldGeomIndices[2] << std::endl; // } - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", - "6_6_apply_transformation_to_geometry"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_apply_transformation_to_geometry.tar.gz", + "6_6_apply_transformation_to_geometry"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_apply_transformation_to_geometry/6_6_apply_transformation_to_geometry_nn.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); @@ -694,23 +694,23 @@ TEST_CASE("ComplexCore::ApplyTransformationToGeometryFilter:Precomputed_Image_NN args.insertOrAssign(ApplyTransformationToGeometryFilter::k_SelectedImageGeometry_Key, std::make_any(inputGeometryPath)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_TransformationType_Key, - std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); + std::make_any(apply_transformation_to_geometry::k_PrecomputedTransformationMatrixIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_InterpolationType_Key, - std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); + std::make_any(apply_transformation_to_geometry::k_NearestNeighborInterpolationIdx)); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_CellAttributeMatrixPath_Key, std::make_any(inputCellAMPath)); const DataPath precomputedPath({apply_transformation_to_geometry::k_InputGeometryName, "Precomputed AM", "TransformationMatrix"}); args.insertOrAssign(ApplyTransformationToGeometryFilter::k_ComputedTransformationMatrix_Key, std::make_any(precomputedPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/apply_transformation_to_geometry_manual.dream3d", unit_test::k_BinaryTestOutputDir)); #endif diff --git a/src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp b/src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp rename to src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp index 2edc15843b..e81662dd8e 100644 --- a/src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp +++ b/src/Plugins/SimplnxCore/test/ApproximatePointCloudHullTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/Filters/ApproximatePointCloudHull.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/Filters/ApproximatePointCloudHull.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Actions/CreateVertexGeometryAction.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Actions/CreateVertexGeometryAction.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -16,8 +16,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { static const std::vector s_Vertices = { @@ -35,7 +35,7 @@ static const std::vector s_Vertices = { 0.0F, 19.0F, 3.2F, 40.35763F, 19.0F, 3.2F, 139.6424F, 19.0F, 3.2F, 180.0F, 19.0F, 3.2}; } -TEST_CASE("ComplexCore::ApproximatePointCloudHull: Instantiate Filter", "[ApproximatePointCloudHull]") +TEST_CASE("SimplnxCore::ApproximatePointCloudHull: Instantiate Filter", "[ApproximatePointCloudHull]") { std::string triangleGeometryName = "[Triangle Geometry]"; std::string triangleFaceDataGroupName = "FaceData"; @@ -124,7 +124,7 @@ TEST_CASE("ComplexCore::ApproximatePointCloudHull: Instantiate Filter", "[Approx } // Write out the DataStructure -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/ApproximatePointCloudHull.dream3d", unit_test::k_BinaryTestOutputDir)); #endif } diff --git a/src/Plugins/ComplexCore/test/ArrayCalculatorTest.cpp b/src/Plugins/SimplnxCore/test/ArrayCalculatorTest.cpp similarity index 97% rename from src/Plugins/ComplexCore/test/ArrayCalculatorTest.cpp rename to src/Plugins/SimplnxCore/test/ArrayCalculatorTest.cpp index 60abd53618..41f7a415dd 100644 --- a/src/Plugins/ComplexCore/test/ArrayCalculatorTest.cpp +++ b/src/Plugins/SimplnxCore/test/ArrayCalculatorTest.cpp @@ -1,19 +1,19 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ArrayCalculatorFilter.hpp" -#include "ComplexCore/utils/CalculatorItem.hpp" - -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IParameter.hpp" -#include "complex/Parameters/CalculatorParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "SimplnxCore/Filters/ArrayCalculatorFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" +#include "SimplnxCore/utils/CalculatorItem.hpp" + +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IParameter.hpp" +#include "simplnx/Parameters/CalculatorParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -112,11 +112,11 @@ void runTest(const std::string& equation, const DataPath& targetArrayPath, int32 auto executeResult = filter.execute(dataStructure, args); if(expectedErrorCondition == static_cast(CalculatorItem::ErrorCode::Success)) { - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } else { - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors()[0].code == expectedErrorCondition); } @@ -157,7 +157,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* mcArray2 = dataStructure.getDataAs(k_MultiComponentArray2Path); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == mcArray1->getNumberOfTuples()); REQUIRE(arrayPtr->getNumberOfComponents() == mcArray1->getNumberOfComponents()); for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++) @@ -179,7 +179,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* mcArray2 = dataStructure.getDataAs(k_MultiComponentArray2Path); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == mcArray1->getNumberOfTuples()); REQUIRE(arrayPtr->getNumberOfComponents() == 1); for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++) @@ -199,7 +199,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* sArray = dataStructure.getDataAs(k_SignArrayPath); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples()); REQUIRE(arrayPtr->getNumberOfComponents() == nArray->getNumberOfComponents()); for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++) @@ -220,7 +220,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* sArray = dataStructure.getDataAs(k_SignArrayPath); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples()); REQUIRE(arrayPtr->getNumberOfComponents() == nArray->getNumberOfComponents()); for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++) @@ -241,7 +241,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* sArray = dataStructure.getDataAs(k_SignArrayPath); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples()); REQUIRE(arrayPtr->getNumberOfComponents() == 1); for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++) @@ -259,7 +259,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* nArray = dataStructure.getDataAs(k_NumberArrayPath); UInt32Array* sArray = dataStructure.getDataAs(k_SignArrayPath); - COMPLEX_RESULT_REQUIRE_INVALID(results.result); + SIMPLNX_RESULT_REQUIRE_INVALID(results.result); REQUIRE(results.result.errors()[0].code == static_cast(CalculatorItem::ErrorCode::InconsistentCompDims)); } @@ -270,7 +270,7 @@ void MultiComponentArrayCalculatorTest() UInt32Array* nArray = dataStructure.getDataAs(k_NumberArrayPath); UInt32Array* sArray = dataStructure.getDataAs(k_SignArrayPath); - COMPLEX_RESULT_REQUIRE_INVALID(results.result); + SIMPLNX_RESULT_REQUIRE_INVALID(results.result); REQUIRE(results.result.errors()[0].code == static_cast(CalculatorItem::ErrorCode::ComponentOutOfRange)); } } @@ -750,7 +750,7 @@ void SingleComponentArrayCalculatorTest2() Float32Array* inputArray1 = dataStructure.getDataAs(DataPath({k_AttributeMatrix, k_InputArray1})); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == inputArray1->getNumberOfTuples()); for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++) { @@ -765,7 +765,7 @@ void SingleComponentArrayCalculatorTest2() UInt32Array* inputArray2 = dataStructure.getDataAs(DataPath({k_AttributeMatrix, k_InputArray2})); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == inputArray2->getNumberOfTuples()); for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++) { @@ -782,7 +782,7 @@ void SingleComponentArrayCalculatorTest2() UInt32Array* spacedArray = dataStructure.getDataAs(DataPath({k_AttributeMatrix, k_SpacedArray})); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == spacedArray->getNumberOfTuples()); for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++) { @@ -797,7 +797,7 @@ void SingleComponentArrayCalculatorTest2() UInt32Array* inputArray2 = dataStructure.getDataAs(DataPath({k_AttributeMatrix, k_InputArray2})); Float64Array* arrayPtr = dataStructure.getDataAs(k_AttributeArrayPath); - COMPLEX_RESULT_REQUIRE_VALID(results.result); + SIMPLNX_RESULT_REQUIRE_VALID(results.result); REQUIRE(arrayPtr->getNumberOfTuples() == inputArray2->getNumberOfTuples()); for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++) { @@ -808,7 +808,7 @@ void SingleComponentArrayCalculatorTest2() } } -TEST_CASE("ComplexCore::ArrayCalculatorFilter: Filter Execution") +TEST_CASE("SimplnxCore::ArrayCalculatorFilter: Filter Execution") { std::cout << "#### ArrayCalculatorTest Starting ####" << std::endl; diff --git a/src/Plugins/ComplexCore/test/CMakeLists.txt b/src/Plugins/SimplnxCore/test/CMakeLists.txt similarity index 98% rename from src/Plugins/ComplexCore/test/CMakeLists.txt rename to src/Plugins/SimplnxCore/test/CMakeLists.txt index c4cc59d554..4b0a405dd7 100644 --- a/src/Plugins/ComplexCore/test/CMakeLists.txt +++ b/src/Plugins/SimplnxCore/test/CMakeLists.txt @@ -128,7 +128,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS WriteVtkRectilinearGridTest.cpp ) -create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} +create_simplnx_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} FILTER_LIST ${${PLUGIN_NAME}UnitTest_SRCS}) # ------------------------------------------------------------------------------ @@ -151,20 +151,20 @@ create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} # you can use the target_include_directories(.....) cmake call target_include_directories(${PLUGIN_NAME}UnitTest PUBLIC - ${complex_SOURCE_DIR}/test + ${simplnx_SOURCE_DIR}/test ) # ----------------------------------------------------------------------------- # Here we are going to setup to download and decompress the test files. In order # to add your own test files you will need to tar.gz the test file, compute the # SHA 512 Hash of the file and then upload the file to -# https://github.com/BlueQuartzSoftware/complex/releases/tag/Data_Archive. +# https://github.com/bluequartzsoftware/simplnx/releases/tag/Data_Archive. # # Go to the web site above, "edit" the release, add the filename and SHA 512 to # the table and then upload your compressed file. # Save the release so that the repo is updated # ----------------------------------------------------------------------------- -if(EXISTS "${DREAM3D_DATA_DIR}" AND COMPLEX_DOWNLOAD_TEST_FILES) +if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) if(NOT EXISTS ${DREAM3D_DATA_DIR}/TestFiles/) file(MAKE_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles/") endif() @@ -226,12 +226,12 @@ endif() # ----------------------------------------------------------------------------- # Include any example pipelines into the unit testing # ----------------------------------------------------------------------------- -include(${complex_SOURCE_DIR}/cmake/Utility.cmake) +include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) set(PREBUILT_PIPELINE_NAMES # Example or other test pipelines - # Currently Broken; Waiting on another PR. https://github.com/BlueQuartzSoftware/complex/pull/472 + # Currently Broken; Waiting on another PR. https://github.com/bluequartzsoftware/simplnx/pull/472 # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Demo.d3dpipeline" # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Image.d3dpipeline" # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Node.d3dpipeline" diff --git a/src/Plugins/ComplexCore/test/CalculateArrayHistogramTest.cpp b/src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/CalculateArrayHistogramTest.cpp rename to src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp index 291d326c69..22432b6a21 100644 --- a/src/Plugins/ComplexCore/test/CalculateArrayHistogramTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateArrayHistogramTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/Filters/CalculateArrayHistogramFilter.hpp" +#include "SimplnxCore/Filters/CalculateArrayHistogramFilter.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -36,7 +36,7 @@ void fillArray(DataArray& data, const std::vector& values) } } // namespace -TEST_CASE("ComplexCore::CalculateArrayHistogram: Valid Filter Execution", "[ComplexCore][CalculateArrayHistogram]") +TEST_CASE("SimplnxCore::CalculateArrayHistogram: Valid Filter Execution", "[SimplnxCore][CalculateArrayHistogram]") { // Instantiate the filter, a DataStructure object and an Arguments Object CalculateArrayHistogramFilter filter; @@ -63,11 +63,11 @@ TEST_CASE("ComplexCore::CalculateArrayHistogram: Valid Filter Execution", "[Comp // Preflight the filter and check result auto preflightResult = filter.preflight(dataStruct, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStruct, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // load vector with child paths from filter std::vector createdDataPaths; diff --git a/src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp b/src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp similarity index 69% rename from src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp rename to src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp index 4d2a6320c6..668e8a8c36 100644 --- a/src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateFeatureSizesTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CalculateFeatureSizesFilter.hpp" -#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" +#include "SimplnxCore/Filters/CalculateFeatureSizesFilter.hpp" +#include "SimplnxCore/Filters/ReadRawBinaryFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace fs = std::filesystem; @@ -20,18 +20,18 @@ const std::string k_EquivalentDiameters("EquivalentDiameters"); } // namespace -TEST_CASE("ComplexCore::CalculateFeatureSizes", "[ComplexCore][CalculateFeatureSizes]") +TEST_CASE("SimplnxCore::CalculateFeatureSizes", "[SimplnxCore][CalculateFeatureSizes]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData); - DataPath cellPhasesPath = cellDataPath.createChildPath(complex::Constants::k_Phases); - DataPath featureIdsPath = cellDataPath.createChildPath(complex::Constants::k_FeatureIds); - DataPath featureGroup = smallIn100Group.createChildPath(complex::Constants::k_CellFeatureData); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); + DataPath cellPhasesPath = cellDataPath.createChildPath(nx::core::Constants::k_Phases); + DataPath featureIdsPath = cellDataPath.createChildPath(nx::core::Constants::k_FeatureIds); + DataPath featureGroup = smallIn100Group.createChildPath(nx::core::Constants::k_CellFeatureData); std::string volumesName = "computed_volumes"; std::string numElementsName = "computed_NumElements"; std::string EquivalentDiametersName = "computed_EquivalentDiameters"; @@ -52,11 +52,11 @@ TEST_CASE("ComplexCore::CalculateFeatureSizes", "[ComplexCore][CalculateFeatureS // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare Outputs @@ -76,7 +76,7 @@ TEST_CASE("ComplexCore::CalculateFeatureSizes", "[ComplexCore][CalculateFeatureS } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/calculate_feature_sizes.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp b/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp rename to src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp index 348e05bcec..04abd1ca33 100644 --- a/src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/CalculateTriangleAreasFilterTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/CalculateTriangleAreasFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -15,10 +15,10 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::CalculateTriangleAreasFilter", "[ComplexCore][CalculateTriangleAreasFilter]") +TEST_CASE("SimplnxCore::CalculateTriangleAreasFilter", "[SimplnxCore][CalculateTriangleAreasFilter]") { std::string triangleGeometryName = "[Triangle Geometry]"; std::string triangleFaceDataGroupName = INodeGeometry2D::k_FaceDataName; @@ -85,7 +85,7 @@ TEST_CASE("ComplexCore::CalculateTriangleAreasFilter", "[ComplexCore][CalculateT } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/calculate_triangle_areas.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/ChangeAngleRepresentationTest.cpp b/src/Plugins/SimplnxCore/test/ChangeAngleRepresentationTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/ChangeAngleRepresentationTest.cpp rename to src/Plugins/SimplnxCore/test/ChangeAngleRepresentationTest.cpp index 566adaecd2..633975f96a 100644 --- a/src/Plugins/ComplexCore/test/ChangeAngleRepresentationTest.cpp +++ b/src/Plugins/SimplnxCore/test/ChangeAngleRepresentationTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/Filters/ChangeAngleRepresentation.hpp" +#include "SimplnxCore/Filters/ChangeAngleRepresentation.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::ChangeAngleRepresentation: Invalid Execution", "[OrientationAnalysis][ChangeAngleRepresentation]") +TEST_CASE("SimplnxCore::ChangeAngleRepresentation: Invalid Execution", "[OrientationAnalysis][ChangeAngleRepresentation]") { // Instantiate the filter, a DataStructure object and an Arguments Object ChangeAngleRepresentation filter; @@ -31,7 +31,7 @@ TEST_CASE("ComplexCore::ChangeAngleRepresentation: Invalid Execution", "[Orienta REQUIRE(preflightResult.outputActions.invalid()); } -TEST_CASE("ComplexCore::ChangeAngleRepresentation: Degrees To Radians") +TEST_CASE("SimplnxCore::ChangeAngleRepresentation: Degrees To Radians") { // Instantiate the filter, a DataStructure object and an Arguments Object ChangeAngleRepresentation filter; @@ -68,7 +68,7 @@ TEST_CASE("ComplexCore::ChangeAngleRepresentation: Degrees To Radians") REQUIRE(executeResult.result.valid()); // Check the results - float d2r = complex::numbers::pi / 180.0f; + float d2r = nx::core::numbers::pi / 180.0f; for(size_t t = 0; t < tupleShape[0]; t++) { for(size_t c = 0; c < componentShape[0]; c++) @@ -78,7 +78,7 @@ TEST_CASE("ComplexCore::ChangeAngleRepresentation: Degrees To Radians") } } -TEST_CASE("ComplexCore::ChangeAngleRepresentation: Radians To Degrees") +TEST_CASE("SimplnxCore::ChangeAngleRepresentation: Radians To Degrees") { // Instantiate the filter, a DataStructure object and an Arguments Object ChangeAngleRepresentation filter; @@ -115,7 +115,7 @@ TEST_CASE("ComplexCore::ChangeAngleRepresentation: Radians To Degrees") REQUIRE(executeResult.result.valid()); // Check the results - float r2d = 180.0f / complex::numbers::pi; + float r2d = 180.0f / nx::core::numbers::pi; for(size_t t = 0; t < tupleShape[0]; t++) { for(size_t c = 0; c < componentShape[0]; c++) diff --git a/src/Plugins/ComplexCore/test/CombineAttributeArraysTest.cpp b/src/Plugins/SimplnxCore/test/CombineAttributeArraysTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/CombineAttributeArraysTest.cpp rename to src/Plugins/SimplnxCore/test/CombineAttributeArraysTest.cpp index 1f057d900a..9aaa2ffa26 100644 --- a/src/Plugins/ComplexCore/test/CombineAttributeArraysTest.cpp +++ b/src/Plugins/SimplnxCore/test/CombineAttributeArraysTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/CombineAttributeArraysFilter.hpp" +#include "SimplnxCore/Filters/CombineAttributeArraysFilter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -25,17 +25,17 @@ DataStructure CreateTestDataStructure() DataStructure dataStructure; - DataArrayType* array1 = complex::UnitTest::CreateTestDataArray(dataStructure, k_Array1, {10ULL, 10ULL}, {1}, 0); + DataArrayType* array1 = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_Array1, {10ULL, 10ULL}, {1}, 0); array1->fill(static_cast(1)); - DataArrayType* array2 = complex::UnitTest::CreateTestDataArray(dataStructure, k_Array2, {10ULL, 10ULL}, {2}, 0); + DataArrayType* array2 = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_Array2, {10ULL, 10ULL}, {2}, 0); array2->fill(static_cast(2)); - DataArrayType* array3 = complex::UnitTest::CreateTestDataArray(dataStructure, k_Array3, {10ULL, 10ULL}, {3}, 0); + DataArrayType* array3 = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_Array3, {10ULL, 10ULL}, {3}, 0); array3->fill(static_cast(3)); return dataStructure; } -TEST_CASE("ComplexCore::CombineAttributeArrays: Parameter Check", "[ComplexCore][CombineAttributeArrays]") +TEST_CASE("SimplnxCore::CombineAttributeArrays: Parameter Check", "[SimplnxCore][CombineAttributeArrays]") { // Instantiate the filter, a DataStructure object and an Arguments Object @@ -54,34 +54,34 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Parameter Check", "[ComplexCore] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Invalid because no arrays are selected args.insertOrAssign(CombineAttributeArraysFilter::k_SelectedDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Invalid because no output array is set args.insertOrAssign(CombineAttributeArraysFilter::k_SelectedDataArrayPaths_Key, std::make_any(inputArrays)); args.insertOrAssign(CombineAttributeArraysFilter::k_StackedDataArrayName_Key, std::make_any("")); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Invalid because mismatch array types - Float32Array* array3 = complex::UnitTest::CreateTestDataArray(dataStructure, k_InvalidArrayType, {10ULL, 10ULL}, {3}, 0); + Float32Array* array3 = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_InvalidArrayType, {10ULL, 10ULL}, {3}, 0); array3->fill(static_cast(3)); inputArrays.push_back(DataPath({k_InvalidArrayType})); args.insertOrAssign(CombineAttributeArraysFilter::k_SelectedDataArrayPaths_Key, std::make_any(inputArrays)); args.insertOrAssign(CombineAttributeArraysFilter::k_StackedDataArrayName_Key, std::make_any(k_OutputArrayPath.getTargetName())); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Invalid because mismatch tuple shapes - dataStructure = CreateTestDataStructure(); // Reset the DataStructure - UInt8Array* array4 = complex::UnitTest::CreateTestDataArray(dataStructure, k_InvalidArrayType, {5ULL, 55ULL}, {3}, 0); // Non-matching tuple shape + dataStructure = CreateTestDataStructure(); // Reset the DataStructure + UInt8Array* array4 = nx::core::UnitTest::CreateTestDataArray(dataStructure, k_InvalidArrayType, {5ULL, 55ULL}, {3}, 0); // Non-matching tuple shape array4->fill(static_cast(3)); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } template @@ -115,7 +115,7 @@ Result<> ValidateFilterOutput(const DataStructure& dataStructure) return {}; } -TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[ComplexCore][CombineAttributeArrays]") +TEST_CASE("SimplnxCore::CombineAttributeArrays: Algorithm Validation", "[SimplnxCore][CombineAttributeArrays]") { MultiArraySelectionParameter::ValueType inputArrays = {DataPath({k_Array1}), DataPath({k_Array2}), DataPath({k_Array3})}; @@ -133,13 +133,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("INT8") @@ -156,13 +156,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("UINT16") @@ -179,13 +179,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("INT16") @@ -202,13 +202,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("UINT32") @@ -225,13 +225,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("INT32") @@ -248,13 +248,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("UINT64") @@ -271,13 +271,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("INT64") @@ -294,13 +294,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("FLOAT32") @@ -317,13 +317,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("DOUBLE") @@ -340,13 +340,13 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } SECTION("BOOL") @@ -363,12 +363,12 @@ TEST_CASE("ComplexCore::CombineAttributeArrays: Algorithm Validation", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); Result<> validationResult = ValidateFilterOutput(dataStructure); - COMPLEX_RESULT_REQUIRE_VALID(validationResult) + SIMPLNX_RESULT_REQUIRE_VALID(validationResult) } } diff --git a/src/Plugins/ComplexCore/test/CombineStlFilesTest.cpp b/src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp similarity index 75% rename from src/Plugins/ComplexCore/test/CombineStlFilesTest.cpp rename to src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp index d509d766cb..1053bbee7f 100644 --- a/src/Plugins/ComplexCore/test/CombineStlFilesTest.cpp +++ b/src/Plugins/SimplnxCore/test/CombineStlFilesTest.cpp @@ -1,17 +1,17 @@ #include -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CombineStlFilesFilter.hpp" +#include "SimplnxCore/Filters/CombineStlFilesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -19,12 +19,12 @@ inline const DataPath k_ComputedTriangleDataContainerName({"ComputedTriangleData inline const DataPath k_ExemplarTriangleDataContainerName({k_TriangleDataContainerName}); } // namespace -TEST_CASE("ComplexCore::CombineStlFilesFilter: Valid Filter Execution", "[ComplexCore][CombineStlFilesFilter]") +TEST_CASE("SimplnxCore::CombineStlFilesFilter: Valid Filter Execution", "[SimplnxCore][CombineStlFilesFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_combine_stl_files.tar.gz", - "6_6_combine_stl_files.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_combine_stl_files.tar.gz", + "6_6_combine_stl_files.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "STL_Models.tar.gz", "STL_Models"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "STL_Models.tar.gz", "STL_Models"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_combine_stl_files.dream3d", unit_test::k_TestFilesDir)); @@ -45,11 +45,11 @@ TEST_CASE("ComplexCore::CombineStlFilesFilter: Valid Filter Execution", "[Comple // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const TriangleGeom& computedTriangleGeom = dataStructure.getDataRefAs(k_ComputedTriangleDataContainerName); const TriangleGeom& exemplarTriangleGeom = dataStructure.getDataRefAs(k_ExemplarTriangleDataContainerName); @@ -61,7 +61,7 @@ TEST_CASE("ComplexCore::CombineStlFilesFilter: Valid Filter Execution", "[Comple k_ComputedTriangleDataContainerName.createChildPath(k_FaceData).createChildPath("Face Normals")); } -TEST_CASE("ComplexCore::CombineStlFilesFilter: InValid Filter Execution") +TEST_CASE("SimplnxCore::CombineStlFilesFilter: InValid Filter Execution") { // Instantiate the filter, a DataStructure object and an Arguments Object CombineStlFilesFilter filter; @@ -79,9 +79,9 @@ TEST_CASE("ComplexCore::CombineStlFilesFilter: InValid Filter Execution") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/ComputeFeatureRectTest.cpp b/src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/ComputeFeatureRectTest.cpp rename to src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp index 79a8375380..181c24ad5d 100644 --- a/src/Plugins/ComplexCore/test/ComputeFeatureRectTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeFeatureRectTest.cpp @@ -1,12 +1,12 @@ -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ComputeFeatureRectFilter.hpp" +#include "SimplnxCore/Filters/ComputeFeatureRectFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -97,7 +97,7 @@ DataStructure CreateTestData() } } // namespace -TEST_CASE("ComplexCore::ComputeFeatureRectFilter: Valid filter execution", "[ComplexCore][ComputeFeatureRectFilter]") +TEST_CASE("SimplnxCore::ComputeFeatureRectFilter: Valid filter execution", "[SimplnxCore][ComputeFeatureRectFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -112,11 +112,11 @@ TEST_CASE("ComplexCore::ComputeFeatureRectFilter: Valid filter execution", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); REQUIRE_NOTHROW(dataStructure.getDataRefAs({{k_ImageGeometryName, k_FeatureAttrMatrixName, k_RectCoordsArrayName}})); const UInt32Array& coords = dataStructure.getDataRefAs({{k_ImageGeometryName, k_FeatureAttrMatrixName, k_RectCoordsArrayName}}); diff --git a/src/Plugins/ComplexCore/test/ComputeMomentInvariants2DTest.cpp b/src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp similarity index 92% rename from src/Plugins/ComplexCore/test/ComputeMomentInvariants2DTest.cpp rename to src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp index d4193101b1..feeb3d5f28 100644 --- a/src/Plugins/ComplexCore/test/ComputeMomentInvariants2DTest.cpp +++ b/src/Plugins/SimplnxCore/test/ComputeMomentInvariants2DTest.cpp @@ -1,15 +1,15 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp" -#include "ComplexCore/Filters/ComputeMomentInvariants2DFilter.hpp" +#include "SimplnxCore/Filters/Algorithms/ComputeMomentInvariants2D.hpp" +#include "SimplnxCore/Filters/ComputeMomentInvariants2DFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Common/Numbers.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -194,7 +194,7 @@ const DataPath k_Omega1Path({k_ImageGeometry, k_FeatureData, k_Omega1}); const DataPath k_Omega2Path({k_ImageGeometry, k_FeatureData, k_Omega2}); } // namespace -TEST_CASE("ComplexCore::ComputeMomentInvariants2DFilter: Valid Filter Execution", "[ComplexCore][ComputeMomentInvariants2DFilter]") +TEST_CASE("SimplnxCore::ComputeMomentInvariants2DFilter: Valid Filter Execution", "[SimplnxCore][ComputeMomentInvariants2DFilter]") { TestBinomial(); TestBigX(); @@ -218,11 +218,11 @@ TEST_CASE("ComplexCore::ComputeMomentInvariants2DFilter: Valid Filter Execution" // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const Float32Array* omega1 = ds.getDataAs(k_Omega1Path); const Float32Array* omega2 = ds.getDataAs(k_Omega2Path); @@ -234,7 +234,7 @@ TEST_CASE("ComplexCore::ComputeMomentInvariants2DFilter: Valid Filter Execution" REQUIRE(std::fabs(value2 - 0.911891) < 0.00001); } -TEST_CASE("ComplexCore::ComputeMomentInvariants2DFilter: InValid Filter Execution", "[ComplexCore][ComputeMomentInvariants2DFilter]") +TEST_CASE("SimplnxCore::ComputeMomentInvariants2DFilter: InValid Filter Execution", "[SimplnxCore][ComputeMomentInvariants2DFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object ComputeMomentInvariants2DFilter filter; @@ -254,9 +254,9 @@ TEST_CASE("ComplexCore::ComputeMomentInvariants2DFilter: InValid Filter Executio // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/ConditionalSetValueTest.cpp b/src/Plugins/SimplnxCore/test/ConditionalSetValueTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/ConditionalSetValueTest.cpp rename to src/Plugins/SimplnxCore/test/ConditionalSetValueTest.cpp index 87a52e7ad8..40a65e2245 100644 --- a/src/Plugins/ComplexCore/test/ConditionalSetValueTest.cpp +++ b/src/Plugins/SimplnxCore/test/ConditionalSetValueTest.cpp @@ -1,16 +1,16 @@ -#include "ComplexCore/Filters/ConditionalSetValue.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/ConditionalSetValue.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -46,7 +46,7 @@ bool RequireDataArrayEqualZero(const DataArray& data) } } // namespace -TEST_CASE("ComplexCore::ConditionalSetValue: Missing/Empty DataPaths", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: Missing/Empty DataPaths", "[ConditionalSetValue]") { DataStructure dataStructure = UnitTest::CreateDataStructure(); Arguments args; @@ -82,13 +82,13 @@ TEST_CASE("ComplexCore::ConditionalSetValue: Missing/Empty DataPaths", "[Conditi REQUIRE(preflightResult.outputActions.valid() == true); } -TEST_CASE("ComplexCore::ConditionalSetValue: Test Algorithm Bool", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: Test Algorithm Bool", "[ConditionalSetValue]") { DataStructure dataStructure = UnitTest::CreateDataStructure(); DataPath ebsdScanPath = DataPath({k_SmallIN100, k_EbsdScanData}); DataPath geomPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ImageGeometry}); std::shared_ptr imageGeometry = dataStructure.getSharedDataAs(geomPath); - complex::SizeVec3 imageGeomDims = imageGeometry->getDimensions(); + nx::core::SizeVec3 imageGeomDims = imageGeometry->getDimensions(); DataPath ciDataPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ConfidenceIndex}); DataObject* ciDataObject = dataStructure.getData(ciDataPath); @@ -122,18 +122,18 @@ TEST_CASE("ComplexCore::ConditionalSetValue: Test Algorithm Bool", "[Conditional REQUIRE(RequireDataArrayEqualZero(*ciDataArray)); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/ConditionalSetValueTest.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } -TEST_CASE("ComplexCore::ConditionalSetValue: Test Algorithm UInt8", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: Test Algorithm UInt8", "[ConditionalSetValue]") { DataStructure dataStructure = UnitTest::CreateDataStructure(); DataPath ebsdScanPath = DataPath({k_SmallIN100, k_EbsdScanData}); DataPath geomPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ImageGeometry}); const ImageGeom& imageGeometry = dataStructure.getDataRefAs(geomPath); - complex::SizeVec3 imageGeomDims = imageGeometry.getDimensions(); + nx::core::SizeVec3 imageGeomDims = imageGeometry.getDimensions(); DataPath ciDataPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ConfidenceIndex}); auto& float32DataArray = dataStructure.getDataRefAs(ciDataPath); @@ -155,22 +155,22 @@ TEST_CASE("ComplexCore::ConditionalSetValue: Test Algorithm UInt8", "[Conditiona // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); REQUIRE(RequireDataArrayEqualZero(float32DataArray)); } -TEST_CASE("ComplexCore::ConditionalSetValue: Test Algorithm Int8", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: Test Algorithm Int8", "[ConditionalSetValue]") { DataStructure dataStructure = UnitTest::CreateDataStructure(); DataPath ebsdScanPath = DataPath({k_SmallIN100, k_EbsdScanData}); DataPath geomPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ImageGeometry}); const ImageGeom& imageGeometry = dataStructure.getDataRefAs(geomPath); - complex::SizeVec3 imageGeomDims = imageGeometry.getDimensions(); + nx::core::SizeVec3 imageGeomDims = imageGeometry.getDimensions(); DataPath ciDataPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ConfidenceIndex}); auto& float32DataArray = dataStructure.getDataRefAs(ciDataPath); @@ -192,16 +192,16 @@ TEST_CASE("ComplexCore::ConditionalSetValue: Test Algorithm Int8", "[Conditional // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); REQUIRE(RequireDataArrayEqualZero(float32DataArray)); } -TEST_CASE("ComplexCore::ConditionalSetValue: Overflow/Underflow", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: Overflow/Underflow", "[ConditionalSetValue]") { std::vector imageDims = {40, 60, 80}; FloatVec3 imageSpacing = {0.10F, 2.0F, 33.0F}; @@ -276,7 +276,7 @@ TEST_CASE("ComplexCore::ConditionalSetValue: Overflow/Underflow", "[ConditionalS ConditionalSetValueOverFlowTest(dataStructure, selectedDataPath, conditionalDataPath, "-1.79769e+309"); // overflow } -TEST_CASE("ComplexCore::ConditionalSetValue: No Conditional", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: No Conditional", "[ConditionalSetValue]") { ConditionalSetValue filter; Arguments args; @@ -285,7 +285,7 @@ TEST_CASE("ComplexCore::ConditionalSetValue: No Conditional", "[ConditionalSetVa DataPath ebsdScanPath = DataPath({k_SmallIN100, k_EbsdScanData}); DataPath geomPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ImageGeometry}); std::shared_ptr imageGeometry = dataStructure.getSharedDataAs(geomPath); - complex::SizeVec3 imageGeomDims = imageGeometry->getDimensions(); + nx::core::SizeVec3 imageGeomDims = imageGeometry->getDimensions(); DataPath ciDataPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ConfidenceIndex}); DataObject* ciDataObject = dataStructure.getData(ciDataPath); @@ -318,13 +318,13 @@ TEST_CASE("ComplexCore::ConditionalSetValue: No Conditional", "[ConditionalSetVa } } -TEST_CASE("ComplexCore::ConditionalSetValue: Test Inverted Mask Algorithm Bool", "[ConditionalSetValue]") +TEST_CASE("SimplnxCore::ConditionalSetValue: Test Inverted Mask Algorithm Bool", "[ConditionalSetValue]") { DataStructure dataStructure = UnitTest::CreateDataStructure(); DataPath ebsdScanPath = DataPath({k_SmallIN100, k_EbsdScanData}); DataPath geomPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ImageGeometry}); const ImageGeom& imageGeometry = dataStructure.getDataRefAs(geomPath); - complex::SizeVec3 imageGeomDims = imageGeometry.getDimensions(); + nx::core::SizeVec3 imageGeomDims = imageGeometry.getDimensions(); DataPath ciDataPath = DataPath({k_SmallIN100, k_EbsdScanData, k_ConfidenceIndex}); auto& float32DataArray = dataStructure.getDataRefAs(ciDataPath); @@ -347,11 +347,11 @@ TEST_CASE("ComplexCore::ConditionalSetValue: Test Inverted Mask Algorithm Bool", // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); REQUIRE(RequireDataArrayEqualZero(float32DataArray)); } diff --git a/src/Plugins/ComplexCore/test/ConvertColorToGrayScaleTest.cpp b/src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/ConvertColorToGrayScaleTest.cpp rename to src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp index b63d9ef8e3..f0c5712224 100644 --- a/src/Plugins/ComplexCore/test/ConvertColorToGrayScaleTest.cpp +++ b/src/Plugins/SimplnxCore/test/ConvertColorToGrayScaleTest.cpp @@ -1,22 +1,22 @@ -#include "ComplexCore/Filters/Algorithms/ConvertColorToGrayScale.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ConvertColorToGrayScaleFilter.hpp" +#include "SimplnxCore/Filters/Algorithms/ConvertColorToGrayScale.hpp" +#include "SimplnxCore/Filters/ConvertColorToGrayScaleFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::types; +using namespace nx::core; +using namespace nx::core::types; const std::string m_GeomName = "VertexGeom"; const std::string m_DataArrayName = "DataArray"; @@ -306,22 +306,22 @@ void RunTest(const uint8& algoMapIndex, const ConvertColorToGrayScale::Conversio auto preflightResult = filter.preflight(dataStruct, args); if(shouldFail) { - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } else { - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); } // Execute the filter and check the result auto executeResult = filter.execute(dataStruct, args); if(shouldFail) { - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } else { - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } if(shouldFail) { @@ -331,7 +331,7 @@ void RunTest(const uint8& algoMapIndex, const ConvertColorToGrayScale::Conversio CompareResults(algoMapIndex, dataStruct); } -TEST_CASE("ComplexCore::ConvertColorToGrayScale: Valid Execution", "[ComplexCore][ConvertColorToGrayScaleFilter]") +TEST_CASE("SimplnxCore::ConvertColorToGrayScale: Valid Execution", "[SimplnxCore][ConvertColorToGrayScaleFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); diff --git a/src/Plugins/ComplexCore/test/ConvertDataTest.cpp b/src/Plugins/SimplnxCore/test/ConvertDataTest.cpp similarity index 97% rename from src/Plugins/ComplexCore/test/ConvertDataTest.cpp rename to src/Plugins/SimplnxCore/test/ConvertDataTest.cpp index bb5f8524ec..d3fd22a1ae 100644 --- a/src/Plugins/ComplexCore/test/ConvertDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/ConvertDataTest.cpp @@ -1,18 +1,18 @@ -#include "ComplexCore/Filters/Algorithms/ConvertData.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ConvertDataFilter.hpp" +#include "SimplnxCore/Filters/Algorithms/ConvertData.hpp" +#include "SimplnxCore/Filters/ConvertDataFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; +using namespace nx::core; const std::string AttributeMatrixName = "AttributeMatrix"; const std::string DataArrayName = "DataArray"; @@ -78,7 +78,7 @@ void TestConversion(DataStructure& dataStructure, ConvertDataFilter& filter, std { Arguments args = getArgs(DataArrayPath, newType, newArrayName); auto executeResults = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResults.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResults.result); if(checkArray) { @@ -411,7 +411,7 @@ void TestInvalidDataArray() Arguments args = getArgs(AttributeMatrixPath.createChildPath("Array1"), DataType::int8, "NewArray"); auto executeResults = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResults.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResults.result); } // ----------------------------------------------------------------------------- @@ -423,11 +423,11 @@ void TestOverwriteArray() Arguments args = getArgs(DataArrayPath, DataType::int8, "DataArray"); auto executeResults = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResults.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResults.result); } // ----------------------------------------------------------------------------- -TEST_CASE("ComplexCore::ConvertData: Valid Execution", "[ComplexCore][ConvertDataFilter]") +TEST_CASE("SimplnxCore::ConvertData: Valid Execution", "[SimplnxCore][ConvertDataFilter]") { std::cout << "#### ConvertDataTest Starting ####" << std::endl; diff --git a/src/Plugins/ComplexCore/test/CopyDataObjectTest.cpp b/src/Plugins/SimplnxCore/test/CopyDataObjectTest.cpp similarity index 82% rename from src/Plugins/ComplexCore/test/CopyDataObjectTest.cpp rename to src/Plugins/SimplnxCore/test/CopyDataObjectTest.cpp index 8e0006fb35..ab92ec1bcb 100644 --- a/src/Plugins/ComplexCore/test/CopyDataObjectTest.cpp +++ b/src/Plugins/SimplnxCore/test/CopyDataObjectTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CopyDataObjectFilter.hpp" +#include "SimplnxCore/Filters/CopyDataObjectFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/MultiPathSelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/MultiPathSelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::CopyDataObjectFilter(Valid Execution)", "[ComplexCore][CopyDataObjectFilter]") +TEST_CASE("SimplnxCore::CopyDataObjectFilter(Valid Execution)", "[SimplnxCore][CopyDataObjectFilter]") { static const DataPath k_DataPath1({Constants::k_SmallIN100, "Phase Data"}); static const DataPath k_DataPath2({Constants::k_SmallIN100, Constants::k_EbsdScanData, "Phases"}); @@ -24,10 +24,10 @@ TEST_CASE("ComplexCore::CopyDataObjectFilter(Valid Execution)", "[ComplexCore][C args.insert(CopyDataObjectFilter::k_NewPathSuffix_Key, std::make_any("_COPY")); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); const auto* path1Copy = dataStructure.getDataAs(DataPath({Constants::k_SmallIN100, "Phase Data_COPY"})); const auto* path2Copy = dataStructure.getDataAs(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, "Phases_COPY"})); @@ -44,10 +44,10 @@ TEST_CASE("ComplexCore::CopyDataObjectFilter(Valid Execution)", "[ComplexCore][C args.insert(CopyDataObjectFilter::k_NewPathSuffix_Key, std::make_any("_COPY")); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); DataGroup* copiedDataGroup = dataStructure.getDataAs(k_CopyPath.createChildPath(k_DataPath1.getTargetName() + "_COPY")); Int32Array* copiedArray = dataStructure.getDataAs(k_CopyPath.createChildPath(k_DataPath2.getTargetName() + "_COPY")); @@ -56,7 +56,7 @@ TEST_CASE("ComplexCore::CopyDataObjectFilter(Valid Execution)", "[ComplexCore][C } } -TEST_CASE("ComplexCore::CopyDataObjectFilter(Invalid Parameters)", "[ComplexCore][CopyDataObjectFilter]") +TEST_CASE("SimplnxCore::CopyDataObjectFilter(Invalid Parameters)", "[SimplnxCore][CopyDataObjectFilter]") { CopyDataObjectFilter filter; DataStructure dataStructure = UnitTest::CreateDataStructure(); @@ -69,7 +69,7 @@ TEST_CASE("ComplexCore::CopyDataObjectFilter(Invalid Parameters)", "[ComplexCore args.insert(CopyDataObjectFilter::k_DataPath_Key, std::make_any({dataPath})); auto result = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(result.outputActions); } SECTION("Same parent copy data suffix is empty") { @@ -81,7 +81,7 @@ TEST_CASE("ComplexCore::CopyDataObjectFilter(Invalid Parameters)", "[ComplexCore args.insert(CopyDataObjectFilter::k_NewPathSuffix_Key, std::make_any("")); auto result = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(result.outputActions); } SECTION("Copy data new parent tuple mismatch") { @@ -96,6 +96,6 @@ TEST_CASE("ComplexCore::CopyDataObjectFilter(Invalid Parameters)", "[ComplexCore args.insert(CopyDataObjectFilter::k_NewPathSuffix_Key, std::make_any("_COPY")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } } diff --git a/src/Plugins/ComplexCore/test/CopyFeatureArrayToElementArrayTest.cpp b/src/Plugins/SimplnxCore/test/CopyFeatureArrayToElementArrayTest.cpp similarity index 84% rename from src/Plugins/ComplexCore/test/CopyFeatureArrayToElementArrayTest.cpp rename to src/Plugins/SimplnxCore/test/CopyFeatureArrayToElementArrayTest.cpp index d1607ad40c..74be97fa2f 100644 --- a/src/Plugins/ComplexCore/test/CopyFeatureArrayToElementArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/CopyFeatureArrayToElementArrayTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/CopyFeatureArrayToElementArray.hpp" +#include "SimplnxCore/Filters/CopyFeatureArrayToElementArray.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -19,7 +19,7 @@ const DataPath k_CellTempArrayPath({k_FeatureTemperatureName + k_CellTempArraySu const DataPath k_CellFeatureArrayPath({k_FeatureDataArrayName + k_CellTempArraySuffix}); } // namespace -TEST_CASE("ComplexCore::CopyFeatureArrayToElementArray: Parameter Check", "[Core][CopyFeatureArrayToElementArray]") +TEST_CASE("SimplnxCore::CopyFeatureArrayToElementArray: Parameter Check", "[Core][CopyFeatureArrayToElementArray]") { // Instantiate the filter, a DataStructure object and an Arguments Object CopyFeatureArrayToElementArray filter; @@ -33,25 +33,25 @@ TEST_CASE("ComplexCore::CopyFeatureArrayToElementArray: Parameter Check", "[Core // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) REQUIRE(preflightResult.outputActions.errors().size() == 1); for(const Error& err : preflightResult.outputActions.errors()) { - REQUIRE(err.code == complex::FilterParameter::Constants::k_Validate_Empty_Value); + REQUIRE(err.code == nx::core::FilterParameter::Constants::k_Validate_Empty_Value); } // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) REQUIRE(executeResult.result.errors().size() == 1); for(const Error& err : executeResult.result.errors()) { - REQUIRE(err.code == complex::FilterParameter::Constants::k_Validate_Empty_Value); + REQUIRE(err.code == nx::core::FilterParameter::Constants::k_Validate_Empty_Value); } } using ListOfTypes = std::tuple; -TEMPLATE_LIST_TEST_CASE("ComplexCore::CopyFeatureArrayToElementArray: Valid filter execution", "[Core][CopyFeatureArrayToElementArray]", ListOfTypes) +TEMPLATE_LIST_TEST_CASE("SimplnxCore::CopyFeatureArrayToElementArray: Valid filter execution", "[Core][CopyFeatureArrayToElementArray]", ListOfTypes) { DataStructure dataStructure; @@ -93,11 +93,11 @@ TEMPLATE_LIST_TEST_CASE("ComplexCore::CopyFeatureArrayToElementArray: Valid filt // Preflight the filter auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // Check the filter results auto& createdElementTempArray = dataStructure.getDataRefAs>(k_CellTempArrayPath); diff --git a/src/Plugins/ComplexCore/test/CoreFilterTest.cpp b/src/Plugins/SimplnxCore/test/CoreFilterTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/CoreFilterTest.cpp rename to src/Plugins/SimplnxCore/test/CoreFilterTest.cpp index 4a0f2b63c2..b04f8a4fe6 100644 --- a/src/Plugins/ComplexCore/test/CoreFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/CoreFilterTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CreateDataGroup.hpp" -#include "ComplexCore/Filters/ReadTextDataArrayFilter.hpp" - -#include "complex/Common/StringLiteral.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" +#include "SimplnxCore/Filters/CreateDataGroup.hpp" +#include "SimplnxCore/Filters/ReadTextDataArrayFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" #include @@ -16,7 +16,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace Catch { @@ -67,7 +67,7 @@ TEST_CASE("CoreFilterTest:RunCoreFilter") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - static const fs::path k_FileName = fmt::format("{}/ascii_data.txt", complex::unit_test::k_BinaryTestOutputDir); + static const fs::path k_FileName = fmt::format("{}/ascii_data.txt", nx::core::unit_test::k_BinaryTestOutputDir); static constexpr uint64 k_NLines = 25; SECTION("Create ASCII File") diff --git a/src/Plugins/ComplexCore/test/CreateAttributeMatrixTest.cpp b/src/Plugins/SimplnxCore/test/CreateAttributeMatrixTest.cpp similarity index 71% rename from src/Plugins/ComplexCore/test/CreateAttributeMatrixTest.cpp rename to src/Plugins/SimplnxCore/test/CreateAttributeMatrixTest.cpp index 7c214925a1..22d25a73cc 100644 --- a/src/Plugins/ComplexCore/test/CreateAttributeMatrixTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateAttributeMatrixTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CreateAttributeMatrixFilter.hpp" +#include "SimplnxCore/Filters/CreateAttributeMatrixFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::CreateAttributeMatrixFilter(Instantiate)", "[ComplexCore][CreateAttributeMatrixFilter]") +TEST_CASE("SimplnxCore::CreateAttributeMatrixFilter(Instantiate)", "[SimplnxCore][CreateAttributeMatrixFilter]") { static constexpr uint64 k_NComp = 3; static constexpr uint64 k_NumTuples = 25; @@ -24,10 +24,10 @@ TEST_CASE("ComplexCore::CreateAttributeMatrixFilter(Instantiate)", "[ComplexCore args.insert(CreateAttributeMatrixFilter::k_TupleDims_Key, std::make_any(k_TupleDims)); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); } -TEST_CASE("ComplexCore::CreateAttributeMatrixFilter(Invalid Parameters)", "[ComplexCore][CreateAttributeMatrixFilter]") +TEST_CASE("SimplnxCore::CreateAttributeMatrixFilter(Invalid Parameters)", "[SimplnxCore][CreateAttributeMatrixFilter]") { static constexpr uint64 k_NComp = 3; static constexpr uint64 k_NumTuples = 25; @@ -51,5 +51,5 @@ TEST_CASE("ComplexCore::CreateAttributeMatrixFilter(Invalid Parameters)", "[Comp } auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } diff --git a/src/Plugins/ComplexCore/test/CreateDataArrayTest.cpp b/src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/CreateDataArrayTest.cpp rename to src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp index 989ea74c3b..1234588114 100644 --- a/src/Plugins/ComplexCore/test/CreateDataArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateDataArrayTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/Filters/CreateDataArray.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/CreateDataArray.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::CreateDataArray(Instantiate)", "[ComplexCore][CreateDataArray]") +TEST_CASE("SimplnxCore::CreateDataArray(Instantiate)", "[SimplnxCore][CreateDataArray]") { static constexpr uint64 k_NComp = 3; static constexpr uint64 k_NumTuples = 25; @@ -26,10 +26,10 @@ TEST_CASE("ComplexCore::CreateDataArray(Instantiate)", "[ComplexCore][CreateData args.insert(CreateDataArray::k_DataPath_Key, std::make_any(k_DataPath)); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); } -TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][CreateDataArray]") +TEST_CASE("SimplnxCore::CreateDataArray(Invalid Parameters)", "[SimplnxCore][CreateDataArray]") { static constexpr uint64 k_NComp = 3; static constexpr uint64 k_NumTuples = 25; @@ -49,7 +49,7 @@ TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][Cre args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-1")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } SECTION("Section2") { @@ -60,7 +60,7 @@ TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][Cre args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1024")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } SECTION("Section3") { @@ -71,7 +71,7 @@ TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][Cre args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } SECTION("Section4") { @@ -84,7 +84,7 @@ TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][Cre args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } SECTION("Section5") { @@ -96,7 +96,7 @@ TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][Cre args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } SECTION("Section6") { @@ -108,31 +108,31 @@ TEST_CASE("ComplexCore::CreateDataArray(Invalid Parameters)", "[ComplexCore][Cre args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("1000")); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::uint8)); args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-1")); result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::int16)); args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("70000")); result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::uint16)); args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-1")); result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::int32)); args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("4294967297")); result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); args.insert(CreateDataArray::k_NumericType_Key, std::make_any(NumericType::int32)); args.insert(CreateDataArray::k_InitilizationValue_Key, std::make_any("-4294967297")); result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } } diff --git a/src/Plugins/ComplexCore/test/CreateFeatureArrayFromElementArrayTest.cpp b/src/Plugins/SimplnxCore/test/CreateFeatureArrayFromElementArrayTest.cpp similarity index 68% rename from src/Plugins/ComplexCore/test/CreateFeatureArrayFromElementArrayTest.cpp rename to src/Plugins/SimplnxCore/test/CreateFeatureArrayFromElementArrayTest.cpp index 7a3509a95d..5dac29a674 100644 --- a/src/Plugins/ComplexCore/test/CreateFeatureArrayFromElementArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateFeatureArrayFromElementArrayTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/Filters/CreateFeatureArrayFromElementArray.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/CreateFeatureArrayFromElementArray.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -19,18 +19,18 @@ template void testElementArray(const DataPath& cellDataPath) { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); { auto* computedFeatureData = AttributeMatrix::Create(dataStructure, k_Computed_CellData, std::vector{81}, dataStructure.getId(smallIn100Group)); } - DataPath featureIdsDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData).createChildPath(k_FeatureIDs); + DataPath featureIdsDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData).createChildPath(k_FeatureIDs); DataPath computedFeatureGroupPath = smallIn100Group.createChildPath(k_Computed_CellData); DataPath computedFeatureArrayPath = computedFeatureGroupPath.createChildPath(cellDataPath.getTargetName()); @@ -46,11 +46,11 @@ void testElementArray(const DataPath& cellDataPath) // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); DataPath exemplaryDataPath = smallIn100Group.createChildPath("CellFeatureData").createChildPath(cellDataPath.getTargetName()); const DataArray& featureArrayExemplary = dataStructure.getDataRefAs>(exemplaryDataPath); @@ -72,20 +72,20 @@ void testElementArray(const DataPath& cellDataPath) } } // namespace -TEST_CASE("ComplexCore::CreateFeatureArrayFromElementArray: Valid filter execution - 1 Component") +TEST_CASE("SimplnxCore::CreateFeatureArrayFromElementArray: Valid filter execution - 1 Component") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData).createChildPath(complex::Constants::k_ConfidenceIndex); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData).createChildPath(nx::core::Constants::k_ConfidenceIndex); testElementArray(cellDataPath); } -TEST_CASE("ComplexCore::CreateFeatureArrayFromElementArray: Valid filter execution - 3 Component") +TEST_CASE("SimplnxCore::CreateFeatureArrayFromElementArray: Valid filter execution - 3 Component") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData).createChildPath(complex::Constants::k_IPFColors); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData).createChildPath(nx::core::Constants::k_IPFColors); testElementArray(cellDataPath); } diff --git a/src/Plugins/ComplexCore/test/CreateGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp similarity index 98% rename from src/Plugins/ComplexCore/test/CreateGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp index 78766b0da7..19ccdca2bb 100644 --- a/src/Plugins/ComplexCore/test/CreateGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateGeometryTest.cpp @@ -1,21 +1,21 @@ -#include "ComplexCore/Filters/CreateGeometryFilter.hpp" - -#include "complex/DataStructure/Geometry/EdgeGeom.hpp" -#include "complex/DataStructure/Geometry/HexahedralGeom.hpp" -#include "complex/DataStructure/Geometry/QuadGeom.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/DataStructure/Geometry/TetrahedralGeom.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/unit_test/complex_test_dirs.hpp" +#include "SimplnxCore/Filters/CreateGeometryFilter.hpp" + +#include "simplnx/DataStructure/Geometry/EdgeGeom.hpp" +#include "simplnx/DataStructure/Geometry/HexahedralGeom.hpp" +#include "simplnx/DataStructure/Geometry/QuadGeom.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/Geometry/TetrahedralGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/unit_test/simplnx_test_dirs.hpp" #include -using namespace complex; +using namespace nx::core; void CreateVerticesArray(DataStructure& dataStructure, const std::string& name, DataObject::IdType parentId) { @@ -2305,7 +2305,7 @@ void CreateIncompatibleVerticesArray(DataStructure& dataStructure, const std::st (*verticesArray)[5] = 0; } -TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateGeometry]") +TEST_CASE("SimplnxCore::CreateGeometry: Valid Execution", "[SimplnxCore][CreateGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object CreateGeometryFilter filter; @@ -2393,11 +2393,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2488,11 +2488,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2548,11 +2548,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2601,11 +2601,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2663,11 +2663,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2725,11 +2725,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2787,11 +2787,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2849,11 +2849,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2911,11 +2911,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto createdGeom = dataStructure.getDataAs(geometryPath); REQUIRE(createdGeom != nullptr); @@ -2974,11 +2974,11 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } SECTION("RectGrid Geometry Invalid Grid Bounds Resolution") @@ -3063,10 +3063,10 @@ TEST_CASE("ComplexCore::CreateGeometry: Valid Execution", "[ComplexCore][CreateG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } } diff --git a/src/Plugins/ComplexCore/test/CreateImageGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CreateImageGeometryTest.cpp similarity index 82% rename from src/Plugins/ComplexCore/test/CreateImageGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/CreateImageGeometryTest.cpp index 4bcffb4788..f51abd413b 100644 --- a/src/Plugins/ComplexCore/test/CreateImageGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateImageGeometryTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/CreateImageGeometry.hpp" +#include "SimplnxCore/Filters/CreateImageGeometry.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/unit_test/complex_test_dirs.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/unit_test/simplnx_test_dirs.hpp" #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace fs = std::filesystem; @@ -19,7 +19,7 @@ const fs::path k_TestFile = "CreateImageGeometry_Test.dream3d"; } // namespace CreateImageGeometryUnitTest -TEST_CASE("ComplexCore::CreateImageGeometry", "[ComplexCore]") +TEST_CASE("SimplnxCore::CreateImageGeometry", "[SimplnxCore]") { // Instantiate the filter, a DataStructure object and an Arguments Object @@ -29,7 +29,7 @@ TEST_CASE("ComplexCore::CreateImageGeometry", "[ComplexCore]") VectorUInt64Parameter::ValueType inputDims = {imageDims[0], imageDims[1], imageDims[2]}; - DataStructure dataStructure = complex::UnitTest::CreateAllPrimitiveTypes(imageDims); + DataStructure dataStructure = nx::core::UnitTest::CreateAllPrimitiveTypes(imageDims); // DataGroup* levelZeroGroup = DataGroup::Create(dataStructure, Complexk_LevelZero); // DataGroup* levelOneGroup = DataGroup::Create(dataStructure, Complexk_LevelOne, levelZeroGroup->getId()); const std::string k_ImageGeometryName("[Image Geometry]"); @@ -56,7 +56,7 @@ TEST_CASE("ComplexCore::CreateImageGeometry", "[ComplexCore]") REQUIRE(executeResult.result.valid() == false); #if 0 - fs::path filePath = COMPLEX_BUILD_DIR / CreateImageGeometryUnitTest::k_DataDir / CreateImageGeometryUnitTest::k_TestFile; + fs::path filePath = SIMPLNX_BUILD_DIR / CreateImageGeometryUnitTest::k_DataDir / CreateImageGeometryUnitTest::k_TestFile; H5::FileWriter::ResultType result = H5::FileWriter::CreateFile(filePath); REQUIRE(result.valid()); diff --git a/src/Plugins/ComplexCore/test/CropImageGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp similarity index 87% rename from src/Plugins/ComplexCore/test/CropImageGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp index 142fdff426..2f5a351a07 100644 --- a/src/Plugins/ComplexCore/test/CropImageGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CropImageGeometryTest.cpp @@ -1,18 +1,18 @@ -#include "ComplexCore/Filters/CropImageGeometry.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" - -#include "complex/Common/StringLiteral.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureReader.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "SimplnxCore/Filters/CropImageGeometry.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -49,7 +49,7 @@ DataStructure CreateDataStructure() } } // namespace -TEST_CASE("ComplexCore::CropImageGeometry(Instantiate)", "[ComplexCore][CropImageGeometry]") +TEST_CASE("SimplnxCore::CropImageGeometry(Instantiate)", "[SimplnxCore][CropImageGeometry]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -77,13 +77,13 @@ TEST_CASE("ComplexCore::CropImageGeometry(Instantiate)", "[ComplexCore][CropImag // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); } -TEST_CASE("ComplexCore::CropImageGeometry Invalid Params", "[ComplexCore][CropImageGeometry]") +TEST_CASE("SimplnxCore::CropImageGeometry Invalid Params", "[SimplnxCore][CropImageGeometry]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -162,7 +162,7 @@ TEST_CASE("ComplexCore::CropImageGeometry Invalid Params", "[ComplexCore][CropIm REQUIRE(preflightErrors[0].code == -5552); } -TEST_CASE("ComplexCore::CropImageGeometry(Execute_Filter)", "[ComplexCore][CropImageGeometry]") +TEST_CASE("SimplnxCore::CropImageGeometry(Execute_Filter)", "[SimplnxCore][CropImageGeometry]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -178,11 +178,11 @@ TEST_CASE("ComplexCore::CropImageGeometry(Execute_Filter)", "[ComplexCore][CropI const DataPath k_CellFeatureAMPath({Constants::k_DataContainer, Constants::k_CellFeatureData}); DataPath k_DestCellFeatureDataPath = k_NewImageGeomPath.createChildPath(Constants::k_CellFeatureData); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); CropImageGeometry filter; // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); Arguments args; @@ -199,17 +199,17 @@ TEST_CASE("ComplexCore::CropImageGeometry(Execute_Filter)", "[ComplexCore][CropI const auto oldDimensions = dataStructure.getDataRefAs(k_ImageGeomPath).getDimensions(); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); { // Write out the DataStructure for later viewing/debugging - Result ioResult = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/crop_image_geom_test.dream3d", unit_test::k_BinaryDir)); - complex::HDF5::FileWriter fileWriter = std::move(ioResult.value()); + Result ioResult = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/crop_image_geom_test.dream3d", unit_test::k_BinaryDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(ioResult.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } auto& newImageGeom = dataStructure.getDataRefAs(k_NewImageGeomPath); diff --git a/src/Plugins/ComplexCore/test/CropVertexGeometryTest.cpp b/src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp similarity index 89% rename from src/Plugins/ComplexCore/test/CropVertexGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp index d4eb720bf6..f027e414ea 100644 --- a/src/Plugins/ComplexCore/test/CropVertexGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/CropVertexGeometryTest.cpp @@ -1,11 +1,11 @@ -#include "ComplexCore/Filters/CropVertexGeometry.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/CropVertexGeometry.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -41,7 +41,7 @@ DataStructure createTestData() } } // namespace -TEST_CASE("ComplexCore::CropVertexGeometry(Instantiate)", "[ComplexCore][CropVertexGeometry]") +TEST_CASE("SimplnxCore::CropVertexGeometry(Instantiate)", "[SimplnxCore][CropVertexGeometry]") { static const std::vector k_MinPos{0, 0, 0}; static const std::vector k_MaxPos{5, 6, 7}; @@ -58,10 +58,10 @@ TEST_CASE("ComplexCore::CropVertexGeometry(Instantiate)", "[ComplexCore][CropVer args.insert(CropVertexGeometry::k_TargetArrayPaths_Key, std::make_any>(targetDataArrays)); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); } -TEST_CASE("ComplexCore::CropVertexGeometry(Data)", "[ComplexCore][CropVertexGeometry]") +TEST_CASE("SimplnxCore::CropVertexGeometry(Data)", "[SimplnxCore][CropVertexGeometry]") { static const std::vector k_MinPos{0, 0, 0}; static const std::vector k_MaxPos{5, 6, 7}; @@ -78,7 +78,7 @@ TEST_CASE("ComplexCore::CropVertexGeometry(Data)", "[ComplexCore][CropVertexGeom args.insert(CropVertexGeometry::k_TargetArrayPaths_Key, std::make_any>(targetDataArrays)); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); auto* croppedGeom = dataStructure.getDataAs(k_CroppedGeomPath); REQUIRE(croppedGeom != nullptr); diff --git a/src/Plugins/ComplexCore/test/DREAM3DFileTest.cpp b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/DREAM3DFileTest.cpp rename to src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp index 0f03f6ad63..8627ffedc4 100644 --- a/src/Plugins/ComplexCore/test/DREAM3DFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp @@ -1,20 +1,20 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" - -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Pipeline/Pipeline.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -23,7 +23,7 @@ #include #include -using namespace complex; +using namespace nx::core; namespace fs = std::filesystem; namespace @@ -69,7 +69,7 @@ fs::path GetIODataPath() auto app = Application::Instance(); if(app == nullptr) { - throw std::runtime_error("complex::Application instance not found"); + throw std::runtime_error("nx::core::Application instance not found"); } return GetDataDir(*app) / Constants::k_Dream3dFilename; @@ -80,7 +80,7 @@ fs::path GetExportDataPath() auto app = Application::Instance(); if(app == nullptr) { - throw std::runtime_error("complex::Application instance not found"); + throw std::runtime_error("nx::core::Application instance not found"); } return GetDataDir(*app) / Constants::k_ExportFilename1; @@ -91,7 +91,7 @@ fs::path GetReExportDataPath() auto app = Application::Instance(); if(app == nullptr) { - throw std::runtime_error("complex::Application instance not found"); + throw std::runtime_error("nx::core::Application instance not found"); } return GetDataDir(*app) / Constants::k_ExportFilename2; @@ -102,7 +102,7 @@ fs::path GetMultiExportDataPath1() auto app = Application::Instance(); if(app == nullptr) { - throw std::runtime_error("complex::Application instance not found"); + throw std::runtime_error("nx::core::Application instance not found"); } return GetDataDir(*app) / Constants::k_MultiExportFilename1; @@ -113,7 +113,7 @@ fs::path GetMultiExportDataPath2() auto app = Application::Instance(); if(app == nullptr) { - throw std::runtime_error("complex::Application instance not found"); + throw std::runtime_error("nx::core::Application instance not found"); } return GetDataDir(*app) / Constants::k_MultiExportFilename2; @@ -124,7 +124,7 @@ fs::path GetReMultiExportDataPath() auto app = Application::Instance(); if(app == nullptr) { - throw std::runtime_error("complex::Application instance not found"); + throw std::runtime_error("nx::core::Application instance not found"); } return GetDataDir(*app) / Constants::k_MultiExportFilename3; @@ -271,7 +271,7 @@ DREAM3D::FileData CreateFileData() TEST_CASE("DREAM3DFileTest:DREAM3D File IO Test") { auto app = Application::GetOrCreateInstance(); - fs::path pluginPath = complex::unit_test::k_BuildDir.str(); + fs::path pluginPath = nx::core::unit_test::k_BuildDir.str(); app->loadPlugins(pluginPath, false); std::lock_guard lock(m_DataMutex); @@ -282,14 +282,14 @@ TEST_CASE("DREAM3DFileTest:DREAM3D File IO Test") REQUIRE(result.valid()); auto writeResult = DREAM3D::WriteFile(result.value(), fileData); - COMPLEX_RESULT_REQUIRE_VALID(writeResult); + SIMPLNX_RESULT_REQUIRE_VALID(writeResult); } // Read .dream3d file { HDF5::FileReader fileReader(GetIODataPath()); auto fileResult = DREAM3D::ReadFile(fileReader); - COMPLEX_RESULT_REQUIRE_VALID(fileResult); + SIMPLNX_RESULT_REQUIRE_VALID(fileResult); auto [pipeline, dataStructure] = fileResult.value(); @@ -312,7 +312,7 @@ TEST_CASE("DREAM3DFileTest:DREAM3D File IO Test") TEST_CASE("DREAM3DFileTest:Import/Export DREAM3D Filter Test") { auto app = Application::GetOrCreateInstance(); - fs::path pluginPath = complex::unit_test::k_BuildDir.str(); + fs::path pluginPath = nx::core::unit_test::k_BuildDir.str(); app->loadPlugins(pluginPath, false); std::lock_guard lock(m_DataMutex); @@ -347,7 +347,7 @@ TEST_CASE("DREAM3DFileTest:Import/Export DREAM3D Filter Test") TEST_CASE("DREAM3DFileTest:Import/Export Multi-DREAM3D Filter Test") { auto app = Application::GetOrCreateInstance(); - fs::path pluginPath = complex::unit_test::k_BuildDir.str(); + fs::path pluginPath = nx::core::unit_test::k_BuildDir.str(); app->loadPlugins(pluginPath, false); std::lock_guard lock(m_DataMutex); diff --git a/src/Plugins/ComplexCore/test/DeleteDataTest.cpp b/src/Plugins/SimplnxCore/test/DeleteDataTest.cpp similarity index 93% rename from src/Plugins/ComplexCore/test/DeleteDataTest.cpp rename to src/Plugins/SimplnxCore/test/DeleteDataTest.cpp index da976f9373..baf59e89ad 100644 --- a/src/Plugins/ComplexCore/test/DeleteDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/DeleteDataTest.cpp @@ -1,16 +1,16 @@ -#include "ComplexCore/Filters/DeleteData.hpp" +#include "SimplnxCore/Filters/DeleteData.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Parameters/MultiPathSelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/unit_test/complex_test_dirs.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Parameters/MultiPathSelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/unit_test/simplnx_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace CreateImageGeometryUnitTest { @@ -18,7 +18,7 @@ const fs::path k_DataDir = "test/data"; const fs::path k_TestFile = "CreateImageGeometry_Test.dream3d"; } // namespace CreateImageGeometryUnitTest -TEST_CASE("ComplexCore::Delete Singular Data Array", "[ComplexCore][DeleteData]") +TEST_CASE("SimplnxCore::Delete Singular Data Array", "[SimplnxCore][DeleteData]") { // Instantiate the filter, a DataStructure object and an Arguments Object @@ -53,7 +53,7 @@ TEST_CASE("ComplexCore::Delete Singular Data Array", "[ComplexCore][DeleteData]" REQUIRE(dataStructure.getData(selectedDataPath2) == nullptr); } -TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][DeleteData]") +TEST_CASE("SimplnxCore::Delete Data Object (Node removal)", "[SimplnxCore][DeleteData]") { // Instantiate the filter, a DataStructure object and an Arguments Object @@ -92,14 +92,14 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet * functional but will likely need review upon time of implementation. */ -// TEST_CASE("ComplexCore::Delete Shared Node (Node removal)", "[ComplexCore][DeleteData]") +// TEST_CASE("SimplnxCore::Delete Shared Node (Node removal)", "[SimplnxCore][DeleteData]") //{ // // For this test case the goal will be to completely wipe node (DataObject) C out of the // // graph completely. Ie clear all edges (parent and child) to node C, call the destructor // // on the node to ensure it doesn't become freehanging, and verify that the object is no longer // // in the data-lake (DataStructure) tables by ID grep. // -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector initialPaths = dataStructure.getAllDataPaths(); // @@ -152,14 +152,14 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // REQUIRE(objectCPtr.expired()); // } // -// TEST_CASE("ComplexCore::Delete DataPath to Object (Edge removal)", "[ComplexCore][DeleteData]") +// TEST_CASE("SimplnxCore::Delete DataPath to Object (Edge removal)", "[SimplnxCore][DeleteData]") //{ // // For this test case the goal will be to remove the edge between Top Level Group A and // // subgroup C. The nuance to this is that the data graph uses a doubly-linked list structure // // therefore the edge must be removed from the parent node's children list and the child node's // // parents list. The node's data and other edges to the nodes should be untouched. // -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector initialPaths = dataStructure.getAllDataPaths(); // This queries the parent lists implicitly // @@ -197,7 +197,7 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // } // } // -// TEST_CASE("ComplexCore::Orphaning A Child Node to Top Level", "[ComplexCore][DeleteData]") +// TEST_CASE("SimplnxCore::Orphaning A Child Node to Top Level", "[SimplnxCore][DeleteData]") //{ // // For this test case the goal will be to remove Group D node and check that the Array I node // // has been moved to the top level. This could also occur if the edge between Group D node and @@ -205,7 +205,7 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // // SECTION("Orphan Through Node Deletion") // { -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector paths = dataStructure.getAllDataPaths(); // @@ -277,7 +277,7 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // // SECTION("Orphan Through Edge Deletion") // { -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector initialPaths = dataStructure.getAllDataPaths(); // @@ -330,13 +330,13 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // } // } // -// TEST_CASE("ComplexCore::Attempt Delete Shared Node", "[ComplexCore][DeleteData]") +// TEST_CASE("SimplnxCore::Attempt Delete Shared Node", "[SimplnxCore][DeleteData]") //{ // // The goal of this test is to attempt to delete a shared node using the delete // // unshared children. Expected behaviour: the node is untouched (and in actual execution // // a warning will be thrown) // -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector initialPaths = dataStructure.getAllDataPaths(); // @@ -392,7 +392,7 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // REQUIRE(secondGroupECount == firstGroupECount); // } // -// TEST_CASE("ComplexCore::Delete Node with Multi-Parented Children", "[ComplexCore][DeleteData]") +// TEST_CASE("SimplnxCore::Delete Node with Multi-Parented Children", "[SimplnxCore][DeleteData]") //{ // // For this test case the goal is to pass in a top level object [group B] with multi-nested children and verify // // the results throughout the four levels according to the respective deletion type. @@ -408,7 +408,7 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // // SECTION("Delete Top Level with delete unshared children (Recursion Check)") // { -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector paths = dataStructure.getAllDataPaths(); // @@ -465,7 +465,7 @@ TEST_CASE("ComplexCore::Delete Data Object (Node removal)", "[ComplexCore][Delet // // SECTION("Delete Top Level without Regard to Childrens' Parent Count (Recursion Check)") // { -// // Create complex DataGraph and unpack it +// // Create simplnx DataGraph and unpack it // DataStructure dataStructure(std::move(UnitTest::CreateComplexMultiLevelDataGraph())); // std::vector paths = dataStructure.getAllDataPaths(); // diff --git a/src/Plugins/ComplexCore/test/ErodeDilateBadDataTest.cpp b/src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp similarity index 77% rename from src/Plugins/ComplexCore/test/ErodeDilateBadDataTest.cpp rename to src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp index ed7afbb45a..1a2f9ff9cd 100644 --- a/src/Plugins/ComplexCore/test/ErodeDilateBadDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/ErodeDilateBadDataTest.cpp @@ -1,20 +1,20 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ErodeDilateBadDataFilter.hpp" +#include "SimplnxCore/Filters/ErodeDilateBadDataFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -29,9 +29,9 @@ const DataPath k_FeatureIdsDataPath = k_EbsdScanDataDataPath.createChildPath("Fe } // namespace -TEST_CASE("ComplexCore::ErodeDilateBadDataFilter(Erode)", "[ComplexCore][ErodeDilateBadDataFilter]") +TEST_CASE("SimplnxCore::ErodeDilateBadDataFilter(Erode)", "[SimplnxCore][ErodeDilateBadDataFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -55,15 +55,15 @@ TEST_CASE("ComplexCore::ErodeDilateBadDataFilter(Erode)", "[ComplexCore][ErodeDi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_erode_dilate_bad_data.dream3d", unit_test::k_BinaryTestOutputDir))); #endif @@ -73,10 +73,10 @@ TEST_CASE("ComplexCore::ErodeDilateBadDataFilter(Erode)", "[ComplexCore][ErodeDi UnitTest::CompareExemplarToGeneratedData(dataStructure, dataStructure, k_EbsdScanDataDataPath, k_ExemplarDataContainerName); } -TEST_CASE("ComplexCore::ErodeDilateBadDataFilter(Dilate)", "[ComplexCore][ErodeDilateBadDataFilter]") +TEST_CASE("SimplnxCore::ErodeDilateBadDataFilter(Dilate)", "[SimplnxCore][ErodeDilateBadDataFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); const std::string k_ExemplarDataContainerName("Exemplar Bad Data Dilate"); const DataPath k_DilateCellAttributeMatrixDataPath = DataPath({k_ExemplarDataContainerName, "EBSD Scan Data"}); @@ -104,11 +104,11 @@ TEST_CASE("ComplexCore::ErodeDilateBadDataFilter(Dilate)", "[ComplexCore][ErodeD // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, dataStructure, k_EbsdScanDataDataPath, k_ExemplarDataContainerName); diff --git a/src/Plugins/ComplexCore/test/ErodeDilateCoordinationNumberTest.cpp b/src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp similarity index 71% rename from src/Plugins/ComplexCore/test/ErodeDilateCoordinationNumberTest.cpp rename to src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp index 0884cdf5fa..8e04e3b40f 100644 --- a/src/Plugins/ComplexCore/test/ErodeDilateCoordinationNumberTest.cpp +++ b/src/Plugins/SimplnxCore/test/ErodeDilateCoordinationNumberTest.cpp @@ -1,19 +1,19 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ErodeDilateCoordinationNumberFilter.hpp" +#include "SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -27,11 +27,11 @@ const std::string k_ExemplarDataContainerName("Exemplar Coordination Number"); const DataPath k_ErodeCellAttributeMatrixDataPath = DataPath({k_ExemplarDataContainerName, k_EbsdScanDataName}); } // namespace -TEST_CASE("ComplexCore::ErodeDilateCoordinationNumberFilter", "[ComplexCore][ErodeDilateCoordinationNumberFilter]") +TEST_CASE("SimplnxCore::ErodeDilateCoordinationNumberFilter", "[SimplnxCore][ErodeDilateCoordinationNumberFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_erode_dilate_test/6_6_erode_dilate_coordination_number.dream3d", unit_test::k_TestFilesDir)); @@ -51,11 +51,11 @@ TEST_CASE("ComplexCore::ErodeDilateCoordinationNumberFilter", "[ComplexCore][Ero // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, dataStructure, k_EbsdScanDataDataPath, k_ExemplarDataContainerName); diff --git a/src/Plugins/ComplexCore/test/ErodeDilateMaskTest.cpp b/src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp similarity index 77% rename from src/Plugins/ComplexCore/test/ErodeDilateMaskTest.cpp rename to src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp index 54115437ef..e22dee9f4b 100644 --- a/src/Plugins/ComplexCore/test/ErodeDilateMaskTest.cpp +++ b/src/Plugins/SimplnxCore/test/ErodeDilateMaskTest.cpp @@ -1,19 +1,19 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ErodeDilateMaskFilter.hpp" +#include "SimplnxCore/Filters/ErodeDilateMaskFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -28,10 +28,10 @@ const DataPath k_MaskArrayDataPath = k_EbsdScanDataDataPath.createChildPath("Mas } // namespace -TEST_CASE("ComplexCore::ErodeDilateMaskFilter(Dilate)", "[ComplexCore][ErodeDilateMaskFilter]") +TEST_CASE("SimplnxCore::ErodeDilateMaskFilter(Dilate)", "[SimplnxCore][ErodeDilateMaskFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); const std::string k_ExemplarDataContainerName("Exemplar Mask Dilate"); const DataPath k_DilateCellAttributeMatrixDataPath = DataPath({k_ExemplarDataContainerName, "EBSD Scan Data"}); @@ -58,19 +58,19 @@ TEST_CASE("ComplexCore::ErodeDilateMaskFilter(Dilate)", "[ComplexCore][ErodeDila // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, dataStructure, k_EbsdScanDataDataPath, k_ExemplarDataContainerName); } -TEST_CASE("ComplexCore::ErodeDilateMaskFilter(Erode)", "[ComplexCore][ErodeDilateMaskFilter]") +TEST_CASE("SimplnxCore::ErodeDilateMaskFilter(Erode)", "[SimplnxCore][ErodeDilateMaskFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_erode_dilate_test.tar.gz", "6_6_erode_dilate_test"); const std::string k_ExemplarDataContainerName("Exemplar Mask Erode"); const DataPath k_ErodeCellAttributeMatrixDataPath = DataPath({k_ExemplarDataContainerName, "EBSD Scan Data"}); @@ -97,11 +97,11 @@ TEST_CASE("ComplexCore::ErodeDilateMaskFilter(Erode)", "[ComplexCore][ErodeDilat // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, dataStructure, k_EbsdScanDataDataPath, k_ExemplarDataContainerName); diff --git a/src/Plugins/ComplexCore/test/ExecuteProcessTest.cpp b/src/Plugins/SimplnxCore/test/ExecuteProcessTest.cpp similarity index 72% rename from src/Plugins/ComplexCore/test/ExecuteProcessTest.cpp rename to src/Plugins/SimplnxCore/test/ExecuteProcessTest.cpp index 7802b8f885..b8efbd83f1 100644 --- a/src/Plugins/ComplexCore/test/ExecuteProcessTest.cpp +++ b/src/Plugins/SimplnxCore/test/ExecuteProcessTest.cpp @@ -1,22 +1,22 @@ #include -#include "complex/ComplexVersion.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/SIMPLNXVersion.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ExecuteProcessFilter.hpp" +#include "SimplnxCore/Filters/ExecuteProcessFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::ExecuteProcessFilter: Valid filter execution") +TEST_CASE("SimplnxCore::ExecuteProcessFilter: Valid filter execution") { // Instantiate the filter, a DataStructure object and an Arguments Object ExecuteProcessFilter filter; @@ -38,11 +38,11 @@ TEST_CASE("ComplexCore::ExecuteProcessFilter: Valid filter execution") // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); std::ifstream processOutputFile(processOutput); REQUIRE(processOutputFile.is_open()); @@ -50,13 +50,13 @@ TEST_CASE("ComplexCore::ExecuteProcessFilter: Valid filter execution") buffer << processOutputFile.rdbuf(); std::string firstLine; - std::vector outputLines = complex::StringUtilities::split(buffer.str(), '\n'); + std::vector outputLines = nx::core::StringUtilities::split(buffer.str(), '\n'); firstLine = StringUtilities::trimmed(outputLines[0]); - const std::string correctOutput = fmt::format("nxrunner: Version {} Build Date:{}", complex::Version::Package(), complex::Version::BuildDate()); + const std::string correctOutput = fmt::format("nxrunner: Version {} Build Date:{}", nx::core::Version::Package(), nx::core::Version::BuildDate()); REQUIRE(firstLine == correctOutput); } -TEST_CASE("ComplexCore::ExecuteProcessFilter: InValid filter execution") +TEST_CASE("SimplnxCore::ExecuteProcessFilter: InValid filter execution") { // Instantiate the filter, a DataStructure object and an Arguments Object ExecuteProcessFilter filter; @@ -74,11 +74,11 @@ TEST_CASE("ComplexCore::ExecuteProcessFilter: InValid filter execution") // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors()[0].code == -56410); } @@ -88,10 +88,10 @@ TEST_CASE("ComplexCore::ExecuteProcessFilter: InValid filter execution") // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } } diff --git a/src/Plugins/ComplexCore/test/ExtractComponentAsArrayTest.cpp b/src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/ExtractComponentAsArrayTest.cpp rename to src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp index 1d201b7daa..0c5281e353 100644 --- a/src/Plugins/ComplexCore/test/ExtractComponentAsArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/ExtractComponentAsArrayTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ExtractComponentAsArrayFilter.hpp" +#include "SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -20,15 +20,15 @@ const DataPath k_ExtractedComponentsPath({Constants::k_DataContainer, Constants: const fs::path k_BaseDataFilePath = fs::path(fmt::format("{}/6_6_find_feature_centroids.dream3d", unit_test::k_TestFilesDir)); } // namespace -TEST_CASE("ComplexCore::ExtractComponentAsArrayFilter: Valid filter execution", "[ComplexCore][ExtractComponentAsArrayFilter]") +TEST_CASE("SimplnxCore::ExtractComponentAsArrayFilter: Valid filter execution", "[SimplnxCore][ExtractComponentAsArrayFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); // Instantiate the filter, a DataStructure object and an Arguments Object ExtractComponentAsArrayFilter filter; - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_feature_centroids.tar.gz", - "6_6_find_feature_centroids.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_feature_centroids.tar.gz", + "6_6_find_feature_centroids.dream3d"); DataStructure alteredDs = UnitTest::LoadDataStructure(k_BaseDataFilePath); const int32 removeCompIndex = 1; @@ -93,12 +93,12 @@ TEST_CASE("ComplexCore::ExtractComponentAsArrayFilter: Valid filter execution", } } -TEST_CASE("ComplexCore::ExtractComponentAsArrayFilter: InValid filter execution", "[ComplexCore][ExtractComponentAsArrayFilter]") +TEST_CASE("SimplnxCore::ExtractComponentAsArrayFilter: InValid filter execution", "[SimplnxCore][ExtractComponentAsArrayFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_feature_centroids.tar.gz", - "6_6_find_feature_centroids.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_feature_centroids.tar.gz", + "6_6_find_feature_centroids.dream3d"); // Instantiate the filter, a DataStructure object and an Arguments Object ExtractComponentAsArrayFilter filter; diff --git a/src/Plugins/ComplexCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp b/src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp index c45710d05d..2973f3bda2 100644 --- a/src/Plugins/ComplexCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/ExtractInternalSurfacesFromTriangleGeometryTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -54,7 +54,7 @@ DataStructure createTestData(const std::string& triangleGeomName, const std::str } } // namespace -TEST_CASE("ComplexCore::ExtractInternalSurfacesFromTriangleGeometry(Instantiate)", "[ComplexCore][ExtractInternalSurfacesFromTriangleGeometry]") +TEST_CASE("SimplnxCore::ExtractInternalSurfacesFromTriangleGeometry(Instantiate)", "[SimplnxCore][ExtractInternalSurfacesFromTriangleGeometry]") { ExtractInternalSurfacesFromTriangleGeometry filter; DataStructure dataStructure = createTestData(k_TriangleGeomName, k_NodeTypesName); @@ -69,10 +69,10 @@ TEST_CASE("ComplexCore::ExtractInternalSurfacesFromTriangleGeometry(Instantiate) args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_FaceDataName_Key, std::make_any("Face Data")); auto preflight = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflight.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflight.outputActions); } -TEST_CASE("ComplexCore::ExtractInternalSurfacesFromTriangleGeometry(Data)", "[ComplexCore][ExtractInternalSurfacesFromTriangleGeometry]") +TEST_CASE("SimplnxCore::ExtractInternalSurfacesFromTriangleGeometry(Data)", "[SimplnxCore][ExtractInternalSurfacesFromTriangleGeometry]") { ExtractInternalSurfacesFromTriangleGeometry filter; DataStructure dataStructure = createTestData(k_TriangleGeomName, k_NodeTypesName); @@ -87,10 +87,10 @@ TEST_CASE("ComplexCore::ExtractInternalSurfacesFromTriangleGeometry(Data)", "[Co args.insert(ExtractInternalSurfacesFromTriangleGeometry::k_FaceDataName_Key, std::make_any("Face Data")); auto preflight = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflight.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflight.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); auto* newTrianglesGeom = dataStructure.getDataAs(k_InternalTrianglePath); auto* oldTrianglesGeom = dataStructure.getDataAs(k_TriangleGeomPath); diff --git a/src/Plugins/ComplexCore/test/ExtractVertexGeometryTest.cpp b/src/Plugins/SimplnxCore/test/ExtractVertexGeometryTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/ExtractVertexGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/ExtractVertexGeometryTest.cpp index 66a551d8b0..cd3232667b 100644 --- a/src/Plugins/ComplexCore/test/ExtractVertexGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/ExtractVertexGeometryTest.cpp @@ -1,19 +1,19 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ExtractVertexGeometryFilter.hpp" - -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -80,7 +80,7 @@ DataStructure CreateDataStructure() } // namespace ExtractVertexGeometryTest } // namespace -TEST_CASE("ComplexCore::ExtractVertexGeometry: Data Array With Wrong Tuple Count", "[ComplexCore][ExtractVertexGeometry]") +TEST_CASE("SimplnxCore::ExtractVertexGeometry: Data Array With Wrong Tuple Count", "[SimplnxCore][ExtractVertexGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object ExtractVertexGeometryFilter filter; @@ -100,7 +100,7 @@ TEST_CASE("ComplexCore::ExtractVertexGeometry: Data Array With Wrong Tuple Count REQUIRE(preflightResult.outputActions.errors()[0].code == -2006); } -TEST_CASE("ComplexCore::ExtractVertexGeometry: Mask Array With Wrong Tuple Count", "[ComplexCore][ExtractVertexGeometry]") +TEST_CASE("SimplnxCore::ExtractVertexGeometry: Mask Array With Wrong Tuple Count", "[SimplnxCore][ExtractVertexGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object ExtractVertexGeometryFilter filter; @@ -122,7 +122,7 @@ TEST_CASE("ComplexCore::ExtractVertexGeometry: Mask Array With Wrong Tuple Count REQUIRE(preflightResult.outputActions.errors()[0].code == -651); } -TEST_CASE("ComplexCore::ExtractVertexGeometry: Move cell data arrays", "[ComplexCore][ExtractVertexGeometry]") +TEST_CASE("SimplnxCore::ExtractVertexGeometry: Move cell data arrays", "[SimplnxCore][ExtractVertexGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object ExtractVertexGeometryFilter filter; @@ -152,7 +152,7 @@ TEST_CASE("ComplexCore::ExtractVertexGeometry: Move cell data arrays", "[Complex REQUIRE_NOTHROW(dataStructure.getDataRefAs(vertexDataPath.createChildPath(k_FloatArrayName))); } -TEST_CASE("ComplexCore::ExtractVertexGeometry: Copy cell data arrays", "[ComplexCore][ExtractVertexGeometry]") +TEST_CASE("SimplnxCore::ExtractVertexGeometry: Copy cell data arrays", "[SimplnxCore][ExtractVertexGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object ExtractVertexGeometryFilter filter; @@ -195,7 +195,7 @@ TEST_CASE("ComplexCore::ExtractVertexGeometry: Copy cell data arrays", "[Complex } } -TEST_CASE("ComplexCore::ExtractVertexGeometry: Move cell data arrays with mask", "[ComplexCore][ExtractVertexGeometry]") +TEST_CASE("SimplnxCore::ExtractVertexGeometry: Move cell data arrays with mask", "[SimplnxCore][ExtractVertexGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object ExtractVertexGeometryFilter filter; @@ -228,7 +228,7 @@ TEST_CASE("ComplexCore::ExtractVertexGeometry: Move cell data arrays with mask", REQUIRE_NOTHROW(dataStructure.getDataRefAs(DataPath{{k_ImageGeometryName, k_CellAttrMatName, k_MaskArrayName}})); } -TEST_CASE("ComplexCore::ExtractVertexGeometry: Copy cell data arrays with mask", "[ComplexCore][ExtractVertexGeometry]") +TEST_CASE("SimplnxCore::ExtractVertexGeometry: Copy cell data arrays with mask", "[SimplnxCore][ExtractVertexGeometry]") { // Instantiate the filter, a DataStructure object and an Arguments Object ExtractVertexGeometryFilter filter; diff --git a/src/Plugins/ComplexCore/test/FeatureFaceCurvatureTest.cpp b/src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/FeatureFaceCurvatureTest.cpp rename to src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp index a64aaf12b0..df692df753 100644 --- a/src/Plugins/ComplexCore/test/FeatureFaceCurvatureTest.cpp +++ b/src/Plugins/SimplnxCore/test/FeatureFaceCurvatureTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FeatureFaceCurvatureFilter.hpp" +#include "SimplnxCore/Filters/FeatureFaceCurvatureFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include -using namespace complex; +using namespace nx::core; inline void CompareDataArrays(const DataStructure& dataStructure, const DataPath& arrayPath1, const DataPath& arrayPath2) { @@ -30,7 +30,7 @@ inline void CompareDataArrays(const DataStructure& dataStructure, const DataPath } } -TEST_CASE("ComplexCore::FeatureFaceCurvatureFilter: Test Algorithm", "[FeatureFaceCurvatureFilter]") +TEST_CASE("SimplnxCore::FeatureFaceCurvatureFilter: Test Algorithm", "[FeatureFaceCurvatureFilter]") { DataPath triangleGeomPath({"TriangleDataContainer"}); DataPath faceAttribMatrixPath = triangleGeomPath.createChildPath("FaceData"); @@ -43,7 +43,7 @@ TEST_CASE("ComplexCore::FeatureFaceCurvatureFilter: Test Algorithm", "[FeatureFa DataPath k_MeanCurvature_Path = faceAttribMatrixPath.createChildPath("MeanCurvatures-2"); DataPath k_WeingartenMatrix_Path = faceAttribMatrixPath.createChildPath("WeingartenMatrix-2"); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_Goldfeather.tar.gz", "6_5_Goldfeather"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_Goldfeather.tar.gz", "6_5_Goldfeather"); FeatureFaceCurvatureFilter filter; @@ -75,11 +75,11 @@ TEST_CASE("ComplexCore::FeatureFaceCurvatureFilter: Test Algorithm", "[FeatureFa // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // Compare arrays SECTION("Principal Curvature 1") diff --git a/src/Plugins/ComplexCore/test/FillBadDataTest.cpp b/src/Plugins/SimplnxCore/test/FillBadDataTest.cpp similarity index 69% rename from src/Plugins/ComplexCore/test/FillBadDataTest.cpp rename to src/Plugins/SimplnxCore/test/FillBadDataTest.cpp index 903eaad558..1129c5ef01 100644 --- a/src/Plugins/ComplexCore/test/FillBadDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/FillBadDataTest.cpp @@ -1,25 +1,25 @@ #include -#include "complex/Core/Application.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FillBadDataFilter.hpp" +#include "SimplnxCore/Filters/FillBadDataFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; -TEST_CASE("ComplexCore::FillBadData", "[Core][FillBadData]") +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; +TEST_CASE("SimplnxCore::FillBadData", "[Core][FillBadData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_fill_bad_data.tar.gz", "6_6_fill_bad_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_fill_bad_data.tar.gz", "6_6_fill_bad_data"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_fill_bad_data/6_6_exemplar.dream3d", unit_test::k_TestFilesDir)); @@ -45,17 +45,17 @@ TEST_CASE("ComplexCore::FillBadData", "[Core][FillBadData]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellAttributeMatrix, k_DataContainer); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_fill_bad_data.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp b/src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp similarity index 97% rename from src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp rename to src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp index 2ba4aceab4..b284efbd70 100644 --- a/src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindArrayStatisticsTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindArrayStatisticsFilter.hpp" +#include "SimplnxCore/Filters/FindArrayStatisticsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -19,7 +19,7 @@ bool VectorContains(const std::vector& vector, T value) } } // namespace -TEST_CASE("ComplexCore::FindArrayStatisticsFilter: Test Algorithm", "[ComplexCore][FindArrayStatisticsFilter]") +TEST_CASE("SimplnxCore::FindArrayStatisticsFilter: Test Algorithm", "[SimplnxCore][FindArrayStatisticsFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -208,7 +208,7 @@ TEST_CASE("ComplexCore::FindArrayStatisticsFilter: Test Algorithm", "[ComplexCor } } -TEST_CASE("ComplexCore::FindArrayStatisticsFilter: Test Algorithm By Index", "[ComplexCore][FindArrayStatisticsFilter]") +TEST_CASE("SimplnxCore::FindArrayStatisticsFilter: Test Algorithm By Index", "[SimplnxCore][FindArrayStatisticsFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); diff --git a/src/Plugins/ComplexCore/test/FindBiasedFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/FindBiasedFeaturesTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/FindBiasedFeaturesTest.cpp rename to src/Plugins/SimplnxCore/test/FindBiasedFeaturesTest.cpp index 6f2f1e2622..ab6aac3f99 100644 --- a/src/Plugins/ComplexCore/test/FindBiasedFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindBiasedFeaturesTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindBiasedFeaturesFilter.hpp" +#include "SimplnxCore/Filters/FindBiasedFeaturesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -26,10 +26,10 @@ const DataPath k_ComputedBiasedFeatures2DPath({Constants::k_SmallIN1002, Constan const DataPath k_WrongSurfaceFeaturePath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_FeatureIds}); } // namespace -TEST_CASE("ComplexCore::FindBiasedFeaturesFilter: Valid filter execution", "[FindBiasedFeaturesFilter]") +TEST_CASE("SimplnxCore::FindBiasedFeaturesFilter: Valid filter execution", "[FindBiasedFeaturesFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_biased_features.tar.gz", - "6_6_find_biased_features.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_biased_features.tar.gz", + "6_6_find_biased_features.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_find_biased_features.dream3d", unit_test::k_TestFilesDir)); @@ -51,11 +51,11 @@ TEST_CASE("ComplexCore::FindBiasedFeaturesFilter: Valid filter execution", "[Fin // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareArrays(dataStructure, k_ExemplarBiasedFeaturesPath, k_ComputedBiasedFeaturesPath); } @@ -68,20 +68,20 @@ TEST_CASE("ComplexCore::FindBiasedFeaturesFilter: Valid filter execution", "[Fin // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareArrays(dataStructure, k_ExemplarBiasedFeatures2DPath, k_ComputedBiasedFeatures2DPath); } } -TEST_CASE("ComplexCore::FindBiasedFeaturesFilter: Invalid filter execution", "[FindBiasedFeaturesFilter]") +TEST_CASE("SimplnxCore::FindBiasedFeaturesFilter: Invalid filter execution", "[FindBiasedFeaturesFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_biased_features.tar.gz", - "6_6_find_biased_features.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_biased_features.tar.gz", + "6_6_find_biased_features.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_find_biased_features.dream3d", unit_test::k_TestFilesDir)); @@ -101,9 +101,9 @@ TEST_CASE("ComplexCore::FindBiasedFeaturesFilter: Invalid filter execution", "[F // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/FindBoundaryCellsTest.cpp b/src/Plugins/SimplnxCore/test/FindBoundaryCellsTest.cpp similarity index 76% rename from src/Plugins/ComplexCore/test/FindBoundaryCellsTest.cpp rename to src/Plugins/SimplnxCore/test/FindBoundaryCellsTest.cpp index 737455c638..6396b79be3 100644 --- a/src/Plugins/ComplexCore/test/FindBoundaryCellsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindBoundaryCellsTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindBoundaryCellsFilter.hpp" +#include "SimplnxCore/Filters/FindBoundaryCellsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -17,10 +17,10 @@ const DataPath k_ExemplarBoundaryCellsPath({k_ExemplarDataContainer, Constants:: const DataPath k_ComputedBoundaryCellsPath({k_ExemplarDataContainer, Constants::k_CellData, k_ComputedBoundaryCellsName}); } // namespace -TEST_CASE("ComplexCore::FindBoundaryCellsFilter: Valid filter execution", "[FindBoundaryCellsFilter]") +TEST_CASE("SimplnxCore::FindBoundaryCellsFilter: Valid filter execution", "[FindBoundaryCellsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_boundary_cells.tar.gz", - "6_6_FindBoundaryCellsExemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_boundary_cells.tar.gz", + "6_6_FindBoundaryCellsExemplar.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_FindBoundaryCellsExemplar.dream3d", unit_test::k_TestFilesDir)); @@ -39,19 +39,19 @@ TEST_CASE("ComplexCore::FindBoundaryCellsFilter: Valid filter execution", "[Find // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareArrays(dataStructure, k_ExemplarBoundaryCellsPath, k_ComputedBoundaryCellsPath); } -TEST_CASE("ComplexCore::FindBoundaryCellsFilter: Invalid filter execution", "[FindBoundaryCellsFilter]") +TEST_CASE("SimplnxCore::FindBoundaryCellsFilter: Invalid filter execution", "[FindBoundaryCellsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_boundary_cells.tar.gz", - "6_6_FindBoundaryCellsExemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_boundary_cells.tar.gz", + "6_6_FindBoundaryCellsExemplar.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_FindBoundaryCellsExemplar.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); @@ -76,9 +76,9 @@ TEST_CASE("ComplexCore::FindBoundaryCellsFilter: Invalid filter execution", "[Fi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/FindBoundaryElementFractionsTest.cpp b/src/Plugins/SimplnxCore/test/FindBoundaryElementFractionsTest.cpp similarity index 75% rename from src/Plugins/ComplexCore/test/FindBoundaryElementFractionsTest.cpp rename to src/Plugins/SimplnxCore/test/FindBoundaryElementFractionsTest.cpp index 7bdcb4b4b4..55fc1d5661 100644 --- a/src/Plugins/ComplexCore/test/FindBoundaryElementFractionsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindBoundaryElementFractionsTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindBoundaryElementFractionsFilter.hpp" +#include "SimplnxCore/Filters/FindBoundaryElementFractionsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -17,10 +17,10 @@ const DataPath k_ExemplarBCFPath = k_FeatureDataAMPath.createChildPath(" Surface const DataPath k_GeneratedBCFPath = k_FeatureDataAMPath.createChildPath(k_BCFName); } // namespace -TEST_CASE("ComplexCore::FindBoundaryElementFractionsFilter: Valid Filter Execution", "[ComplexCore][FindBoundaryElementFractionsFilter]") +TEST_CASE("SimplnxCore::FindBoundaryElementFractionsFilter: Valid Filter Execution", "[SimplnxCore][FindBoundaryElementFractionsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_feature_boundary_element_fractions.tar.gz", - "6_6_find_feature_boundary_element_fractions"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_feature_boundary_element_fractions.tar.gz", + "6_6_find_feature_boundary_element_fractions"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/6_6_find_feature_boundary_element_fractions/6_6_find_feature_boundary_element_fractions.dream3d", unit_test::k_TestFilesDir))); diff --git a/src/Plugins/ComplexCore/test/FindDifferencesMapTest.cpp b/src/Plugins/SimplnxCore/test/FindDifferencesMapTest.cpp similarity index 87% rename from src/Plugins/ComplexCore/test/FindDifferencesMapTest.cpp rename to src/Plugins/SimplnxCore/test/FindDifferencesMapTest.cpp index 7fc1533680..9d755f3fe6 100644 --- a/src/Plugins/ComplexCore/test/FindDifferencesMapTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindDifferencesMapTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/Filters/FindDifferencesMap.hpp" +#include "SimplnxCore/Filters/FindDifferencesMap.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::FindDifferencesMap: Instantiate Filter", "[FindDifferencesMap]") +TEST_CASE("SimplnxCore::FindDifferencesMap: Instantiate Filter", "[FindDifferencesMap]") { FindDifferencesMap filter; DataStructure dataStructure; @@ -32,7 +32,7 @@ TEST_CASE("ComplexCore::FindDifferencesMap: Instantiate Filter", "[FindDifferenc REQUIRE(!executeResult.result.valid()); } -TEST_CASE("ComplexCore::FindDifferencesMap: Test Algorithm", "[FindDifferencesMap]") +TEST_CASE("SimplnxCore::FindDifferencesMap: Test Algorithm", "[FindDifferencesMap]") { FindDifferencesMap filter; DataStructure dataStructure = UnitTest::CreateDataStructure(); diff --git a/src/Plugins/ComplexCore/test/FindEuclideanDistMapTest.cpp b/src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/FindEuclideanDistMapTest.cpp rename to src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp index 66275358d5..ba1d0db90c 100644 --- a/src/Plugins/ComplexCore/test/FindEuclideanDistMapTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindEuclideanDistMapTest.cpp @@ -1,19 +1,19 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindEuclideanDistMapFilter.hpp" +#include "SimplnxCore/Filters/FindEuclideanDistMapFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; -TEST_CASE("ComplexCore::FindEuclideanDistMap", "[ComplexCore][FindEuclideanDistMap]") +TEST_CASE("SimplnxCore::FindEuclideanDistMap", "[SimplnxCore][FindEuclideanDistMap]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); @@ -48,11 +48,11 @@ TEST_CASE("ComplexCore::FindEuclideanDistMap", "[ComplexCore][FindEuclideanDistM // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Compare the output arrays with those precalculated from the file @@ -69,7 +69,7 @@ TEST_CASE("ComplexCore::FindEuclideanDistMap", "[ComplexCore][FindEuclideanDistM } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_euclidean_dist_map.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindFeatureCentroidsFilterTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp similarity index 71% rename from src/Plugins/ComplexCore/test/FindFeatureCentroidsFilterTest.cpp rename to src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp index 0891ff9cf3..e654fe0cda 100644 --- a/src/Plugins/ComplexCore/test/FindFeatureCentroidsFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureCentroidsFilterTest.cpp @@ -1,24 +1,24 @@ -#include "ComplexCore/Filters/FindFeatureCentroidsFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/FindFeatureCentroidsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::UnitTest; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::FindFeatureCentroidsFilter", "[ComplexCore][FindFeatureCentroidsFilter]") +TEST_CASE("SimplnxCore::FindFeatureCentroidsFilter", "[SimplnxCore][FindFeatureCentroidsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); @@ -44,11 +44,11 @@ TEST_CASE("ComplexCore::FindFeatureCentroidsFilter", "[ComplexCore][FindFeatureC // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } { @@ -61,7 +61,7 @@ TEST_CASE("ComplexCore::FindFeatureCentroidsFilter", "[ComplexCore][FindFeatureC CompareDataArrays(k_CentroidsArray, k_CentroidsNXArray); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_feature_centroids.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindFeatureClusteringTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/FindFeatureClusteringTest.cpp rename to src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp index 90ee61bf6e..9d93fd8840 100644 --- a/src/Plugins/ComplexCore/test/FindFeatureClusteringTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureClusteringTest.cpp @@ -1,13 +1,13 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindFeatureClusteringFilter.hpp" +#include "SimplnxCore/Filters/FindFeatureClusteringFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -20,10 +20,10 @@ const std::string k_GeneratedRDF = "NX_RDF"; const std::string k_GeneratedMinMaxDistances = "NX_RDFMaxMinDistances"; } // namespace -TEST_CASE("ComplexCore::FindFeatureClusteringFilter: Valid Filter Execution", "[ComplexCore][FindFeatureClusteringFilter]") +TEST_CASE("SimplnxCore::FindFeatureClusteringFilter: Valid Filter Execution", "[SimplnxCore][FindFeatureClusteringFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_feature_clustering.tar.gz", - "6_6_find_feature_clustering.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_feature_clustering.tar.gz", + "6_6_find_feature_clustering.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_find_feature_clustering.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = LoadDataStructure(exemplarFilePath); @@ -50,21 +50,21 @@ TEST_CASE("ComplexCore::FindFeatureClusteringFilter: Valid Filter Execution", "[ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) CompareNeighborLists(dataStructure, k_CellFeatureDataPath.createChildPath(k_ExemplarClusteringList), k_CellFeatureDataPath.createChildPath(k_GeneratedClusteringList)); CompareArrays(dataStructure, k_CellEnsembleAttributeMatrixPath.createChildPath(k_ExemplarRDF), k_CellEnsembleAttributeMatrixPath.createChildPath(k_GeneratedRDF)); CompareArrays(dataStructure, k_CellEnsembleAttributeMatrixPath.createChildPath(k_ExemplarMinMaxDistances), k_CellEnsembleAttributeMatrixPath.createChildPath(k_GeneratedMinMaxDistances)); } -TEST_CASE("ComplexCore::FindFeatureClusteringFilter: InValid Filter Execution", "[ComplexCore][FindFeatureClusteringFilter]") +TEST_CASE("SimplnxCore::FindFeatureClusteringFilter: InValid Filter Execution", "[SimplnxCore][FindFeatureClusteringFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_feature_clustering.tar.gz", - "6_6_find_feature_clustering.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_feature_clustering.tar.gz", + "6_6_find_feature_clustering.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_find_feature_clustering.dream3d", unit_test::k_TestFilesDir)); @@ -92,9 +92,9 @@ TEST_CASE("ComplexCore::FindFeatureClusteringFilter: InValid Filter Execution", // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/FindFeaturePhasesBinaryTest.cpp b/src/Plugins/SimplnxCore/test/FindFeaturePhasesBinaryTest.cpp similarity index 78% rename from src/Plugins/ComplexCore/test/FindFeaturePhasesBinaryTest.cpp rename to src/Plugins/SimplnxCore/test/FindFeaturePhasesBinaryTest.cpp index ad4674bd22..94a7188bb1 100644 --- a/src/Plugins/ComplexCore/test/FindFeaturePhasesBinaryTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeaturePhasesBinaryTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindFeaturePhasesBinaryFilter.hpp" +#include "SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -15,9 +15,9 @@ const DataPath k_ExemplarArray = DataPath({Constants::k_SmallIN100, Constants::k const DataPath k_GeneratedArray = DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, k_BinaryFeaturePhasesName}); } // namespace -TEST_CASE("ComplexCore::FindFeaturePhasesBinaryFilter: Valid Filter Execution", "[ComplexCore][FindFeaturePhasesBinaryFilter]") +TEST_CASE("SimplnxCore::FindFeaturePhasesBinaryFilter: Valid Filter Execution", "[SimplnxCore][FindFeaturePhasesBinaryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "bin_feature_phases.tar.gz", "bin_feature_phases.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "bin_feature_phases.tar.gz", "bin_feature_phases.dream3d"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/bin_feature_phases/6_6_find_feature_phases_binary.dream3d", unit_test::k_TestFilesDir))); diff --git a/src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp b/src/Plugins/SimplnxCore/test/FindFeaturePhasesFilterTest.cpp similarity index 61% rename from src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp rename to src/Plugins/SimplnxCore/test/FindFeaturePhasesFilterTest.cpp index 1a4afae60d..18b08727a8 100644 --- a/src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeaturePhasesFilterTest.cpp @@ -1,29 +1,29 @@ -#include "ComplexCore/Filters/FindFeaturePhasesFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/FindFeaturePhasesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; -TEST_CASE("ComplexCore::FindFeaturePhasesFilter(Valid Parameters)", "[ComplexCore][FindFeaturePhasesFilter]") +TEST_CASE("SimplnxCore::FindFeaturePhasesFilter(Valid Parameters)", "[SimplnxCore][FindFeaturePhasesFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); - DataPath cellDataPath = smallIn100Group.createChildPath(complex::Constants::k_CellData); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); + DataPath cellDataPath = smallIn100Group.createChildPath(nx::core::Constants::k_CellData); DataPath cellFeatureDataPath = smallIn100Group.createChildPath(Constants::k_CellFeatureData); - DataPath cellPhasesPath = cellDataPath.createChildPath(complex::Constants::k_Phases); - DataPath featureIdsPath = cellDataPath.createChildPath(complex::Constants::k_FeatureIds); + DataPath cellPhasesPath = cellDataPath.createChildPath(nx::core::Constants::k_Phases); + DataPath featureIdsPath = cellDataPath.createChildPath(nx::core::Constants::k_FeatureIds); std::string computedPrefix = "Computed_"; - std::string featurePhasesName = computedPrefix + complex::Constants::k_Phases.str(); + std::string featurePhasesName = computedPrefix + nx::core::Constants::k_Phases.str(); DataPath featurePhasesPath = cellFeatureDataPath.createChildPath(featurePhasesName); { @@ -35,12 +35,12 @@ TEST_CASE("ComplexCore::FindFeaturePhasesFilter(Valid Parameters)", "[ComplexCor args.insert(FindFeaturePhasesFilter::k_FeaturePhasesArrayName_Key, std::make_any(featurePhasesName)); auto preflightResult = ffpFilter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = ffpFilter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); - DataPath exemplaryDataPath = cellFeatureDataPath.createChildPath(complex::Constants::k_Phases); + DataPath exemplaryDataPath = cellFeatureDataPath.createChildPath(nx::core::Constants::k_Phases); const Int32Array& featureArrayExemplary = dataStructure.getDataRefAs(exemplaryDataPath); const Int32Array& createdFeatureArray = dataStructure.getDataRefAs(featurePhasesPath); @@ -53,7 +53,7 @@ TEST_CASE("ComplexCore::FindFeaturePhasesFilter(Valid Parameters)", "[ComplexCor } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_feature_phases_filter.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindLargestCrossSectionsTest.cpp b/src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp similarity index 93% rename from src/Plugins/ComplexCore/test/FindLargestCrossSectionsTest.cpp rename to src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp index 52d6c27574..0ec863a417 100644 --- a/src/Plugins/ComplexCore/test/FindLargestCrossSectionsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindLargestCrossSectionsTest.cpp @@ -1,14 +1,14 @@ #include -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindLargestCrossSectionsFilter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "SimplnxCore/Filters/FindLargestCrossSectionsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -281,7 +281,7 @@ DataStructure CreateInvalidTestDataStructure(bool geomIs3d) } } // namespace -TEST_CASE("ComplexCore::FindLargestCrossSectionsFilter: Valid Filter Execution", "[ComplexCore][FindLargestCrossSectionsFilter]") +TEST_CASE("SimplnxCore::FindLargestCrossSectionsFilter: Valid Filter Execution", "[SimplnxCore][FindLargestCrossSectionsFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object FindLargestCrossSectionsFilter filter; @@ -297,11 +297,11 @@ TEST_CASE("ComplexCore::FindLargestCrossSectionsFilter: Valid Filter Execution", // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* largestCrossSection = ds.getDataAs(DataPath({k_ImageGeometry, k_CellFeatureData, k_LargestCrossSections})); REQUIRE(largestCrossSection != nullptr); @@ -319,7 +319,7 @@ TEST_CASE("ComplexCore::FindLargestCrossSectionsFilter: Valid Filter Execution", REQUIRE(std::fabs(crossSection5 - 1.375f) < UnitTest::EPSILON); } -TEST_CASE("ComplexCore::FindLargestCrossSectionsFilter: InValid Filter Execution") +TEST_CASE("SimplnxCore::FindLargestCrossSectionsFilter: InValid Filter Execution") { // Instantiate the filter, a DataStructure object and an Arguments Object FindLargestCrossSectionsFilter filter; @@ -335,10 +335,10 @@ TEST_CASE("ComplexCore::FindLargestCrossSectionsFilter: InValid Filter Execution args.insertOrAssign(FindLargestCrossSectionsFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(DataPath({k_ImageGeometry, k_CellFeatureData}))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } SECTION("Invalid Cell Feature Attribute Matrix") { @@ -346,9 +346,9 @@ TEST_CASE("ComplexCore::FindLargestCrossSectionsFilter: InValid Filter Execution args.insertOrAssign(FindLargestCrossSectionsFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(DataPath({k_ImageGeometry, k_CellEnsembleData}))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(ds, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } } diff --git a/src/Plugins/ComplexCore/test/FindNeighborListStatisticsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp similarity index 96% rename from src/Plugins/ComplexCore/test/FindNeighborListStatisticsTest.cpp rename to src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp index d41e71f6a9..34029ed53b 100644 --- a/src/Plugins/ComplexCore/test/FindNeighborListStatisticsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborListStatisticsTest.cpp @@ -1,16 +1,16 @@ -#include "ComplexCore/Filters/FindNeighborListStatistics.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/FindNeighborListStatistics.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::FindNeighborListStatistics: Test Algorithm", "[FindNeighborListStatistics]") +TEST_CASE("SimplnxCore::FindNeighborListStatistics: Test Algorithm", "[FindNeighborListStatistics]") { DataStructure dataStructure; DataGroup* topLevelGroup = DataGroup::Create(dataStructure, "TestData"); @@ -142,7 +142,7 @@ TEST_CASE("ComplexCore::FindNeighborListStatistics: Test Algorithm", "[FindNeigh REQUIRE(sumVal3 == 22391.0f); } -TEST_CASE("ComplexCore::FindNeighborListStatistics: Invalid Input Array", "[FindNeighborListStatistics]") +TEST_CASE("SimplnxCore::FindNeighborListStatistics: Invalid Input Array", "[FindNeighborListStatistics]") { DataStructure dataStructure; DataGroup* topLevelGroup = DataGroup::Create(dataStructure, "TestData"); diff --git a/src/Plugins/ComplexCore/test/FindNeighborhoodsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp similarity index 79% rename from src/Plugins/ComplexCore/test/FindNeighborhoodsTest.cpp rename to src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp index fcfcec029c..9292542614 100644 --- a/src/Plugins/ComplexCore/test/FindNeighborhoodsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborhoodsTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindNeighborhoodsFilter.hpp" +#include "SimplnxCore/Filters/FindNeighborhoodsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace fs = std::filesystem; @@ -23,9 +23,9 @@ const std::string k_NeighborhoodsNX("NeighborhoodsNX"); const std::string k_NeighborhoodListNX("NeighborhoodListNX"); } // namespace -TEST_CASE("ComplexCore::FindNeighborhoods", "[ComplexCore][FindNeighborhoods]") +TEST_CASE("SimplnxCore::FindNeighborhoods", "[SimplnxCore][FindNeighborhoods]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); @@ -48,11 +48,11 @@ TEST_CASE("ComplexCore::FindNeighborhoods", "[ComplexCore][FindNeighborhoods]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Compare the k_Neighborhoods output array with those precalculated from the file @@ -70,7 +70,7 @@ TEST_CASE("ComplexCore::FindNeighborhoods", "[ComplexCore][FindNeighborhoods]") } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_neighborhoods.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp similarity index 79% rename from src/Plugins/ComplexCore/test/FindNeighborsTest.cpp rename to src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp index 70174d8090..781ea67202 100644 --- a/src/Plugins/ComplexCore/test/FindNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp @@ -1,23 +1,23 @@ -#include "ComplexCore/Filters/FindNeighbors.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/FindNeighbors.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; -TEST_CASE("ComplexCore::FindNeighbors", "[ComplexCore][FindNeighbors]") +TEST_CASE("SimplnxCore::FindNeighbors", "[SimplnxCore][FindNeighbors]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataAttributeMatrix = smallIn100Group.createChildPath(k_CellData); DataPath featureIdsDataPath({k_DataContainer, k_CellData, k_FeatureIds}); DataPath cellFeatureAttributeMatrixPath({k_DataContainer, k_CellFeatureData}); @@ -47,16 +47,16 @@ TEST_CASE("ComplexCore::FindNeighbors", "[ComplexCore][FindNeighbors]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Output { - DataPath featureGroup = smallIn100Group.createChildPath(complex::Constants::k_CellFeatureData); + DataPath featureGroup = smallIn100Group.createChildPath(nx::core::Constants::k_CellFeatureData); DataPath exemplaryDataPath = featureGroup.createChildPath("SurfaceFeatures"); UnitTest::CompareArrays(dataStructure, exemplaryDataPath, cellFeatureAttributeMatrixPath.createChildPath(surfaceFeaturesName)); @@ -71,7 +71,7 @@ TEST_CASE("ComplexCore::FindNeighbors", "[ComplexCore][FindNeighbors]") } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_neighbors_test.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindNumFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp similarity index 76% rename from src/Plugins/ComplexCore/test/FindNumFeaturesTest.cpp rename to src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp index b5e10a6070..752812c6df 100644 --- a/src/Plugins/ComplexCore/test/FindNumFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindNumFeaturesTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindNumFeaturesFilter.hpp" +#include "SimplnxCore/Filters/FindNumFeaturesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -23,14 +23,14 @@ const DataPath k_FeatureCountsPathNX({Constants::k_DataContainer, Constants::k_C const fs::path k_BaseDataFilePath = fs::path(fmt::format("{}/6_6_volume_fraction_feature_count.dream3d", unit_test::k_TestFilesDir)); } // namespace -TEST_CASE("ComplexCore::FindNumFeaturesFilter: Valid filter execution", "[ComplexCore][FindNumFeaturesFilter]") +TEST_CASE("SimplnxCore::FindNumFeaturesFilter: Valid filter execution", "[SimplnxCore][FindNumFeaturesFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object FindNumFeaturesFilter filter; Arguments args; - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", - "6_6_volume_fraction_feature_count.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", + "6_6_volume_fraction_feature_count.dream3d"); DataStructure dataStructure = UnitTest::LoadDataStructure(k_BaseDataFilePath); @@ -56,14 +56,14 @@ TEST_CASE("ComplexCore::FindNumFeaturesFilter: Valid filter execution", "[Comple } } -TEST_CASE("ComplexCore::FindNumFeaturesFilter: InValid filter execution", "[ComplexCore][FindNumFeaturesFilter]") +TEST_CASE("SimplnxCore::FindNumFeaturesFilter: InValid filter execution", "[SimplnxCore][FindNumFeaturesFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object FindNumFeaturesFilter filter; Arguments args; - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", - "6_6_volume_fraction_feature_count.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", + "6_6_volume_fraction_feature_count.dream3d"); DataStructure dataStructure = UnitTest::LoadDataStructure(k_BaseDataFilePath); diff --git a/src/Plugins/ComplexCore/test/FindSurfaceAreaToVolumeTest.cpp b/src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp similarity index 80% rename from src/Plugins/ComplexCore/test/FindSurfaceAreaToVolumeTest.cpp rename to src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp index 7da3c1cd05..97249631ce 100644 --- a/src/Plugins/ComplexCore/test/FindSurfaceAreaToVolumeTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindSurfaceAreaToVolumeTest.cpp @@ -1,9 +1,9 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindSurfaceAreaToVolumeFilter.hpp" +#include "SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -11,9 +11,9 @@ namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -23,9 +23,9 @@ const std::string k_SurfaceAreaVolumeRationArrayNameNX("SurfaceAreaVolumeRatioNX const std::string k_SphericityArrayNameNX("SphericityNX"); } // namespace -TEST_CASE("ComplexCore::FindSurfaceAreaToVolume", "[ComplexCore][FindSurfaceAreaToVolume]") +TEST_CASE("SimplnxCore::FindSurfaceAreaToVolume", "[SimplnxCore][FindSurfaceAreaToVolume]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set auto baseDataFilePath = fs::path(fmt::format("{}/6_6_stats_test.dream3d", unit_test::k_TestFilesDir)); @@ -51,11 +51,11 @@ TEST_CASE("ComplexCore::FindSurfaceAreaToVolume", "[ComplexCore][FindSurfaceArea // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Compare the output arrays with those precalculated from the file @@ -69,7 +69,7 @@ TEST_CASE("ComplexCore::FindSurfaceAreaToVolume", "[ComplexCore][FindSurfaceArea } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_surface_area_volume_ratio.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp rename to src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp index 6f177d2e36..c721359f49 100644 --- a/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindSurfaceFeaturesTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/Filters/FindSurfaceFeatures.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CreateImageGeometry.hpp" -#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" +#include "SimplnxCore/Filters/FindSurfaceFeatures.hpp" +#include "SimplnxCore/Filters/CreateImageGeometry.hpp" +#include "SimplnxCore/Filters/ReadRawBinaryFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -26,7 +26,7 @@ const std::string k_SurfaceFeatures2DExemplaryFileName = "FindSurfaceFeaturesTes void test_impl(const std::vector& geometryDims, const std::string& featureIdsFileName, usize featureIdsSize, const std::string& exemplaryFileName) { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "FindSurfaceFeaturesTest.tar.gz", "FindSurfaceFeaturesTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "FindSurfaceFeaturesTest.tar.gz", "FindSurfaceFeaturesTest"); // Instantiate the filter, a DataStructure object and an Arguments Object FindSurfaceFeatures filter; @@ -37,7 +37,7 @@ void test_impl(const std::vector& geometryDims, const std::string& featu cigArgs.insertOrAssign(CreateImageGeometry::k_GeometryDataPath_Key, std::make_any(k_FeatureGeometryPath)); cigArgs.insertOrAssign(CreateImageGeometry::k_Dimensions_Key, geometryDims); auto result = cigFilter.execute(dataStructure, cigArgs); - COMPLEX_RESULT_REQUIRE_VALID(result.result) + SIMPLNX_RESULT_REQUIRE_VALID(result.result) ReadRawBinaryFilter rbrFilter; Arguments rbrArgs; @@ -48,7 +48,7 @@ void test_impl(const std::vector& geometryDims, const std::string& featu rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_CreatedAttributeArrayPath_Key, std::make_any(k_FeatureIDsPath)); result = rbrFilter.execute(dataStructure, rbrArgs); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); // Change Feature 470 to 0 REQUIRE(dataStructure.getDataAs(k_FeatureIDsPath) != nullptr); @@ -68,7 +68,7 @@ void test_impl(const std::vector& geometryDims, const std::string& featu rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_CreatedAttributeArrayPath_Key, std::make_any(k_SurfaceFeaturesExemplaryPath)); result = rbrFilter.execute(dataStructure, rbrArgs); - COMPLEX_RESULT_REQUIRE_VALID(result.result) + SIMPLNX_RESULT_REQUIRE_VALID(result.result) // Create default Parameters for the filter. Arguments args; @@ -79,11 +79,11 @@ void test_impl(const std::vector& geometryDims, const std::string& featu // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) REQUIRE_NOTHROW(dataStructure.getDataRefAs(k_SurfaceFeaturesArrayPath)); REQUIRE_NOTHROW(dataStructure.getDataRefAs(k_SurfaceFeaturesExemplaryPath)); @@ -95,7 +95,7 @@ void test_impl(const std::vector& geometryDims, const std::string& featu REQUIRE(surfaceFeaturesExemplary.getSize() == 796); REQUIRE(surfaceFeaturesExemplary[0] == 1); // This is due to a bug in legacy DREAM.3D that sets featureID 0 as a surface feature (DREAM3D issue #989) - REQUIRE(surfaceFeatures[0] == false); // This bug is fixed in complex. + REQUIRE(surfaceFeatures[0] == false); // This bug is fixed in simplnx. for(usize i = 1; i < surfaceFeatures.getSize(); i++) { @@ -105,13 +105,13 @@ void test_impl(const std::vector& geometryDims, const std::string& featu } } // namespace -TEST_CASE("ComplexCore::FindSurfaceFeatures: Valid filter execution in 3D", "[ComplexCore][FindSurfaceFeatures]") +TEST_CASE("SimplnxCore::FindSurfaceFeatures: Valid filter execution in 3D", "[SimplnxCore][FindSurfaceFeatures]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); const std::string k_SurfaceFeaturesExemplar("SurfaceFeatures"); @@ -128,11 +128,11 @@ TEST_CASE("ComplexCore::FindSurfaceFeatures: Valid filter execution in 3D", "[Co // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } { @@ -151,17 +151,17 @@ TEST_CASE("ComplexCore::FindSurfaceFeatures: Valid filter execution in 3D", "[Co } } -TEST_CASE("ComplexCore::FindSurfaceFeatures: Valid filter execution in 2D - XY Plane", "[ComplexCore][FindSurfaceFeatures]") +TEST_CASE("SimplnxCore::FindSurfaceFeatures: Valid filter execution in 2D - XY Plane", "[SimplnxCore][FindSurfaceFeatures]") { test_impl(std::vector({100, 100, 1}), k_FeatureIds2DFileName, 10000, k_SurfaceFeatures2DExemplaryFileName); } -TEST_CASE("ComplexCore::FindSurfaceFeatures: Valid filter execution in 2D - XZ Plane", "[ComplexCore][FindSurfaceFeatures]") +TEST_CASE("SimplnxCore::FindSurfaceFeatures: Valid filter execution in 2D - XZ Plane", "[SimplnxCore][FindSurfaceFeatures]") { test_impl(std::vector({100, 1, 100}), k_FeatureIds2DFileName, 10000, k_SurfaceFeatures2DExemplaryFileName); } -TEST_CASE("ComplexCore::FindSurfaceFeatures: Valid filter execution in 2D - YZ Plane", "[ComplexCore][FindSurfaceFeatures]") +TEST_CASE("SimplnxCore::FindSurfaceFeatures: Valid filter execution in 2D - YZ Plane", "[SimplnxCore][FindSurfaceFeatures]") { test_impl(std::vector({1, 100, 100}), k_FeatureIds2DFileName, 10000, k_SurfaceFeatures2DExemplaryFileName); } diff --git a/src/Plugins/ComplexCore/test/FindTriangleGeomCentroidsTest.cpp b/src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp similarity index 77% rename from src/Plugins/ComplexCore/test/FindTriangleGeomCentroidsTest.cpp rename to src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp index 4bf7fffbe5..e613febb75 100644 --- a/src/Plugins/ComplexCore/test/FindTriangleGeomCentroidsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindTriangleGeomCentroidsTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindTriangleGeomCentroidsFilter.hpp" +#include "SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace FindTriangleGeomCentroidsFilterTest { @@ -27,9 +27,9 @@ const DataPath k_FaceLabelsPath = k_GeometryPath.createChildPath(k_FaceDataName) using namespace FindTriangleGeomCentroidsFilterTest; -TEST_CASE("ComplexCore::FindTriangleGeomCentroids", "[ComplexCore][FindTriangleGeomCentroids]") +TEST_CASE("SimplnxCore::FindTriangleGeomCentroids", "[SimplnxCore][FindTriangleGeomCentroids]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/12_IN625_GBCD/12_IN625_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -49,11 +49,11 @@ TEST_CASE("ComplexCore::FindTriangleGeomCentroids", "[ComplexCore][FindTriangleG // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the results @@ -68,7 +68,7 @@ TEST_CASE("ComplexCore::FindTriangleGeomCentroids", "[ComplexCore][FindTriangleG CompareDataArrays(kExemplarsArray, kNxArray); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_triangle_geom_centroids.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindTriangleGeomSizesTest.cpp b/src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp similarity index 76% rename from src/Plugins/ComplexCore/test/FindTriangleGeomSizesTest.cpp rename to src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp index 23e24ac69c..efdb9320b3 100644 --- a/src/Plugins/ComplexCore/test/FindTriangleGeomSizesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindTriangleGeomSizesTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindTriangleGeomSizesFilter.hpp" +#include "SimplnxCore/Filters/FindTriangleGeomSizesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace FindTriangleGeomSizesFilterTest { @@ -27,9 +27,9 @@ const DataPath k_FaceLabelsPath = k_GeometryPath.createChildPath(k_FaceDataName) using namespace FindTriangleGeomSizesFilterTest; -TEST_CASE("ComplexCore::FindTriangleGeomSizes", "[ComplexCore][FindTriangleGeomSizes]") +TEST_CASE("SimplnxCore::FindTriangleGeomSizes", "[SimplnxCore][FindTriangleGeomSizes]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/12_IN625_GBCD/12_IN625_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -49,11 +49,11 @@ TEST_CASE("ComplexCore::FindTriangleGeomSizes", "[ComplexCore][FindTriangleGeomS // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the results { @@ -67,7 +67,7 @@ TEST_CASE("ComplexCore::FindTriangleGeomSizes", "[ComplexCore][FindTriangleGeomS CompareDataArrays(kExemplarsArray, kNxArray); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/find_triangle_geom_sizes.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindVertexToTriangleDistancesTest.cpp b/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp similarity index 78% rename from src/Plugins/ComplexCore/test/FindVertexToTriangleDistancesTest.cpp rename to src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp index ae0c70f0e1..a33854cbc7 100644 --- a/src/Plugins/ComplexCore/test/FindVertexToTriangleDistancesTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindVertexToTriangleDistancesTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindVertexToTriangleDistancesFilter.hpp" +#include "SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -18,10 +18,10 @@ inline constexpr StringLiteral k_DistancesNameNX("DistancesNX"); inline constexpr StringLiteral k_ClosestTriangleIdsNameNX("Closest Triangle Ids"); } // namespace -TEST_CASE("ComplexCore::FindVertexToTriangleDistancesFilter", "[ComplexCore][FindVertexToTriangleDistancesFilter]") +TEST_CASE("SimplnxCore::FindVertexToTriangleDistancesFilter", "[SimplnxCore][FindVertexToTriangleDistancesFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_vertex_to_triangle_distances.tar.gz", - "6_6_vertex_to_triangle_distances.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_vertex_to_triangle_distances.tar.gz", + "6_6_vertex_to_triangle_distances.dream3d"); // Read the Small IN100 Data set DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/6_6_vertex_to_triangle_distances.dream3d", unit_test::k_TestFilesDir))); @@ -64,7 +64,7 @@ TEST_CASE("ComplexCore::FindVertexToTriangleDistancesFilter", "[ComplexCore][Fin } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/vertex_to_triangle_distances.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/FindVolFractionsTest.cpp b/src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp similarity index 77% rename from src/Plugins/ComplexCore/test/FindVolFractionsTest.cpp rename to src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp index 845c8160b9..41afccfce6 100644 --- a/src/Plugins/ComplexCore/test/FindVolFractionsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindVolFractionsTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindVolFractionsFilter.hpp" +#include "SimplnxCore/Filters/FindVolFractionsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -22,14 +22,14 @@ const DataPath k_VolumeFractionsPathNX = Constants::k_CellEnsembleAttributeMatri const fs::path k_BaseDataFilePath = fs::path(fmt::format("{}/6_6_volume_fraction_feature_count.dream3d", unit_test::k_TestFilesDir)); } // namespace -TEST_CASE("ComplexCore::FindVolFractionsFilter: Valid filter execution", "[ComplexCore::FindVolFractionsFilter]") +TEST_CASE("SimplnxCore::FindVolFractionsFilter: Valid filter execution", "[SimplnxCore::FindVolFractionsFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object FindVolFractionsFilter filter; Arguments args; - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", - "6_6_volume_fraction_feature_count.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", + "6_6_volume_fraction_feature_count.dream3d"); DataStructure dataStructure = UnitTest::LoadDataStructure(k_BaseDataFilePath); @@ -56,14 +56,14 @@ TEST_CASE("ComplexCore::FindVolFractionsFilter: Valid filter execution", "[Compl } } -TEST_CASE("ComplexCore::FindVolFractionsFilter: InValid filter execution", "[ComplexCore::FindVolFractionsFilter]") +TEST_CASE("SimplnxCore::FindVolFractionsFilter: InValid filter execution", "[SimplnxCore::FindVolFractionsFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object FindVolFractionsFilter filter; Arguments args; - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", - "6_6_volume_fraction_feature_count.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_volume_fraction_feature_count.dream3d.tar.gz", + "6_6_volume_fraction_feature_count.dream3d"); auto baseDataFilePath = fs::path(fmt::format("{}/6_6_volFractions_and_numFeatures_test.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(k_BaseDataFilePath); diff --git a/src/Plugins/ComplexCore/test/GenerateColorTableTest.cpp b/src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/GenerateColorTableTest.cpp rename to src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp index ba49b17de8..a6f95976b5 100644 --- a/src/Plugins/ComplexCore/test/GenerateColorTableTest.cpp +++ b/src/Plugins/SimplnxCore/test/GenerateColorTableTest.cpp @@ -1,21 +1,21 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/GenerateColorTableFilter.hpp" -#include "ComplexCore/Filters/ReadTextDataArrayFilter.hpp" +#include "SimplnxCore/Filters/GenerateColorTableFilter.hpp" +#include "SimplnxCore/Filters/ReadTextDataArrayFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/ColorPresetsUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/ColorPresetsUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { -const fs::path k_TestFilesDir = fs::path(complex::unit_test::k_DREAM3DDataDir.str()) / "TestFiles" / "GenerateColorTableTest"; +const fs::path k_TestFilesDir = fs::path(nx::core::unit_test::k_DREAM3DDataDir.str()) / "TestFiles" / "GenerateColorTableTest"; const fs::path k_PresetsFilePath = k_TestFilesDir / "ColorTablePresets.json"; const fs::path k_InputImageFilePath = k_TestFilesDir / "ColorTableTestFile.txt"; @@ -54,7 +54,7 @@ const std::string k_XRayPresetName = "X Ray"; std::map ReadPresets() { Result result = ReadRGBPresets(k_PresetsFilePath); - COMPLEX_RESULT_REQUIRE_VALID(result); + SIMPLNX_RESULT_REQUIRE_VALID(result); std::map presetsMap; for(const nlohmann::json& preset : result.value()) @@ -69,9 +69,9 @@ std::map ReadPresets() } } // namespace -TEST_CASE("ComplexCore::GenerateColorTableFilter: Valid filter execution") +TEST_CASE("SimplnxCore::GenerateColorTableFilter: Valid filter execution") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "GenerateColorTableTest.tar.gz", "GenerateColorTableTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "GenerateColorTableTest.tar.gz", "GenerateColorTableTest"); DataStructure dataStructure; @@ -89,7 +89,7 @@ TEST_CASE("ComplexCore::GenerateColorTableFilter: Valid filter execution") args.insertOrAssign(ReadTextDataArrayFilter::k_DataArrayKey, std::make_any(DataPath{{Constants::k_Confidence_Index.str()}})); IFilter::ExecuteResult executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Apply Preset @@ -192,7 +192,7 @@ TEST_CASE("ComplexCore::GenerateColorTableFilter: Valid filter execution") args.insertOrAssign(GenerateColorTableFilter::k_RgbArrayPath_Key, std::make_any("CI_RGB")); IFilter::ExecuteResult executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // Validate Results REQUIRE_NOTHROW(dataStructure.getDataRefAs(DataPath{{"CI_RGB"}})); diff --git a/src/Plugins/ComplexCore/test/GenerateVectorColorsTest.cpp b/src/Plugins/SimplnxCore/test/GenerateVectorColorsTest.cpp similarity index 74% rename from src/Plugins/ComplexCore/test/GenerateVectorColorsTest.cpp rename to src/Plugins/SimplnxCore/test/GenerateVectorColorsTest.cpp index a8f5690f3c..0a53ac2e6b 100644 --- a/src/Plugins/ComplexCore/test/GenerateVectorColorsTest.cpp +++ b/src/Plugins/SimplnxCore/test/GenerateVectorColorsTest.cpp @@ -1,11 +1,11 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/GenerateVectorColorsFilter.hpp" +#include "SimplnxCore/Filters/GenerateVectorColorsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -14,9 +14,9 @@ DataPath eulerAnglesPath = ebsdPath.createChildPath(Constants::k_EulerAngles); const std::string k_VecColorsNX = "Vector Colors"; } // namespace -TEST_CASE("ComplexCore::GenerateVectorColorsFilter: Valid Filter Execution", "[ComplexCore][GenerateVectorColorsFilter]") +TEST_CASE("SimplnxCore::GenerateVectorColorsFilter: Valid Filter Execution", "[SimplnxCore][GenerateVectorColorsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "generate_vector_colors.tar.gz", "generate_vector_colors"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "generate_vector_colors.tar.gz", "generate_vector_colors"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/generate_vector_colors/6_6_generate_vector_colors.dream3d", unit_test::k_TestFilesDir))); { // Instantiate the filter, a DataStructure object and an Arguments Object diff --git a/src/Plugins/ComplexCore/test/IdentifySampleTest.cpp b/src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp similarity index 69% rename from src/Plugins/ComplexCore/test/IdentifySampleTest.cpp rename to src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp index 244f399dc8..66164f7ea9 100644 --- a/src/Plugins/ComplexCore/test/IdentifySampleTest.cpp +++ b/src/Plugins/SimplnxCore/test/IdentifySampleTest.cpp @@ -1,16 +1,16 @@ -#include "ComplexCore/Filters/IdentifySample.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/IdentifySample.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; -TEST_CASE("ComplexCore::IdentifySample : Valid filter execution", "[ComplexCore][IdentifySample]") +TEST_CASE("SimplnxCore::IdentifySample : Valid filter execution", "[SimplnxCore][IdentifySample]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_identify_sample.tar.gz", "6_6_identify_sample"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_identify_sample.tar.gz", "6_6_identify_sample"); // Read Input/Exemplar DREAM3D File data DataStructure dataStructure = LoadDataStructure(fs::path(fmt::format("{}/6_6_identify_sample/6_6_identify_sample.dream3d", unit_test::k_TestFilesDir))); @@ -34,18 +34,18 @@ TEST_CASE("ComplexCore::IdentifySample : Valid filter execution", "[ComplexCore] // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) CompareExemplarToGeneratedData(dataStructure, dataStructure, Constants::k_CellAttributeMatrix, k_ExemplarDataContainerName); } -TEST_CASE("ComplexCore::IdentifySample : Invalid filter execution", "[ComplexCore][IdentifySample]") +TEST_CASE("SimplnxCore::IdentifySample : Invalid filter execution", "[SimplnxCore][IdentifySample]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_identify_sample.tar.gz", "6_6_identify_sample"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_identify_sample.tar.gz", "6_6_identify_sample"); // Read Input/Exemplar DREAM3D File data DataStructure dataStructure = LoadDataStructure(fs::path(fmt::format("{}/6_6_identify_sample/6_6_identify_sample.dream3d", unit_test::k_TestFilesDir))); @@ -61,9 +61,9 @@ TEST_CASE("ComplexCore::IdentifySample : Invalid filter execution", "[ComplexCor // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/ImageContouringTest.cpp b/src/Plugins/SimplnxCore/test/ImageContouringTest.cpp similarity index 77% rename from src/Plugins/ComplexCore/test/ImageContouringTest.cpp rename to src/Plugins/SimplnxCore/test/ImageContouringTest.cpp index ebb4caa0e0..d05e05f8f8 100644 --- a/src/Plugins/ComplexCore/test/ImageContouringTest.cpp +++ b/src/Plugins/SimplnxCore/test/ImageContouringTest.cpp @@ -1,16 +1,16 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ImageContouringFilter.hpp" +#include "SimplnxCore/Filters/ImageContouringFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace ContourTest { @@ -33,10 +33,10 @@ const DataPath k_ExemplarNormals = k_ExemplarContourPath.createChildPath(INodeGe const DataPath k_NewNormals = k_NewContourPath.createChildPath(INodeGeometry0D::k_VertexDataName).createChildPath(k_VertexNormals); } // namespace ContourTest -TEST_CASE("ComplexCore::Image Contouring Valid Execution", "[ComplexCore][ImageContouring]") +TEST_CASE("SimplnxCore::Image Contouring Valid Execution", "[SimplnxCore][ImageContouring]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "flying_edges_exemplar.tar.gz", - "flying_edges_exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "flying_edges_exemplar.tar.gz", + "flying_edges_exemplar.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/flying_edges_exemplar.dream3d", unit_test::k_TestFilesDir)); @@ -57,11 +57,11 @@ TEST_CASE("ComplexCore::Image Contouring Valid Execution", "[ComplexCore][ImageC // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the results @@ -85,7 +85,7 @@ TEST_CASE("ComplexCore::Image Contouring Valid Execution", "[ComplexCore][ImageC CompareDataArrays(kExemplarsNormalsArray, kNxNormalsArray); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/image_contouring_test.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/ImageGeomTest.cpp b/src/Plugins/SimplnxCore/test/ImageGeomTest.cpp similarity index 94% rename from src/Plugins/ComplexCore/test/ImageGeomTest.cpp rename to src/Plugins/SimplnxCore/test/ImageGeomTest.cpp index 429e0e6ab4..ee14c880d5 100644 --- a/src/Plugins/ComplexCore/test/ImageGeomTest.cpp +++ b/src/Plugins/SimplnxCore/test/ImageGeomTest.cpp @@ -1,11 +1,11 @@ -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Filter/Arguments.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Filter/Arguments.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::ImageGeom: Test Index Calculation", "[Geometry][ImageGeom]") +TEST_CASE("SimplnxCore::ImageGeom: Test Index Calculation", "[Geometry][ImageGeom]") { // Instantiate the filter, a DataStructure object and an Arguments Object DataStructure dataStructure; @@ -55,7 +55,7 @@ TEST_CASE("ComplexCore::ImageGeom: Test Index Calculation", "[Geometry][ImageGeo REQUIRE(err == ImageGeom::ErrorType::ZOutOfBoundsHigh); } -TEST_CASE("ComplexCore::ImageGeom: Test Coords To Index", "[Geometry][ImageGeom]") +TEST_CASE("SimplnxCore::ImageGeom: Test Coords To Index", "[Geometry][ImageGeom]") { // Instantiate the filter, a DataStructure object and an Arguments Object DataStructure dataStructure; diff --git a/src/Plugins/ComplexCore/test/InitializeDataTest.cpp b/src/Plugins/SimplnxCore/test/InitializeDataTest.cpp similarity index 77% rename from src/Plugins/ComplexCore/test/InitializeDataTest.cpp rename to src/Plugins/SimplnxCore/test/InitializeDataTest.cpp index 19eb19d2ee..a985b673c9 100644 --- a/src/Plugins/ComplexCore/test/InitializeDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/InitializeDataTest.cpp @@ -1,12 +1,12 @@ -#include "ComplexCore/Filters/InitializeData.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/InitializeData.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -56,10 +56,10 @@ void BoundsCheck(const DataArray& dataArray, const std::vector& compBounds } // namespace -TEST_CASE("ComplexCore::InitializeData 1: Single Component Fill Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 1: Single Component Fill Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_fill.dream3d", unit_test::k_TestFilesDir))); { @@ -84,10 +84,10 @@ TEST_CASE("ComplexCore::InitializeData 1: Single Component Fill Initialization", UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 2: Multi Component Single-Value Fill Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 2: Multi Component Single-Value Fill Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_single_val_fill.dream3d", unit_test::k_TestFilesDir))); { @@ -112,10 +112,10 @@ TEST_CASE("ComplexCore::InitializeData 2: Multi Component Single-Value Fill Init UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 3: Multi Component Multi-Value Fill Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 3: Multi Component Multi-Value Fill Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_multi_val_fill.dream3d", unit_test::k_TestFilesDir))); { @@ -140,10 +140,10 @@ TEST_CASE("ComplexCore::InitializeData 3: Multi Component Multi-Value Fill Initi UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 4: Single Component Incremental-Addition Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 4: Single Component Incremental-Addition Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_inc_add.dream3d", unit_test::k_TestFilesDir))); { @@ -170,10 +170,10 @@ TEST_CASE("ComplexCore::InitializeData 4: Single Component Incremental-Addition UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 5: Multi Component Single-Value Incremental-Addition Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 5: Multi Component Single-Value Incremental-Addition Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_single_val_inc_add.dream3d", unit_test::k_TestFilesDir))); { @@ -200,10 +200,10 @@ TEST_CASE("ComplexCore::InitializeData 5: Multi Component Single-Value Increment UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 6: Multi Component Multi-Value Incremental-Addition Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 6: Multi Component Multi-Value Incremental-Addition Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_multi_val_inc_add.dream3d", unit_test::k_TestFilesDir))); { @@ -230,10 +230,10 @@ TEST_CASE("ComplexCore::InitializeData 6: Multi Component Multi-Value Incrementa UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 7: Single Component Incremental-Subtraction Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 7: Single Component Incremental-Subtraction Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_inc_sub.dream3d", unit_test::k_TestFilesDir))); { @@ -260,10 +260,10 @@ TEST_CASE("ComplexCore::InitializeData 7: Single Component Incremental-Subtracti UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 8: Multi Component Single-Value Incremental-Subtraction Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 8: Multi Component Single-Value Incremental-Subtraction Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_single_val_inc_sub.dream3d", unit_test::k_TestFilesDir))); { @@ -290,10 +290,10 @@ TEST_CASE("ComplexCore::InitializeData 8: Multi Component Single-Value Increment UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 9: Multi Component Multi-Value Incremental-Subtraction Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 9: Multi Component Multi-Value Incremental-Subtraction Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_multi_val_inc_sub.dream3d", unit_test::k_TestFilesDir))); { @@ -320,10 +320,10 @@ TEST_CASE("ComplexCore::InitializeData 9: Multi Component Multi-Value Incrementa UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 10: Single Component Random-With-Range Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 10: Single Component Random-With-Range Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_rwr.dream3d", unit_test::k_TestFilesDir))); { @@ -353,10 +353,10 @@ TEST_CASE("ComplexCore::InitializeData 10: Single Component Random-With-Range In ::BoundsCheck(dataStructure.getDataRefAs(::k_BaselinePath), {2.62f, 6666.66f}); } -TEST_CASE("ComplexCore::InitializeData 11: Multi Component Single-Value Standardized Random-With-Range Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 11: Multi Component Single-Value Standardized Random-With-Range Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_single_val_stand_rwr.dream3d", unit_test::k_TestFilesDir))); { @@ -386,10 +386,10 @@ TEST_CASE("ComplexCore::InitializeData 11: Multi Component Single-Value Standard ::BoundsCheck(dataStructure.getDataRefAs(::k_BaselinePath), {-6.283185f, 6.283185f, -6.28318f, 6.283185f, -6.28318f, 6.283185f}); } -TEST_CASE("ComplexCore::InitializeData 12: Multi Component Single-Value Non-Standardized Random-With-Range Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 12: Multi Component Single-Value Non-Standardized Random-With-Range Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_single_val_non_stand_rwr.dream3d", unit_test::k_TestFilesDir))); { @@ -419,10 +419,10 @@ TEST_CASE("ComplexCore::InitializeData 12: Multi Component Single-Value Non-Stan ::BoundsCheck(dataStructure.getDataRefAs(::k_BaselinePath), {-1000, 1000, -1000, 1000, -1000, 1000}); } -TEST_CASE("ComplexCore::InitializeData 13: Multi Component Multi-Value Non-Standardized Random-With-Range Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 13: Multi Component Multi-Value Non-Standardized Random-With-Range Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_multi_val_non_stand_rwr.dream3d", unit_test::k_TestFilesDir))); { @@ -452,10 +452,10 @@ TEST_CASE("ComplexCore::InitializeData 13: Multi Component Multi-Value Non-Stand ::BoundsCheck(dataStructure.getDataRefAs(::k_BaselinePath), {-500, -1, 0, 0, 19, 1000}); } -TEST_CASE("ComplexCore::InitializeData 14: Boolean Multi Component Single-Value Fill Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 14: Boolean Multi Component Single-Value Fill Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_bool_single_val_fill.dream3d", unit_test::k_TestFilesDir))); { @@ -480,10 +480,10 @@ TEST_CASE("ComplexCore::InitializeData 14: Boolean Multi Component Single-Value UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 15: Boolean Multi Component Incremental-Addition Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 15: Boolean Multi Component Incremental-Addition Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_bool_inc_addition.dream3d", unit_test::k_TestFilesDir))); { @@ -510,10 +510,10 @@ TEST_CASE("ComplexCore::InitializeData 15: Boolean Multi Component Incremental-A UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 16: Boolean Multi Component Incremental-Subtraction Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 16: Boolean Multi Component Incremental-Subtraction Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_bool_inc_subtraction.dream3d", unit_test::k_TestFilesDir))); { @@ -540,10 +540,10 @@ TEST_CASE("ComplexCore::InitializeData 16: Boolean Multi Component Incremental-S UnitTest::CompareArrays(dataStructure, ::k_ExemplarPath, ::k_BaselinePath); } -TEST_CASE("ComplexCore::InitializeData 17: Boolean Multi Component Standardized Random-With-Range Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 17: Boolean Multi Component Standardized Random-With-Range Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_bool_stand_rwr.dream3d", unit_test::k_TestFilesDir))); { @@ -573,10 +573,10 @@ TEST_CASE("ComplexCore::InitializeData 17: Boolean Multi Component Standardized ::BoundsCheck(dataStructure.getDataRefAs(::k_BaselinePath), {false, true, false, false, false, true}); } -TEST_CASE("ComplexCore::InitializeData 18: Single Component Random Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 18: Single Component Random Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_rand.dream3d", unit_test::k_TestFilesDir))); { @@ -604,10 +604,10 @@ TEST_CASE("ComplexCore::InitializeData 18: Single Component Random Initializatio ::BoundsCheck(dataStructure.getDataRefAs(::k_BaselinePath), {std::numeric_limits::min(), std::numeric_limits::max()}); } -TEST_CASE("ComplexCore::InitializeData 19: Multi Component Standardized-Random Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 19: Multi Component Standardized-Random Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_stand_rand.dream3d", unit_test::k_TestFilesDir))); { @@ -636,10 +636,10 @@ TEST_CASE("ComplexCore::InitializeData 19: Multi Component Standardized-Random I std::numeric_limits::max(), std::numeric_limits::min(), std::numeric_limits::max()}); } -TEST_CASE("ComplexCore::InitializeData 20: Multi Component Non-Standardized-Random Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 20: Multi Component Non-Standardized-Random Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_multi_comp_non_stand_rand.dream3d", unit_test::k_TestFilesDir))); { @@ -669,10 +669,10 @@ TEST_CASE("ComplexCore::InitializeData 20: Multi Component Non-Standardized-Rand std::numeric_limits::min(), std::numeric_limits::max()}); } -TEST_CASE("ComplexCore::InitializeData 21: Boolean Single Component Fill Initialization", "[ComplexCore][InitializeData]") +TEST_CASE("SimplnxCore::InitializeData 21: Boolean Single Component Fill Initialization", "[SimplnxCore][InitializeData]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", - "initialize_data_test_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "initialize_data_test_files.tar.gz", + "initialize_data_test_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/initialize_data_test_files/7_0_single_comp_bool_fill.dream3d", unit_test::k_TestFilesDir))); { diff --git a/src/Plugins/ComplexCore/test/InitializeImageGeomCellDataTest.cpp b/src/Plugins/SimplnxCore/test/InitializeImageGeomCellDataTest.cpp similarity index 89% rename from src/Plugins/ComplexCore/test/InitializeImageGeomCellDataTest.cpp rename to src/Plugins/SimplnxCore/test/InitializeImageGeomCellDataTest.cpp index dde55ff9b5..69b24a1fa8 100644 --- a/src/Plugins/ComplexCore/test/InitializeImageGeomCellDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/InitializeImageGeomCellDataTest.cpp @@ -1,17 +1,17 @@ -#include "ComplexCore/Filters/InitializeImageGeomCellData.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/InitializeImageGeomCellData.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -110,7 +110,7 @@ struct IsDataWithinInclusiveRangeFunctor }; } // namespace -TEST_CASE("ComplexCore::InitializeImageGeomCellData(Manual)", "[ComplexCore][InitializeImageGeomCellData]") +TEST_CASE("SimplnxCore::InitializeImageGeomCellData(Manual)", "[SimplnxCore][InitializeImageGeomCellData]") { InitializeImageGeomCellData filter; DataStructure dataStructure = CreateDataStructure(); @@ -126,10 +126,10 @@ TEST_CASE("ComplexCore::InitializeImageGeomCellData(Manual)", "[ComplexCore][Ini Arguments args = CreateArgs(cellArrayPaths, k_ImageGeomPath, xMin, yMin, zMin, xMax, yMax, zMax, InitializeImageGeomCellData::InitType::Manual, initValue, {0.0, 0.0}); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); for(const auto& path : cellArrayPaths) { @@ -145,7 +145,7 @@ TEST_CASE("ComplexCore::InitializeImageGeomCellData(Manual)", "[ComplexCore][Ini } } -TEST_CASE("ComplexCore::InitializeImageGeomCellData(Random)", "[ComplexCore][InitializeImageGeomCellData]") +TEST_CASE("SimplnxCore::InitializeImageGeomCellData(Random)", "[SimplnxCore][InitializeImageGeomCellData]") { InitializeImageGeomCellData filter; DataStructure dataStructure = CreateDataStructure(); @@ -160,10 +160,10 @@ TEST_CASE("ComplexCore::InitializeImageGeomCellData(Random)", "[ComplexCore][Ini Arguments args = CreateArgs(cellArrayPaths, k_ImageGeomPath, xMin, yMin, zMin, xMax, yMax, zMax, InitializeImageGeomCellData::InitType::Random, 0.0, {0.0, 0.0}); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); for(const auto& path : cellArrayPaths) { @@ -179,7 +179,7 @@ TEST_CASE("ComplexCore::InitializeImageGeomCellData(Random)", "[ComplexCore][Ini } } -TEST_CASE("ComplexCore::InitializeImageGeomCellData(RandomWithRange)", "[ComplexCore][InitializeImageGeomCellData]") +TEST_CASE("SimplnxCore::InitializeImageGeomCellData(RandomWithRange)", "[SimplnxCore][InitializeImageGeomCellData]") { InitializeImageGeomCellData filter; DataStructure dataStructure = CreateDataStructure(); @@ -195,10 +195,10 @@ TEST_CASE("ComplexCore::InitializeImageGeomCellData(RandomWithRange)", "[Complex Arguments args = CreateArgs(cellArrayPaths, k_ImageGeomPath, xMin, yMin, zMin, xMax, yMax, zMax, InitializeImageGeomCellData::InitType::RandomWithRange, 0.0, initRange); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); for(const auto& path : cellArrayPaths) { diff --git a/src/Plugins/ComplexCore/test/InterpolatePointCloudToRegularGridTest.cpp b/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp similarity index 86% rename from src/Plugins/ComplexCore/test/InterpolatePointCloudToRegularGridTest.cpp rename to src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp index a1ea8affc0..f9dbeb9f5d 100644 --- a/src/Plugins/ComplexCore/test/InterpolatePointCloudToRegularGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/InterpolatePointCloudToRegularGridTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp" +#include "SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -45,10 +45,10 @@ const DataPath k_GaussianVoxelIndicesComputed = k_GaussianInterpolatedDataComput const DataPath k_GaussianKernalDistancesComputed = k_GaussianInterpolatedDataComputed.createChildPath(k_KernalDistances); } // namespace -TEST_CASE("ComplexCore::InterpolatePointCloudToRegularGridFilter: Valid Filter Execution - Uniform Inpterpolation with Mask", "[ComplexCore][InterpolatePointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Valid Filter Execution - Uniform Inpterpolation with Mask", "[SimplnxCore][InterpolatePointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_interpolate_point_cloud_to_regular_grid.tar.gz", - "6_6_interpolate_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_interpolate_point_cloud_to_regular_grid.tar.gz", + "6_6_interpolate_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_interpolate_point_cloud_to_regular_grid/6_6_interpolate_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -72,21 +72,21 @@ TEST_CASE("ComplexCore::InterpolatePointCloudToRegularGridFilter: Valid Filter E // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareNeighborLists(dataStructure, k_UniformFaceAreasExemplar, k_UniformFaceAreasComputed); UnitTest::CompareNeighborLists(dataStructure, k_UniformVoxelIndicesExemplar, k_UniformVoxelIndicesComputed); UnitTest::CompareNeighborLists(dataStructure, k_UniformKernalDistancesExemplar, k_UniformKernalDistancesComputed); } -TEST_CASE("ComplexCore::InterpolatePointCloudToRegularGridFilter: Valid Filter Execution - Gaussian Inpterpolation", "[ComplexCore][InterpolatePointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Valid Filter Execution - Gaussian Inpterpolation", "[SimplnxCore][InterpolatePointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_interpolate_point_cloud_to_regular_grid.tar.gz", - "6_6_interpolate_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_interpolate_point_cloud_to_regular_grid.tar.gz", + "6_6_interpolate_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_interpolate_point_cloud_to_regular_grid/6_6_interpolate_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -110,21 +110,21 @@ TEST_CASE("ComplexCore::InterpolatePointCloudToRegularGridFilter: Valid Filter E // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareNeighborLists(dataStructure, k_GaussianFaceAreasExemplar, k_GaussianFaceAreasComputed); UnitTest::CompareNeighborLists(dataStructure, k_GaussianVoxelIndicesExemplar, k_GaussianVoxelIndicesComputed); UnitTest::CompareNeighborLists(dataStructure, k_GaussianKernalDistancesExemplar, k_GaussianKernalDistancesComputed); } -TEST_CASE("ComplexCore::InterpolatePointCloudToRegularGridFilter: Invalid Filter Execution", "[ComplexCore][InterpolatePointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::InterpolatePointCloudToRegularGridFilter: Invalid Filter Execution", "[SimplnxCore][InterpolatePointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_interpolate_point_cloud_to_regular_grid.tar.gz", - "6_6_interpolate_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_interpolate_point_cloud_to_regular_grid.tar.gz", + "6_6_interpolate_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_interpolate_point_cloud_to_regular_grid/6_6_interpolate_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -164,9 +164,9 @@ TEST_CASE("ComplexCore::InterpolatePointCloudToRegularGridFilter: Invalid Filter // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/IterativeClosestPointTest.cpp b/src/Plugins/SimplnxCore/test/IterativeClosestPointTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/IterativeClosestPointTest.cpp rename to src/Plugins/SimplnxCore/test/IterativeClosestPointTest.cpp index c856462529..7ac58f388b 100644 --- a/src/Plugins/ComplexCore/test/IterativeClosestPointTest.cpp +++ b/src/Plugins/SimplnxCore/test/IterativeClosestPointTest.cpp @@ -1,7 +1,7 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/IterativeClosestPointFilter.hpp" +#include "SimplnxCore/Filters/IterativeClosestPointFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -9,10 +9,10 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::IterativeClosestPointFilter: Create Filter", "[DREAM3DReview][IterativeClosestPointFilter]") +TEST_CASE("SimplnxCore::IterativeClosestPointFilter: Create Filter", "[DREAM3DReview][IterativeClosestPointFilter]") { IterativeClosestPointFilter filter; DataStructure dataStructure; @@ -27,7 +27,7 @@ TEST_CASE("ComplexCore::IterativeClosestPointFilter: Create Filter", "[DREAM3DRe REQUIRE(executeResult.result.invalid()); } -TEST_CASE("ComplexCore::IterativeClosestPointFilter: Test Algorithm", "[DREAM3DReview][IterativeClosestPointFilter]") +TEST_CASE("SimplnxCore::IterativeClosestPointFilter: Test Algorithm", "[DREAM3DReview][IterativeClosestPointFilter]") { IterativeClosestPointFilter filter; DataStructure dataStructure = UnitTest::CreateDataStructure(); diff --git a/src/Plugins/ComplexCore/test/KMeansTest.cpp b/src/Plugins/SimplnxCore/test/KMeansTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/KMeansTest.cpp rename to src/Plugins/SimplnxCore/test/KMeansTest.cpp index b3431cd923..68426af076 100644 --- a/src/Plugins/ComplexCore/test/KMeansTest.cpp +++ b/src/Plugins/SimplnxCore/test/KMeansTest.cpp @@ -1,15 +1,15 @@ #include -#include "complex/DataStructure/DataArray.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/KMeansFilter.hpp" +#include "SimplnxCore/Filters/KMeansFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -32,9 +32,9 @@ const std::string k_MeansNameNX = k_MeansName + "NX"; const DataPath k_ClusterIdsPathNX = k_CellPath.createChildPath(k_ClusterIdsNameNX); } // namespace -TEST_CASE("ComplexCore::KMeans: Valid Filter Execution", "[ComplexCore][KMeans]") +TEST_CASE("SimplnxCore::KMeans: Valid Filter Execution", "[SimplnxCore][KMeans]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/k_files/7_0_means_exemplar.dream3d", unit_test::k_TestFilesDir))); { @@ -117,7 +117,7 @@ TEST_CASE("ComplexCore::KMeans: Valid Filter Execution", "[ComplexCore][KMeans]" } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_k_means_0_test.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/KMedoidsTest.cpp b/src/Plugins/SimplnxCore/test/KMedoidsTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/KMedoidsTest.cpp rename to src/Plugins/SimplnxCore/test/KMedoidsTest.cpp index 20121ca934..6b82c1cb98 100644 --- a/src/Plugins/ComplexCore/test/KMedoidsTest.cpp +++ b/src/Plugins/SimplnxCore/test/KMedoidsTest.cpp @@ -1,12 +1,12 @@ #include -#include "complex/DataStructure/DataArray.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/KMedoidsFilter.hpp" +#include "SimplnxCore/Filters/KMedoidsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -29,9 +29,9 @@ const std::string k_MedoidsNameNX = k_MedoidsName + "NX"; const DataPath k_ClusterIdsPathNX = k_CellPath.createChildPath(k_ClusterIdsNameNX); } // namespace -TEST_CASE("ComplexCore::KMedoidsFilter: Valid Filter Execution", "[ComplexCore][KMedoidsFilter]") +TEST_CASE("SimplnxCore::KMedoidsFilter: Valid Filter Execution", "[SimplnxCore][KMedoidsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/k_files/7_0_medoids_exemplar.dream3d", unit_test::k_TestFilesDir))); { @@ -114,7 +114,7 @@ TEST_CASE("ComplexCore::KMedoidsFilter: Valid Filter Execution", "[ComplexCore][ } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_k_medoids_0_test.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp b/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp similarity index 78% rename from src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp rename to src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp index 1148897baf..651de625cb 100644 --- a/src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/LaplacianSmoothingFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/Filters/LaplacianSmoothingFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -15,10 +15,10 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSmoothingFilter]") +TEST_CASE("SimplnxCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSmoothingFilter]") { std::string triangleGeometryName = "[Triangle Geometry]"; std::string triangleFaceDataGroupName = INodeGeometry2D::k_FaceDataName; @@ -44,11 +44,11 @@ TEST_CASE("ComplexCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); TriangleGeom& triangleGeom = dataStructure.getDataRefAs(triangleGeomDataPath); REQUIRE(triangleGeom.getNumberOfFaces() == 92); @@ -70,12 +70,12 @@ TEST_CASE("ComplexCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm std::vector tupleShape = {triangleGeom.getNumberOfVertices()}; std::vector compShape = {1}; // Insert a Node Type array into the DataStructure so the filter works. - Int8Array* nodeType = complex::UnitTest::CreateTestDataArray(dataStructure, nodeTypeArrayName, tupleShape, compShape, vertexDataGroupId); + Int8Array* nodeType = nx::core::UnitTest::CreateTestDataArray(dataStructure, nodeTypeArrayName, tupleShape, compShape, vertexDataGroupId); // Assign the `Default Node Type` to all the values for(size_t i = 0; i < triangleGeom.getNumberOfVertices(); i++) { - (*nodeType)[i] = complex::NodeType::Default; + (*nodeType)[i] = nx::core::NodeType::Default; } DataPath nodeTypeArrayPath = vertexDataGroupPath.createChildPath(nodeTypeArrayName); @@ -109,9 +109,9 @@ TEST_CASE("ComplexCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm REQUIRE(executeResult.result.valid()); } - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/LaplacianSmoothing.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/LaplacianSmoothing.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } diff --git a/src/Plugins/ComplexCore/test/MapPointCloudToRegularGridTest.cpp b/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/MapPointCloudToRegularGridTest.cpp rename to src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp index 3724e5e030..a9cc42b5b8 100644 --- a/src/Plugins/ComplexCore/test/MapPointCloudToRegularGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/MapPointCloudToRegularGridTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/MapPointCloudToRegularGridFilter.hpp" +#include "SimplnxCore/Filters/MapPointCloudToRegularGridFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -36,10 +36,10 @@ const DataPath k_VoxelIndicesManualMaskComputed = k_VertexDataPath.createChildPa const DataPath k_VoxelIndicesExistingMaskComputed = k_VertexDataPath.createChildPath(k_VoxelIndices.str() + " " + k_Existing + " " + k_Computed); } // namespace -TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Valid Filter Execution - Manual Geometry", "[MapPointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution - Manual Geometry", "[MapPointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", - "6_6_map_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", + "6_6_map_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_map_point_cloud_to_regular_grid/6_6_map_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -61,20 +61,20 @@ TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Valid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareImageGeometry(dataStructure, k_ManualImageGeomPathExemplar, k_ManualImageGeomPathComputed); UnitTest::CompareArrays(dataStructure, k_VoxelIndicesManualExemplar, k_VoxelIndicesManualComputed); } -TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Valid Filter Execution - Manual Geometry with Mask", "[MapPointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution - Manual Geometry with Mask", "[MapPointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", - "6_6_map_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", + "6_6_map_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_map_point_cloud_to_regular_grid/6_6_map_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -97,20 +97,20 @@ TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Valid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareImageGeometry(dataStructure, k_ManualMaskImageGeomPathExemplar, k_ManualMaskImageGeomPathComputed); UnitTest::CompareArrays(dataStructure, k_VoxelIndicesManualMaskExemplar, k_VoxelIndicesManualMaskComputed); } -TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Valid Filter Execution - Existing Geometry with Mask", "[MapPointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Valid Filter Execution - Existing Geometry with Mask", "[MapPointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", - "6_6_map_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", + "6_6_map_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_map_point_cloud_to_regular_grid/6_6_map_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -130,19 +130,19 @@ TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Valid Filter Execution // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UnitTest::CompareArrays(dataStructure, k_VoxelIndicesExistingMaskExemplar, k_VoxelIndicesExistingMaskComputed); } -TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Invalid Filter Execution", "[MapPointCloudToRegularGridFilter]") +TEST_CASE("SimplnxCore::MapPointCloudToRegularGridFilter: Invalid Filter Execution", "[MapPointCloudToRegularGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", - "6_6_map_point_cloud_to_regular_grid"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_map_point_cloud_to_regular_grid.tar.gz", + "6_6_map_point_cloud_to_regular_grid"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_map_point_cloud_to_regular_grid/6_6_map_point_cloud_to_regular_grid.dream3d", unit_test::k_TestFilesDir)); @@ -177,9 +177,9 @@ TEST_CASE("ComplexCore::MapPointCloudToRegularGridFilter: Invalid Filter Executi // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/MinNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/MinNeighborsTest.cpp rename to src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp index 5eef9ad46c..90ea066d4d 100644 --- a/src/Plugins/ComplexCore/test/MinNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp @@ -1,10 +1,10 @@ -#include "ComplexCore/Filters/MinNeighbors.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FindNeighbors.hpp" +#include "SimplnxCore/Filters/MinNeighbors.hpp" +#include "SimplnxCore/Filters/FindNeighbors.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -12,8 +12,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -48,13 +48,13 @@ const std::vector k_NumberElements = { } // namespace -TEST_CASE("ComplexCore::MinNeighbors", "[ComplexCore][MinNeighbors]") +TEST_CASE("SimplnxCore::MinNeighbors", "[SimplnxCore][MinNeighbors]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath cellDataAttributeMatrix = smallIn100Group.createChildPath(k_CellData); DataPath featureIdsDataPath({k_DataContainer, k_CellData, k_FeatureIds}); DataPath cellFeatureAttributeMatrixPath({k_DataContainer, k_CellFeatureData}); @@ -89,11 +89,11 @@ TEST_CASE("ComplexCore::MinNeighbors", "[ComplexCore][MinNeighbors]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } { @@ -112,11 +112,11 @@ TEST_CASE("ComplexCore::MinNeighbors", "[ComplexCore][MinNeighbors]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // there currently is not an exemplar data set to compare against. Compare at // least the new number of features. @@ -133,15 +133,15 @@ TEST_CASE("ComplexCore::MinNeighbors", "[ComplexCore][MinNeighbors]") { // Write out the DataStructure for later viewing/debugging - Result result = complex::HDF5::FileWriter::CreateFile(fmt::format("{}/minimum_neighbors_test.dream3d", unit_test::k_BinaryTestOutputDir)); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/minimum_neighbors_test.dream3d", unit_test::k_BinaryTestOutputDir)); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } } #if 0 -TEST_CASE("ComplexCore::MinNeighbors: Bad Phase Number", "[MinNeighbors]") +TEST_CASE("SimplnxCore::MinNeighbors: Bad Phase Number", "[MinNeighbors]") { MinNeighbors filter; DataStructure dataStructure = createTestData(); @@ -167,14 +167,14 @@ TEST_CASE("ComplexCore::MinNeighbors: Bad Phase Number", "[MinNeighbors]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); } -TEST_CASE("ComplexCore::MinNeighbors: Phase Array", "[MinNeighbors]") +TEST_CASE("SimplnxCore::MinNeighbors: Phase Array", "[MinNeighbors]") { MinNeighbors filter; DataStructure dataStructure = createTestData(); @@ -201,10 +201,10 @@ TEST_CASE("ComplexCore::MinNeighbors: Phase Array", "[MinNeighbors]") args.insertOrAssign(MinNeighbors::k_CellDataAttributeMatrix_Key, std::make_any(k_CellDataAttributeMatrixPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } #endif diff --git a/src/Plugins/ComplexCore/test/MoveDataTest.cpp b/src/Plugins/SimplnxCore/test/MoveDataTest.cpp similarity index 86% rename from src/Plugins/ComplexCore/test/MoveDataTest.cpp rename to src/Plugins/SimplnxCore/test/MoveDataTest.cpp index 963f25a268..e57188d8e6 100644 --- a/src/Plugins/ComplexCore/test/MoveDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/MoveDataTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/MoveData.hpp" +#include "SimplnxCore/Filters/MoveData.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -29,7 +29,7 @@ DataStructure createDataStructure() } } // namespace -TEST_CASE("ComplexCore::MoveData Successful", "[Complex::Core][MoveData]") +TEST_CASE("SimplnxCore::MoveData Successful", "[Complex::Core][MoveData]") { MoveData filter; Arguments args; @@ -44,11 +44,11 @@ TEST_CASE("ComplexCore::MoveData Successful", "[Complex::Core][MoveData]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto* group1 = dataStructure.getDataAs(k_Group1Path); REQUIRE(group1->getDataMap().getSize() == 2); @@ -67,7 +67,7 @@ TEST_CASE("ComplexCore::MoveData Successful", "[Complex::Core][MoveData]") REQUIRE(dataStructure.getDataAs(newGroup4Path) != nullptr); } -TEST_CASE("ComplexCore::MoveData Unsuccessful", "[Complex::Core][MoveData]") +TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Complex::Core][MoveData]") { MoveData filter; Arguments args; @@ -94,5 +94,5 @@ TEST_CASE("ComplexCore::MoveData Unsuccessful", "[Complex::Core][MoveData]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } diff --git a/src/Plugins/ComplexCore/test/MultiThresholdObjectsTest.cpp b/src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/MultiThresholdObjectsTest.cpp rename to src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp index 9b4711573a..ef6e2ccd1d 100644 --- a/src/Plugins/ComplexCore/test/MultiThresholdObjectsTest.cpp +++ b/src/Plugins/SimplnxCore/test/MultiThresholdObjectsTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/MultiThresholdObjects.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/MultiThresholdObjects.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -79,7 +79,7 @@ float64 GetOutOfBoundsMaximumValue() } } // namespace -TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution", "[ComplexCore][MultiThresholdObjects]") +TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution", "[SimplnxCore][MultiThresholdObjects]") { DataStructure dataStructure = CreateTestDataStructure(); @@ -101,11 +101,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution", "[ComplexCore][ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto* thresholdArray = dataStructure.getDataAs(k_ThresholdArrayPath); REQUIRE(thresholdArray != nullptr); @@ -142,11 +142,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution", "[ComplexCore][ // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto* thresholdArray = dataStructure.getDataAs(k_ThresholdArrayPath); REQUIRE(thresholdArray != nullptr); @@ -166,7 +166,7 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution", "[ComplexCore][ } } -TEMPLATE_TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution - Custom Values", "[ComplexCore][MultiThresholdObjects]", int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, +TEMPLATE_TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution - Custom Values", "[SimplnxCore][MultiThresholdObjects]", int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64) { MultiThresholdObjects filter; @@ -193,11 +193,11 @@ TEMPLATE_TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution - Custom // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto* thresholdArray = dataStructure.getDataAs>(k_ThresholdArrayPath); REQUIRE(thresholdArray != nullptr); @@ -216,7 +216,7 @@ TEMPLATE_TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution - Custom } } -TEST_CASE("ComplexCore::MultiThresholdObjects: Invalid Execution", "[ComplexCore][MultiThresholdObjects]") +TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution", "[SimplnxCore][MultiThresholdObjects]") { MultiThresholdObjects filter; DataStructure dataStructure = CreateTestDataStructure(); @@ -271,14 +271,14 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Invalid Execution", "[ComplexCore // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } -TEMPLATE_TEST_CASE("ComplexCore::MultiThresholdObjects: Invalid Execution - Out of Bounds Custom Values", "[ComplexCore][MultiThresholdObjects]", int8, uint8, int16, uint16, int32, uint32, int64, +TEMPLATE_TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution - Out of Bounds Custom Values", "[SimplnxCore][MultiThresholdObjects]", int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32) { MultiThresholdObjects filter; @@ -334,12 +334,12 @@ TEMPLATE_TEST_CASE("ComplexCore::MultiThresholdObjects: Invalid Execution - Out // Preflight the filter auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); REQUIRE(preflightResult.outputActions.errors().size() == 1); REQUIRE(preflightResult.outputActions.errors()[0].code == code); } -TEST_CASE("ComplexCore::MultiThresholdObjects: Invalid Execution - Boolean Custom Values", "[ComplexCore][MultiThresholdObjects]") +TEST_CASE("SimplnxCore::MultiThresholdObjects: Invalid Execution - Boolean Custom Values", "[SimplnxCore][MultiThresholdObjects]") { MultiThresholdObjects filter; DataStructure dataStructure = CreateTestDataStructure(); @@ -372,7 +372,7 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Invalid Execution - Boolean Custo // Preflight the filter auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); REQUIRE(preflightResult.outputActions.errors().size() == 1); REQUIRE(preflightResult.outputActions.errors()[0].code == code); } @@ -399,7 +399,7 @@ void checkMaskValues(const DataStructure& dataStructure, const DataPath& thresho } } -TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[ComplexCore][MultiThresholdObjects]") +TEST_CASE("SimplnxCore::MultiThresholdObjects: Valid Execution, DataType", "[SimplnxCore][MultiThresholdObjects]") { DataStructure dataStructure = CreateTestDataStructure(); @@ -422,11 +422,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -449,11 +449,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -476,11 +476,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -503,11 +503,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -531,11 +531,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -558,11 +558,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -585,11 +585,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -612,11 +612,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -640,11 +640,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } @@ -667,11 +667,11 @@ TEST_CASE("ComplexCore::MultiThresholdObjects: Valid Execution, DataType", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) checkMaskValues(dataStructure, k_ThresholdArrayPath); } diff --git a/src/Plugins/ComplexCore/test/NearestPointFuseRegularGridsTest.cpp b/src/Plugins/SimplnxCore/test/NearestPointFuseRegularGridsTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/NearestPointFuseRegularGridsTest.cpp rename to src/Plugins/SimplnxCore/test/NearestPointFuseRegularGridsTest.cpp index c9b121c6db..9c72cf6505 100644 --- a/src/Plugins/ComplexCore/test/NearestPointFuseRegularGridsTest.cpp +++ b/src/Plugins/SimplnxCore/test/NearestPointFuseRegularGridsTest.cpp @@ -1,15 +1,15 @@ #include -#include "complex/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp" +#include "SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/CreateImageGeometryAction.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -34,22 +34,22 @@ DataStructure CreateDualImageGeomDataStructure(CreateImageGeometryAction::Dimens auto sampleAction = CreateImageGeometryAction(sampleImageGeomPath, dims, origin, spacing, sampleCellDataName, IGeometry::LengthUnit::Micrometer); Result<> sampleActionResult = sampleAction.apply(dataStructure, IDataAction::Mode::Execute); - COMPLEX_RESULT_REQUIRE_VALID(sampleActionResult); + SIMPLNX_RESULT_REQUIRE_VALID(sampleActionResult); auto sampleDataAction = CreateArrayAction(DataType::float64, {25}, {1}, sampleDataArrayPath); Result<> sampleDataActionResult = sampleDataAction.apply(dataStructure, IDataAction::Mode::Execute); - COMPLEX_RESULT_REQUIRE_VALID(sampleDataActionResult); + SIMPLNX_RESULT_REQUIRE_VALID(sampleDataActionResult); auto* sampleDataStore = dataStructure.getDataAs(sampleDataArrayPath)->getDataStore(); std::iota(sampleDataStore->begin(), sampleDataStore->end(), 1.0); auto refAction = CreateImageGeometryAction(refImageGeomPath, refDims, refOrigin, refSpacing, refCellDataName, IGeometry::LengthUnit::Micrometer); Result<> refActionResult = refAction.apply(dataStructure, IDataAction::Mode::Execute); - COMPLEX_RESULT_REQUIRE_VALID(refActionResult); + SIMPLNX_RESULT_REQUIRE_VALID(refActionResult); auto refDataAction = CreateArrayAction(DataType::int32, {25}, {1}, refDataArrayPath); Result<> refDataActionResult = refDataAction.apply(dataStructure, IDataAction::Mode::Execute); - COMPLEX_RESULT_REQUIRE_VALID(refDataActionResult); + SIMPLNX_RESULT_REQUIRE_VALID(refDataActionResult); auto* refDataStore = dataStructure.getDataAs(refDataArrayPath)->getDataStore(); std::iota(refDataStore->begin(), refDataStore->end(), 26); @@ -58,7 +58,7 @@ DataStructure CreateDualImageGeomDataStructure(CreateImageGeometryAction::Dimens } } // namespace -TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Basic Valid Execution", "[ComplexCore][NearestPointFuseRegularGridsFilter]") +TEST_CASE("SimplnxCore::NearestPointFuseRegularGridsFilter: Basic Valid Execution", "[SimplnxCore][NearestPointFuseRegularGridsFilter]") { const CreateImageGeometryAction::DimensionType refDims = {5, 5, 1}; const CreateImageGeometryAction::OriginType refOrigin = {2.5f, 2.5f, 0.0f}; @@ -113,7 +113,7 @@ TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Basic Valid Executio REQUIRE(copiedArray[24] == 9.8); } -TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: No Overlap Valid Execution", "[ComplexCore][NearestPointFuseRegularGridsFilter]") +TEST_CASE("SimplnxCore::NearestPointFuseRegularGridsFilter: No Overlap Valid Execution", "[SimplnxCore][NearestPointFuseRegularGridsFilter]") { const CreateImageGeometryAction::DimensionType refDims = {5, 5, 1}; const CreateImageGeometryAction::OriginType refOrigin = {10.0f, 10.0f, 3.0f}; @@ -147,7 +147,7 @@ TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: No Overlap Valid Exe } } -TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Nested Valid Execution", "[ComplexCore][NearestPointFuseRegularGridsFilter]") +TEST_CASE("SimplnxCore::NearestPointFuseRegularGridsFilter: Nested Valid Execution", "[SimplnxCore][NearestPointFuseRegularGridsFilter]") { const CreateImageGeometryAction::DimensionType refDims = {5, 5, 1}; const CreateImageGeometryAction::OriginType refOrigin = {1.0f, 1.0f, 0.0f}; @@ -202,7 +202,7 @@ TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Nested Valid Executi REQUIRE(copiedArray[24] == 13.0); } -TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Encompassing Valid Execution", "[ComplexCore][NearestPointFuseRegularGridsFilter]") +TEST_CASE("SimplnxCore::NearestPointFuseRegularGridsFilter: Encompassing Valid Execution", "[SimplnxCore][NearestPointFuseRegularGridsFilter]") { const CreateImageGeometryAction::DimensionType refDims = {5, 5, 1}; const CreateImageGeometryAction::OriginType refOrigin = {-2.0f, -2.0f, 0.0f}; @@ -257,7 +257,7 @@ TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Encompassing Valid E REQUIRE(copiedArray[24] == 9.8); } -TEST_CASE("ComplexCore::NearestPointFuseRegularGridsFilter: Invalid Execution", "[ComplexCore][NearestPointFuseRegularGridsFilter]") +TEST_CASE("SimplnxCore::NearestPointFuseRegularGridsFilter: Invalid Execution", "[SimplnxCore][NearestPointFuseRegularGridsFilter]") { const CreateImageGeometryAction::DimensionType refDims = {5, 5, 1}; const CreateImageGeometryAction::OriginType refOrigin = {0.0f, 0.0f, 0.0f}; diff --git a/src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp b/src/Plugins/SimplnxCore/test/PartitionGeometryTest.cpp similarity index 92% rename from src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp rename to src/Plugins/SimplnxCore/test/PartitionGeometryTest.cpp index da259451da..7e27851c71 100644 --- a/src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/PartitionGeometryTest.cpp @@ -23,17 +23,17 @@ #include #include -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/PartitionGeometryFilter.hpp" -#include "ComplexCore/Filters/ReadDREAM3DFilter.hpp" +#include "SimplnxCore/Filters/PartitionGeometryFilter.hpp" +#include "SimplnxCore/Filters/ReadDREAM3DFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace fs = std::filesystem; namespace @@ -114,13 +114,13 @@ Arguments createExistingPartitioningSchemeGeometryArguments(const DataPath& inpu return args; } -using FileSentinelType = complex::UnitTest::TestFileSentinel; +using FileSentinelType = nx::core::UnitTest::TestFileSentinel; using SharedFileSentinelType = std::shared_ptr; // This is here so that we don't have to decompress and then delete multiple times SharedFileSentinelType s_FileSentinel; } // namespace -TEST_CASE("ComplexCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeometryFilter]") +TEST_CASE("SimplnxCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeometryFilter]") { const std::string partitionIdsArrayName = "PartitioningSchemeIds"; const DataPath existingPSGeometryPath = {{"ExemplaryPSDataContainer"}}; @@ -152,7 +152,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeo // First time through, decompress the test data if(index == 0) { - s_FileSentinel = std::make_shared(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); + s_FileSentinel = std::make_shared(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); } std::cout << "Basic Partition Arguments: " << filePaths[index] << std::endl; @@ -167,7 +167,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeo importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); // Preflight the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } { @@ -183,7 +183,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeo const PartitionGeometryFilter filter; // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, partitionGeometryArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) attrMatrixPath = partitionGeometryArgs.value(PartitionGeometryFilter::k_InputGeometryCellAttributeMatrixPath_Key); } @@ -210,7 +210,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeo } } -TEST_CASE("ComplexCore::PartitionGeometryFilter: Advanced", "[Plugins][PartitionGeometryFilter]") +TEST_CASE("SimplnxCore::PartitionGeometryFilter: Advanced", "[Plugins][PartitionGeometryFilter]") { const std::string partitionIdsArrayName = "PartitioningSchemeIds"; const DataPath existingPSGeometryPath = {{"ExemplaryPSDataContainer"}}; @@ -255,7 +255,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Advanced", "[Plugins][Partition // First time through, decompress the test data if(index == 0) { - s_FileSentinel = std::make_shared(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); + s_FileSentinel = std::make_shared(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); } std::cout << "Basic Partition Arguments: " << filePaths[index] << std::endl; @@ -270,7 +270,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Advanced", "[Plugins][Partition importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); // Execute the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } { @@ -280,7 +280,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Advanced", "[Plugins][Partition const PartitionGeometryFilter filter; // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, partitionGeometryArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) attrMatrixPath = partitionGeometryArgs.value(PartitionGeometryFilter::k_InputGeometryCellAttributeMatrixPath_Key); } @@ -307,7 +307,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Advanced", "[Plugins][Partition } } -TEST_CASE("ComplexCore::PartitionGeometryFilter: Bounding Box", "[Plugins][PartitionGeometryFilter]") +TEST_CASE("SimplnxCore::PartitionGeometryFilter: Bounding Box", "[Plugins][PartitionGeometryFilter]") { const std::string partitionIdsArrayName = "PartitioningSchemeIds"; const DataPath existingPSGeometryPath = {{"ExemplaryPSDataContainer"}}; @@ -350,7 +350,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Bounding Box", "[Plugins][Parti // First time through, decompress the test data if(index == 0) { - s_FileSentinel = std::make_shared(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); + s_FileSentinel = std::make_shared(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); } std::cout << "Basic Partition Arguments: " << filePaths[index] << std::endl; @@ -365,7 +365,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Bounding Box", "[Plugins][Parti importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); // Execute the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } { @@ -375,7 +375,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Bounding Box", "[Plugins][Parti const PartitionGeometryFilter filter; // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, partitionGeometryArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) attrMatrixPath = partitionGeometryArgs.value(PartitionGeometryFilter::k_InputGeometryCellAttributeMatrixPath_Key); } @@ -402,9 +402,9 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Bounding Box", "[Plugins][Parti } } -TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plugins][PartitionGeometryFilter]") +TEST_CASE("SimplnxCore::PartitionGeometryFilter: Valid filter execution", "[Plugins][PartitionGeometryFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); Arguments partitionGeometryArgs; Arguments importD3DArgs; @@ -499,11 +499,11 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug // Preflight the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // Execute the filter and check the result executeResult = filter.execute(dataStructure, partitionGeometryArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) const auto attrMatrixPath = partitionGeometryArgs.value(PartitionGeometryFilter::k_InputGeometryCellAttributeMatrixPath_Key); @@ -522,9 +522,9 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug } } -TEST_CASE("ComplexCore::PartitionGeometryFilter: Invalid filter execution") +TEST_CASE("SimplnxCore::PartitionGeometryFilter: Invalid filter execution") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PartitionGeometryTest.tar.gz", "PartitionGeometryTest"); Arguments partitionGeometryArgs; Arguments importD3DArgs; @@ -569,10 +569,10 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Invalid filter execution") const PartitionGeometryFilter filter; auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) executeResult = filter.execute(dataStructure, partitionGeometryArgs); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == expectedErrorCode); } diff --git a/src/Plugins/ComplexCore/test/PipelineTest.cpp b/src/Plugins/SimplnxCore/test/PipelineTest.cpp similarity index 94% rename from src/Plugins/ComplexCore/test/PipelineTest.cpp rename to src/Plugins/SimplnxCore/test/PipelineTest.cpp index b78b89dbe0..59b9f12c97 100644 --- a/src/Plugins/ComplexCore/test/PipelineTest.cpp +++ b/src/Plugins/SimplnxCore/test/PipelineTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" - -#include "complex/Core/Application.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Filter/Actions/DeleteDataAction.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Pipeline/Pipeline.hpp" -#include "complex/Pipeline/PipelineFilter.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Core/Application.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Filter/Actions/DeleteDataAction.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/PipelineFilter.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" #include @@ -20,7 +20,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -137,7 +137,7 @@ TEST_CASE("PipelineTest:Execute Pipeline") defaultValue.endIndex = 1; defaultValue.filePrefix = "test_"; defaultValue.fileExtension = ".txt"; - defaultValue.inputPath = complex::unit_test::k_BinaryTestOutputDir; + defaultValue.inputPath = nx::core::unit_test::k_BinaryTestOutputDir; const std::vector fileList = defaultValue.generate(); // We need to actually have files available for the test to pass so generate some files diff --git a/src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp b/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp rename to src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp index fa74642aec..870013b930 100644 --- a/src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp @@ -1,18 +1,18 @@ -#include "ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CalculateTriangleAreasFilter.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" - -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "SimplnxCore/Filters/PointSampleTriangleGeometryFilter.hpp" +#include "SimplnxCore/Filters/CalculateTriangleAreasFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -20,8 +20,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; std::array FindMinMaxCoord(IGeometry::SharedVertexList* vertices, usize numVerts) { @@ -67,7 +67,7 @@ std::array FindMinMaxCoord(IGeometry::SharedVertexList* vertices, usiz return minMaxVerts; } -TEST_CASE("ComplexCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][PointSampleTriangleGeometryFilter]") +TEST_CASE("SimplnxCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][PointSampleTriangleGeometryFilter]") { std::string triangleGeometryName = "[Triangle Geometry]"; @@ -99,7 +99,7 @@ TEST_CASE("ComplexCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); TriangleGeom& triangleGeom = dataStructure.getDataRefAs(triangleGeomDataPath); REQUIRE(triangleGeom.getNumberOfFaces() == 92); @@ -197,11 +197,11 @@ TEST_CASE("ComplexCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi } std::string outputFilePath = fmt::format("{}/{}", unit_test::k_BinaryTestOutputDir, k_OutputFile); // std::cout << "Writing Output file to " << outputFilePath << std::endl; - Result result = complex::HDF5::FileWriter::CreateFile(outputFilePath); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(outputFilePath); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); // for(size_t i = 0; i < 6; i++) // { // printf("%0.8f %0.8f\n", minMaxTriVerts[i], minMaxVerts[i]); diff --git a/src/Plugins/ComplexCore/test/QuickSurfaceMeshFilterTest.cpp b/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp similarity index 79% rename from src/Plugins/ComplexCore/test/QuickSurfaceMeshFilterTest.cpp rename to src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp index 99dfae5494..58be759772 100644 --- a/src/Plugins/ComplexCore/test/QuickSurfaceMeshFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/QuickSurfaceMeshFilterTest.cpp @@ -1,26 +1,26 @@ -#include "ComplexCore/Filters/QuickSurfaceMeshFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/QuickSurfaceMeshFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::UnitTest; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::QuickSurfaceMeshFilter", "[ComplexCore][QuickSurfaceMeshFilter]") +TEST_CASE("SimplnxCore::QuickSurfaceMeshFilter", "[SimplnxCore][QuickSurfaceMeshFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "SurfaceMeshTest.tar.gz", "SurfaceMeshTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "SurfaceMeshTest.tar.gz", "SurfaceMeshTest"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/SurfaceMeshTest/SurfaceMeshTest.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/SurfaceMeshTest/SurfaceMeshTest.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - DataPath smallIn100Group({complex::Constants::k_DataContainer}); + DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); DataPath featureIdsDataPath({k_DataContainer, k_CellData, k_FeatureIds}); DataPath ebsdSanDataPath({k_DataContainer, k_CellData}); @@ -63,11 +63,11 @@ TEST_CASE("ComplexCore::QuickSurfaceMeshFilter", "[ComplexCore][QuickSurfaceMesh // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // Check a few things about the generated data. TriangleGeom& triangleGeom = dataStructure.getDataRefAs(triangleGeometryPath); @@ -85,7 +85,7 @@ TEST_CASE("ComplexCore::QuickSurfaceMeshFilter", "[ComplexCore][QuickSurfaceMesh CompareExemplarToGeneratedData(dataStructure, dataStructure, triangleGeometryPath.createChildPath(k_FaceDataGroupName), exemplarGeometryPath); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/QuickSurfaceMeshFilterTest.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/ReadBinaryCTNorthstarTest.cpp b/src/Plugins/SimplnxCore/test/ReadBinaryCTNorthstarTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/ReadBinaryCTNorthstarTest.cpp rename to src/Plugins/SimplnxCore/test/ReadBinaryCTNorthstarTest.cpp index add0f55a1e..26adac24b0 100644 --- a/src/Plugins/ComplexCore/test/ReadBinaryCTNorthstarTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadBinaryCTNorthstarTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp" +#include "SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include #include @@ -13,11 +13,11 @@ namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { -const fs::path k_TestDirPath = fs::path(complex::unit_test::k_BinaryTestOutputDir.str()); +const fs::path k_TestDirPath = fs::path(nx::core::unit_test::k_BinaryTestOutputDir.str()); const std::string k_NsiHeaderName = "binary_header.nsihdr"; const fs::path k_NsiHeaderPath = k_TestDirPath / k_NsiHeaderName; const std::string k_NsiDataFileName1 = "binary_file1.nsidat"; @@ -81,7 +81,7 @@ void WriteNsiBinaryDataFiles(const fs::path& binaryFilePath1, const fs::path& bi } } // namespace -TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution") +TEST_CASE("SimplnxCore::ReadBinaryCTNorthStarFilter: Valid filter execution") { // Write binary test files WriteNsiHeaderFile(k_NsiHeaderPath, k_NsiDataFileName1, k_NsiDataFileName2); @@ -97,11 +97,11 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); REQUIRE_NOTHROW(dataStructure.getDataRefAs(densityArrayPath)); const Float32Array& densityResult = dataStructure.getDataRefAs(densityArrayPath); @@ -112,7 +112,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution") } } -TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution with subvolume") +TEST_CASE("SimplnxCore::ReadBinaryCTNorthStarFilter: Valid filter execution with subvolume") { // Write binary test files WriteNsiHeaderFile(k_NsiHeaderPath, k_NsiDataFileName1, k_NsiDataFileName2); @@ -131,11 +131,11 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution with // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); REQUIRE_NOTHROW(dataStructure.getDataRefAs(densityArrayPath)); const Float32Array& densityResult = dataStructure.getDataRefAs(densityArrayPath); @@ -159,7 +159,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution with } } -TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - Data file size too small") +TEST_CASE("SimplnxCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - Data file size too small") { const usize file1WrongZCount = 2; @@ -177,12 +177,12 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38705); } -TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - Data file does not exist") +TEST_CASE("SimplnxCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - Data file does not exist") { const std::string k_MissingFileName = "this_should_not_exist.nsidat"; @@ -200,12 +200,12 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38704); } -TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - Incorrect Start/End Coords") +TEST_CASE("SimplnxCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - Incorrect Start/End Coords") { // Write binary test files WriteNsiHeaderFile(k_NsiHeaderPath, k_NsiDataFileName1, k_NsiDataFileName2); @@ -222,7 +222,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{3, 3, 6})); auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38712); @@ -232,7 +232,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 2, 6})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38713); @@ -242,7 +242,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 4})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38714); @@ -252,7 +252,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38715); @@ -262,7 +262,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38715); @@ -272,7 +272,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38715); @@ -282,7 +282,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{9, 3, 6})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38716); @@ -292,7 +292,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 9, 6})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38717); @@ -302,7 +302,7 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 9})); executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38718); } diff --git a/src/Plugins/ComplexCore/test/ReadCSVFileTest.cpp b/src/Plugins/SimplnxCore/test/ReadCSVFileTest.cpp similarity index 95% rename from src/Plugins/ComplexCore/test/ReadCSVFileTest.cpp rename to src/Plugins/SimplnxCore/test/ReadCSVFileTest.cpp index e2ee5022f2..266df30756 100644 --- a/src/Plugins/ComplexCore/test/ReadCSVFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadCSVFileTest.cpp @@ -1,21 +1,21 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/CreateDataGroup.hpp" -#include "ComplexCore/Filters/ReadCSVFileFilter.hpp" - -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/ReadCSVFileParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "SimplnxCore/Filters/CreateDataGroup.hpp" +#include "SimplnxCore/Filters/ReadCSVFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/ReadCSVFileParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -126,11 +126,11 @@ void TestCase_TestPrimitives(nonstd::span values) // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // Check the results const DataArray* array = dataStructure.getDataAs>(arrayPath); @@ -140,7 +140,7 @@ void TestCase_TestPrimitives(nonstd::span values) for(int i = 0; i < values.size(); i++) { Result parseResult = ConvertTo::convert(values[i]); - COMPLEX_RESULT_REQUIRE_VALID(parseResult); + SIMPLNX_RESULT_REQUIRE_VALID(parseResult); const auto& exemplaryValue = parseResult.value(); const auto& testValue = array->at(i); REQUIRE(testValue == exemplaryValue); @@ -170,11 +170,11 @@ void TestCase_TestPrimitives_Error(nonstd::span values, int32 expec // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == expectedErrorCode); } @@ -191,12 +191,12 @@ void TestCase_TestImporterData_Error(const std::string& inputFilePath, usize sta // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == expectedErrorCode); } -TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 1): Valid filter execution") +TEST_CASE("SimplnxCore::ReadCSVFileFilter (Case 1): Valid filter execution") { // Create the parent directory path fs::create_directories(k_TestInput.parent_path()); @@ -235,7 +235,7 @@ TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 1): Valid filter execution") TestCase_TestPrimitives(v); } -TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 2): Valid filter execution - Skipped Array") +TEST_CASE("SimplnxCore::ReadCSVFileFilter (Case 2): Valid filter execution - Skipped Array") { std::string newGroupName = "New Group"; @@ -252,18 +252,18 @@ TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 2): Valid filter execution - Ski // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // Check that the array does not exist const IDataArray* array = dataStructure.getDataAs(arrayPath); REQUIRE(array == nullptr); } -TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 3): Invalid filter execution - Out of Bounds") +TEST_CASE("SimplnxCore::ReadCSVFileFilter (Case 3): Invalid filter execution - Out of Bounds") { // Create the parent directory path fs::create_directories(k_TestInput.parent_path()); @@ -339,7 +339,7 @@ TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 3): Invalid filter execution - O TestCase_TestPrimitives_Error(v, k_OverflowErrorCode); } -TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 4): Invalid filter execution - Invalid arguments") +TEST_CASE("SimplnxCore::ReadCSVFileFilter (Case 4): Invalid filter execution - Invalid arguments") { // Create the parent directory path fs::create_directories(k_TestInput.parent_path()); @@ -381,7 +381,7 @@ TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 4): Invalid filter execution - I TestCase_TestPrimitives_Error(v, k_InvalidArgumentErrorCode); } -TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 5): Invalid filter execution - Invalid ReadCSVData values") +TEST_CASE("SimplnxCore::ReadCSVFileFilter (Case 5): Invalid filter execution - Invalid ReadCSVData values") { std::vector v = {std::to_string(std::numeric_limits::min()), std::to_string(std::numeric_limits::max())}; fs::create_directories(k_TestInput.parent_path()); @@ -472,7 +472,7 @@ TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 5): Invalid filter execution - I k_InconsistentCols); } -TEST_CASE("ComplexCore::ReadCSVFileFilter (Case 6): Invalid filter execution - Blank Lines") +TEST_CASE("SimplnxCore::ReadCSVFileFilter (Case 6): Invalid filter execution - Blank Lines") { // Create the parent directory path fs::create_directories(k_TestInput.parent_path()); diff --git a/src/Plugins/ComplexCore/test/ReadDeformKeyFileV12Test.cpp b/src/Plugins/SimplnxCore/test/ReadDeformKeyFileV12Test.cpp similarity index 87% rename from src/Plugins/ComplexCore/test/ReadDeformKeyFileV12Test.cpp rename to src/Plugins/SimplnxCore/test/ReadDeformKeyFileV12Test.cpp index 57f6f7e97c..dac7769483 100644 --- a/src/Plugins/ComplexCore/test/ReadDeformKeyFileV12Test.cpp +++ b/src/Plugins/SimplnxCore/test/ReadDeformKeyFileV12Test.cpp @@ -1,18 +1,18 @@ #include -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp" +#include "SimplnxCore/Filters/ReadDeformKeyFileV12Filter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; /** * The commented out code in this filter is there to generate a file to test should the need arise down the line. @@ -155,9 +155,9 @@ const DataPath k_VertexPath = k_QuadGeomPath.createChildPath(k_VertexData); // } // } -TEST_CASE("ComplexCore::ReadDeformKeyFileV12: Case 0", "[Core][ReadDeformKeyFileV12]") +TEST_CASE("SimplnxCore::ReadDeformKeyFileV12: Case 0", "[Core][ReadDeformKeyFileV12]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_import_deform_12.tar.gz", "6_6_import_deform_12"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_import_deform_12.tar.gz", "6_6_import_deform_12"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_import_deform_12/6_6_read_deform_12_0.dream3d", unit_test::k_TestFilesDir)); DataStructure exemplarDataStructure = LoadDataStructure(exemplarFilePath); @@ -178,25 +178,25 @@ TEST_CASE("ComplexCore::ReadDeformKeyFileV12: Case 0", "[Core][ReadDeformKeyFile // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_VertexPath, k_QuadGeomPath.getTargetName()); UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellPath, k_QuadGeomPath.getTargetName()); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_import_deform_key_v12_0_test.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } -TEST_CASE("ComplexCore::ReadDeformKeyFileV12Filter: Case 1", "[Core][ReadDeformKeyFileV12Filter]") +TEST_CASE("SimplnxCore::ReadDeformKeyFileV12Filter: Case 1", "[Core][ReadDeformKeyFileV12Filter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_import_deform_12.tar.gz", "6_6_import_deform_12"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_import_deform_12.tar.gz", "6_6_import_deform_12"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_import_deform_12/6_6_read_deform_12_1.dream3d", unit_test::k_TestFilesDir)); DataStructure exemplarDataStructure = LoadDataStructure(exemplarFilePath); @@ -217,18 +217,18 @@ TEST_CASE("ComplexCore::ReadDeformKeyFileV12Filter: Case 1", "[Core][ReadDeformK // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_VertexPath, k_QuadGeomPath.getTargetName()); UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellPath, k_QuadGeomPath.getTargetName()); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_import_deform_key_v12_1_test.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp b/src/Plugins/SimplnxCore/test/ReadHDF5DatasetTest.cpp similarity index 94% rename from src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp rename to src/Plugins/SimplnxCore/test/ReadHDF5DatasetTest.cpp index 1345a6088b..12a45b4ad8 100644 --- a/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadHDF5DatasetTest.cpp @@ -1,21 +1,21 @@ -#include "ComplexCore/Filters/ReadHDF5Dataset.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" - -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/ReadHDF5DatasetParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/H5Support.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "SimplnxCore/Filters/ReadHDF5Dataset.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/ReadHDF5DatasetParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/H5Support.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -27,9 +27,9 @@ std::string m_FilePath = unit_test::k_BinaryDir.str() + "/ImportHDF5DatasetTest. // Uses Raw Pointers to save data to the data file // ----------------------------------------------------------------------------- template -void writePointerArrayDataset(complex::HDF5::GroupWriter& ptrGroupWriter) +void writePointerArrayDataset(nx::core::HDF5::GroupWriter& ptrGroupWriter) { - std::string dsetName = complex::HDF5::Support::HdfTypeForPrimitiveAsStr(); + std::string dsetName = nx::core::HDF5::Support::HdfTypeForPrimitiveAsStr(); std::vector dims = {}; if constexpr(Dims == 1) @@ -60,9 +60,9 @@ void writePointerArrayDataset(complex::HDF5::GroupWriter& ptrGroupWriter) data[i] = static_cast(i * 5); } - complex::HDF5::DatasetWriter dsetWriter = ptrGroupWriter.createDatasetWriter(dsetName); + nx::core::HDF5::DatasetWriter dsetWriter = ptrGroupWriter.createDatasetWriter(dsetName); auto result = dsetWriter.writeSpan(dims, nonstd::span{data}); - COMPLEX_RESULT_REQUIRE_VALID(result); + SIMPLNX_RESULT_REQUIRE_VALID(result); } template @@ -88,13 +88,13 @@ void writeHDF5File() } } - auto writerResults = complex::HDF5::FileWriter::CreateFile(m_FilePath); - COMPLEX_RESULT_REQUIRE_VALID(writerResults); - complex::HDF5::FileWriter fileWriter = std::move(writerResults.value()); + auto writerResults = nx::core::HDF5::FileWriter::CreateFile(m_FilePath); + SIMPLNX_RESULT_REQUIRE_VALID(writerResults); + nx::core::HDF5::FileWriter fileWriter = std::move(writerResults.value()); REQUIRE(fileWriter.isValid()); // Create the Pointer group - complex::HDF5::GroupWriter ptrGroupWriter = fileWriter.createGroupWriter("Pointer"); + nx::core::HDF5::GroupWriter ptrGroupWriter = fileWriter.createGroupWriter("Pointer"); REQUIRE(ptrGroupWriter.isValid()); writePointer1DArrayDataset(ptrGroupWriter); @@ -206,7 +206,7 @@ void testFilterPreflight(ReadHDF5Dataset& filter) // Fill in Dataset Path with a valid path so that we can continue our error checks importInfoList.clear(); - std::string typeStr = complex::HDF5::Support::HdfTypeForPrimitiveAsStr(); + std::string typeStr = nx::core::HDF5::Support::HdfTypeForPrimitiveAsStr(); importInfo.dataSetPath = "Pointer/Pointer1DArrayDataset<" + typeStr + ">"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; @@ -287,7 +287,7 @@ void DatasetTest(ReadHDF5Dataset& filter, const std::list(); + std::string typeStr = nx::core::HDF5::Support::HdfTypeForPrimitiveAsStr(); DataStructure dataStructure; DataGroup* levelZeroGroup = DataGroup::Create(dataStructure, Constants::k_LevelZero); @@ -603,7 +603,7 @@ void testFilterExecute(ReadHDF5Dataset& filter) } } // namespace // ----------------------------------------------------------------------------- -TEST_CASE("ComplexCore::ReadHDF5Dataset Filter") +TEST_CASE("SimplnxCore::ReadHDF5Dataset Filter") { { writeHDF5File(); diff --git a/src/Plugins/ComplexCore/test/ReadRawBinaryTest.cpp b/src/Plugins/SimplnxCore/test/ReadRawBinaryTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/ReadRawBinaryTest.cpp rename to src/Plugins/SimplnxCore/test/ReadRawBinaryTest.cpp index 95298612b0..df6c37e325 100644 --- a/src/Plugins/ComplexCore/test/ReadRawBinaryTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadRawBinaryTest.cpp @@ -15,18 +15,18 @@ * possibilty that we can not write the data or read the data from the file in one * step in the filter */ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" - -#include "complex/Common/ScopeGuard.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "SimplnxCore/Filters/ReadRawBinaryFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Common/ScopeGuard.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -34,7 +34,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -107,11 +107,11 @@ void TestCase1_Execute(NumericType scalarType) // Preflight, get the error condition, and check that there are no errors auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter, check that there are no errors, and compare the data auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); const DataArray& createdData = dataStructure.getDataRefAs>(k_CreatedArrayPath); const AbstractDataStore& store = createdData.getDataStoreRef(); @@ -165,7 +165,7 @@ void TestCase2_Execute() // Preflight, get the error condition, and check that there are no errors auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); const std::vector& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); @@ -201,7 +201,7 @@ void TestCase3_Execute() // Preflight, get the error condition, and check that there are no errors auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); const std::vector& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); @@ -238,11 +238,11 @@ void TestCase4_Execute(NumericType scalarType) // Preflight, get the error condition, and check that there are no errors auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter, check that there are no errors, and compare the data auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); DataArray* createdArray = dataStructure.getDataAs>(k_CreatedArrayPath); REQUIRE(createdArray != nullptr); @@ -290,7 +290,7 @@ void TestCase5_Execute(NumericType scalarType) // Preflight, get the error condition, and check that there are no errors auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); const std::vector& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); @@ -317,7 +317,7 @@ void TestCase4_TestPrimitives(NumericType scalarType) } // namespace // Case1: This tests when skipHeaderBytes equals 0, and checks to see if the data read is the same as the data written. -TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case1)", "[ComplexCore][ReadRawBinaryFilter]") +TEST_CASE("SimplnxCore::ReadRawBinaryFilter(Case1)", "[SimplnxCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -335,7 +335,7 @@ TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case1)", "[ComplexCore][ReadRawBinar } // Case2: This tests when the wrong scalar type is selected. (The total number of bytes in the file does not evenly divide by the scalar type size). -TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case2)", "[ComplexCore][ReadRawBinaryFilter]") +TEST_CASE("SimplnxCore::ReadRawBinaryFilter(Case2)", "[SimplnxCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -344,7 +344,7 @@ TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case2)", "[ComplexCore][ReadRawBinar } // Case3: This tests when the wrong component size is chosen. (The total number of scalar elements in the file does not evenly divide by the chosen component size). -TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case3)", "[ComplexCore][ReadRawBinaryFilter]") +TEST_CASE("SimplnxCore::ReadRawBinaryFilter(Case3)", "[SimplnxCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -353,7 +353,7 @@ TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case3)", "[ComplexCore][ReadRawBinar } // Case4: This tests when skipHeaderBytes is non-zero, and checks to see if the data read is the same as the data written. -TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case4)", "[ComplexCore][ReadRawBinaryFilter]") +TEST_CASE("SimplnxCore::ReadRawBinaryFilter(Case4)", "[SimplnxCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -371,7 +371,7 @@ TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case4)", "[ComplexCore][ReadRawBinar } // Case5: This tests when skipHeaderBytes equals the file size -TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case5)", "[ComplexCore][ReadRawBinaryFilter]") +TEST_CASE("SimplnxCore::ReadRawBinaryFilter(Case5)", "[SimplnxCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); diff --git a/src/Plugins/ComplexCore/test/ReadStlFileTest.cpp b/src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp similarity index 67% rename from src/Plugins/ComplexCore/test/ReadStlFileTest.cpp rename to src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp index b24a7849d2..d694f70ae4 100644 --- a/src/Plugins/ComplexCore/test/ReadStlFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadStlFileTest.cpp @@ -1,11 +1,11 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -13,10 +13,10 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::ReadStlFileFilter", "[ComplexCore][ReadStlFileFilter]") +TEST_CASE("SimplnxCore::ReadStlFileFilter", "[SimplnxCore][ReadStlFileFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object DataStructure dataStructure; @@ -33,18 +33,18 @@ TEST_CASE("ComplexCore::ReadStlFileFilter", "[ComplexCore][ReadStlFileFilter]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); TriangleGeom& triangleGeom = dataStructure.getDataRefAs(triangleGeomDataPath); REQUIRE(triangleGeom.getNumberOfFaces() == 92); REQUIRE(triangleGeom.getNumberOfVertices() == 48); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/StlFileReaderTest.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/ReadTextDataArrayTest.cpp b/src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp similarity index 90% rename from src/Plugins/ComplexCore/test/ReadTextDataArrayTest.cpp rename to src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp index 8bd296fbac..e006c3ab21 100644 --- a/src/Plugins/ComplexCore/test/ReadTextDataArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadTextDataArrayTest.cpp @@ -1,22 +1,22 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadTextDataArrayFilter.hpp" - -#include "ComplexCore/Filters/ReadCSVFileFilter.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/ReadCSVFileParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "SimplnxCore/Filters/ReadTextDataArrayFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "SimplnxCore/Filters/ReadCSVFileFilter.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/ReadCSVFileParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -102,11 +102,11 @@ void RunInvalidTest() // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } // RemoveTestFiles(); @@ -135,11 +135,11 @@ void RunInvalidTest() // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } // Min Overflow Test @@ -185,11 +185,11 @@ void RunInvalidTest() // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } } @@ -223,11 +223,11 @@ void RunTest(char sep, int delimiter) // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) REQUIRE(dataStructure.getDataAs>(createdAttributeArrayPath) != nullptr); auto& createdArray = dataStructure.getDataRefAs>(createdAttributeArrayPath); @@ -243,7 +243,7 @@ void RunTest(char sep, int delimiter) } } -TEST_CASE("ComplexCore::ReadTextDataArrayFilter: Valid filter execution", "[ComplexCore][ReadTextDataArrayFilter]") +TEST_CASE("SimplnxCore::ReadTextDataArrayFilter: Valid filter execution", "[SimplnxCore][ReadTextDataArrayFilter]") { RunTest(',', 0); RunTest(',', 0); @@ -301,7 +301,7 @@ TEST_CASE("ComplexCore::ReadTextDataArrayFilter: Valid filter execution", "[Comp RunTest('\t', 4); } -TEST_CASE("ComplexCore::ReadTextDataArrayFilter: Invalid filter execution", "[ComplexCore][ReadTextDataArrayFilter]") +TEST_CASE("SimplnxCore::ReadTextDataArrayFilter: Invalid filter execution", "[SimplnxCore][ReadTextDataArrayFilter]") { // Reading alphabetical/special characters, and min/max overflow RunInvalidTest(); @@ -335,11 +335,11 @@ TEST_CASE("ComplexCore::ReadTextDataArrayFilter: Invalid filter execution", "[Co // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } // DataGroup parent with tuple dimension of 0 @@ -360,10 +360,10 @@ TEST_CASE("ComplexCore::ReadTextDataArrayFilter: Invalid filter execution", "[Co // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } } diff --git a/src/Plugins/ComplexCore/test/ReadVolumeGraphicsFileTest.cpp b/src/Plugins/SimplnxCore/test/ReadVolumeGraphicsFileTest.cpp similarity index 67% rename from src/Plugins/ComplexCore/test/ReadVolumeGraphicsFileTest.cpp rename to src/Plugins/SimplnxCore/test/ReadVolumeGraphicsFileTest.cpp index f944696462..f25b55700f 100644 --- a/src/Plugins/ComplexCore/test/ReadVolumeGraphicsFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReadVolumeGraphicsFileTest.cpp @@ -1,22 +1,22 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp" +#include "SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -const fs::path k_VgiSrcFile = fs::path(complex::unit_test::k_DREAM3DDataDir.str()) / "TestFiles" / "volume_graphics_test.vgi"; -const fs::path k_VolFile = fs::path(complex::unit_test::k_BinaryTestOutputDir.str()) / "VolumeGraphicsTest.vol"; -const fs::path k_VgiDestFile = fs::path(complex::unit_test::k_BinaryTestOutputDir.str()) / "VolumeGraphicsTest.vgi"; +const fs::path k_VgiSrcFile = fs::path(nx::core::unit_test::k_DREAM3DDataDir.str()) / "TestFiles" / "volume_graphics_test.vgi"; +const fs::path k_VolFile = fs::path(nx::core::unit_test::k_BinaryTestOutputDir.str()) / "VolumeGraphicsTest.vol"; +const fs::path k_VgiDestFile = fs::path(nx::core::unit_test::k_BinaryTestOutputDir.str()) / "VolumeGraphicsTest.vgi"; const SizeVec3 k_Dimensions = {50, 20, 80}; // ----------------------------------------------------------------------------- @@ -36,9 +36,9 @@ void writeVolTestFile() REQUIRE_NOTHROW(fs::copy(k_VgiSrcFile, k_VgiDestFile, copyOptions)); // copy vgi file } -TEST_CASE("ComplexCore::ReadVolumeGraphicsFileFilter - Valid filter execution", "[Plugins][ReadVolumeGraphicsFileFilter]") +TEST_CASE("SimplnxCore::ReadVolumeGraphicsFileFilter - Valid filter execution", "[Plugins][ReadVolumeGraphicsFileFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "volume_graphics_test.tar.gz", "volume_graphics_test.vgi"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "volume_graphics_test.tar.gz", "volume_graphics_test.vgi"); // Instantiate the filter, a DataStructure object and an Arguments Object const ReadVolumeGraphicsFileFilter filter; diff --git a/src/Plugins/ComplexCore/test/RegularGridSampleSurfaceMeshTest.cpp b/src/Plugins/SimplnxCore/test/RegularGridSampleSurfaceMeshTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/RegularGridSampleSurfaceMeshTest.cpp rename to src/Plugins/SimplnxCore/test/RegularGridSampleSurfaceMeshTest.cpp index 48b1bef250..0887ff142b 100644 --- a/src/Plugins/ComplexCore/test/RegularGridSampleSurfaceMeshTest.cpp +++ b/src/Plugins/SimplnxCore/test/RegularGridSampleSurfaceMeshTest.cpp @@ -1,13 +1,13 @@ #include -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" +#include "SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -23,7 +23,7 @@ const DataPath k_GeneratedImageGeomPath = DataPath({Constants::k_ImageGeometry}) const DataPath k_GeneratedFeatureIdsPath = k_GeneratedImageGeomPath.createChildPath(Constants::k_CellData).createChildPath(Constants::k_FeatureIds); } // namespace -TEST_CASE("ComplexCore::RegularGridSampleSurfaceMeshFilter: Valid Filter Execution", "[ComplexCore][RegularGridSampleSurfaceMeshFilter]") +TEST_CASE("SimplnxCore::RegularGridSampleSurfaceMeshFilter: Valid Filter Execution", "[SimplnxCore][RegularGridSampleSurfaceMeshFilter]") { /** * THe generated test case file for this was generated on a temporary modification of the 6.6 DREAM3D-SIMPL fork where the @@ -31,7 +31,7 @@ TEST_CASE("ComplexCore::RegularGridSampleSurfaceMeshFilter: Valid Filter Executi * utilizing the standard library. It was seeded with the std::mt19937::default_seed. */ - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_sample_surface_mesh.tar.gz", "6_6_sample_surface_mesh"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_sample_surface_mesh.tar.gz", "6_6_sample_surface_mesh"); // Read Exemplar DREAM3D File Filter auto baseDataFilePath = fs::path(fmt::format("{}/6_6_sample_surface_mesh/6_6_grid_sample_surface_mesh.dream3d", unit_test::k_TestFilesDir)); @@ -64,7 +64,7 @@ TEST_CASE("ComplexCore::RegularGridSampleSurfaceMeshFilter: Valid Filter Executi } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT UnitTest::WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_regular_grid_sample_surface_mesh.dream3d", unit_test::k_BinaryTestOutputDir))); #endif diff --git a/src/Plugins/ComplexCore/test/RemoveFlaggedFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp similarity index 89% rename from src/Plugins/ComplexCore/test/RemoveFlaggedFeaturesTest.cpp rename to src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp index 5a6da7d200..bcb8904b20 100644 --- a/src/Plugins/ComplexCore/test/RemoveFlaggedFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveFlaggedFeaturesTest.cpp @@ -1,18 +1,18 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/RemoveFlaggedFeaturesFilter.hpp" +#include "SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -134,7 +134,7 @@ void ValidateNewGeom(const Int32Array& featureIdsResult, const AttributeMatrix& } } // namespace -TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Remove Algorithm", "[ComplexCore][RemoveFlaggedFeatures]") +TEST_CASE("SimplnxCore::RemoveFlaggedFeatures: Test Remove Algorithm", "[SimplnxCore][RemoveFlaggedFeatures]") { // Instantiate the filter, a DataStructure object and an Arguments Object RemoveFlaggedFeaturesFilter filter; DataStructure dataStructure; @@ -151,11 +151,11 @@ TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Remove Algorithm", "[Complex // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); const auto& featureIdsResult = dataStructure.getDataRefAs(k_FeatureIdsPath); const auto& cellFeatureAMResult = dataStructure.getDataRefAs(DataPath({k_DataContainer, k_CellFeatureData})); @@ -163,7 +163,7 @@ TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Remove Algorithm", "[Complex ValidateResults(featureIdsResult, cellFeatureAMResult, testArrayResult); } -TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Extract Algorithm", "[ComplexCore][RemoveFlaggedFeatures]") +TEST_CASE("SimplnxCore::RemoveFlaggedFeatures: Test Extract Algorithm", "[SimplnxCore][RemoveFlaggedFeatures]") { // Instantiate the filter, a DataStructure object and an Arguments Object RemoveFlaggedFeaturesFilter filter; DataStructure dataStructure; @@ -179,13 +179,13 @@ TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Extract Algorithm", "[Comple // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/extract_flagged_features.dream3d", unit_test::k_BinaryTestOutputDir)); #endif @@ -200,7 +200,7 @@ TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Extract Algorithm", "[Comple ValidateNewGeom(newFeatureIdsResult, newCellFeatureAMResult, newTestArrayResult); } -TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Extract then Remove Algorithm", "[ComplexCore][RemoveFlaggedFeatures]") +TEST_CASE("SimplnxCore::RemoveFlaggedFeatures: Test Extract then Remove Algorithm", "[SimplnxCore][RemoveFlaggedFeatures]") { // Instantiate the filter, a DataStructure object and an Arguments Object RemoveFlaggedFeaturesFilter filter; DataStructure dataStructure; @@ -218,11 +218,11 @@ TEST_CASE("ComplexCore::RemoveFlaggedFeatures: Test Extract then Remove Algorith // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); const auto& featureIdsResult = dataStructure.getDataRefAs(k_FeatureIdsPath); const auto& cellFeatureAMResult = dataStructure.getDataRefAs(DataPath({k_DataContainer, k_CellFeatureData})); diff --git a/src/Plugins/ComplexCore/test/RemoveFlaggedVerticesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/RemoveFlaggedVerticesTest.cpp rename to src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp index 2bdec291d8..42cbec3f0a 100644 --- a/src/Plugins/ComplexCore/test/RemoveFlaggedVerticesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/Filters/RemoveFlaggedVertices.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/RemoveFlaggedVertices.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::RemoveFlaggedVertices: Instantiate", "[ComplexCore][RemoveFlaggedVertices]") +TEST_CASE("SimplnxCore::RemoveFlaggedVertices: Instantiate", "[SimplnxCore][RemoveFlaggedVertices]") { RemoveFlaggedVertices filter; DataStructure dataStructure; @@ -24,7 +24,7 @@ TEST_CASE("ComplexCore::RemoveFlaggedVertices: Instantiate", "[ComplexCore][Remo REQUIRE(preflightResult.outputActions.invalid()); } -TEST_CASE("ComplexCore::RemoveFlaggedVertices: Test Algorithm", "[ComplexCore][RemoveFlaggedVertices]") +TEST_CASE("SimplnxCore::RemoveFlaggedVertices: Test Algorithm", "[SimplnxCore][RemoveFlaggedVertices]") { RemoveFlaggedVertices filter; DataStructure dataStructure; @@ -74,10 +74,10 @@ TEST_CASE("ComplexCore::RemoveFlaggedVertices: Test Algorithm", "[ComplexCore][R // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) auto* reducedVertexGeom = dataStructure.getDataAs(reducedVertexPath); @@ -105,8 +105,8 @@ TEST_CASE("ComplexCore::RemoveFlaggedVertices: Test Algorithm", "[ComplexCore][R // Write out the DataStructure for later viewing/debugging std::string filePath = fmt::format("{}/RemoveFlaggedVertices.dream3d", unit_test::k_BinaryTestOutputDir); // std::cout << "Writing file to: " << filePath << std::endl; - Result result = complex::HDF5::FileWriter::CreateFile(filePath); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(filePath); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } diff --git a/src/Plugins/ComplexCore/test/RemoveMinimumSizeFeaturesTest.cpp b/src/Plugins/SimplnxCore/test/RemoveMinimumSizeFeaturesTest.cpp similarity index 83% rename from src/Plugins/ComplexCore/test/RemoveMinimumSizeFeaturesTest.cpp rename to src/Plugins/SimplnxCore/test/RemoveMinimumSizeFeaturesTest.cpp index ca1fb1875b..24f794ffd5 100644 --- a/src/Plugins/ComplexCore/test/RemoveMinimumSizeFeaturesTest.cpp +++ b/src/Plugins/SimplnxCore/test/RemoveMinimumSizeFeaturesTest.cpp @@ -1,26 +1,26 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp" +#include "SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/Dream3dImportParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/Dream3dImportParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; -TEST_CASE("ComplexCore::RemoveMinimumSizeFeatures: Small IN100 Pipeline", "[ComplexCore][RemoveMinimumSizeFeatures]") +TEST_CASE("SimplnxCore::RemoveMinimumSizeFeatures: Small IN100 Pipeline", "[SimplnxCore][RemoveMinimumSizeFeatures]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_min_size_output.tar.gz", "6_6_min_size_output.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_min_size_output.tar.gz", "6_6_min_size_output.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_min_size_input.tar.gz", "6_6_min_size_input.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_min_size_input.tar.gz", "6_6_min_size_input.dream3d"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_min_size_output.dream3d", unit_test::k_TestFilesDir)); @@ -56,11 +56,11 @@ TEST_CASE("ComplexCore::RemoveMinimumSizeFeatures: Small IN100 Pipeline", "[Comp // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } // Loop and compare each array from the 'Exemplar Data / CellData' to the 'Data Container / CellData' group @@ -156,7 +156,7 @@ TEST_CASE("ComplexCore::RemoveMinimumSizeFeatures: Small IN100 Pipeline", "[Comp } } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/7_0_min_size_output.dream3d", unit_test::k_BinaryTestOutputDir)); #endif } diff --git a/src/Plugins/ComplexCore/test/RenameDataObjectTest.cpp b/src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp similarity index 73% rename from src/Plugins/ComplexCore/test/RenameDataObjectTest.cpp rename to src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp index 14d1ee29fb..688dd7e7fa 100644 --- a/src/Plugins/ComplexCore/test/RenameDataObjectTest.cpp +++ b/src/Plugins/SimplnxCore/test/RenameDataObjectTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/RenameDataObject.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/RenameDataObject.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::RenameDataAction(Instantiate)", "[ComplexCore][RenameDataAction]") +TEST_CASE("SimplnxCore::RenameDataAction(Instantiate)", "[SimplnxCore][RenameDataAction]") { static constexpr StringLiteral k_NewName = "Bar"; const DataPath k_DataPath({Constants::k_SmallIN100}); @@ -20,10 +20,10 @@ TEST_CASE("ComplexCore::RenameDataAction(Instantiate)", "[ComplexCore][RenameDat args.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_DataPath)); auto result = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(result.outputActions); } -TEST_CASE("ComplexCore::RenameDataAction(Invalid Parameters)", "[ComplexCore][RenameDataAction]") +TEST_CASE("SimplnxCore::RenameDataAction(Invalid Parameters)", "[SimplnxCore][RenameDataAction]") { static constexpr StringLiteral k_NewName = Constants::k_ConfidenceIndex; static const DataPath k_DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_ImageGeometry}); @@ -36,13 +36,13 @@ TEST_CASE("ComplexCore::RenameDataAction(Invalid Parameters)", "[ComplexCore][Re args.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_DataPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(result.result); + SIMPLNX_RESULT_REQUIRE_INVALID(result.result); } -TEST_CASE("ComplexCore::RenameDataAction(Valid Parameters)", "[ComplexCore][RenameDataAction]") +TEST_CASE("SimplnxCore::RenameDataAction(Valid Parameters)", "[SimplnxCore][RenameDataAction]") { static constexpr StringLiteral k_NewName = "Foo"; static const DataPath k_DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_ImageGeometry}); @@ -55,10 +55,10 @@ TEST_CASE("ComplexCore::RenameDataAction(Valid Parameters)", "[ComplexCore][Rena args.insert(RenameDataObject::k_DataObject_Key, std::make_any(k_DataPath)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); DataPath newPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, k_NewName}); auto* dataObject = dataStructure.getData(newPath); diff --git a/src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp b/src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp similarity index 69% rename from src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp rename to src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp index ddbdf35307..2b032c7623 100644 --- a/src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp @@ -1,17 +1,17 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp" +#include "SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -19,15 +19,15 @@ const DataPath k_ConfidenceIndexPath = k_CellAttributeMatrix.createChildPath(Con const std::string k_ExemplarDataContainer2("DataContainer"); } // namespace -TEST_CASE("ComplexCore::ReplaceElementAttributesWithNeighborValuesFilter", "[ComplexCore][ReplaceElementAttributesWithNeighborValuesFilter]") +TEST_CASE("SimplnxCore::ReplaceElementAttributesWithNeighborValuesFilter", "[SimplnxCore][ReplaceElementAttributesWithNeighborValuesFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_replace_element_attributes_with_neighbor.tar.gz", - "6_6_replace_element_attributes_with_neighbor"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_replace_element_attributes_with_neighbor.tar.gz", + "6_6_replace_element_attributes_with_neighbor"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/TestFiles/6_6_replace_element_attributes_with_neighbor/6_6_replace_element_attributes_with_neighbor.dream3d", unit_test::k_DREAM3DDataDir)); - DataStructure exemplarDataStructure = complex::UnitTest::LoadDataStructure(exemplarFilePath); + DataStructure exemplarDataStructure = nx::core::UnitTest::LoadDataStructure(exemplarFilePath); // Read the Test Data set auto baseDataFilePath = fs::path(fmt::format("{}/TestFiles/6_6_replace_element_attributes_with_neighbor/6_6_replace_element_attributes_with_neighbor.dream3d", unit_test::k_DREAM3DDataDir)); @@ -47,16 +47,16 @@ TEST_CASE("ComplexCore::ReplaceElementAttributesWithNeighborValuesFilter", "[Com // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } UnitTest::CompareExemplarToGeneratedData(dataStructure, exemplarDataStructure, k_CellAttributeMatrix, k_ExemplarDataContainer2); -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fmt::format("{}/7_0_replace_element_attributes_with_neighbor.dream3d", unit_test::k_BinaryTestOutputDir)); #endif } diff --git a/src/Plugins/ComplexCore/test/ResampleImageGeomTest.cpp b/src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/ResampleImageGeomTest.cpp rename to src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp index daca7d909b..00bc20cc66 100644 --- a/src/Plugins/ComplexCore/test/ResampleImageGeomTest.cpp +++ b/src/Plugins/SimplnxCore/test/ResampleImageGeomTest.cpp @@ -1,19 +1,19 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ResampleImageGeomFilter.hpp" +#include "SimplnxCore/Filters/ResampleImageGeomFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace { @@ -31,10 +31,10 @@ struct CompareDataArrayFunctor } }; -TEST_CASE("ComplexCore::ResampleImageGeom: Invalid Parameters", "[ComplexCore][ResampleImageGeom]") +TEST_CASE("SimplnxCore::ResampleImageGeom: Invalid Parameters", "[SimplnxCore][ResampleImageGeom]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", - "ResampleImageGeom_Exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", + "ResampleImageGeom_Exemplar.dream3d"); ResampleImageGeomFilter filter; Arguments args; @@ -81,10 +81,10 @@ TEST_CASE("ComplexCore::ResampleImageGeom: Invalid Parameters", "[ComplexCore][R REQUIRE(preflightErrors[0].code == errCode); } -TEST_CASE("ComplexCore::ResampleImageGeom: 3D In Place", "[ComplexCore][ResampleImageGeom]") +TEST_CASE("SimplnxCore::ResampleImageGeom: 3D In Place", "[SimplnxCore][ResampleImageGeom]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", - "ResampleImageGeom_Exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", + "ResampleImageGeom_Exemplar.dream3d"); ResampleImageGeomFilter filter; Arguments args; @@ -129,11 +129,11 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 3D In Place", "[ComplexCore][Resample // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) DataPath exemplarCellDataPath = exemplarGeoPath.createChildPath(Constants::k_EbsdScanData); DataPath exemplarCellFeatureDataPath = exemplarGeoPath.createChildPath(Constants::k_FeatureGroupName); @@ -223,10 +223,10 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 3D In Place", "[ComplexCore][Resample } } -TEST_CASE("ComplexCore::ResampleImageGeom: 3D Save Geometry", "[ComplexCore][ResampleImageGeom]") +TEST_CASE("SimplnxCore::ResampleImageGeom: 3D Save Geometry", "[SimplnxCore][ResampleImageGeom]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", - "ResampleImageGeom_Exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", + "ResampleImageGeom_Exemplar.dream3d"); ResampleImageGeomFilter filter; Arguments args; @@ -271,11 +271,11 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 3D Save Geometry", "[ComplexCore][Res // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) DataPath exemplarCellDataPath = exemplarGeoPath.createChildPath(Constants::k_EbsdScanData); DataPath exemplarCellFeatureDataPath = exemplarGeoPath.createChildPath(Constants::k_FeatureGroupName); @@ -365,10 +365,10 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 3D Save Geometry", "[ComplexCore][Res } } -TEST_CASE("ComplexCore::ResampleImageGeom: 2D In Place", "[ComplexCore][ResampleImageGeom]") +TEST_CASE("SimplnxCore::ResampleImageGeom: 2D In Place", "[SimplnxCore][ResampleImageGeom]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", - "ResampleImageGeom_Exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", + "ResampleImageGeom_Exemplar.dream3d"); ResampleImageGeomFilter filter; Arguments args; @@ -408,11 +408,11 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 2D In Place", "[ComplexCore][Resample // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) DataPath exemplarCellDataPath = exemplarGeoPath.createChildPath(cellDataPath.getTargetName()); @@ -457,10 +457,10 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 2D In Place", "[ComplexCore][Resample } } -TEST_CASE("ComplexCore::ResampleImageGeom: 2D Save Geometry", "[ComplexCore][ResampleImageGeom]") +TEST_CASE("SimplnxCore::ResampleImageGeom: 2D Save Geometry", "[SimplnxCore][ResampleImageGeom]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", - "ResampleImageGeom_Exemplar.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ResampleImageGeom_Exemplar_2.tar.gz", + "ResampleImageGeom_Exemplar.dream3d"); ResampleImageGeomFilter filter; Arguments args; @@ -500,11 +500,11 @@ TEST_CASE("ComplexCore::ResampleImageGeom: 2D Save Geometry", "[ComplexCore][Res // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // check that the geometry(s) and the attribute matrices are all there DataPath exemplarCellDataPath = exemplarGeoPath.createChildPath(cellDataPath.getTargetName()); diff --git a/src/Plugins/ComplexCore/test/ResampleRectGridToImageGeomTest.cpp b/src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp similarity index 82% rename from src/Plugins/ComplexCore/test/ResampleRectGridToImageGeomTest.cpp rename to src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp index e00df5dad7..63de965622 100644 --- a/src/Plugins/ComplexCore/test/ResampleRectGridToImageGeomTest.cpp +++ b/src/Plugins/SimplnxCore/test/ResampleRectGridToImageGeomTest.cpp @@ -1,16 +1,16 @@ #include -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp" +#include "SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; -using namespace complex::Constants; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::Constants; +using namespace nx::core::UnitTest; namespace { @@ -24,10 +24,10 @@ const std::string k_NeighborListArrayName = "NeighborList"; const std::string k_StringArrayName = "StringArray"; } // namespace -TEST_CASE("ComplexCore::ResampleRectGridToImageGeomFilter: Valid Filter Execution", "[ComplexCore][ResampleRectGridToImageGeomFilter]") +TEST_CASE("SimplnxCore::ResampleRectGridToImageGeomFilter: Valid Filter Execution", "[SimplnxCore][ResampleRectGridToImageGeomFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_resample_rect_grid_to_image_geom.tar.gz", - "6_6_resample_rect_grid_to_image_geom.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_resample_rect_grid_to_image_geom.tar.gz", + "6_6_resample_rect_grid_to_image_geom.dream3d"); // Instantiate the filter, a DataStructure object and an Arguments Object ResampleRectGridToImageGeomFilter filter; @@ -77,19 +77,19 @@ TEST_CASE("ComplexCore::ResampleRectGridToImageGeomFilter: Valid Filter Executio // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) CompareExemplarToGeneratedData(dataStructure, dataStructure, k_ImageGeomComputed.createChildPath(k_CellData), exemplarImageGeomName); } -TEST_CASE("ComplexCore::ResampleRectGridToImageGeomFilter: InValid Filter Execution") +TEST_CASE("SimplnxCore::ResampleRectGridToImageGeomFilter: InValid Filter Execution") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_resample_rect_grid_to_image_geom.tar.gz", - "6_6_resample_rect_grid_to_image_geom.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_resample_rect_grid_to_image_geom.tar.gz", + "6_6_resample_rect_grid_to_image_geom.dream3d"); // Instantiate the filter, a DataStructure object and an Arguments Object ResampleRectGridToImageGeomFilter filter; DataStructure dataStructure = LoadDataStructure(fs::path(fmt::format("{}/6_6_resample_rect_grid_to_image_geom.dream3d", unit_test::k_TestFilesDir))); @@ -129,9 +129,9 @@ TEST_CASE("ComplexCore::ResampleRectGridToImageGeomFilter: InValid Filter Execut // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/ReverseTriangleWindingTest.cpp b/src/Plugins/SimplnxCore/test/ReverseTriangleWindingTest.cpp similarity index 67% rename from src/Plugins/ComplexCore/test/ReverseTriangleWindingTest.cpp rename to src/Plugins/SimplnxCore/test/ReverseTriangleWindingTest.cpp index 96734b1d5c..10c248bb84 100644 --- a/src/Plugins/ComplexCore/test/ReverseTriangleWindingTest.cpp +++ b/src/Plugins/SimplnxCore/test/ReverseTriangleWindingTest.cpp @@ -1,22 +1,23 @@ #include -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReverseTriangleWindingFilter.hpp" +#include "SimplnxCore/Filters/ReverseTriangleWindingFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { const DataPath k_TriangleGeomPath = DataPath({Constants::k_DataContainer}); } -TEST_CASE("ComplexCore::ReverseTriangleWindingFilter: Valid Filter Execution", "[ComplexCore][ReverseTriangleWindingFilter]") +TEST_CASE("SimplnxCore::ReverseTriangleWindingFilter: Valid Filter Execution", "[SimplnxCore][ReverseTriangleWindingFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "reverse_triangle_winding.tar.gz", "reverse_triangle_winding"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "reverse_triangle_winding.tar.gz", + "reverse_triangle_winding"); DataStructure exemplarDataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/reverse_triangle_winding/6_6_exemplar_triangle_winding.dream3d", unit_test::k_TestFilesDir))); diff --git a/src/Plugins/ComplexCore/test/RobustAutomaticThresholdTest.cpp b/src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp similarity index 74% rename from src/Plugins/ComplexCore/test/RobustAutomaticThresholdTest.cpp rename to src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp index b235bc11ff..c4f77928af 100644 --- a/src/Plugins/ComplexCore/test/RobustAutomaticThresholdTest.cpp +++ b/src/Plugins/SimplnxCore/test/RobustAutomaticThresholdTest.cpp @@ -1,16 +1,16 @@ -#include "ComplexCore/Filters/RobustAutomaticThreshold.hpp" +#include "SimplnxCore/Filters/RobustAutomaticThreshold.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include #include -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::RobustAutomaticThreshold: Missing/Empty DataPaths", "[RobustAutomaticThreshold]") +TEST_CASE("SimplnxCore::RobustAutomaticThreshold: Missing/Empty DataPaths", "[RobustAutomaticThreshold]") { RobustAutomaticThreshold filter; DataStructure dataStructure = UnitTest::CreateDataStructure(); @@ -22,25 +22,25 @@ TEST_CASE("ComplexCore::RobustAutomaticThreshold: Missing/Empty DataPaths", "[Ro // Preflight the filter and check result { auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } args.insertOrAssign(RobustAutomaticThreshold::k_InputArrayPath, std::make_any(inputPath)); // Preflight the filter and check result { auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) } args.insertOrAssign(RobustAutomaticThreshold::k_GradientMagnitudePath, std::make_any(gradientMagnitudePath)); // Preflight the filter and check result { auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) } } -TEST_CASE("ComplexCore::RobustAutomaticThreshold: Test Algorithm", "[RobustAutomaticThreshold]") +TEST_CASE("SimplnxCore::RobustAutomaticThreshold: Test Algorithm", "[RobustAutomaticThreshold]") { RobustAutomaticThreshold filter; DataStructure dataStructure = UnitTest::CreateDataStructure(); @@ -55,9 +55,9 @@ TEST_CASE("ComplexCore::RobustAutomaticThreshold: Test Algorithm", "[RobustAutom // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) } diff --git a/src/Plugins/ComplexCore/test/RotateSampleRefFrameTest.cpp b/src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/RotateSampleRefFrameTest.cpp rename to src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp index 7c8b38c708..e7eb868f52 100644 --- a/src/Plugins/ComplexCore/test/RotateSampleRefFrameTest.cpp +++ b/src/Plugins/SimplnxCore/test/RotateSampleRefFrameTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/RotateSampleRefFrameFilter.hpp" - -#include "complex/Common/Numbers.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/FilterUtilities.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "SimplnxCore/Filters/RotateSampleRefFrameFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/Common/Numbers.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include @@ -18,7 +18,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -105,16 +105,16 @@ std::vector> ConvertMatrixToTable(const Eigen::Matrix3f& ma } } // namespace -TEST_CASE("ComplexCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilter]") +TEST_CASE("SimplnxCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Rotate_Sample_Ref_Frame_Test.tar.gz", - "Rotate_Sample_Ref_Frame_Test.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Rotate_Sample_Ref_Frame_Test.tar.gz", + "Rotate_Sample_Ref_Frame_Test.dream3d"); const DataPath k_OriginalGeomPath({"Original"}); const DataPath k_OriginalCellArrayPath = k_OriginalGeomPath.createChildPath("CellData").createChildPath("Data"); - Result dataStructureResult = DREAM3D::ImportDataStructureFromFile(fs::path(fmt::format("{}/Rotate_Sample_Ref_Frame_Test.dream3d", complex::unit_test::k_TestFilesDir))); - COMPLEX_RESULT_REQUIRE_VALID(dataStructureResult); + Result dataStructureResult = DREAM3D::ImportDataStructureFromFile(fs::path(fmt::format("{}/Rotate_Sample_Ref_Frame_Test.dream3d", nx::core::unit_test::k_TestFilesDir))); + SIMPLNX_RESULT_REQUIRE_VALID(dataStructureResult); DataStructure dataStructure = std::move(dataStructureResult.value()); @@ -163,10 +163,10 @@ TEST_CASE("ComplexCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilte args.insertOrAssign(RotateSampleRefFrameFilter::k_RotationAxisAngle_Key, std::make_any(axisAngleMapping[name])); auto preflightAxisAngleResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightAxisAngleResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightAxisAngleResult.outputActions); auto executeAxisAngleResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeAxisAngleResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeAxisAngleResult.result); auto* testAxisAngleGeom = dataStructure.getDataAs(testAxisAngleGeomPath); REQUIRE(testAxisAngleGeom != nullptr); @@ -200,10 +200,10 @@ TEST_CASE("ComplexCore::RotateSampleRefFrame", "[Core][RotateSampleRefFrameFilte args.insertOrAssign(RotateSampleRefFrameFilter::k_CreatedImageGeometry_Key, std::make_any(testRotationMatrixGeomPath)); auto preflightRotationMatrixResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightRotationMatrixResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightRotationMatrixResult.outputActions); auto executeRotationMatrixResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeRotationMatrixResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeRotationMatrixResult.result); auto* testRotationMatrixGeom = dataStructure.getDataAs(testRotationMatrixGeomPath); REQUIRE(testRotationMatrixGeom != nullptr); diff --git a/src/Plugins/ComplexCore/test/ScalarSegmentFeaturesFilterTest.cpp b/src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp similarity index 72% rename from src/Plugins/ComplexCore/test/ScalarSegmentFeaturesFilterTest.cpp rename to src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp index 3e520ee0a0..b17e376026 100644 --- a/src/Plugins/ComplexCore/test/ScalarSegmentFeaturesFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesFilterTest.cpp @@ -1,25 +1,25 @@ -#include "ComplexCore/Filters/ScalarSegmentFeaturesFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include -using namespace complex; -using namespace complex::UnitTest; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::UnitTest; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::ScalarSegmentFeatures", "[Reconstruction][ScalarSegmentFeatures]") +TEST_CASE("SimplnxCore::ScalarSegmentFeatures", "[Reconstruction][ScalarSegmentFeatures]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_5_test_data_1.tar.gz", "6_5_test_data_1"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/6_5_test_data_1/6_5_test_data_1.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); { @@ -55,11 +55,11 @@ TEST_CASE("ComplexCore::ScalarSegmentFeatures", "[Reconstruction][ScalarSegmentF // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) UInt8Array& actives = dataStructure.getDataRefAs(activeArrayDataPath); size_t numFeatures = actives.getNumberOfTuples(); @@ -71,10 +71,10 @@ TEST_CASE("ComplexCore::ScalarSegmentFeatures", "[Reconstruction][ScalarSegmentF // Write out the DataStructure for later viewing/debugging std::string filePath = fmt::format("{}/ScalarSegmentFeatures.dream3d", unit_test::k_BinaryTestOutputDir); // std::cout << "Writing file to: " << filePath << std::endl; - Result result = complex::HDF5::FileWriter::CreateFile(filePath); - complex::HDF5::FileWriter fileWriter = std::move(result.value()); + Result result = nx::core::HDF5::FileWriter::CreateFile(filePath); + nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); - COMPLEX_RESULT_REQUIRE_VALID(resultH5); + SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } } diff --git a/src/Plugins/ComplexCore/test/SetImageGeomOriginScalingFilterTest.cpp b/src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp similarity index 79% rename from src/Plugins/ComplexCore/test/SetImageGeomOriginScalingFilterTest.cpp rename to src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp index 3bb43c2df6..485350a0fa 100644 --- a/src/Plugins/ComplexCore/test/SetImageGeomOriginScalingFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/SetImageGeomOriginScalingFilterTest.cpp @@ -1,13 +1,13 @@ -#include "ComplexCore/Filters/SetImageGeomOriginScalingFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/SetImageGeomOriginScalingFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; -TEST_CASE("ComplexCore::SetImageGeomOriginScalingFilter(Instantiate)", "[ComplexCore][SetImageGeomOriginScalingFilter]") +TEST_CASE("SimplnxCore::SetImageGeomOriginScalingFilter(Instantiate)", "[SimplnxCore][SetImageGeomOriginScalingFilter]") { DataPath k_ImageGeomPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_ImageGeometry}); bool k_ChangeOrigin = false; @@ -26,10 +26,10 @@ TEST_CASE("ComplexCore::SetImageGeomOriginScalingFilter(Instantiate)", "[Complex args.insert(SetImageGeomOriginScalingFilter::k_Spacing_Key, std::make_any>(k_Spacing)); auto result = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(result.outputActions); } -TEST_CASE("ComplexCore::SetImageGeomOriginScalingFilter(Valid Parameters)", "[ComplexCore][SetImageGeomOriginScalingFilter]") +TEST_CASE("SimplnxCore::SetImageGeomOriginScalingFilter(Valid Parameters)", "[SimplnxCore][SetImageGeomOriginScalingFilter]") { DataPath k_ImageGeomPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_ImageGeometry}); bool k_ChangeOrigin = true; @@ -48,10 +48,10 @@ TEST_CASE("ComplexCore::SetImageGeomOriginScalingFilter(Valid Parameters)", "[Co args.insert(SetImageGeomOriginScalingFilter::k_Spacing_Key, std::make_any>(k_Spacing)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); auto result = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(result.result); + SIMPLNX_RESULT_REQUIRE_VALID(result.result); auto& imageGeom = dataStructure.getDataRefAs(k_ImageGeomPath); REQUIRE(imageGeom.getOrigin() == FloatVec3{7, 6, 5}); diff --git a/src/Plugins/ComplexCore/test/SharedFeatureFaceTest.cpp b/src/Plugins/SimplnxCore/test/SharedFeatureFaceTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/SharedFeatureFaceTest.cpp rename to src/Plugins/SimplnxCore/test/SharedFeatureFaceTest.cpp index 283363eff5..5255fc1373 100644 --- a/src/Plugins/ComplexCore/test/SharedFeatureFaceTest.cpp +++ b/src/Plugins/SimplnxCore/test/SharedFeatureFaceTest.cpp @@ -1,15 +1,15 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/SharedFeatureFaceFilter.hpp" +#include "SimplnxCore/Filters/SharedFeatureFaceFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/DataObjectNameParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/DataObjectNameParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; +using namespace nx::core; +using namespace nx::core::UnitTest; namespace SharedFeatureFaceFilterTest { @@ -32,9 +32,9 @@ const DataPath k_FaceLabelsPath = k_GeometryPath.createChildPath(k_FaceDataName) using namespace SharedFeatureFaceFilterTest; -TEST_CASE("ComplexCore::SharedFeatureFaceFilter", "[ComplexCore][SharedFeatureFaceFilter]") +TEST_CASE("SimplnxCore::SharedFeatureFaceFilter", "[SimplnxCore][SharedFeatureFaceFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "12_IN625_GBCD.tar.gz", "12_IN625_GBCD"); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/12_IN625_GBCD/12_IN625_GBCD.dream3d", unit_test::k_TestFilesDir)); @@ -56,11 +56,11 @@ TEST_CASE("ComplexCore::SharedFeatureFaceFilter", "[ComplexCore][SharedFeatureFa // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } // Compare the results @@ -95,7 +95,7 @@ TEST_CASE("ComplexCore::SharedFeatureFaceFilter", "[ComplexCore][SharedFeatureFa UnitTest::CompareDataArrays(kExemplarsArray, kNxArray); } -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/shared_feature_faces.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/SilhouetteTest.cpp b/src/Plugins/SimplnxCore/test/SilhouetteTest.cpp similarity index 83% rename from src/Plugins/ComplexCore/test/SilhouetteTest.cpp rename to src/Plugins/SimplnxCore/test/SilhouetteTest.cpp index f38dac0ece..f8df449e79 100644 --- a/src/Plugins/ComplexCore/test/SilhouetteTest.cpp +++ b/src/Plugins/SimplnxCore/test/SilhouetteTest.cpp @@ -1,11 +1,11 @@ #include -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/SilhouetteFilter.hpp" +#include "SimplnxCore/Filters/SilhouetteFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -25,9 +25,9 @@ const DataPath k_MedoidsSilhouettePathNX = k_CellPath.createChildPath(k_MedoidsS const DataPath k_MeansSilhouettePathNX = k_CellPath.createChildPath(k_MeansSilhouetteName + "NX"); } // namespace -TEST_CASE("ComplexCore::SilhouetteFilter: Medoids Test", "[ComplexCore][SilhouetteFilter]") +TEST_CASE("SimplnxCore::SilhouetteFilter: Medoids Test", "[SimplnxCore][SilhouetteFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/k_files/7_0_silhouette_exemplar.dream3d", unit_test::k_TestFilesDir))); { @@ -53,9 +53,9 @@ TEST_CASE("ComplexCore::SilhouetteFilter: Medoids Test", "[ComplexCore][Silhouet UnitTest::CompareArrays(dataStructure, k_MedoidsSilhouettePath, k_MedoidsSilhouettePathNX); } -TEST_CASE("ComplexCore::SilhouetteFilter: Means Test", "[ComplexCore][SilhouetteFilter]") +TEST_CASE("SimplnxCore::SilhouetteFilter: Means Test", "[SimplnxCore][SilhouetteFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "k_files.tar.gz", "k_files"); DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/k_files/7_0_silhouette_exemplar.dream3d", unit_test::k_TestFilesDir))); { diff --git a/src/Plugins/ComplexCore/test/ComplexCore_test_main.cpp b/src/Plugins/SimplnxCore/test/SimplnxCore_test_main.cpp similarity index 100% rename from src/Plugins/ComplexCore/test/ComplexCore_test_main.cpp rename to src/Plugins/SimplnxCore/test/SimplnxCore_test_main.cpp diff --git a/src/Plugins/ComplexCore/test/SplitAttributeArrayTest.cpp b/src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/SplitAttributeArrayTest.cpp rename to src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp index abb3a2ab9f..407920cf93 100644 --- a/src/Plugins/ComplexCore/test/SplitAttributeArrayTest.cpp +++ b/src/Plugins/SimplnxCore/test/SplitAttributeArrayTest.cpp @@ -1,17 +1,17 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/SplitAttributeArrayFilter.hpp" +#include "SimplnxCore/Filters/SplitAttributeArrayFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- void fillDataArray(BoolArray* inputArray) @@ -127,7 +127,7 @@ void TestSplitByType(DataStructure& dataStructure, const std::string& dataType, } auto executeResults = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResults.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResults.result); using DataArrayPtrType = DataArray*; @@ -153,7 +153,7 @@ void TestSplitByType(DataStructure& dataStructure, const std::string& dataType, } // ----------------------------------------------------------------------------- -TEST_CASE("ComplexCore::SplitAttributeArray", "[ComplexCore][SplitAttributeArrayFilter]") +TEST_CASE("SimplnxCore::SplitAttributeArray", "[SimplnxCore][SplitAttributeArrayFilter]") { DataStructure dataStructure = createDataStructure(); diff --git a/src/Plugins/ComplexCore/test/SurfaceNetsTest.cpp b/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp similarity index 85% rename from src/Plugins/ComplexCore/test/SurfaceNetsTest.cpp rename to src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp index acf41f0ddc..f0b2a81414 100644 --- a/src/Plugins/ComplexCore/test/SurfaceNetsTest.cpp +++ b/src/Plugins/SimplnxCore/test/SurfaceNetsTest.cpp @@ -1,27 +1,27 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/SurfaceNetsFilter.hpp" +#include "SimplnxCore/Filters/SurfaceNetsFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; -using namespace complex::UnitTest; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::UnitTest; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::SurfaceNetsFilter: NO Smoothing", "[ComplexCore][SurfaceNetsFilter]") +TEST_CASE("SimplnxCore::SurfaceNetsFilter: NO Smoothing", "[SimplnxCore][SurfaceNetsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "SurfaceMeshTest.tar.gz", "SurfaceMeshTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "SurfaceMeshTest.tar.gz", "SurfaceMeshTest"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/SurfaceMeshTest/SurfaceMeshTest.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/SurfaceMeshTest/SurfaceMeshTest.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - const DataPath smallIn100Group({complex::Constants::k_DataContainer}); + const DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); const DataPath featureIdsDataPath({k_DataContainer, k_CellData, k_FeatureIds}); const DataPath ebsdSanDataPath({k_DataContainer, k_CellData}); @@ -85,19 +85,19 @@ TEST_CASE("ComplexCore::SurfaceNetsFilter: NO Smoothing", "[ComplexCore][Surface CompareExemplarToGeneratedData(dataStructure, dataStructure, triangleGeometryPath.createChildPath(k_FaceDataGroupName), exemplarGeometryPath); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/surface_nets.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } -TEST_CASE("ComplexCore::SurfaceNetsFilter: With Smoothing", "[ComplexCore][SurfaceNetsFilter]") +TEST_CASE("SimplnxCore::SurfaceNetsFilter: With Smoothing", "[SimplnxCore][SurfaceNetsFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "SurfaceMeshTest.tar.gz", "SurfaceMeshTest"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "SurfaceMeshTest.tar.gz", "SurfaceMeshTest"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/SurfaceMeshTest/SurfaceMeshTest.dream3d", complex::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/SurfaceMeshTest/SurfaceMeshTest.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); - const DataPath smallIn100Group({complex::Constants::k_DataContainer}); + const DataPath smallIn100Group({nx::core::Constants::k_DataContainer}); const DataPath featureIdsDataPath({k_DataContainer, k_CellData, k_FeatureIds}); const DataPath ebsdSanDataPath({k_DataContainer, k_CellData}); @@ -162,7 +162,7 @@ TEST_CASE("ComplexCore::SurfaceNetsFilter: With Smoothing", "[ComplexCore][Surfa CompareExemplarToGeneratedData(dataStructure, dataStructure, triangleGeometryPath.createChildPath(k_FaceDataGroupName), exemplarGeometryPath); // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/surface_nets_smoothing.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/TriangleCentroidTest.cpp b/src/Plugins/SimplnxCore/test/TriangleCentroidTest.cpp similarity index 87% rename from src/Plugins/ComplexCore/test/TriangleCentroidTest.cpp rename to src/Plugins/SimplnxCore/test/TriangleCentroidTest.cpp index 9fd0cc327a..54ac5300d2 100644 --- a/src/Plugins/ComplexCore/test/TriangleCentroidTest.cpp +++ b/src/Plugins/SimplnxCore/test/TriangleCentroidTest.cpp @@ -1,10 +1,10 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/TriangleCentroidFilter.hpp" +#include "SimplnxCore/Filters/TriangleCentroidFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -12,8 +12,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -44,7 +44,7 @@ static const IGeometry::SharedFaceList* CreateFaceList(IGeometry& geom, const Da } // namespace -TEST_CASE("ComplexCore::TriangleCentroidFilter", "[ComplexCore][TriangleCentroidFilter]") +TEST_CASE("SimplnxCore::TriangleCentroidFilter", "[SimplnxCore][TriangleCentroidFilter]") { DataStructure dataStructure; TriangleGeom& acuteTriangle = *TriangleGeom::Create(dataStructure, k_TriangleGeometryName); @@ -87,11 +87,11 @@ TEST_CASE("ComplexCore::TriangleCentroidFilter", "[ComplexCore][TriangleCentroid // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) std::vector centroids = {{0.5F, 0.333333F, 0.0F}, {3.0F, 0.333333, 0.0F}, {6.66667, 0.0F, 0.0F}, {9.0F, 0.0F, 0.0F}}; diff --git a/src/Plugins/ComplexCore/test/TriangleDihedralAngleFilterTest.cpp b/src/Plugins/SimplnxCore/test/TriangleDihedralAngleFilterTest.cpp similarity index 88% rename from src/Plugins/ComplexCore/test/TriangleDihedralAngleFilterTest.cpp rename to src/Plugins/SimplnxCore/test/TriangleDihedralAngleFilterTest.cpp index d4fc0fea34..5101bd8627 100644 --- a/src/Plugins/ComplexCore/test/TriangleDihedralAngleFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/TriangleDihedralAngleFilterTest.cpp @@ -1,10 +1,10 @@ -#include "ComplexCore/Filters/TriangleDihedralAngleFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "SimplnxCore/Filters/TriangleDihedralAngleFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -12,8 +12,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -43,7 +43,7 @@ static const IGeometry::SharedFaceList* createFaceList(IGeometry& geom, const Da } // namespace -TEST_CASE("ComplexCore::TriangleDihedralAngleFilter[valid results]", "[ComplexCore][TriangleDihedralAngleFilter]") +TEST_CASE("SimplnxCore::TriangleDihedralAngleFilter[valid results]", "[SimplnxCore][TriangleDihedralAngleFilter]") { std::string triangleGeometryName = "[Triangle Geometry]"; std::string triangleFaceDataGroupName = "Face Data"; @@ -90,11 +90,11 @@ TEST_CASE("ComplexCore::TriangleDihedralAngleFilter[valid results]", "[ComplexCo // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) std::vector officialDihedralAngleMinimums = {53.1301002502441, 18.4349555969238, 0.0, 0.0}; Float64Array& calculatedDihedralAngleMinimums = dataStructure.getDataRefAs(triangleDihedralAnglesDataPath); diff --git a/src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp b/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp similarity index 76% rename from src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp rename to src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp index d1f8e17d50..18974c5cb7 100644 --- a/src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/TriangleNormalFilterTest.cpp @@ -1,14 +1,14 @@ -#include "ComplexCore/Filters/TriangleNormalFilter.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ReadStlFileFilter.hpp" - -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "SimplnxCore/Filters/TriangleNormalFilter.hpp" +#include "SimplnxCore/Filters/ReadStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" + +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include @@ -16,15 +16,15 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { constexpr float64 k_max_difference = 0.0001; } -TEST_CASE("ComplexCore::TriangleNormalFilter", "[ComplexCore][TriangleNormalFilter]") +TEST_CASE("SimplnxCore::TriangleNormalFilter", "[SimplnxCore][TriangleNormalFilter]") { std::string triangleGeometryName = "[Triangle Geometry]"; std::string triangleFaceDataGroupName = "Face Data"; @@ -48,11 +48,11 @@ TEST_CASE("ComplexCore::TriangleNormalFilter", "[ComplexCore][TriangleNormalFilt // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); TriangleGeom& triangleGeom = dataStructure.getDataRefAs(triangleGeomDataPath); REQUIRE(triangleGeom.getNumberOfFaces() == 92); @@ -72,11 +72,11 @@ TEST_CASE("ComplexCore::TriangleNormalFilter", "[ComplexCore][TriangleNormalFilt // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); DataPath triangleNormalsDataPath = geometryPath.createChildPath(triangleFaceDataGroupName).createChildPath(triangleNormalsName); @@ -93,7 +93,7 @@ TEST_CASE("ComplexCore::TriangleNormalFilter", "[ComplexCore][TriangleNormalFilt } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/TriangleNormals.dream3d", unit_test::k_BinaryTestOutputDir))); #endif } diff --git a/src/Plugins/ComplexCore/test/UncertainRegularGridSampleSurfaceMeshTest.cpp b/src/Plugins/SimplnxCore/test/UncertainRegularGridSampleSurfaceMeshTest.cpp similarity index 86% rename from src/Plugins/ComplexCore/test/UncertainRegularGridSampleSurfaceMeshTest.cpp rename to src/Plugins/SimplnxCore/test/UncertainRegularGridSampleSurfaceMeshTest.cpp index 7043d7e8b0..34b412c9c6 100644 --- a/src/Plugins/ComplexCore/test/UncertainRegularGridSampleSurfaceMeshTest.cpp +++ b/src/Plugins/SimplnxCore/test/UncertainRegularGridSampleSurfaceMeshTest.cpp @@ -1,15 +1,15 @@ #include -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp" +#include "SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -25,14 +25,14 @@ const DataPath k_GeneratedImageGeomPath = DataPath({Constants::k_ImageGeometry}) const DataPath k_GeneratedFeatureIdsPath = k_GeneratedImageGeomPath.createChildPath(Constants::k_CellData).createChildPath(Constants::k_FeatureIds); } // namespace -TEST_CASE("ComplexCore::UncertainRegularGridSampleSurfaceMeshFilter: Valid Filter Execution", "[ComplexCore][UncertainRegularGridSampleSurfaceMeshFilter]") +TEST_CASE("SimplnxCore::UncertainRegularGridSampleSurfaceMeshFilter: Valid Filter Execution", "[SimplnxCore][UncertainRegularGridSampleSurfaceMeshFilter]") { /** * THe generated test case file for this was generated on a temporary modification of the 6.6 DREAM3D-SIMPL fork where the * random generation was modified to use the same generator, engine, and distribution used in standard SIMPLNX random generation * utilizing the standard library. It was seeded with the std::mt19937::default_seed. */ - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_sample_surface_mesh.tar.gz", "6_6_sample_surface_mesh"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_sample_surface_mesh.tar.gz", "6_6_sample_surface_mesh"); // Read Exemplar DREAM3D File Filter auto baseDataFilePath = fs::path(fmt::format("{}/6_6_sample_surface_mesh/6_6_grid_sample_surface_mesh.dream3d", unit_test::k_TestFilesDir)); @@ -68,7 +68,7 @@ TEST_CASE("ComplexCore::UncertainRegularGridSampleSurfaceMeshFilter: Valid Filte } // Write the DataStructure out to the file system -#ifdef COMPLEX_WRITE_TEST_OUTPUT +#ifdef SIMPLNX_WRITE_TEST_OUTPUT UnitTest::WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_uncertain_regular_grid_sample_surface_mesh.dream3d", unit_test::k_BinaryTestOutputDir))); #endif diff --git a/src/Plugins/ComplexCore/test/WriteASCIIDataTest.cpp b/src/Plugins/SimplnxCore/test/WriteASCIIDataTest.cpp similarity index 92% rename from src/Plugins/ComplexCore/test/WriteASCIIDataTest.cpp rename to src/Plugins/SimplnxCore/test/WriteASCIIDataTest.cpp index 46843820e6..c61810182d 100644 --- a/src/Plugins/ComplexCore/test/WriteASCIIDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteASCIIDataTest.cpp @@ -1,9 +1,9 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteASCIIDataFilter.hpp" +#include "SimplnxCore/Filters/WriteASCIIDataFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -12,7 +12,7 @@ #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; /** * @brief The WriteASCIIDataTest class @@ -184,11 +184,11 @@ class RunASCIIDataTest // Preflight the filter and check result auto preflightResult = filter.preflight(m_DataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(m_DataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // read the file(s) back in if(fileType == k_MultipleFiles) @@ -205,9 +205,9 @@ class RunASCIIDataTest } }; -TEST_CASE("ComplexCore::WriteASCIIData: Valid filter execution") +TEST_CASE("SimplnxCore::WriteASCIIData: Valid filter execution") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ascii_data_exemplars.tar.gz", "ascii_data_exemplars"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ascii_data_exemplars.tar.gz", "ascii_data_exemplars"); DataStructure dataStructure; diff --git a/src/Plugins/ComplexCore/test/WriteAbaqusHexahedronTest.cpp b/src/Plugins/SimplnxCore/test/WriteAbaqusHexahedronTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/WriteAbaqusHexahedronTest.cpp rename to src/Plugins/SimplnxCore/test/WriteAbaqusHexahedronTest.cpp index 11e53c50a8..23a61698ae 100644 --- a/src/Plugins/ComplexCore/test/WriteAbaqusHexahedronTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteAbaqusHexahedronTest.cpp @@ -1,15 +1,15 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp" +#include "SimplnxCore/Filters/WriteAbaqusHexahedronFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -68,13 +68,13 @@ void CompareResults() // compare hash of both file strings } } // namespace -TEST_CASE("ComplexCore::WriteAbaqusHexahedronFilter: Valid Filter Execution", "[ComplexCore][WriteAbaqusHexahedronFilter]") +TEST_CASE("SimplnxCore::WriteAbaqusHexahedronFilter: Valid Filter Execution", "[SimplnxCore][WriteAbaqusHexahedronFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "abaqus_hexahedron_writer_test.tar.gz", - "abaqus_hexahedron_writer_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "abaqus_hexahedron_writer_test.tar.gz", + "abaqus_hexahedron_writer_test"); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_find_feature_centroids.tar.gz", - "6_6_find_feature_centroids.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_feature_centroids.tar.gz", + "6_6_find_feature_centroids.dream3d"); // Instantiate the filter, a DataStructure object and an Arguments Object const WriteAbaqusHexahedronFilter filter; diff --git a/src/Plugins/ComplexCore/test/WriteAvizoRectilinearCoordinateTest.cpp b/src/Plugins/SimplnxCore/test/WriteAvizoRectilinearCoordinateTest.cpp similarity index 75% rename from src/Plugins/ComplexCore/test/WriteAvizoRectilinearCoordinateTest.cpp rename to src/Plugins/SimplnxCore/test/WriteAvizoRectilinearCoordinateTest.cpp index 69ae7fac2f..95948464a3 100644 --- a/src/Plugins/ComplexCore/test/WriteAvizoRectilinearCoordinateTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteAvizoRectilinearCoordinateTest.cpp @@ -1,25 +1,25 @@ #include -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" +#include "SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::WriteAvizoRectilinearCoordinateFilter: Valid Filter Execution", "[ComplexCore][WriteAvizoRectilinearCoordinateFilter][.][UNIMPLEMENTED][!mayfail]") +TEST_CASE("SimplnxCore::WriteAvizoRectilinearCoordinateFilter: Valid Filter Execution", "[SimplnxCore][WriteAvizoRectilinearCoordinateFilter][.][UNIMPLEMENTED][!mayfail]") { const std::string kDataInputArchive = "6_6_avizo_writers.tar.gz"; const std::string kExpectedOutputTopLevel = "6_6_avizo_writers"; - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, kDataInputArchive, kExpectedOutputTopLevel); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, kDataInputArchive, kExpectedOutputTopLevel); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_avizo_writers/6_6_avizo_writers_input.dream3d", unit_test::k_TestFilesDir)); @@ -44,20 +44,20 @@ TEST_CASE("ComplexCore::WriteAvizoRectilinearCoordinateFilter: Valid Filter Exec // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_WriteBinaryFile_Key, std::make_any(true)); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) std::vector linesToSkip{8, 9}; // skip the author & DateTime lines std::ifstream computedFile(computedOutputPath); diff --git a/src/Plugins/ComplexCore/test/WriteAvizoUniformCoordinateTest.cpp b/src/Plugins/SimplnxCore/test/WriteAvizoUniformCoordinateTest.cpp similarity index 75% rename from src/Plugins/ComplexCore/test/WriteAvizoUniformCoordinateTest.cpp rename to src/Plugins/SimplnxCore/test/WriteAvizoUniformCoordinateTest.cpp index 308b893c89..adc12f9a93 100644 --- a/src/Plugins/ComplexCore/test/WriteAvizoUniformCoordinateTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteAvizoUniformCoordinateTest.cpp @@ -1,25 +1,25 @@ #include -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" +#include "SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::WriteAvizoUniformCoordinateFilter: Valid Filter Execution", "[ComplexCore][WriteAvizoUniformCoordinateFilter]") +TEST_CASE("SimplnxCore::WriteAvizoUniformCoordinateFilter: Valid Filter Execution", "[SimplnxCore][WriteAvizoUniformCoordinateFilter]") { const std::string kDataInputArchive = "6_6_avizo_writers.tar.gz"; const std::string kExpectedOutputTopLevel = "6_6_avizo_writers"; - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, kDataInputArchive, kExpectedOutputTopLevel); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, kDataInputArchive, kExpectedOutputTopLevel); // Read Exemplar DREAM3D File Filter auto exemplarFilePath = fs::path(fmt::format("{}/6_6_avizo_writers/6_6_avizo_writers_input.dream3d", unit_test::k_TestFilesDir)); @@ -43,20 +43,20 @@ TEST_CASE("ComplexCore::WriteAvizoUniformCoordinateFilter: Valid Filter Executio // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_WriteBinaryFile_Key, std::make_any(true)); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) std::vector linesToSkip{6, 7}; // skip the author & DateTime lines std::ifstream computedFile(computedOutputPath); diff --git a/src/Plugins/ComplexCore/test/WriteBinaryDataTest.cpp b/src/Plugins/SimplnxCore/test/WriteBinaryDataTest.cpp similarity index 93% rename from src/Plugins/ComplexCore/test/WriteBinaryDataTest.cpp rename to src/Plugins/SimplnxCore/test/WriteBinaryDataTest.cpp index 1efeb03075..0534daa1cf 100644 --- a/src/Plugins/ComplexCore/test/WriteBinaryDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteBinaryDataTest.cpp @@ -1,9 +1,9 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteBinaryDataFilter.hpp" +#include "SimplnxCore/Filters/WriteBinaryDataFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -23,7 +23,7 @@ #endif namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; /** * @brief The WriteASCIIDataTest class @@ -237,11 +237,11 @@ class RunBinaryTest // Preflight the filter and check result auto preflightResult = filter.preflight(m_DataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(m_DataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); // read the file(s) back in for(int32 i = 0; i < daps1.size(); i++) @@ -251,9 +251,9 @@ class RunBinaryTest } }; -TEST_CASE("ComplexCore::WriteBinaryData: Valid filter execution") +TEST_CASE("SimplnxCore::WriteBinaryData: Valid filter execution") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "export_files_test.tar.gz", "export_files_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "export_files_test.tar.gz", "export_files_test"); DataStructure dataStructure; DataStructure& dsRef = dataStructure; @@ -274,7 +274,7 @@ TEST_CASE("ComplexCore::WriteBinaryData: Valid filter execution") // Not sure how to replicate this on unix as there is a decent probability that // a test bot might actually have write access to the root "/" of the Unix OS. This // definitely would NOT happen macOS. Linux is iffy. -TEST_CASE("ComplexCore::WriteBinaryData:Invalid Filter Execution") +TEST_CASE("SimplnxCore::WriteBinaryData:Invalid Filter Execution") { // We are just going to generate a big number so that we can use that in the output // file path. This tests the creation of intermediate directories that the filter @@ -329,5 +329,5 @@ TEST_CASE("ComplexCore::WriteBinaryData:Invalid Filter Execution") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); } diff --git a/src/Plugins/ComplexCore/test/WriteFeatureDataCSVTest.cpp b/src/Plugins/SimplnxCore/test/WriteFeatureDataCSVTest.cpp similarity index 79% rename from src/Plugins/ComplexCore/test/WriteFeatureDataCSVTest.cpp rename to src/Plugins/SimplnxCore/test/WriteFeatureDataCSVTest.cpp index bd6de89222..3e03327074 100644 --- a/src/Plugins/ComplexCore/test/WriteFeatureDataCSVTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteFeatureDataCSVTest.cpp @@ -1,12 +1,12 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp" +#include "SimplnxCore/Filters/WriteFeatureDataCSVFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include @@ -15,8 +15,8 @@ #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; namespace { @@ -48,7 +48,7 @@ std::vector readIn(fs::path filePath) return {}; } -TEST_CASE("ComplexCore::WriteFeatureDataCSVFilter: Test Algorithm", "[WriteFeatureDataCSVFilter]") +TEST_CASE("SimplnxCore::WriteFeatureDataCSVFilter: Test Algorithm", "[WriteFeatureDataCSVFilter]") { WriteFeatureDataCSVFilter filter; DataStructure dataStructure; @@ -82,13 +82,13 @@ TEST_CASE("ComplexCore::WriteFeatureDataCSVFilter: Test Algorithm", "[WriteFeatu // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "ascii_data_exemplars.tar.gz", "ascii_data_exemplars"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "ascii_data_exemplars.tar.gz", "ascii_data_exemplars"); auto exemplarPath = fs::path(fmt::format("{}/ascii_data_exemplars/{}", unit_test::k_TestFilesDir, k_CSVExemplarFileName)); REQUIRE(fs::exists(exemplarPath)); diff --git a/src/Plugins/ComplexCore/test/WriteLosAlamosFFTTest.cpp b/src/Plugins/SimplnxCore/test/WriteLosAlamosFFTTest.cpp similarity index 75% rename from src/Plugins/ComplexCore/test/WriteLosAlamosFFTTest.cpp rename to src/Plugins/SimplnxCore/test/WriteLosAlamosFFTTest.cpp index ad98af1177..0f11012361 100644 --- a/src/Plugins/ComplexCore/test/WriteLosAlamosFFTTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteLosAlamosFFTTest.cpp @@ -1,16 +1,16 @@ #include -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp" +#include "SimplnxCore/Filters/WriteLosAlamosFFTFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -57,11 +57,11 @@ void CompareResults() // compare hash of both file strings } } // namespace -TEST_CASE("ComplexCore::WriteLosAlamosFFTFilter: Valid Filter Execution", "[ComplexCore][WriteLosAlamosFFTFilter]") +TEST_CASE("SimplnxCore::WriteLosAlamosFFTFilter: Valid Filter Execution", "[SimplnxCore][WriteLosAlamosFFTFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "bin_feature_phases.tar.gz", "bin_feature_phases"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "bin_feature_phases.tar.gz", "bin_feature_phases"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "LosAlamosFFTExemplar.tar.gz", "LosAlamosFFTExemplar.txt"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "LosAlamosFFTExemplar.tar.gz", "LosAlamosFFTExemplar.txt"); // Utilize the 6.6 Binary Feature Phases test file to conserve space DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/bin_feature_phases/6_6_find_feature_phases_binary.dream3d", unit_test::k_TestFilesDir))); @@ -81,11 +81,11 @@ TEST_CASE("ComplexCore::WriteLosAlamosFFTFilter: Valid Filter Execution", "[Comp // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); } ::CompareResults(); diff --git a/src/Plugins/ComplexCore/test/WriteStlFileTest.cpp b/src/Plugins/SimplnxCore/test/WriteStlFileTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/WriteStlFileTest.cpp rename to src/Plugins/SimplnxCore/test/WriteStlFileTest.cpp index dd71789700..1c731b5ddb 100644 --- a/src/Plugins/ComplexCore/test/WriteStlFileTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteStlFileTest.cpp @@ -1,17 +1,17 @@ #include -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteStlFileFilter.hpp" +#include "SimplnxCore/Filters/WriteStlFileFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -53,9 +53,9 @@ void CompareResults() // compare hash of both file strings } } // namespace -TEST_CASE("ComplexCore::WriteStlFileFilter: Valid Filter Execution", "[ComplexCore][WriteStlFileFilter]") +TEST_CASE("SimplnxCore::WriteStlFileFilter: Valid Filter Execution", "[SimplnxCore][WriteStlFileFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_write_stl_test.tar.gz", "6_6_write_stl_test"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_write_stl_test.tar.gz", "6_6_write_stl_test"); // Instantiate the filter, a DataStructure object and an Arguments Object WriteStlFileFilter filter; diff --git a/src/Plugins/ComplexCore/test/WriteVtkRectilinearGridTest.cpp b/src/Plugins/SimplnxCore/test/WriteVtkRectilinearGridTest.cpp similarity index 72% rename from src/Plugins/ComplexCore/test/WriteVtkRectilinearGridTest.cpp rename to src/Plugins/SimplnxCore/test/WriteVtkRectilinearGridTest.cpp index 3537ef45fe..42f237b323 100644 --- a/src/Plugins/ComplexCore/test/WriteVtkRectilinearGridTest.cpp +++ b/src/Plugins/SimplnxCore/test/WriteVtkRectilinearGridTest.cpp @@ -1,24 +1,24 @@ #include -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" -#include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp" +#include "SimplnxCore/Filters/WriteVtkRectilinearGridFilter.hpp" +#include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include namespace fs = std::filesystem; -using namespace complex; -using namespace complex::Constants; +using namespace nx::core; +using namespace nx::core::Constants; -TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: Valid Filter Execution", "[ComplexCore][WriteVtkRectilinearGridFilter]") +TEST_CASE("SimplnxCore::WriteVtkRectilinearGridFilter: Valid Filter Execution", "[SimplnxCore][WriteVtkRectilinearGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "vtk_rectilinear_grid_writer.tar.gz", - "vtk_rectilinear_grid_writer"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "vtk_rectilinear_grid_writer.tar.gz", + "vtk_rectilinear_grid_writer"); // Read input DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); @@ -41,20 +41,20 @@ TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: Valid Filter Execution", args.insertOrAssign(WriteVtkRectilinearGridFilter::k_SelectedDataArrayPaths_Key, std::make_any(selectedArrayPaths)); auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) // write out binary vtk file args.insertOrAssign(WriteVtkRectilinearGridFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); args.insertOrAssign(WriteVtkRectilinearGridFilter::k_WriteBinaryFile_Key, std::make_any(true)); preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions) executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result) std::vector linesToSkip{1}; // skip the version line std::ifstream computedFile(computedOutputPath); @@ -69,12 +69,12 @@ TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: Valid Filter Execution", std::filesystem::remove_all(fmt::format("{}/vtk_rectilinear_grid_writer", unit_test::k_BinaryTestOutputDir), errorCode); } -TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: InValid Filter Execution", "[ComplexCore][WriteVtkRectilinearGridFilter]") +TEST_CASE("SimplnxCore::WriteVtkRectilinearGridFilter: InValid Filter Execution", "[SimplnxCore][WriteVtkRectilinearGridFilter]") { - const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); - const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_vtk_rectilinear_grid_writer.tar.gz", - "6_6_vtk_rectilinear_grid_writer"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel1(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_vtk_rectilinear_grid_writer.tar.gz", + "6_6_vtk_rectilinear_grid_writer"); // Read input DREAM3D File auto exemplarFilePath = fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)); @@ -107,8 +107,8 @@ TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: InValid Filter Execution" } auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions) auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result) + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result) } diff --git a/src/Plugins/SimplnxCore/test/test_dirs.hpp.in b/src/Plugins/SimplnxCore/test/test_dirs.hpp.in new file mode 100644 index 0000000000..79bda38b27 --- /dev/null +++ b/src/Plugins/SimplnxCore/test/test_dirs.hpp.in @@ -0,0 +1,21 @@ +#pragma once + +#include "simplnx/Common/StringLiteral.hpp" + +#cmakedefine SIMPLNX_WRITE_TEST_OUTPUT + + +namespace nx::core::unit_test +{ +inline constexpr StringLiteral k_ComplexSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@"; +inline constexpr StringLiteral k_ComplexTestSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@/test"; +inline constexpr StringLiteral k_ComplexTestDataSourceDir = "@SIMPLNX_SOURCE_DIR_NORM@/test/Data"; +inline constexpr StringLiteral k_SourceDir = "@PLUGIN_SOURCE_DIR_NORM@"; +inline constexpr StringLiteral k_TestDataSourceDir = "@PLUGIN_SOURCE_DIR_NORM@/data"; +inline constexpr StringLiteral k_BinaryDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; +inline constexpr StringLiteral k_BinaryTestOutputDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@/test_output"; +inline constexpr StringLiteral k_BuildDir = SIMPLNX_BUILD_DIR; +inline constexpr StringLiteral k_DREAM3DDataDir = "@DREAM3D_DATA_DIR_NORM@"; +inline constexpr StringLiteral k_TestFilesDir = "@DREAM3D_DATA_DIR_NORM@/TestFiles"; +inline constexpr StringLiteral k_CMakeExecutable = "@CMAKE_COMMAND_NORM@"; +} // namespace nx::core::unit_test diff --git a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp b/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp similarity index 83% rename from src/Plugins/ComplexCore/wrapping/python/complexpy.cpp rename to src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp index 288f07a335..dfbb3fbc24 100644 --- a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp +++ b/src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp @@ -7,111 +7,111 @@ #include #include -#include "ComplexCore/ComplexCoreFilterBinding.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "SimplnxCore/SimplnxCoreFilterBinding.hpp" +#include "SimplnxCore/SimplnxCorePlugin.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -using namespace complex; -using namespace complex::CxPybind; +using namespace nx::core; +using namespace nx::core::CxPybind; namespace py = pybind11; using namespace pybind11::literals; template <> -struct fmt::formatter +struct fmt::formatter { constexpr format_parse_context::iterator parse(format_parse_context& ctx) { return ctx.begin(); } - format_context::iterator format(const complex::Error& value, format_context& ctx) const + format_context::iterator format(const nx::core::Error& value, format_context& ctx) const { return fmt::format_to(ctx.out(), "Error(code={}, message='{}')", value.code, value.message); } }; template <> -struct fmt::formatter +struct fmt::formatter { constexpr format_parse_context::iterator parse(format_parse_context& ctx) { return ctx.begin(); } - format_context::iterator format(const complex::Warning& value, format_context& ctx) const + format_context::iterator format(const nx::core::Warning& value, format_context& ctx) const { return fmt::format_to(ctx.out(), "Warning(code={}, message='{}')", value.code, value.message); } @@ -141,8 +141,8 @@ auto BindVectorParameter(py::handle scope, const char* name) return vectorParameter; } -#define COMPLEX_PY_BIND_NUMBER_PARAMETER(scope, className) BindNumberParameter(scope, #className) -#define COMPLEX_PY_BIND_VECTOR_PARAMETER(scope, className) BindVectorParameter(scope, #className) +#define SIMPLNX_PY_BIND_NUMBER_PARAMETER(scope, className) BindNumberParameter(scope, #className) +#define SIMPLNX_PY_BIND_VECTOR_PARAMETER(scope, className) BindVectorParameter(scope, #className) template auto BindDataStore(py::handle scope, const char* name) @@ -185,9 +185,9 @@ auto BindDataArray(py::handle scope, const char* name) return dataArray; } -#define COMPLEX_PY_BIND_DATA_ARRAY(scope, className) BindDataArray(scope, #className) -#define COMPLEX_PY_BIND_DATA_STORE(scope, className) BindDataStore(scope, #className) -#define COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(scope, className) COMPLEX_PY_BIND_CLASS_VARIADIC(scope, className, IDataStore, std::shared_ptr) +#define SIMPLNX_PY_BIND_DATA_ARRAY(scope, className) BindDataArray(scope, #className) +#define SIMPLNX_PY_BIND_DATA_STORE(scope, className) BindDataStore(scope, #className) +#define SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(scope, className) SIMPLNX_PY_BIND_CLASS_VARIADIC(scope, className, IDataStore, std::shared_ptr) template auto BindCreateGeometry2DAction(py::handle scope, const char* name) @@ -211,8 +211,8 @@ auto BindCreateGeometry3DAction(py::handle scope, const char* name) return createGeometry3DAction; } -#define COMPLEX_PY_BIND_CREATE_GEOMETRY_2D_ACTION(scope, className) BindCreateGeometry2DAction(scope, #className) -#define COMPLEX_PY_BIND_CREATE_GEOMETRY_3D_ACTION(scope, className) BindCreateGeometry3DAction(scope, #className) +#define SIMPLNX_PY_BIND_CREATE_GEOMETRY_2D_ACTION(scope, className) BindCreateGeometry2DAction(scope, #className) +#define SIMPLNX_PY_BIND_CREATE_GEOMETRY_3D_ACTION(scope, className) BindCreateGeometry3DAction(scope, #className) std::pair, std::vector> GetPipelineFilterResult(const PipelineFilter& filter) { @@ -269,17 +269,17 @@ Result<> ExecutePipeline(Pipeline& pipeline, DataStructure& dataStructure) return result; } -complex::DataPath CreateDataPath(std::string_view path) +nx::core::DataPath CreateDataPath(std::string_view path) { auto result = DataPath::FromString(path); return result.value(); } -PYBIND11_MODULE(complex, mod) +PYBIND11_MODULE(simplnx, mod) { auto* internals = new Internals(); - const auto* corePlugin = internals->addPlugin(); + const auto* corePlugin = internals->addPlugin(); py::set_shared_data(Internals::k_Key, internals); @@ -293,16 +293,16 @@ PYBIND11_MODULE(complex, mod) error.def(py::init()); error.def_readwrite("code", &Error::code); error.def_readwrite("message", &Error::message); - error.def("__repr__", [](const Error& self) { return fmt::format("", self.code, self.message); }); - error.def("__str__", [](const Error& self) { return fmt::format("", self.code, self.message); }); + error.def("__repr__", [](const Error& self) { return fmt::format("", self.code, self.message); }); + error.def("__str__", [](const Error& self) { return fmt::format("", self.code, self.message); }); py::class_ warning(mod, "Warning"); warning.def(py::init<>()); warning.def(py::init()); warning.def_readwrite("code", &Warning::code); warning.def_readwrite("message", &Warning::message); - warning.def("__repr__", [](const Warning& self) { return fmt::format("", self.code, self.message); }); - warning.def("__str__", [](const Warning& self) { return fmt::format("", self.code, self.message); }); + warning.def("__repr__", [](const Warning& self) { return fmt::format("", self.code, self.message); }); + warning.def("__str__", [](const Warning& self) { return fmt::format("", self.code, self.message); }); py::class_> result(mod, "Result"); result.def(py::init<>([](std::optional> errors, std::optional> warnings) { @@ -332,7 +332,7 @@ PYBIND11_MODULE(complex, mod) { errors = self.errors(); } - return fmt::format("", errors, self.warnings()); + return fmt::format("", errors, self.warnings()); }); py::enum_ numericType(mod, "NumericType"); @@ -371,7 +371,7 @@ PYBIND11_MODULE(complex, mod) return *uuid; })); uuid.def("__str__", &Uuid::str); - uuid.def("__repr__", [](const Uuid& self) { return fmt::format("", self.str()); }); + uuid.def("__repr__", [](const Uuid& self) { return fmt::format("", self.str()); }); uuid.def("__getitem__", [](const Uuid& self, usize i) { return static_cast(self.data.at(i)); }); uuid.def("__setitem__", [](Uuid& self, usize i, uint8 value) { self.data.at(i) = std::byte{value}; }); uuid.def("__len__", [](const Uuid& self) { return self.data.size(); }); @@ -476,29 +476,29 @@ PYBIND11_MODULE(complex, mod) iDataStore.def_property_readonly("tdims", &IDataStore::getTupleShape); iDataStore.def_property_readonly("cdims", &IDataStore::getComponentShape); - auto abstractDataStoreInt8 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int8AbstractDataStore); - auto abstractDataStoreUInt8 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt8AbstractDataStore); - auto abstractDataStoreInt16 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int16AbstractDataStore); - auto abstractDataStoreUInt16 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt16AbstractDataStore); - auto abstractDataStoreInt32 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int32AbstractDataStore); - auto abstractDataStoreUInt32 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt32AbstractDataStore); - auto abstractDataStoreInt64 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int64AbstractDataStore); - auto abstractDataStoreUInt64 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt64AbstractDataStore); - auto abstractDataStoreFloat32 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, Float32AbstractDataStore); - auto abstractDataStoreFloat64 = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, Float64AbstractDataStore); - auto abstractDataStoreBool = COMPLEX_PY_BIND_ABSTRACT_DATA_STORE(mod, BoolAbstractDataStore); - - auto dataStoreInt8 = COMPLEX_PY_BIND_DATA_STORE(mod, Int8DataStore); - auto dataStoreUInt8 = COMPLEX_PY_BIND_DATA_STORE(mod, UInt8DataStore); - auto dataStoreInt16 = COMPLEX_PY_BIND_DATA_STORE(mod, Int16DataStore); - auto dataStoreUInt16 = COMPLEX_PY_BIND_DATA_STORE(mod, UInt16DataStore); - auto dataStoreInt32 = COMPLEX_PY_BIND_DATA_STORE(mod, Int32DataStore); - auto dataStoreUInt32 = COMPLEX_PY_BIND_DATA_STORE(mod, UInt32DataStore); - auto dataStoreInt64 = COMPLEX_PY_BIND_DATA_STORE(mod, Int64DataStore); - auto dataStoreUInt64 = COMPLEX_PY_BIND_DATA_STORE(mod, UInt64DataStore); - auto dataStoreFloat32 = COMPLEX_PY_BIND_DATA_STORE(mod, Float32DataStore); - auto dataStoreFloat64 = COMPLEX_PY_BIND_DATA_STORE(mod, Float64DataStore); - auto dataStoreBool = COMPLEX_PY_BIND_DATA_STORE(mod, BoolDataStore); + auto abstractDataStoreInt8 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int8AbstractDataStore); + auto abstractDataStoreUInt8 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt8AbstractDataStore); + auto abstractDataStoreInt16 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int16AbstractDataStore); + auto abstractDataStoreUInt16 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt16AbstractDataStore); + auto abstractDataStoreInt32 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int32AbstractDataStore); + auto abstractDataStoreUInt32 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt32AbstractDataStore); + auto abstractDataStoreInt64 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, Int64AbstractDataStore); + auto abstractDataStoreUInt64 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, UInt64AbstractDataStore); + auto abstractDataStoreFloat32 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, Float32AbstractDataStore); + auto abstractDataStoreFloat64 = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, Float64AbstractDataStore); + auto abstractDataStoreBool = SIMPLNX_PY_BIND_ABSTRACT_DATA_STORE(mod, BoolAbstractDataStore); + + auto dataStoreInt8 = SIMPLNX_PY_BIND_DATA_STORE(mod, Int8DataStore); + auto dataStoreUInt8 = SIMPLNX_PY_BIND_DATA_STORE(mod, UInt8DataStore); + auto dataStoreInt16 = SIMPLNX_PY_BIND_DATA_STORE(mod, Int16DataStore); + auto dataStoreUInt16 = SIMPLNX_PY_BIND_DATA_STORE(mod, UInt16DataStore); + auto dataStoreInt32 = SIMPLNX_PY_BIND_DATA_STORE(mod, Int32DataStore); + auto dataStoreUInt32 = SIMPLNX_PY_BIND_DATA_STORE(mod, UInt32DataStore); + auto dataStoreInt64 = SIMPLNX_PY_BIND_DATA_STORE(mod, Int64DataStore); + auto dataStoreUInt64 = SIMPLNX_PY_BIND_DATA_STORE(mod, UInt64DataStore); + auto dataStoreFloat32 = SIMPLNX_PY_BIND_DATA_STORE(mod, Float32DataStore); + auto dataStoreFloat64 = SIMPLNX_PY_BIND_DATA_STORE(mod, Float64DataStore); + auto dataStoreBool = SIMPLNX_PY_BIND_DATA_STORE(mod, BoolDataStore); py::class_ dataStructure(mod, "DataStructure"); py::class_> dataObject(mod, "DataObject"); @@ -538,7 +538,7 @@ PYBIND11_MODULE(complex, mod) self.exportHierarchyAsGraphViz(ss); return ss.str(); }); - dataStructure.def("get_children", [](DataStructure& self, complex::DataPath& parentPath) { + dataStructure.def("get_children", [](DataStructure& self, nx::core::DataPath& parentPath) { if(parentPath.empty()) { std::vector outputPaths; @@ -551,7 +551,7 @@ PYBIND11_MODULE(complex, mod) } else { - auto result = complex::GetAllChildDataPaths(self, parentPath); + auto result = nx::core::GetAllChildDataPaths(self, parentPath); if(result) { return result.value(); @@ -578,7 +578,7 @@ PYBIND11_MODULE(complex, mod) return std::vector{}; } - auto result = complex::GetAllChildDataPaths(self, pathConversionResult.value()); + auto result = nx::core::GetAllChildDataPaths(self, pathConversionResult.value()); if(result) { return result.value(); @@ -701,17 +701,17 @@ PYBIND11_MODULE(complex, mod) iDataArray.def_property_readonly("cdims", &IDataArray::getComponentShape); iDataArray.def_property_readonly("data_type", &IDataArray::getDataType); - auto dataArrayInt8 = COMPLEX_PY_BIND_DATA_ARRAY(mod, Int8Array); - auto dataArrayUInt8 = COMPLEX_PY_BIND_DATA_ARRAY(mod, UInt8Array); - auto dataArrayInt16 = COMPLEX_PY_BIND_DATA_ARRAY(mod, Int16Array); - auto dataArrayUInt16 = COMPLEX_PY_BIND_DATA_ARRAY(mod, UInt16Array); - auto dataArrayInt32 = COMPLEX_PY_BIND_DATA_ARRAY(mod, Int32Array); - auto dataArrayUInt32 = COMPLEX_PY_BIND_DATA_ARRAY(mod, UInt32Array); - auto dataArrayInt64 = COMPLEX_PY_BIND_DATA_ARRAY(mod, Int64Array); - auto dataArrayUInt64 = COMPLEX_PY_BIND_DATA_ARRAY(mod, UInt64Array); - auto dataArrayFloat32 = COMPLEX_PY_BIND_DATA_ARRAY(mod, Float32Array); - auto dataArrayFloat64 = COMPLEX_PY_BIND_DATA_ARRAY(mod, Float64Array); - auto dataArrayBool = COMPLEX_PY_BIND_DATA_ARRAY(mod, BoolArray); + auto dataArrayInt8 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, Int8Array); + auto dataArrayUInt8 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, UInt8Array); + auto dataArrayInt16 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, Int16Array); + auto dataArrayUInt16 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, UInt16Array); + auto dataArrayInt32 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, Int32Array); + auto dataArrayUInt32 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, UInt32Array); + auto dataArrayInt64 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, Int64Array); + auto dataArrayUInt64 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, UInt64Array); + auto dataArrayFloat32 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, Float32Array); + auto dataArrayFloat64 = SIMPLNX_PY_BIND_DATA_ARRAY(mod, Float64Array); + auto dataArrayBool = SIMPLNX_PY_BIND_DATA_ARRAY(mod, BoolArray); rectGridGeom.def_property_readonly("x_bounds", py::overload_cast<>(&RectGridGeom::getXBoundsRef), py::return_value_policy::reference_internal); rectGridGeom.def_property_readonly("y_bounds", py::overload_cast<>(&RectGridGeom::getYBoundsRef), py::return_value_policy::reference_internal); @@ -745,74 +745,74 @@ PYBIND11_MODULE(complex, mod) iDataCreationActionArrayHandlingType.value("Reference", IDataCreationAction::ArrayHandlingType::Reference); iDataCreationActionArrayHandlingType.value("Create", IDataCreationAction::ArrayHandlingType::Create); - auto copyArrayInstanceAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CopyArrayInstanceAction, IDataCreationAction); + auto copyArrayInstanceAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CopyArrayInstanceAction, IDataCreationAction); copyArrayInstanceAction.def(py::init(), "selected_data_path"_a, "created_data_path"_a); - auto copyDataObjectAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CopyDataObjectAction, IDataCreationAction); + auto copyDataObjectAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CopyDataObjectAction, IDataCreationAction); copyDataObjectAction.def(py::init>(), "path"_a, "new_path"_a, "all_created_paths"_a); - auto createArrayAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateArrayAction, IDataCreationAction); + auto createArrayAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateArrayAction, IDataCreationAction); createArrayAction.def(py::init&, const std::vector&, const DataPath&, std::string>(), "type"_a, "t_dims"_a, "c_dims"_a, "path"_a, "data_format"_a = std::string("")); - auto createAttributeMatrixAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateAttributeMatrixAction, IDataCreationAction); + auto createAttributeMatrixAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateAttributeMatrixAction, IDataCreationAction); createAttributeMatrixAction.def(py::init(), "path"_a, "shape"_a); - auto createDataGroupAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateDataGroupAction, IDataCreationAction); + auto createDataGroupAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateDataGroupAction, IDataCreationAction); createDataGroupAction.def(py::init(), "path"_a); - auto createEdgeGeometryAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateEdgeGeometryAction, IDataCreationAction); + auto createEdgeGeometryAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateEdgeGeometryAction, IDataCreationAction); createEdgeGeometryAction.def(py::init(), "geometry_path"_a, "num_edges"_a, "num_vertices"_a, "vertex_attribute_matrix_name"_a, "edge_attribute_matrix_name"_a, "shared_vertices_name"_a, "shared_edges_name"_a); createEdgeGeometryAction.def(py::init(), "geometry_path"_a, "input_vertices_array_path"_a, "input_edges_array_path"_a, "vertex_attribute_matrix_name"_a, "edge_attribute_matrix_name"_a, "array_type"_a); - auto createTriangleGeometryAction = COMPLEX_PY_BIND_CREATE_GEOMETRY_2D_ACTION(mod, CreateTriangleGeometryAction); - auto createQuadGeometryAction = COMPLEX_PY_BIND_CREATE_GEOMETRY_2D_ACTION(mod, CreateQuadGeometryAction); + auto createTriangleGeometryAction = SIMPLNX_PY_BIND_CREATE_GEOMETRY_2D_ACTION(mod, CreateTriangleGeometryAction); + auto createQuadGeometryAction = SIMPLNX_PY_BIND_CREATE_GEOMETRY_2D_ACTION(mod, CreateQuadGeometryAction); - auto createTetrahedralGeometryAction = COMPLEX_PY_BIND_CREATE_GEOMETRY_3D_ACTION(mod, CreateTetrahedralGeometryAction); - auto createHexahedralGeometryAction = COMPLEX_PY_BIND_CREATE_GEOMETRY_3D_ACTION(mod, CreateHexahedralGeometryAction); + auto createTetrahedralGeometryAction = SIMPLNX_PY_BIND_CREATE_GEOMETRY_3D_ACTION(mod, CreateTetrahedralGeometryAction); + auto createHexahedralGeometryAction = SIMPLNX_PY_BIND_CREATE_GEOMETRY_3D_ACTION(mod, CreateHexahedralGeometryAction); - auto createImageGeometryAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateImageGeometryAction, IDataCreationAction); + auto createImageGeometryAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateImageGeometryAction, IDataCreationAction); createImageGeometryAction.def( py::init(), "path"_a, "dims"_a, "origin"_a, "spacing"_a, "cell_attribute_matrix_name"_a); - auto createNeighborListAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateNeighborListAction, IDataCreationAction); + auto createNeighborListAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateNeighborListAction, IDataCreationAction); createNeighborListAction.def(py::init(), "type"_a, "tuple_count"_a, "path"_a); - auto createRectGridGeometryAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateRectGridGeometryAction, IDataCreationAction); + auto createRectGridGeometryAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateRectGridGeometryAction, IDataCreationAction); createRectGridGeometryAction.def(py::init(), "path"_a, "x_bounds_dim"_a, "y_bounds_dim"_a, "z_bounds_dim"_a, "cell_attribute_matrix_name"_a, "x_bounds_name"_a, "y_bounds_name"_a, "z_bounds_name"_a); createRectGridGeometryAction.def(py::init(), "path"_a, "input_x_bounds_path"_a, "input_y_bounds_path"_a, "input_z_bounds_path"_a, "cell_attribute_matrix_name"_a, "array_type"_a); - auto createStringArrayAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateStringArrayAction, IDataCreationAction); + auto createStringArrayAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateStringArrayAction, IDataCreationAction); createStringArrayAction.def(py::init&, const DataPath&, const std::string&>(), "t_dims"_a, "path"_a, "initialize_value"_a = std::string("")); - auto createVertexGeometryAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, CreateVertexGeometryAction, IDataCreationAction); + auto createVertexGeometryAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, CreateVertexGeometryAction, IDataCreationAction); createVertexGeometryAction.def(py::init(), "geometry_path"_a, "num_vertices"_a, "vertex_attribute_matrix_name"_a, "shared_vertex_list_name"_a); createVertexGeometryAction.def(py::init(), "geometry_path"_a, "input_vertices_array_path"_a, "vertex_attribute_matrix_name"_a, "array_type"_a); - auto deleteDataAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, DeleteDataAction, IDataAction); + auto deleteDataAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, DeleteDataAction, IDataAction); auto deleteDataActionType = py::enum_(deleteDataAction, "DeleteType"); deleteDataActionType.value("JustObject", DeleteDataAction::DeleteType::JustObject); deleteDataAction.def(py::init(), "path"_a, "type"_a); - auto importH5ObjectPathsAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, ImportH5ObjectPathsAction, IDataCreationAction); + auto importH5ObjectPathsAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, ImportH5ObjectPathsAction, IDataCreationAction); importH5ObjectPathsAction.def(py::init(), "import_file"_a, "paths"_a); - auto moveDataAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, MoveDataAction, IDataAction); + auto moveDataAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, MoveDataAction, IDataAction); moveDataAction.def(py::init(), "path"_a, "new_parent_path"_a); - auto renameDataAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, RenameDataAction, IDataAction); + auto renameDataAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, RenameDataAction, IDataAction); renameDataAction.def(py::init(), "path"_a, "new_name"_a); - auto updateImageGeomAction = COMPLEX_PY_BIND_CLASS_VARIADIC(mod, UpdateImageGeomAction, IDataAction); + auto updateImageGeomAction = SIMPLNX_PY_BIND_CLASS_VARIADIC(mod, UpdateImageGeomAction, IDataAction); updateImageGeomAction.def(py::init&, const std::optional&, const DataPath&>(), "origin"_a, "spacing"_a, "path"_a); auto outputActions = py::class_(mod, "OutputActions"); @@ -820,53 +820,53 @@ PYBIND11_MODULE(complex, mod) outputActions.def("append_action", [](OutputActions& self, const IDataAction& action) { self.appendAction(action.clone()); }); outputActions.def("append_deferred_action", [](OutputActions& self, const IDataAction& action) { self.appendDeferredAction(action.clone()); }); - auto arrayCreationParameter = COMPLEX_PY_BIND_PARAMETER(mod, ArrayCreationParameter); - auto arraySelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, ArraySelectionParameter); - auto arrayThresholdsParameter = COMPLEX_PY_BIND_PARAMETER(mod, ArrayThresholdsParameter); - auto attributeMatrixSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, AttributeMatrixSelectionParameter); - auto boolParameter = COMPLEX_PY_BIND_PARAMETER(mod, BoolParameter); - auto calculatorParameter = COMPLEX_PY_BIND_PARAMETER(mod, CalculatorParameter); - auto choicesParameter = COMPLEX_PY_BIND_PARAMETER(mod, ChoicesParameter); - auto dataGroupCreationParameter = COMPLEX_PY_BIND_PARAMETER(mod, DataGroupCreationParameter); - auto dataGroupSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, DataGroupSelectionParameter); - auto dataObjectNameParameter = COMPLEX_PY_BIND_PARAMETER(mod, DataObjectNameParameter); - auto dataPathSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, DataPathSelectionParameter); - auto dataStoreFormatParameter = COMPLEX_PY_BIND_PARAMETER(mod, DataStoreFormatParameter); - auto dataTypeParameter = COMPLEX_PY_BIND_PARAMETER(mod, DataTypeParameter); - auto dream3dImportParameter = COMPLEX_PY_BIND_PARAMETER(mod, Dream3dImportParameter); - auto dynamicTableParameter = COMPLEX_PY_BIND_PARAMETER(mod, DynamicTableParameter); - auto ensembleInfoParameter = COMPLEX_PY_BIND_PARAMETER(mod, EnsembleInfoParameter); - auto fileSystemPathParameter = COMPLEX_PY_BIND_PARAMETER(mod, FileSystemPathParameter); - auto generateColorTableParameter = COMPLEX_PY_BIND_PARAMETER(mod, GenerateColorTableParameter); - auto generatedFileListParameter = COMPLEX_PY_BIND_PARAMETER(mod, GeneratedFileListParameter); - auto geometrySelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, GeometrySelectionParameter); - auto importTextDataParameter = COMPLEX_PY_BIND_PARAMETER(mod, ReadCSVFileParameter); - auto importHDF5DatasetParameter = COMPLEX_PY_BIND_PARAMETER(mod, ReadHDF5DatasetParameter); - auto multiArraySelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, MultiArraySelectionParameter); - auto multiPathSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, MultiPathSelectionParameter); - auto neighborListSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, NeighborListSelectionParameter); - auto int8Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, Int8Parameter); - auto uInt8Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, UInt8Parameter); - auto int16Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, Int16Parameter); - auto uInt16Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, UInt16Parameter); - auto int32Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, Int32Parameter); - auto uInt32Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, UInt32Parameter); - auto int64Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, Int64Parameter); - auto uInt64Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, UInt64Parameter); - auto float32Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, Float32Parameter); - auto float64Parameter = COMPLEX_PY_BIND_NUMBER_PARAMETER(mod, Float64Parameter); - auto numericTypeParameter = COMPLEX_PY_BIND_PARAMETER(mod, NumericTypeParameter); - auto stringParameter = COMPLEX_PY_BIND_PARAMETER(mod, StringParameter); - auto vectorInt8Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt8Parameter); - auto vectorUInt8Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt8Parameter); - auto vectorInt16Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt16Parameter); - auto vectorUInt16Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt16Parameter); - auto vectorInt32Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt32Parameter); - auto vectorUInt32Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt32Parameter); - auto vectorInt64Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt64Parameter); - auto vectorUInt64Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt64Parameter); - auto vectorFloat32Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorFloat32Parameter); - auto vectorFloat64Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorFloat64Parameter); + auto arrayCreationParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ArrayCreationParameter); + auto arraySelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ArraySelectionParameter); + auto arrayThresholdsParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ArrayThresholdsParameter); + auto attributeMatrixSelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, AttributeMatrixSelectionParameter); + auto boolParameter = SIMPLNX_PY_BIND_PARAMETER(mod, BoolParameter); + auto calculatorParameter = SIMPLNX_PY_BIND_PARAMETER(mod, CalculatorParameter); + auto choicesParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ChoicesParameter); + auto dataGroupCreationParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DataGroupCreationParameter); + auto dataGroupSelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DataGroupSelectionParameter); + auto dataObjectNameParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DataObjectNameParameter); + auto dataPathSelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DataPathSelectionParameter); + auto dataStoreFormatParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DataStoreFormatParameter); + auto dataTypeParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DataTypeParameter); + auto dream3dImportParameter = SIMPLNX_PY_BIND_PARAMETER(mod, Dream3dImportParameter); + auto dynamicTableParameter = SIMPLNX_PY_BIND_PARAMETER(mod, DynamicTableParameter); + auto ensembleInfoParameter = SIMPLNX_PY_BIND_PARAMETER(mod, EnsembleInfoParameter); + auto fileSystemPathParameter = SIMPLNX_PY_BIND_PARAMETER(mod, FileSystemPathParameter); + auto generateColorTableParameter = SIMPLNX_PY_BIND_PARAMETER(mod, GenerateColorTableParameter); + auto generatedFileListParameter = SIMPLNX_PY_BIND_PARAMETER(mod, GeneratedFileListParameter); + auto geometrySelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, GeometrySelectionParameter); + auto importTextDataParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ReadCSVFileParameter); + auto importHDF5DatasetParameter = SIMPLNX_PY_BIND_PARAMETER(mod, ReadHDF5DatasetParameter); + auto multiArraySelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, MultiArraySelectionParameter); + auto multiPathSelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, MultiPathSelectionParameter); + auto neighborListSelectionParameter = SIMPLNX_PY_BIND_PARAMETER(mod, NeighborListSelectionParameter); + auto int8Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, Int8Parameter); + auto uInt8Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, UInt8Parameter); + auto int16Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, Int16Parameter); + auto uInt16Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, UInt16Parameter); + auto int32Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, Int32Parameter); + auto uInt32Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, UInt32Parameter); + auto int64Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, Int64Parameter); + auto uInt64Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, UInt64Parameter); + auto float32Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, Float32Parameter); + auto float64Parameter = SIMPLNX_PY_BIND_NUMBER_PARAMETER(mod, Float64Parameter); + auto numericTypeParameter = SIMPLNX_PY_BIND_PARAMETER(mod, NumericTypeParameter); + auto stringParameter = SIMPLNX_PY_BIND_PARAMETER(mod, StringParameter); + auto vectorInt8Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt8Parameter); + auto vectorUInt8Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt8Parameter); + auto vectorInt16Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt16Parameter); + auto vectorUInt16Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt16Parameter); + auto vectorInt32Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt32Parameter); + auto vectorUInt32Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt32Parameter); + auto vectorInt64Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorInt64Parameter); + auto vectorUInt64Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorUInt64Parameter); + auto vectorFloat32Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorFloat32Parameter); + auto vectorFloat64Parameter = SIMPLNX_PY_BIND_VECTOR_PARAMETER(mod, VectorFloat64Parameter); py::class_ datasetImportInfo(importHDF5DatasetParameter, "DatasetImportInfo"); datasetImportInfo.def(py::init<>()); @@ -1096,7 +1096,7 @@ PYBIND11_MODULE(complex, mod) executeResult.def_property_readonly("warnings", [](const IFilter::ExecuteResult& self) { return self.result.warnings(); }); executeResult.def("__bool__", [](const IFilter::ExecuteResult& self) { return self.result.valid(); }); executeResult.def("__repr__", [](const IFilter::ExecuteResult& self) { - return fmt::format("", fmt::join(self.result.valid() ? ErrorCollection{} : self.result.errors(), ", "), + return fmt::format("", fmt::join(self.result.valid() ? ErrorCollection{} : self.result.errors(), ", "), fmt::join(self.result.warnings(), ", ")); }); @@ -1218,7 +1218,7 @@ PYBIND11_MODULE(complex, mod) internals->addConversion(); internals->addConversion(); - ComplexCore::BindFilters(mod, *internals); + SimplnxCore::BindFilters(mod, *internals); internals->registerPluginPyFilters(*corePlugin); diff --git a/src/Plugins/TestOne/CMakeLists.txt b/src/Plugins/TestOne/CMakeLists.txt index 3b7d289a83..a6a67429da 100644 --- a/src/Plugins/TestOne/CMakeLists.txt +++ b/src/Plugins/TestOne/CMakeLists.txt @@ -1,7 +1,7 @@ -include("${complex_SOURCE_DIR}/cmake/Plugin.cmake") +include("${simplnx_SOURCE_DIR}/cmake/Plugin.cmake") set(PLUGIN_NAME "TestOne") -set(${PLUGIN_NAME}_SOURCE_DIR ${complex_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) +set(${PLUGIN_NAME}_SOURCE_DIR ${simplnx_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) #------------------------------------------------------------------------------ # These are all the filters in the plugin. All filters should be kept in the @@ -15,7 +15,7 @@ set(FilterList DynamicTableExample ) -create_complex_plugin(NAME ${PLUGIN_NAME} +create_simplnx_plugin(NAME ${PLUGIN_NAME} FILTER_LIST ${FilterList} DESCRIPTION "Test Plugin for ${PLUGIN_NAME}" VERSION "0.1.0" @@ -23,7 +23,7 @@ create_complex_plugin(NAME ${PLUGIN_NAME} #------------------------------------------------------------------------------ # Add in the unit tests for the filters included in this plugin -if(COMPLEX_BUILD_TESTS) +if(SIMPLNX_BUILD_TESTS) enable_testing() add_subdirectory(${${PLUGIN_NAME}_SOURCE_DIR}/test) endif() diff --git a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp index bd84586bd6..b8cb183f41 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp @@ -1,18 +1,18 @@ #include "CreateOutOfCoreArray.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/Filter/Actions/CreateArrayAction.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/Filter/Actions/CreateArrayAction.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -31,7 +31,7 @@ void CreateAndInitArray(DataStructure& data, const DataPath& path, const std::st } } // namespace -namespace complex +namespace nx::core { std::string CreateOutOfCoreArray::name() const { @@ -170,4 +170,4 @@ Result<> CreateOutOfCoreArray::executeImpl(DataStructure& data, const Arguments& return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp index b4481c0250..8edd67e4d1 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestOne/TestOne_export.hpp" -namespace complex +namespace nx::core { class TESTONE_EXPORT CreateOutOfCoreArray : public IFilter { @@ -82,6 +82,6 @@ class TESTONE_EXPORT CreateOutOfCoreArray : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, CreateOutOfCoreArray, "f1ac8cb2-ec9b-4764-a6f8-9211de3f8975"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, CreateOutOfCoreArray, "f1ac8cb2-ec9b-4764-a6f8-9211de3f8975"); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.cpp b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.cpp index 718ef3153d..4529d00573 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.cpp @@ -1,9 +1,9 @@ #include "DynamicTableExample.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -13,7 +13,7 @@ constexpr StringLiteral k_Param3 = "param3"; constexpr StringLiteral k_Param4 = "param4"; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ @@ -105,4 +105,4 @@ Result<> DynamicTableExample::executeImpl(DataStructure& data, const Arguments& { return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.hpp b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.hpp index c663b60d13..164be69708 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExample.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestOne/TestOne_export.hpp" -namespace complex +namespace nx::core { class TESTONE_EXPORT DynamicTableExample : public IFilter { @@ -81,6 +81,6 @@ class TESTONE_EXPORT DynamicTableExample : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, DynamicTableExample, "1307bbbc-112E-4aaa-941f-682637F7b17e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, DynamicTableExample, "1307bbbc-112E-4aaa-941f-682637F7b17e"); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp index 3dcad75efb..419da92f4b 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.cpp @@ -31,9 +31,9 @@ #include "ErrorWarningFilter.hpp" -#include "complex/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" -using namespace complex; +using namespace nx::core; //------------------------------------------------------------------------------ std::string ErrorWarningFilter::name() const @@ -48,7 +48,7 @@ std::string ErrorWarningFilter::className() const } //------------------------------------------------------------------------------ -complex::Uuid ErrorWarningFilter::uuid() const +nx::core::Uuid ErrorWarningFilter::uuid() const { return FilterTraits::uuid; } @@ -66,7 +66,7 @@ std::vector ErrorWarningFilter::defaultTags() const } //------------------------------------------------------------------------------ -complex::Parameters ErrorWarningFilter::parameters() const +nx::core::Parameters ErrorWarningFilter::parameters() const { Parameters params; params.insert(std::make_unique(k_PreflightWarning_Key, "Preflight Warning", "Preflight warning parameter", false)); @@ -85,13 +85,13 @@ IFilter::UniquePointer ErrorWarningFilter::clone() const } //------------------------------------------------------------------------------ -complex::IFilter::PreflightResult ErrorWarningFilter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const +nx::core::IFilter::PreflightResult ErrorWarningFilter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto preflightWarning = args.value(k_PreflightWarning_Key); auto preflightError = args.value(k_PreflightError_Key); auto preflightException = args.value(k_PreflightException_Key); - complex::Result resultOutputActions; + nx::core::Result resultOutputActions; if(preflightWarning) { @@ -110,14 +110,14 @@ complex::IFilter::PreflightResult ErrorWarningFilter::preflightImpl(const DataSt } //------------------------------------------------------------------------------ -complex::Result<> ErrorWarningFilter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const +nx::core::Result<> ErrorWarningFilter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const { auto executeWarning = args.value(k_ExecuteWarning_Key); auto executeError = args.value(k_ExecuteError_Key); auto executeException = args.value(k_ExecuteException_Key); - complex::Result<> resultActions; + nx::core::Result<> resultActions; if(executeWarning) { diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp index deba60744b..43124918b8 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ErrorWarningFilter.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestOne/TestOne_export.hpp" -namespace complex +namespace nx::core { /** * @brief The ErrorWarningFilter class. See [Filter documentation](@ref ErrorWarningFilter) for details. */ -class TESTONE_EXPORT ErrorWarningFilter : public complex::IFilter +class TESTONE_EXPORT ErrorWarningFilter : public nx::core::IFilter { public: ErrorWarningFilter() = default; @@ -46,7 +46,7 @@ class TESTONE_EXPORT ErrorWarningFilter : public complex::IFilter * @brief Returns the filters ID as a std::string. * @return Uuid */ - complex::Uuid uuid() const override; + nx::core::Uuid uuid() const override; /** * @brief Returns the filter's human label. @@ -64,19 +64,19 @@ class TESTONE_EXPORT ErrorWarningFilter : public complex::IFilter * @brief Returns a collection of parameters used. * @return Parameters */ - complex::Parameters parameters() const override; + nx::core::Parameters parameters() const override; /** * @brief Returns a unique_pointer to a copy of the filter. - * @return complex::IFilter::UniquePointer + * @return nx::core::IFilter::UniquePointer */ UniquePointer clone() const override; protected: - PreflightResult preflightImpl(const complex::DataStructure& data, const complex::Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; - complex::Result<> executeImpl(complex::DataStructure& data, const complex::Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const override; + PreflightResult preflightImpl(const nx::core::DataStructure& data, const nx::core::Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; + nx::core::Result<> executeImpl(nx::core::DataStructure& data, const nx::core::Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ErrorWarningFilter, "3ede4bcd-944a-4bca-a0d4-ade65403641e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ErrorWarningFilter, "3ede4bcd-944a-4bca-a0d4-ade65403641e"); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp index 478f010bee..9cfaf94fbc 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.cpp @@ -1,22 +1,22 @@ #include "ExampleFilter1.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Parameters/ArrayThresholdsParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/NumericTypeParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" -#include "complex/Parameters/VectorParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Parameters/ArrayThresholdsParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/FileSystemPathParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/NumericTypeParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" +#include "simplnx/Parameters/VectorParameter.hpp" #include using namespace std::string_literals; -using namespace complex; +using namespace nx::core; namespace { @@ -32,7 +32,7 @@ constexpr StringLiteral k_Param9 = "param9"; constexpr StringLiteral k_Param10 = "param10"; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ExampleFilter1::name() const @@ -176,4 +176,4 @@ Result<> ExampleFilter1::executeImpl(DataStructure& data, const Arguments& args, { return MakeWarningVoidResult(-100, "Example Warning from within an execute message"); } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.hpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.hpp index 9b47b6d751..a108378461 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestOne/TestOne_export.hpp" -namespace complex +namespace nx::core { class TESTONE_EXPORT ExampleFilter1 : public IFilter { @@ -87,6 +87,6 @@ class TESTONE_EXPORT ExampleFilter1 : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ExampleFilter1, "dd92896b-26ec-4419-b905-567e93e8f39d"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ExampleFilter1, "dd92896b-26ec-4419-b905-567e93e8f39d"); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp index 03b375645b..1c422c63b4 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.cpp @@ -1,19 +1,19 @@ #include "ExampleFilter2.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Parameters/ArrayCreationParameter.hpp" -#include "complex/Parameters/ArraySelectionParameter.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/DataPathSelectionParameter.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/Parameters/GeometrySelectionParameter.hpp" -#include "complex/Parameters/MultiArraySelectionParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Parameters/ArrayCreationParameter.hpp" +#include "simplnx/Parameters/ArraySelectionParameter.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/DataGroupCreationParameter.hpp" +#include "simplnx/Parameters/DataGroupSelectionParameter.hpp" +#include "simplnx/Parameters/DataPathSelectionParameter.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/Parameters/GeometrySelectionParameter.hpp" +#include "simplnx/Parameters/MultiArraySelectionParameter.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -35,7 +35,7 @@ constexpr StringLiteral k_Param15 = "param15"; constexpr StringLiteral k_Param16 = "param16"; } // namespace -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ std::string ExampleFilter2::name() const @@ -86,10 +86,10 @@ Parameters ExampleFilter2::parameters() const params.insert(std::make_unique(k_Param9, "DataGroupSelectionParameter", "Example data group selection help text", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::DataGroup})); params.insert(std::make_unique(k_Param10, "DataPathSelectionParameter", "Example data path selection help text", DataPath{})); - params.insert(std::make_unique(k_Param6, "Array Selection", "Example array selection help text", ArraySelectionParameter::ValueType{}, complex::GetAllDataTypes())); + params.insert(std::make_unique(k_Param6, "Array Selection", "Example array selection help text", ArraySelectionParameter::ValueType{}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_Param11, "GeometrySelectionParameter", "Example geometry selection help text", DataPath{}, GeometrySelectionParameter::AllowedTypes{})); params.insert(std::make_unique(k_Param12, "MultiArraySelectionParameter", "Example multiarray selection help text", MultiArraySelectionParameter::ValueType{}, - MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::Any}, complex::GetAllDataTypes())); + MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::Any}, nx::core::GetAllDataTypes())); params.linkParameters(k_Param7, k_Param9, std::make_any(true)); @@ -121,4 +121,4 @@ Result<> ExampleFilter2::executeImpl(DataStructure& data, const Arguments& args, { return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.hpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.hpp index 0acf0f8d69..b56bbbcba6 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestOne/TestOne_export.hpp" -namespace complex +namespace nx::core { class TESTONE_EXPORT ExampleFilter2 : public IFilter { @@ -81,6 +81,6 @@ class TESTONE_EXPORT ExampleFilter2 : public IFilter */ Result<> executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, ExampleFilter2, "1307bbbc-112d-4aaa-941f-58253787b17e"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, ExampleFilter2, "1307bbbc-112d-4aaa-941f-58253787b17e"); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp index 5051078c79..7f2465ba9c 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.cpp @@ -1,11 +1,11 @@ #include "TestFilter.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Parameters/BoolParameter.hpp" -#include "complex/Parameters/GeneratedFileListParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Parameters/BoolParameter.hpp" +#include "simplnx/Parameters/GeneratedFileListParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -31,7 +31,7 @@ std::string TestFilter::className() const } //------------------------------------------------------------------------------ -complex::Uuid TestFilter::uuid() const +nx::core::Uuid TestFilter::uuid() const { return FilterTraits::uuid; } @@ -49,7 +49,7 @@ std::vector TestFilter::defaultTags() const } //------------------------------------------------------------------------------ -complex::Parameters TestFilter::parameters() const +nx::core::Parameters TestFilter::parameters() const { Parameters params; params.insert(std::make_unique(k_Param1, "Parameter 1", "The 1st parameter", 0.1234f)); @@ -60,20 +60,20 @@ complex::Parameters TestFilter::parameters() const } //------------------------------------------------------------------------------ -complex::IFilter::UniquePointer TestFilter::clone() const +nx::core::IFilter::UniquePointer TestFilter::clone() const { return std::make_unique(); } //------------------------------------------------------------------------------ -complex::IFilter::PreflightResult TestFilter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const +nx::core::IFilter::PreflightResult TestFilter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { return {}; } //------------------------------------------------------------------------------ -complex::Result<> TestFilter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const +nx::core::Result<> TestFilter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const { return {}; } diff --git a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp index dd6eecd7ae..9e65a2fb8f 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/TestFilter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestOne/TestOne_export.hpp" -namespace complex +namespace nx::core { -class TESTONE_EXPORT TestFilter : public complex::IFilter +class TESTONE_EXPORT TestFilter : public nx::core::IFilter { public: TestFilter(); @@ -29,7 +29,7 @@ class TESTONE_EXPORT TestFilter : public complex::IFilter * @brief Returns the filters ID as a std::string. * @return Uuid */ - complex::Uuid uuid() const override; + nx::core::Uuid uuid() const override; /** * @brief Returns the filter's human label. @@ -47,19 +47,19 @@ class TESTONE_EXPORT TestFilter : public complex::IFilter * @brief Returns a collection of parameters used. * @return Parameters */ - complex::Parameters parameters() const override; + nx::core::Parameters parameters() const override; /** * @brief Returns a unique_pointer to a copy of the filter. - * @return complex::IFilter::UniquePointer + * @return nx::core::IFilter::UniquePointer */ UniquePointer clone() const override; protected: - PreflightResult preflightImpl(const complex::DataStructure& data, const complex::Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; - complex::Result<> executeImpl(complex::DataStructure& data, const complex::Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const override; + PreflightResult preflightImpl(const nx::core::DataStructure& data, const nx::core::Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; + nx::core::Result<> executeImpl(nx::core::DataStructure& data, const nx::core::Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, TestFilter, "5502c3f7-37a8-4a86-b003-1c856be02491"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, TestFilter, "5502c3f7-37a8-4a86-b003-1c856be02491"); diff --git a/src/Plugins/TestOne/src/TestOne/TestOnePlugin.cpp b/src/Plugins/TestOne/src/TestOne/TestOnePlugin.cpp index a7bf5dec40..a7d1b96aad 100644 --- a/src/Plugins/TestOne/src/TestOne/TestOnePlugin.cpp +++ b/src/Plugins/TestOne/src/TestOne/TestOnePlugin.cpp @@ -1,7 +1,7 @@ #include "TestOnePlugin.hpp" #include "TestOne/TestOne_filter_registration.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -20,9 +20,9 @@ TestOnePlugin::TestOnePlugin() TestOnePlugin::~TestOnePlugin() = default; -AbstractPlugin::SIMPLMapType TestOnePlugin::getSimplToComplexMap() const +AbstractPlugin::SIMPLMapType TestOnePlugin::getSimplToSimplnxMap() const { return {}; } -COMPLEX_DEF_PLUGIN(TestOnePlugin) +SIMPLNX_DEF_PLUGIN(TestOnePlugin) diff --git a/src/Plugins/TestOne/src/TestOne/TestOnePlugin.hpp b/src/Plugins/TestOne/src/TestOne/TestOnePlugin.hpp index 6c10dfac6d..04589f3f4f 100644 --- a/src/Plugins/TestOne/src/TestOne/TestOnePlugin.hpp +++ b/src/Plugins/TestOne/src/TestOne/TestOnePlugin.hpp @@ -2,9 +2,9 @@ #include "TestOne/TestOne_export.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" -class TESTONE_EXPORT TestOnePlugin : public complex::AbstractPlugin +class TESTONE_EXPORT TestOnePlugin : public nx::core::AbstractPlugin { public: TestOnePlugin(); @@ -18,8 +18,8 @@ class TESTONE_EXPORT TestOnePlugin : public complex::AbstractPlugin /** * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to - * their complex counterpart + * their simplnx counterpart * @return SIMPLMapType */ - SIMPLMapType getSimplToComplexMap() const override; + SIMPLMapType getSimplToSimplnxMap() const override; }; diff --git a/src/Plugins/TestOne/test/CMakeLists.txt b/src/Plugins/TestOne/test/CMakeLists.txt index 911ea89b8e..9a8dbc5c1f 100644 --- a/src/Plugins/TestOne/test/CMakeLists.txt +++ b/src/Plugins/TestOne/test/CMakeLists.txt @@ -9,7 +9,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS ErrorWarningFilterTest.cpp ) -create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} +create_simplnx_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} FILTER_LIST ${${PLUGIN_NAME}UnitTest_SRCS}) @@ -33,5 +33,5 @@ create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} # you can use the target_include_directories(.....) cmake call target_include_directories(${PLUGIN_NAME}UnitTest PUBLIC - ${complex_SOURCE_DIR}/test + ${simplnx_SOURCE_DIR}/test ) diff --git a/src/Plugins/TestOne/test/ErrorWarningFilterTest.cpp b/src/Plugins/TestOne/test/ErrorWarningFilterTest.cpp index 9bbe70f4f1..152d685ae0 100644 --- a/src/Plugins/TestOne/test/ErrorWarningFilterTest.cpp +++ b/src/Plugins/TestOne/test/ErrorWarningFilterTest.cpp @@ -1,11 +1,11 @@ #include "TestOne/Filters/ErrorWarningFilter.hpp" #include "TestOne/TestOne_test_dirs.hpp" -#include "complex/UnitTest/UnitTestCommon.hpp" +#include "simplnx/UnitTest/UnitTestCommon.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -32,7 +32,7 @@ TEST_CASE("ErrorWarningFilter: Instantiate Filter", "[ErrorWarningFilter]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); } // Preflight Warning enabled @@ -48,7 +48,7 @@ TEST_CASE("ErrorWarningFilter: Instantiate Filter", "[ErrorWarningFilter]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_VALID(preflightResult.outputActions); const std::vector& warnings = preflightResult.outputActions.warnings(); REQUIRE(warnings.size() == 1); @@ -68,7 +68,7 @@ TEST_CASE("ErrorWarningFilter: Instantiate Filter", "[ErrorWarningFilter]") // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); + SIMPLNX_RESULT_REQUIRE_INVALID(preflightResult.outputActions); const std::vector& errors = preflightResult.outputActions.errors(); REQUIRE(errors.size() == 1); @@ -88,7 +88,7 @@ TEST_CASE("ErrorWarningFilter: Instantiate Filter", "[ErrorWarningFilter]") // Execute the filter and check result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_VALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result); const std::vector& warnings = executeResult.result.warnings(); REQUIRE(warnings.size() == 1); @@ -108,7 +108,7 @@ TEST_CASE("ErrorWarningFilter: Instantiate Filter", "[ErrorWarningFilter]") // Execute the filter and check result auto executeResult = filter.execute(dataStructure, args); - COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); + SIMPLNX_RESULT_REQUIRE_INVALID(executeResult.result); const std::vector& errors = executeResult.result.errors(); REQUIRE(errors.size() == 1); diff --git a/src/Plugins/TestOne/test/test_dirs.hpp.in b/src/Plugins/TestOne/test/test_dirs.hpp.in index 4789e971aa..eaddaba66c 100644 --- a/src/Plugins/TestOne/test/test_dirs.hpp.in +++ b/src/Plugins/TestOne/test/test_dirs.hpp.in @@ -1,12 +1,12 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/StringLiteral.hpp" -namespace complex +namespace nx::core { namespace unit_test { inline constexpr StringLiteral k_SourceDir = "@PLUGIN_SOURCE_DIR_NORM@"; -inline constexpr StringLiteral k_BinaryDir = "@complex_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; +inline constexpr StringLiteral k_BinaryDir = "@simplnx_BINARY_DIR@/Plugins/@PLUGIN_NAME@"; } -} // namespace complex +} // namespace nx::core diff --git a/src/Plugins/TestTwo/CMakeLists.txt b/src/Plugins/TestTwo/CMakeLists.txt index 273b85ea1b..3908b28ef4 100644 --- a/src/Plugins/TestTwo/CMakeLists.txt +++ b/src/Plugins/TestTwo/CMakeLists.txt @@ -1,7 +1,7 @@ -include("${complex_SOURCE_DIR}/cmake/Plugin.cmake") +include("${simplnx_SOURCE_DIR}/cmake/Plugin.cmake") set(PLUGIN_NAME "TestTwo") -set(${PLUGIN_NAME}_SOURCE_DIR ${complex_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) +set(${PLUGIN_NAME}_SOURCE_DIR ${simplnx_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) #------------------------------------------------------------------------------ # These are all the filters in the plugin. All filters should be kept in the @@ -10,7 +10,7 @@ set(FilterList Test2Filter ) -create_complex_plugin(NAME ${PLUGIN_NAME} +create_simplnx_plugin(NAME ${PLUGIN_NAME} FILTER_LIST ${FilterList} DESCRIPTION "Test Plugin for ${PLUGIN_NAME}" VERSION "0.1.0" diff --git a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp index 00f95cc50f..1e5151fbce 100644 --- a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp +++ b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.cpp @@ -1,11 +1,11 @@ #include "Test2Filter.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Parameters/ChoicesParameter.hpp" -#include "complex/Parameters/NumberParameter.hpp" -#include "complex/Parameters/StringParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Parameters/ChoicesParameter.hpp" +#include "simplnx/Parameters/NumberParameter.hpp" +#include "simplnx/Parameters/StringParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -31,7 +31,7 @@ std::string Test2Filter::className() const } //------------------------------------------------------------------------------ -complex::Uuid Test2Filter::uuid() const +nx::core::Uuid Test2Filter::uuid() const { return FilterTraits::uuid; } @@ -49,7 +49,7 @@ std::vector Test2Filter::defaultTags() const } //------------------------------------------------------------------------------ -complex::Parameters Test2Filter::parameters() const +nx::core::Parameters Test2Filter::parameters() const { Parameters params; params.insert(std::make_unique(k_Param1, "Parameter 1", "The 1st parameter", 0)); @@ -59,20 +59,20 @@ complex::Parameters Test2Filter::parameters() const } //------------------------------------------------------------------------------ -complex::IFilter::UniquePointer Test2Filter::clone() const +nx::core::IFilter::UniquePointer Test2Filter::clone() const { return std::make_unique(); } //------------------------------------------------------------------------------ -complex::IFilter::PreflightResult Test2Filter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const +nx::core::IFilter::PreflightResult Test2Filter::preflightImpl(const DataStructure& data, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { return {}; } //------------------------------------------------------------------------------ -complex::Result<> Test2Filter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const +nx::core::Result<> Test2Filter::executeImpl(DataStructure& data, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const { return {}; } diff --git a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp index a8a03ab6df..214c43cd5c 100644 --- a/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp +++ b/src/Plugins/TestTwo/src/TestTwo/Filters/Test2Filter.hpp @@ -1,12 +1,12 @@ #pragma once -#include "complex/Filter/FilterTraits.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterTraits.hpp" +#include "simplnx/Filter/IFilter.hpp" #include "TestTwo/TestTwo_export.hpp" -namespace complex +namespace nx::core { -class TESTTWO_EXPORT Test2Filter : public complex::IFilter +class TESTTWO_EXPORT Test2Filter : public nx::core::IFilter { public: Test2Filter(); @@ -26,9 +26,9 @@ class TESTTWO_EXPORT Test2Filter : public complex::IFilter /** * @brief Returns the filters ID as a std::string. - * @return complex::Uuid + * @return nx::core::Uuid */ - complex::Uuid uuid() const override; + nx::core::Uuid uuid() const override; /** * @brief Returns the filter's human label. @@ -46,11 +46,11 @@ class TESTTWO_EXPORT Test2Filter : public complex::IFilter * @brief Returns a collection of parameters used. * @return Parameters */ - complex::Parameters parameters() const override; + nx::core::Parameters parameters() const override; /** * @brief Returns a unique_pointer to a copy of the filter. - * @return complex::IFilter::UniquePointer + * @return nx::core::IFilter::UniquePointer */ UniquePointer clone() const override; @@ -62,7 +62,7 @@ class TESTTWO_EXPORT Test2Filter : public complex::IFilter * @param messageHandler * @return Result */ - PreflightResult preflightImpl(const complex::DataStructure& data, const complex::Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; + PreflightResult preflightImpl(const nx::core::DataStructure& data, const nx::core::Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const override; /** * @brief Filter-specifics for performing execute. @@ -72,9 +72,9 @@ class TESTTWO_EXPORT Test2Filter : public complex::IFilter * @param messageHandler * @return Result<> */ - complex::Result<> executeImpl(complex::DataStructure& data, const complex::Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const override; + nx::core::Result<> executeImpl(nx::core::DataStructure& data, const nx::core::Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const override; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_FILTER_TRAITS(complex, Test2Filter, "ad9cf22b-bc5e-41d6-b02e-bb49ffd12c04"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, Test2Filter, "ad9cf22b-bc5e-41d6-b02e-bb49ffd12c04"); diff --git a/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.cpp b/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.cpp index a81002f056..f4a2848307 100644 --- a/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.cpp +++ b/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.cpp @@ -1,7 +1,7 @@ #include "TestTwoPlugin.hpp" #include "TestTwo/TestTwo_filter_registration.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -20,9 +20,9 @@ TestTwoPlugin::TestTwoPlugin() TestTwoPlugin::~TestTwoPlugin() = default; -AbstractPlugin::SIMPLMapType TestTwoPlugin::getSimplToComplexMap() const +AbstractPlugin::SIMPLMapType TestTwoPlugin::getSimplToSimplnxMap() const { return {}; } -COMPLEX_DEF_PLUGIN(TestTwoPlugin) +SIMPLNX_DEF_PLUGIN(TestTwoPlugin) diff --git a/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.hpp b/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.hpp index 10e460fc23..a8640f30b1 100644 --- a/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.hpp +++ b/src/Plugins/TestTwo/src/TestTwo/TestTwoPlugin.hpp @@ -2,9 +2,9 @@ #include "TestTwo/TestTwo_export.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" -class TESTTWO_EXPORT TestTwoPlugin : public complex::AbstractPlugin +class TESTTWO_EXPORT TestTwoPlugin : public nx::core::AbstractPlugin { public: TestTwoPlugin(); @@ -18,8 +18,8 @@ class TESTTWO_EXPORT TestTwoPlugin : public complex::AbstractPlugin /** * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to - * their complex counterpart + * their simplnx counterpart * @return SIMPLMapType */ - SIMPLMapType getSimplToComplexMap() const override; + SIMPLMapType getSimplToSimplnxMap() const override; }; diff --git a/src/complex/Common/ComplexConstants.hpp b/src/complex/Common/ComplexConstants.hpp deleted file mode 100644 index dacdd5e268..0000000000 --- a/src/complex/Common/ComplexConstants.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "complex/Common/StringLiteral.hpp" - -#define COMPLEX_DEF_STRING_CONSTANT(name) StringLiteral k_##name = #name - -namespace complex -{ -namespace Constants -{ -inline constexpr COMPLEX_DEF_STRING_CONSTANT(Int8); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(UInt8); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(Int16); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(UInt16); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(Int32); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(UInt32); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(Int64); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(UInt64); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(Float32); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(Float64); -inline constexpr COMPLEX_DEF_STRING_CONSTANT(USize); -} // namespace Constants -} // namespace complex - -#undef COMPLEX_DEF_STRING_CONSTANT diff --git a/src/complex/DataStructure/IO/HDF5/IDataStoreIO.cpp b/src/complex/DataStructure/IO/HDF5/IDataStoreIO.cpp deleted file mode 100644 index 79ab4cfd3b..0000000000 --- a/src/complex/DataStructure/IO/HDF5/IDataStoreIO.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "IDataStoreIO.hpp" - -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" - -#include "complex/Utilities/Parsing/HDF5/H5Support.hpp" - -#include "complex/Common/Types.hpp" - -#include - -using namespace complex; - -typename complex::IDataStore::ShapeType complex::HDF5::IDataStoreIO::ReadTupleShape(const complex::HDF5::DatasetReader& datasetReader) -{ - complex::HDF5::AttributeReader tupleShapeAttribute = datasetReader.getAttribute(IOConstants::k_TupleShapeTag); - if(!tupleShapeAttribute.isValid()) - { - throw std::runtime_error(fmt::format("Error reading Tuple Shape from HDF5 at {}/{}", complex::HDF5::Support::GetObjectPath(datasetReader.getParentId()), datasetReader.getName())); - } - return tupleShapeAttribute.readAsVector(); -} - -typename complex::IDataStore::ShapeType complex::HDF5::IDataStoreIO::ReadComponentShape(const complex::HDF5::DatasetReader& datasetReader) -{ - complex::HDF5::AttributeReader componentShapeAttribute = datasetReader.getAttribute(IOConstants::k_ComponentShapeTag); - if(!componentShapeAttribute.isValid()) - { - throw std::runtime_error(fmt::format("Error reading Component Shape from HDF5 at {}/{}", complex::HDF5::Support::GetObjectPath(datasetReader.getParentId()), datasetReader.getName())); - } - return componentShapeAttribute.readAsVector(); -} diff --git a/src/complex/Pipeline/Messaging/NodeStatusMessage.hpp b/src/complex/Pipeline/Messaging/NodeStatusMessage.hpp deleted file mode 100644 index 631db4006d..0000000000 --- a/src/complex/Pipeline/Messaging/NodeStatusMessage.hpp +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include "complex/Pipeline/AbstractPipelineNode.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" - -namespace complex -{ -class PipelineFilter; -class IFilter; - -/** - * @class NodeStatusMessage - * @brief The NodeStatusMessage class is used to notify observers that a - * AbstractPipelineNode's Status has been changed. - */ -class COMPLEX_EXPORT NodeStatusMessage : public AbstractPipelineMessage -{ -public: - /** - * @brief Constructs a new NodeStatusMessage specifying the node and its Status. - * @param node - * @param faultState - * @param runState - */ - NodeStatusMessage(AbstractPipelineNode* node, complex::FaultState faultState, complex::RunState runState); - - ~NodeStatusMessage() override; - - /** - * @brief Returns the updated complex::FaultState. - * @return complex::FaultState - */ - complex::FaultState getFaultState() const; - - /** - * @brief Returns the updated complex::RunState. - * @return complex::RunState - */ - complex::RunState getRunState() const; - - /** - * @brief Returns a string representation of the message. - * @return std::string - */ - std::string toString() const override; - -private: - complex::FaultState m_FaultState; - complex::RunState m_RunState; -}; -} // namespace complex diff --git a/src/complex/Utilities/DataObjectUtilities.hpp b/src/complex/Utilities/DataObjectUtilities.hpp deleted file mode 100644 index 57aa587cf8..0000000000 --- a/src/complex/Utilities/DataObjectUtilities.hpp +++ /dev/null @@ -1,280 +0,0 @@ -#pragma once - -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DynamicListArray.hpp" -#include "complex/DataStructure/Geometry/EdgeGeom.hpp" -#include "complex/DataStructure/Geometry/HexahedralGeom.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry1D.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry3D.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/Geometry/QuadGeom.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/DataStructure/Geometry/TetrahedralGeom.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/DataStructure/IArray.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/Montage/AbstractMontage.hpp" -#include "complex/DataStructure/Montage/GridMontage.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/DataStructure/ScalarData.hpp" -#include "complex/DataStructure/StringArray.hpp" - -#include -#include -#include - -namespace complex -{ -/** - * @brief Returns a string representation of the passed in IGeometry::Type - * @param dataType - * @return - */ -inline constexpr StringLiteral GeometryTypeToString(IGeometry::Type geomType) -{ - switch(geomType) - { - case IGeometry::Type::Image: { - return "Image"; - } - case IGeometry::Type::RectGrid: { - return "Rectilinear Grid"; - } - case IGeometry::Type::Vertex: { - return "Vertex"; - } - case IGeometry::Type::Edge: { - return "Edge"; - } - case IGeometry::Type::Triangle: { - return "Triangle"; - } - case IGeometry::Type::Quad: { - return "Quadrilateral"; - } - case IGeometry::Type::Tetrahedral: { - return "Tetrahedral"; - } - case IGeometry::Type::Hexahedral: { - return "Hexahedral"; - } - default: - throw std::runtime_error("complex::GeometryTypeToString: Unknown IGeometry::Type"); - } -} - -/** - * @brief Returns string representations for all DataTypes. - * @return - */ -inline const std::vector& GetAllGeometryTypesAsStrings() -{ - static const std::vector geomTypes = {GeometryTypeToString(IGeometry::Type::Image), GeometryTypeToString(IGeometry::Type::RectGrid), - GeometryTypeToString(IGeometry::Type::Vertex), GeometryTypeToString(IGeometry::Type::Edge), - GeometryTypeToString(IGeometry::Type::Triangle), GeometryTypeToString(IGeometry::Type::Quad), - GeometryTypeToString(IGeometry::Type::Tetrahedral), GeometryTypeToString(IGeometry::Type::Hexahedral)}; - return geomTypes; -} - -/** - * @brief Returns a IGeometry::Type for the passed in string representation - * @param geomTypeString - * @return - */ -inline constexpr IGeometry::Type StringToGeometryType(std::string_view geomTypeString) -{ - if(geomTypeString == GeometryTypeToString(IGeometry::Type::Image).view()) - { - return IGeometry::Type::Image; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::RectGrid).view()) - { - return IGeometry::Type::RectGrid; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Vertex).view()) - { - return IGeometry::Type::Vertex; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Edge).view()) - { - return IGeometry::Type::Edge; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Triangle).view()) - { - return IGeometry::Type::Triangle; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Quad).view()) - { - return IGeometry::Type::Quad; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Tetrahedral).view()) - { - return IGeometry::Type::Tetrahedral; - } - else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Hexahedral).view()) - { - return IGeometry::Type::Hexahedral; - } - else - { - throw std::runtime_error("complex::StringToGeometryType: No known IGeometry::Type matches the given string value."); - } -} - -inline constexpr StringLiteral DataObjectTypeToString(DataObject::Type dataObjType) -{ - switch(dataObjType) - { - case complex::DataObject::Type::BaseGroup: { - return complex::BaseGroup::k_TypeName; - } - case complex::DataObject::Type::DataGroup: { - return complex::DataGroup::k_TypeName; - } - case complex::DataObject::Type::AttributeMatrix: { - return complex::AttributeMatrix::k_TypeName; - } - case complex::DataObject::Type::IGeometry: { - return complex::IGeometry::k_TypeName; - } - case complex::DataObject::Type::IGridGeometry: { - return complex::IGridGeometry::k_TypeName; - } - case complex::DataObject::Type::INodeGeometry0D: { - return complex::INodeGeometry0D::k_TypeName; - } - case complex::DataObject::Type::INodeGeometry1D: { - return complex::INodeGeometry1D::k_TypeName; - } - case complex::DataObject::Type::INodeGeometry2D: { - return complex::INodeGeometry2D::k_TypeName; - } - case complex::DataObject::Type::INodeGeometry3D: { - return complex::INodeGeometry3D::k_TypeName; - } - case complex::DataObject::Type::ImageGeom: { - return complex::ImageGeom::k_TypeName; - } - case complex::DataObject::Type::RectGridGeom: { - return complex::RectGridGeom::k_TypeName; - } - case complex::DataObject::Type::VertexGeom: { - return complex::VertexGeom::k_TypeName; - } - case complex::DataObject::Type::EdgeGeom: { - return complex::EdgeGeom::k_TypeName; - } - case complex::DataObject::Type::TriangleGeom: { - return complex::TriangleGeom::k_TypeName; - } - case complex::DataObject::Type::QuadGeom: { - return complex::QuadGeom::k_TypeName; - } - case complex::DataObject::Type::TetrahedralGeom: { - return complex::TetrahedralGeom::k_TypeName; - } - case complex::DataObject::Type::HexahedralGeom: { - return complex::HexahedralGeom::k_TypeName; - } - case complex::DataObject::Type::IDataArray: { - return complex::IDataArray::k_TypeName; - } - case complex::DataObject::Type::DataArray: { - return complex::DataArrayConstants::k_TypeName; - } - case complex::DataObject::Type::INeighborList: { - return complex::INeighborList::k_TypeName; - } - case complex::DataObject::Type::NeighborList: { - return complex::NeighborListConstants::k_TypeName; - } - case complex::DataObject::Type::ScalarData: { - return complex::ScalarDataConstants::k_TypeName; - } - case complex::DataObject::Type::StringArray: { - return complex::StringArray::k_TypeName; - } - case complex::DataObject::Type::DynamicListArray: { - return complex::DynamicListArrayConstants::k_TypeName; - } - case complex::DataObject::Type::AbstractMontage: { - return complex::AbstractMontage::k_TypeName; - } - case complex::DataObject::Type::GridMontage: { - return complex::GridMontage::k_TypeName; - } - case complex::DataObject::Type::Any: { - return {"Any"}; - } - default: { - throw std::runtime_error("complex::DataObjectTypeToString: Unknown DataObject::Type"); - } - } -} - -/** - * @brief Converts IArray::ArrayType to DataObject::Type. ArrayType is a subset of DataObject::Type so this function cannot fail. - * @param arrayType - * @return - */ -inline constexpr DataObject::Type ConvertArrayTypeToDataObjectType(IArray::ArrayType arrayType) -{ - switch(arrayType) - { - case IArray::ArrayType::DataArray: { - return DataObject::Type::DataArray; - } - case IArray::ArrayType::NeighborListArray: { - return DataObject::Type::NeighborList; - } - case IArray::ArrayType::StringArray: { - return DataObject::Type::StringArray; - } - case IArray::ArrayType::Any: { - return DataObject::Type::Any; - } - default: { - throw std::runtime_error("complex::ConvertArrayTypeToDataObjectType: Invalid ArrayType"); - } - } -} - -/** - * @brief Converts DataObject::Type to IArray::ArrayType. - * @param dataObjectType - * @return - */ -inline constexpr std::optional ConvertDataObjectTypeToArrayType(DataObject::Type dataObjectType) noexcept -{ - switch(dataObjectType) - { - case DataObject::Type::IDataArray: - case DataObject::Type::DataArray: { - return IArray::ArrayType::DataArray; - } - case DataObject::Type::INeighborList: - case DataObject::Type::NeighborList: { - return IArray::ArrayType::NeighborListArray; - } - case DataObject::Type::StringArray: { - return IArray::ArrayType::StringArray; - } - case DataObject::Type::Any: { - return IArray::ArrayType::Any; - } - default: { - return {}; - } - } -} -} // namespace complex diff --git a/src/complex/Utilities/MemoryUtilities.hpp b/src/complex/Utilities/MemoryUtilities.hpp deleted file mode 100644 index 2adbdd5ec6..0000000000 --- a/src/complex/Utilities/MemoryUtilities.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" - -#include - -namespace complex -{ -namespace Memory -{ -struct COMPLEX_EXPORT dataStorage -{ - uint64_t total = 0; - uint64_t free = 0; -}; - -uint64 COMPLEX_EXPORT GetTotalMemory(); -dataStorage COMPLEX_EXPORT GetAvailableStorage(); -dataStorage COMPLEX_EXPORT GetAvailableStorageOnDrive(const std::filesystem::path& path); -} // namespace Memory -} // namespace complex diff --git a/src/nxrunner/CMakeLists.txt b/src/nxrunner/CMakeLists.txt index a4bff332b5..dd6e4efbe6 100644 --- a/src/nxrunner/CMakeLists.txt +++ b/src/nxrunner/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(nxrunner) set_target_properties(nxrunner PROPERTIES - DEBUG_POSTFIX "${COMPLEX_DEBUG_POSTFIX}" + DEBUG_POSTFIX "${SIMPLNX_DEBUG_POSTFIX}" ) target_sources(nxrunner @@ -26,11 +26,11 @@ target_sources(nxrunner ${CLI_SRCS} ) -target_link_libraries(nxrunner PRIVATE complex::complex) +target_link_libraries(nxrunner PRIVATE simplnx::simplnx) source_group("nxrunner" FILES ${CLI_HDRS} ${CLI_SRCS}) -if(COMPLEX_EMBED_PYTHON) +if(SIMPLNX_EMBED_PYTHON) find_package(pybind11 2.10.0 CONFIG REQUIRED) target_link_libraries(nxrunner @@ -44,7 +44,7 @@ endif() # ----------------------------------------------------------------------- set(DEST_DIR ".") # Windows we dump everything into the top level dir -if((UNIX AND NOT APPLE) OR COMPLEX_CONDA_BUILD) # Linux we obey standard unix layout +if((UNIX AND NOT APPLE) OR SIMPLNX_CONDA_BUILD) # Linux we obey standard unix layout set(DEST_DIR "bin") # Apple we have a custom script somewhere endif() diff --git a/src/nxrunner/docs/NX_CLI.md b/src/nxrunner/docs/NX_CLI.md index 9c8e9847eb..386b17f5a9 100644 --- a/src/nxrunner/docs/NX_CLI.md +++ b/src/nxrunner/docs/NX_CLI.md @@ -1,8 +1,8 @@ # NX Runner (NX CLI) -NX Runner is an executable that allows preflighting and executing complex pipelines from the command line. The executable is created as part of the default complex CMake project and created alongside the complex library file. +NX Runner is an executable that allows preflighting and executing simplnx pipelines from the command line. The executable is created as part of the default simplnx CMake project and created alongside the simplnx library file. -In addition, NX Runner contains commands for porting SIMPL pipeline files to complex pipelines. One of these commands prints the converted pipeline to the terminal, and the other saves the converted pipeline to a new file using the complex pipeline extension. +In addition, NX Runner contains commands for porting SIMPL pipeline files to simplnx pipelines. One of these commands prints the converted pipeline to the terminal, and the other saves the converted pipeline to a new file using the simplnx pipeline extension. ## Commands @@ -48,8 +48,8 @@ For example, ```--preflight bash D:/Directory/pipeline.d3pipeline -l D:/Logs/pip -co [--logfile | -l] ``` -Converts a SIMPL pipeline at the target filepath to a complex pipeline. If any errors are encountered during the process, they are printed to the console. Otherwise, the converted pipeline is printed to the console. Optionally, a log file is created at the specified filepath where the output is saved. +Converts a SIMPL pipeline at the target filepath to a simplnx pipeline. If any errors are encountered during the process, they are printed to the console. Otherwise, the converted pipeline is printed to the console. Optionally, a log file is created at the specified filepath where the output is saved. -The second option (convert-output / co) also saves the converted pipeline to file based on the name of the converted pipeline using the complex pipeline extension (`.d3pipeline`). +The second option (convert-output / co) also saves the converted pipeline to file based on the name of the converted pipeline using the simplnx pipeline extension (`.d3pipeline`). For example, ```--convert-output bash D:/Directory/SIMPL.json``` will attempt to convert the SIMPL pipeline at `D:/Directory/SIMPL.json` and save the converted pipeline to `D:/Directory/SIMPL.d3pipeline` diff --git a/src/nxrunner/src/CliObserver.cpp b/src/nxrunner/src/CliObserver.cpp index 9c60ce49b3..3ff97ad191 100644 --- a/src/nxrunner/src/CliObserver.cpp +++ b/src/nxrunner/src/CliObserver.cpp @@ -1,12 +1,12 @@ #include "CliObserver.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" #include #include -using namespace complex; -using namespace complex::CLI; +using namespace nx::core; +using namespace nx::core::CLI; PipelineObserver::PipelineObserver(Pipeline* pipeline) { @@ -26,27 +26,27 @@ PipelineObserver::PipelineObserver(Pipeline* pipeline) int32_t currentFilterIndex = 0; for(const auto cxFilter : *pipeline) { - m_SignalConnections.push_back(cxFilter->getFilterUpdateSignal().connect([currentFilterIndex](complex::AbstractPipelineNode* node, int32_t, const std::string& message) { + m_SignalConnections.push_back(cxFilter->getFilterUpdateSignal().connect([currentFilterIndex](nx::core::AbstractPipelineNode* node, int32_t, const std::string& message) { std::cout << "[" << currentFilterIndex << "] " << node->getName() << ": " << message << std::endl; })); - m_SignalConnections.push_back(cxFilter->getFilterProgressSignal().connect([currentFilterIndex](complex::AbstractPipelineNode* node, int32_t, int32_t progress, const std::string& message) { + m_SignalConnections.push_back(cxFilter->getFilterProgressSignal().connect([currentFilterIndex](nx::core::AbstractPipelineNode* node, int32_t, int32_t progress, const std::string& message) { std::cout << "[" << currentFilterIndex << "] " << node->getName() << ": " << progress << "% " << message << std::endl; })); - m_SignalConnections.push_back(cxFilter->getFilterFaultSignal().connect([currentFilterIndex](complex::AbstractPipelineNode*, int32_t filterIndex, complex::FaultState state) { - if(state == complex::FaultState::Errors) + m_SignalConnections.push_back(cxFilter->getFilterFaultSignal().connect([currentFilterIndex](nx::core::AbstractPipelineNode*, int32_t filterIndex, nx::core::FaultState state) { + if(state == nx::core::FaultState::Errors) { std::cout << "[" << currentFilterIndex << "] Error(s) Encountered during filter execution. Fault state= " << static_cast(state) << std::endl; } - if(state != complex::FaultState::Warnings) + if(state != nx::core::FaultState::Warnings) { std::cout << "[" << currentFilterIndex << "] Warning(s) Encountered during filter execution. Fault state= " << static_cast(state) << std::endl; } })); m_SignalConnections.push_back(cxFilter->getFilterFaultDetailSignal().connect( - [currentFilterIndex](complex::AbstractPipelineNode*, int32_t filterIndex, const complex::WarningCollection& warnings, const complex::ErrorCollection& errors) { + [currentFilterIndex](nx::core::AbstractPipelineNode*, int32_t filterIndex, const nx::core::WarningCollection& warnings, const nx::core::ErrorCollection& errors) { if(!warnings.empty()) { std::cout << "[" << currentFilterIndex << "] Warnings During Execution" << std::endl; diff --git a/src/nxrunner/src/CliObserver.hpp b/src/nxrunner/src/CliObserver.hpp index 64676d10fb..758252baf6 100644 --- a/src/nxrunner/src/CliObserver.hpp +++ b/src/nxrunner/src/CliObserver.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Pipeline/Messaging/PipelineNodeObserver.hpp" -#include "complex/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/Messaging/PipelineNodeObserver.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" -namespace complex +namespace nx::core { namespace CLI { @@ -39,4 +39,4 @@ class PipelineObserver : public PipelineNodeObserver std::vector m_SignalConnections; }; } // namespace CLI -} // namespace complex +} // namespace nx::core diff --git a/src/nxrunner/src/nxrunner.cpp b/src/nxrunner/src/nxrunner.cpp index 960e590306..585840648a 100644 --- a/src/nxrunner/src/nxrunner.cpp +++ b/src/nxrunner/src/nxrunner.cpp @@ -1,11 +1,11 @@ #include "CliObserver.hpp" -#include "complex/Common/Result.hpp" -#include "complex/ComplexPython.hpp" -#include "complex/ComplexVersion.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Pipeline/Pipeline.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" +#include "simplnx/SIMPLNXVersion.hpp" +#include "simplnx/SimplnxPython.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include @@ -14,14 +14,14 @@ #include #include -#if COMPLEX_EMBED_PYTHON +#if SIMPLNX_EMBED_PYTHON #include #endif namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; -#if COMPLEX_EMBED_PYTHON +#if SIMPLNX_EMBED_PYTHON namespace py = pybind11; #endif @@ -86,7 +86,7 @@ class CliStream if(filepath.empty() || filepath.string().length() == 0) { std::string errorMessage = "Log file cannot be created with an empty filepath."; - return complex::MakeErrorResult(k_NullLogFileError, errorMessage); + return nx::core::MakeErrorResult(k_NullLogFileError, errorMessage); } const std::ios_base::openmode openmode = std::ios_base::out | std::ios_base::trunc; @@ -94,7 +94,7 @@ class CliStream if(m_LogStream.is_open() == false) { std::string errorMessage = fmt::format("Failed to open log file: '{}'", filepath.string()); - return complex::MakeErrorResult(k_LogFileError, errorMessage); + return nx::core::MakeErrorResult(k_LogFileError, errorMessage); } return {}; @@ -183,7 +183,7 @@ Result ParseParameters(int argc, char* argv[]) if(argc < 2) { std::string ss = "No arguments to parse"; - return complex::MakeErrorResult(k_NoArgumentsProvided, ss); + return nx::core::MakeErrorResult(k_NoArgumentsProvided, ss); } CliArguments args; @@ -274,7 +274,7 @@ Result<> PreflightPipeline(Pipeline& pipeline) if(!pipeline.preflight()) { std::string ss = "Error preflighting pipeline"; - return complex::MakeErrorResult(-2, ss); + return nx::core::MakeErrorResult(-2, ss); } cliOut << "Finished preflighting pipeline"; @@ -291,7 +291,7 @@ Result<> ExecutePipeline(Pipeline& pipeline) if(!pipeline.execute()) { std::string ss = "Error executing pipeline"; - return complex::MakeErrorResult(k_ExecutePipelineError, ss); + return nx::core::MakeErrorResult(k_ExecutePipelineError, ss); } cliOut << "Finished executing pipeline"; cliOut.endline(); @@ -306,7 +306,7 @@ Result<> ExecutePipeline(const Argument& arg) { cliOut << fmt::format("Could not load pipeline at path: '{}'", pipelinePath); cliOut.endline(); - return complex::ConvertResult(std::move(loadPipelineResult)); + return nx::core::ConvertResult(std::move(loadPipelineResult)); } Pipeline pipeline = loadPipelineResult.value(); @@ -323,7 +323,7 @@ Result<> PreflightPipeline(const Argument& arg) { cliOut << fmt::format("Could not load pipeline at path: '{}'", pipelinePath); cliOut.endline(); - return complex::ConvertResult(std::move(loadPipelineResult)); + return nx::core::ConvertResult(std::move(loadPipelineResult)); } cliOut << fmt::format("Preflighting pipeline at path: '{}'\n", pipelinePath); @@ -458,13 +458,13 @@ Result<> DisplayHelpMenu(const std::vector& arguments) } std::string ss = "Incorrect Help Syntax"; - return complex::MakeErrorResult(k_FailedParsingArguments, ss); + return nx::core::MakeErrorResult(k_FailedParsingArguments, ss); } Result<> CreateArgumentError(const Argument& argument) { std::string errorMessage = fmt::format("Failed to parse argument: {}", argument.value); - return complex::MakeErrorResult(k_InvalidArgumentError, errorMessage); + return nx::core::MakeErrorResult(k_InvalidArgumentError, errorMessage); } Result<> SetLogFile(const Argument& argument) @@ -473,10 +473,10 @@ Result<> SetLogFile(const Argument& argument) return cliOut.setLogFile(filepath); } -#if COMPLEX_EMBED_PYTHON +#if SIMPLNX_EMBED_PYTHON std::vector GetPythonPluginList() { - auto* var = std::getenv("COMPLEX_PYTHON_PLUGINS"); + auto* var = std::getenv("SIMPLNX_PYTHON_PLUGINS"); if(var == nullptr) { return {}; @@ -489,7 +489,7 @@ std::vector GetPythonPluginList() int main(int argc, char* argv[]) { - cliOut << fmt::format("nxrunner: Version {} Build Date:{}\n\n", complex::Version::Package(), complex::Version::BuildDate()); + cliOut << fmt::format("nxrunner: Version {} Build Date:{}\n\n", nx::core::Version::Package(), nx::core::Version::BuildDate()); // cliOut.endline(); // cliOut << "ARGUMENT LISTING START\n"; // for(int argIndex = 0; argIndex < argc; argIndex++) @@ -538,16 +538,16 @@ int main(int argc, char* argv[]) } } - // Load the Complex Application instance and load the plugins - auto app = complex::Application::GetOrCreateInstance(); + // Load the Simplnx Application instance and load the plugins + auto app = nx::core::Application::GetOrCreateInstance(); LoadApp(); -#if COMPLEX_EMBED_PYTHON +#if SIMPLNX_EMBED_PYTHON py::scoped_interpreter guard{}; try { - auto cx = py::module_::import(COMPLEX_PYTHON_MODULE); + auto cx = py::module_::import(SIMPLNX_PYTHON_MODULE); auto pythonPlugins = GetPythonPluginList(); @@ -586,7 +586,7 @@ int main(int argc, char* argv[]) auto result = ExecutePipeline(arguments[0]); results.push_back(result); } -#if COMPLEX_EMBED_PYTHON +#if SIMPLNX_EMBED_PYTHON catch(const py::error_already_set& exception) { fmt::print("Python exception: {}\n", exception.what()); @@ -606,7 +606,7 @@ int main(int argc, char* argv[]) auto result = PreflightPipeline(arguments[0]); results.push_back(result); } -#if COMPLEX_EMBED_PYTHON +#if SIMPLNX_EMBED_PYTHON catch(const py::error_already_set& exception) { fmt::print("Python exception: {}\n", exception.what()); diff --git a/src/complex/Common/Any.hpp b/src/simplnx/Common/Any.hpp similarity index 93% rename from src/complex/Common/Any.hpp rename to src/simplnx/Common/Any.hpp index f9be941c5f..142df6d79d 100644 --- a/src/complex/Common/Any.hpp +++ b/src/simplnx/Common/Any.hpp @@ -2,7 +2,7 @@ #include -namespace complex +namespace nx::core { /** * @brief Returns a reference to the contained value in the std::any. @@ -37,4 +37,4 @@ const T& GetAnyRef(const std::any& value) } return *valuePtr; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Array.hpp b/src/simplnx/Common/Array.hpp similarity index 99% rename from src/complex/Common/Array.hpp rename to src/simplnx/Common/Array.hpp index e3ddb5e4d5..29a34c411c 100644 --- a/src/complex/Common/Array.hpp +++ b/src/simplnx/Common/Array.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Types.hpp" #include #include @@ -8,7 +8,7 @@ #include #include -namespace complex +namespace nx::core { template class Array @@ -1455,4 +1455,4 @@ using Point2D = Vec2; using Point2Df = Vec2; using Point2Dd = Vec2; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/AtomicFile.cpp b/src/simplnx/Common/AtomicFile.cpp similarity index 97% rename from src/complex/Common/AtomicFile.cpp rename to src/simplnx/Common/AtomicFile.cpp index a81207cfb1..f878f65dea 100644 --- a/src/complex/Common/AtomicFile.cpp +++ b/src/simplnx/Common/AtomicFile.cpp @@ -1,12 +1,12 @@ #include "AtomicFile.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/complex/Common/AtomicFile.hpp b/src/simplnx/Common/AtomicFile.hpp similarity index 87% rename from src/complex/Common/AtomicFile.hpp rename to src/simplnx/Common/AtomicFile.hpp index f6d68c257e..cb025d168e 100644 --- a/src/complex/Common/AtomicFile.hpp +++ b/src/simplnx/Common/AtomicFile.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" -#include "complex/Common/Result.hpp" +#include "simplnx/Common/Result.hpp" #include #include -namespace complex +namespace nx::core { namespace fs = std::filesystem; @@ -20,7 +20,7 @@ namespace fs = std::filesystem; * will be swapped upon object destruction. The temporary file will always be deleted * upon object destruction. */ -class COMPLEX_EXPORT AtomicFile +class SIMPLNX_EXPORT AtomicFile { public: explicit AtomicFile(const std::string& filename, bool autoCommit = false); @@ -43,4 +43,4 @@ class COMPLEX_EXPORT AtomicFile Result<> createOutputDirectories(); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Bit.hpp b/src/simplnx/Common/Bit.hpp similarity index 93% rename from src/complex/Common/Bit.hpp rename to src/simplnx/Common/Bit.hpp index bcd4f7635c..8000f34e43 100644 --- a/src/complex/Common/Bit.hpp +++ b/src/simplnx/Common/Bit.hpp @@ -3,25 +3,25 @@ #include #include -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Types.hpp" #ifdef _WIN32 -#define COMPLEX_BYTE_ORDER little +#define SIMPLNX_BYTE_ORDER little #elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__) #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -#define COMPLEX_BYTE_ORDER little +#define SIMPLNX_BYTE_ORDER little #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -#define COMPLEX_BYTE_ORDER big +#define SIMPLNX_BYTE_ORDER big #endif #endif -namespace complex +namespace nx::core { enum class endian : uint8 { little = 0, big = 1, - native = COMPLEX_BYTE_ORDER + native = SIMPLNX_BYTE_ORDER }; inline endian checkEndian() @@ -128,4 +128,4 @@ inline constexpr T byteswap(T value) noexcept } } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/BoundingBox.hpp b/src/simplnx/Common/BoundingBox.hpp similarity index 98% rename from src/complex/Common/BoundingBox.hpp rename to src/simplnx/Common/BoundingBox.hpp index bc93e0684d..6b0e0f4256 100644 --- a/src/complex/Common/BoundingBox.hpp +++ b/src/simplnx/Common/BoundingBox.hpp @@ -2,11 +2,11 @@ #include -#include "complex/Common/Array.hpp" +#include "simplnx/Common/Array.hpp" #include -namespace complex +namespace nx::core { /** * @class BoundingBox @@ -16,7 +16,7 @@ namespace complex * for calculations checking for points in a given region. As the BoundingBox * class operates along X, Y, and Z axis (in 3D version), no rotation information is available. * - * Template Type: Point - Point is a parameter for the type of (complex) Point used + * Template Type: Point - Point is a parameter for the type of (simplnx) Point used * by the BoundingBox based on the templated value type. */ template class Point = Point3D> @@ -189,4 +189,4 @@ template using BoundingBox2D = BoundingBox; using BoundingBox2Df = BoundingBox; using BoundingBox2Dd = BoundingBox; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Constants.hpp b/src/simplnx/Common/Constants.hpp similarity index 98% rename from src/complex/Common/Constants.hpp rename to src/simplnx/Common/Constants.hpp index 8739178465..7cba0527c0 100644 --- a/src/complex/Common/Constants.hpp +++ b/src/simplnx/Common/Constants.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Common/Numbers.hpp" +#include "simplnx/Common/Numbers.hpp" -namespace complex::Constants +namespace nx::core::Constants { template >> @@ -187,4 +187,4 @@ inline constexpr double k_Cos_ThreeEighthPiD = k_Cos_ThreeEighthPi; inline constexpr float k_Sin_ThreeEighthPiF = k_Sin_ThreeEighthPi; inline constexpr double k_Sin_ThreeEighthPiD = k_Sin_ThreeEighthPi; -} // namespace complex::Constants +} // namespace nx::core::Constants diff --git a/src/complex/Common/DataVector.hpp b/src/simplnx/Common/DataVector.hpp similarity index 98% rename from src/complex/Common/DataVector.hpp rename to src/simplnx/Common/DataVector.hpp index b12f8a3ce9..5f4354e63b 100644 --- a/src/complex/Common/DataVector.hpp +++ b/src/simplnx/Common/DataVector.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/Bit.hpp" -#include "complex/Common/IteratorUtility.hpp" -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Bit.hpp" +#include "simplnx/Common/IteratorUtility.hpp" +#include "simplnx/Common/Types.hpp" #include "nonstd/span.hpp" #include -namespace complex +namespace nx::core { template class DataVector @@ -793,7 +793,7 @@ class DataVector pointer rawPtr = data(); for(value_type& value : *this) { - value = complex::byteswap(value); + value = nx::core::byteswap(value); } } @@ -914,4 +914,4 @@ class DataVector std::unique_ptr m_Data = nullptr; pointer m_DataPtr = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/EulerAngle.hpp b/src/simplnx/Common/EulerAngle.hpp similarity index 90% rename from src/complex/Common/EulerAngle.hpp rename to src/simplnx/Common/EulerAngle.hpp index a4e34d17e2..043cd00559 100644 --- a/src/complex/Common/EulerAngle.hpp +++ b/src/simplnx/Common/EulerAngle.hpp @@ -2,7 +2,7 @@ #include "Eigen/Dense" -namespace complex +namespace nx::core { /** * @brief The ZXZEuler alias is used to describe Euler angles and their format @@ -11,4 +11,4 @@ namespace complex * becomes harder to accidentally use the wrong Euler angle format in code. */ using ZXZEuler = Eigen::Vector3f; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/IteratorUtility.hpp b/src/simplnx/Common/IteratorUtility.hpp similarity index 75% rename from src/complex/Common/IteratorUtility.hpp rename to src/simplnx/Common/IteratorUtility.hpp index 33d32184ec..11faac4085 100644 --- a/src/complex/Common/IteratorUtility.hpp +++ b/src/simplnx/Common/IteratorUtility.hpp @@ -1,10 +1,10 @@ #pragma once -namespace complex +namespace nx::core { template typename Iter::difference_type distance(Iter first, Iter last) { return last - first; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Numbers.hpp b/src/simplnx/Common/Numbers.hpp similarity index 98% rename from src/complex/Common/Numbers.hpp rename to src/simplnx/Common/Numbers.hpp index c3f9e92157..1799d9fcef 100644 --- a/src/complex/Common/Numbers.hpp +++ b/src/simplnx/Common/Numbers.hpp @@ -2,7 +2,7 @@ #include -namespace complex +namespace nx::core { // Based on from C++20 namespace numbers @@ -61,4 +61,4 @@ inline constexpr double egamma = egamma_v; inline constexpr double phi = phi_v; } // namespace numbers -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Range.cpp b/src/simplnx/Common/Range.cpp similarity index 93% rename from src/complex/Common/Range.cpp rename to src/simplnx/Common/Range.cpp index e532a92fc8..718ccdef60 100644 --- a/src/complex/Common/Range.cpp +++ b/src/simplnx/Common/Range.cpp @@ -1,7 +1,7 @@ -#include "complex/Common/Range.hpp" +#include "simplnx/Common/Range.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- Range::Range() @@ -14,7 +14,7 @@ Range::Range(size_t begin, size_t end) : m_Range({{begin, end}}) { } -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE // ----------------------------------------------------------------------------- Range::Range(const tbb::blocked_range& r) : m_Range({{r.begin(), r.end()}}) diff --git a/src/complex/Common/Range.hpp b/src/simplnx/Common/Range.hpp similarity index 86% rename from src/complex/Common/Range.hpp rename to src/simplnx/Common/Range.hpp index f9161fe9ba..fca2531641 100644 --- a/src/complex/Common/Range.hpp +++ b/src/simplnx/Common/Range.hpp @@ -1,18 +1,18 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE #include #endif #include #include -namespace complex +namespace nx::core { /** - * @class Range Range.h complex/Common/Range.h + * @class Range Range.h simplnx/Common/Range.h * @brief The Range class defines a range between set of minimum and * maximum values. The purpose of this class is mainly to allow a more unified * control flow during parallelization between builds using TBB and those that @@ -20,7 +20,7 @@ namespace complex * a single operator accepting a Range can be used TBB parallelized and * non-paralleled versions without a branching code base. */ -class COMPLEX_EXPORT Range +class SIMPLNX_EXPORT Range { public: using RangeType = std::array; @@ -28,7 +28,7 @@ class COMPLEX_EXPORT Range Range(); Range(size_t begin, size_t end); -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE Range(const tbb::blocked_range& r); #endif @@ -72,4 +72,4 @@ class COMPLEX_EXPORT Range RangeType m_Range; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Range2D.cpp b/src/simplnx/Common/Range2D.cpp similarity index 96% rename from src/complex/Common/Range2D.cpp rename to src/simplnx/Common/Range2D.cpp index 71afc0da6c..14435ed1fe 100644 --- a/src/complex/Common/Range2D.cpp +++ b/src/simplnx/Common/Range2D.cpp @@ -1,7 +1,7 @@ -#include "complex/Common/Range2D.hpp" +#include "simplnx/Common/Range2D.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- Range2D::Range2D() : m_Range({{0, 0, 0, 0}}) @@ -14,7 +14,7 @@ Range2D::Range2D(size_t colStart, size_t colEnd, size_t rowStart, size_t rowEnd) { } -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE // ----------------------------------------------------------------------------- Range2D::Range2D(const tbb::blocked_range2d& r) : m_Range({{r.cols().begin(), r.cols().end(), r.rows().begin(), r.rows().end()}}) diff --git a/src/complex/Common/Range2D.hpp b/src/simplnx/Common/Range2D.hpp similarity index 92% rename from src/complex/Common/Range2D.hpp rename to src/simplnx/Common/Range2D.hpp index 9bbb129cc7..22c555ebb9 100644 --- a/src/complex/Common/Range2D.hpp +++ b/src/simplnx/Common/Range2D.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE #include #endif -namespace complex +namespace nx::core { /** - * @class Range2D Range2D.h complex/Common/Range2D.h + * @class Range2D Range2D.h simplnx/Common/Range2D.h * @brief The Range2D class defines a range between set of minimum and * maximum values for 2 dimensions. The purpose of this class is mainly to allow a more unified * control flow during parallelization between builds using TBB and those that @@ -19,7 +19,7 @@ namespace complex * a single operator accepting a Range can be used TBB parallelized and * non-paralleled versions without a branching code base. */ -class COMPLEX_EXPORT Range2D +class SIMPLNX_EXPORT Range2D { public: /** @@ -40,7 +40,7 @@ class COMPLEX_EXPORT Range2D */ Range2D(size_t colStart, size_t colEnd, size_t rowStart, size_t rowEnd); -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE /** * @brief Uses the tbb::blocked_rang2d as the init value * @param tbbRange A tbb::blocked_range2d object. NOTE: TBB may order its arguments @@ -113,4 +113,4 @@ class COMPLEX_EXPORT Range2D RangeType m_Range; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Range3D.cpp b/src/simplnx/Common/Range3D.cpp similarity index 95% rename from src/complex/Common/Range3D.cpp rename to src/simplnx/Common/Range3D.cpp index 90519a824d..c4f92e22c9 100644 --- a/src/complex/Common/Range3D.cpp +++ b/src/simplnx/Common/Range3D.cpp @@ -1,8 +1,8 @@ -#include "complex/Common/Range3D.hpp" +#include "simplnx/Common/Range3D.hpp" #include -using namespace complex; +using namespace nx::core; // ----------------------------------------------------------------------------- Range3D::Range3D() : m_Range({{0, 0, 0, 0, 0, 0}}) @@ -21,7 +21,7 @@ Range3D::Range3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin { } -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE // ----------------------------------------------------------------------------- Range3D::Range3D(const tbb::blocked_range3d& r) : m_Range({{r.cols().begin(), r.cols().end(), r.rows().begin(), r.rows().end(), r.pages().begin(), r.pages().end()}}) diff --git a/src/complex/Common/Range3D.hpp b/src/simplnx/Common/Range3D.hpp similarity index 90% rename from src/complex/Common/Range3D.hpp rename to src/simplnx/Common/Range3D.hpp index 0bf795441c..3082cb4e5a 100644 --- a/src/complex/Common/Range3D.hpp +++ b/src/simplnx/Common/Range3D.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE #include #endif #include #include -namespace complex +namespace nx::core { /** - * @class Range3D Range3D.h complex/Common/Range3D.h + * @class Range3D Range3D.h simplnx/Common/Range3D.h * @brief The Range3D class defines a range between set of minimum and * maximum values. The purpose of this class is mainly to allow a more unified * control flow during parallelization between builds using TBB and those that @@ -21,7 +21,7 @@ namespace complex * a single operator accepting a Range can be used TBB parallelized and * non-paralleled versions without a branching code base. */ -class COMPLEX_EXPORT Range3D +class SIMPLNX_EXPORT Range3D { public: using RangeType = std::array; //<* {size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax} @@ -48,7 +48,7 @@ class COMPLEX_EXPORT Range3D */ Range3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax); -#ifdef COMPLEX_ENABLE_MULTICORE +#ifdef SIMPLNX_ENABLE_MULTICORE Range3D(const tbb::blocked_range3d& r); #endif @@ -94,4 +94,4 @@ class COMPLEX_EXPORT Range3D RangeType m_Range; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Ray.hpp b/src/simplnx/Common/Ray.hpp similarity index 97% rename from src/complex/Common/Ray.hpp rename to src/simplnx/Common/Ray.hpp index 6fed55a88d..72da96e4ad 100644 --- a/src/complex/Common/Ray.hpp +++ b/src/simplnx/Common/Ray.hpp @@ -2,10 +2,10 @@ #include -#include "complex/Common/Array.hpp" -#include "complex/Common/EulerAngle.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/Common/EulerAngle.hpp" -namespace complex +namespace nx::core { /** @@ -217,4 +217,4 @@ class Ray ZXZEulerType m_Angle; LengthType m_Length; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Result.hpp b/src/simplnx/Common/Result.hpp similarity index 94% rename from src/complex/Common/Result.hpp rename to src/simplnx/Common/Result.hpp index b9216ffd79..10427c489c 100644 --- a/src/complex/Common/Result.hpp +++ b/src/simplnx/Common/Result.hpp @@ -6,18 +6,18 @@ #include -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Error is a simple struct of a error code and message. * It is meant for general purpose error reporting. */ -struct COMPLEX_EXPORT Error +struct SIMPLNX_EXPORT Error { - int32 code = 0; + nx::core::types::int32 code = 0; std::string message; }; @@ -27,7 +27,7 @@ using ErrorCollection = std::vector; * @brief Warning is a simple struct of a warning code and message. * It is meant for general purpose warning reporting. */ -struct COMPLEX_EXPORT Warning +struct SIMPLNX_EXPORT Warning { int32 code = 0; std::string message; @@ -61,7 +61,7 @@ struct ResultBase nonstd::expected> m_Expected; }; -struct COMPLEX_EXPORT ResultVoid +struct SIMPLNX_EXPORT ResultVoid { nonstd::expected> m_Expected; }; @@ -198,7 +198,7 @@ std::enable_if_t, Result> ConvertResultTo * * A Typical invocation would be: * @code - * return complex::MakeErrorResult(-1, fmt::format("{} JSON Data does not contain an entry with a key of '{}'", prefix, name())); + * return nx::core::MakeErrorResult(-1, fmt::format("{} JSON Data does not contain an entry with a key of '{}'", prefix, name())); * @endcode * @tparam T * @param code Error Value. Typically negative number @@ -315,4 +315,4 @@ inline Result<> MergeResults(std::vector> results) return outputResult; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/RgbColor.cpp b/src/simplnx/Common/RgbColor.cpp similarity index 98% rename from src/complex/Common/RgbColor.cpp rename to src/simplnx/Common/RgbColor.cpp index b61f4f6a8f..138edcdbbc 100644 --- a/src/complex/Common/RgbColor.cpp +++ b/src/simplnx/Common/RgbColor.cpp @@ -1,6 +1,6 @@ #include "RgbColor.hpp" -namespace complex +namespace nx::core { namespace RgbColor { @@ -100,4 +100,4 @@ void GetColorTable(int numColors, std::vector& colorsOut) } } // namespace RgbColor -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/RgbColor.hpp b/src/simplnx/Common/RgbColor.hpp similarity index 71% rename from src/complex/Common/RgbColor.hpp rename to src/simplnx/Common/RgbColor.hpp index 8033385a11..e4a4fd1a6e 100644 --- a/src/complex/Common/RgbColor.hpp +++ b/src/simplnx/Common/RgbColor.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include -namespace complex +namespace nx::core { /** * @brief The Rgba alias is used to specify the format for storing integer @@ -35,35 +35,35 @@ using Component = uint8; * @param rgb * @return uint8 */ -Component COMPLEX_EXPORT dRed(complex::Rgba rgb); +Component SIMPLNX_EXPORT dRed(nx::core::Rgba rgb); /** * @brief Returns the integer representation of the green component. * @param rgb * @return uint8 */ -Component COMPLEX_EXPORT dGreen(complex::Rgba rgb); +Component SIMPLNX_EXPORT dGreen(nx::core::Rgba rgb); /** * @brief Returns the integrer representation of the blue component. * @param rgb * @return uint8 */ -Component COMPLEX_EXPORT dBlue(complex::Rgba rgb); +Component SIMPLNX_EXPORT dBlue(nx::core::Rgba rgb); /** * @brief Returns the integer representation of the alpha component. * @param rgb * @return uint8 */ -Component COMPLEX_EXPORT dAlpha(complex::Rgba rgb); +Component SIMPLNX_EXPORT dAlpha(nx::core::Rgba rgb); /** * @brief Returns the integer representation of the grayscale value. * @param rgb * @return uint8 */ -Component COMPLEX_EXPORT dGray(complex::Rgba rgb); +Component SIMPLNX_EXPORT dGray(nx::core::Rgba rgb); /** * @brief Returns the Rgba value from the individual component values. @@ -71,9 +71,9 @@ Component COMPLEX_EXPORT dGray(complex::Rgba rgb); * @param g * @param b * @param a - * @return complex::Rgba + * @return nx::core::Rgba */ -complex::Rgba COMPLEX_EXPORT dRgb(Component r, Component g, Component b, Component a); +nx::core::Rgba SIMPLNX_EXPORT dRgb(Component r, Component g, Component b, Component a); /** * @brief Prints the Rgba value to stream using the specified separator. @@ -81,7 +81,7 @@ complex::Rgba COMPLEX_EXPORT dRgb(Component r, Component g, Component b, Compone * @param sep * @param rgb */ -void COMPLEX_EXPORT print(std::ostream& out, const char* sep, complex::Rgba rgb); +void SIMPLNX_EXPORT print(std::ostream& out, const char* sep, nx::core::Rgba rgb); /** * @brief Checks equality between two Rgba values. @@ -89,21 +89,21 @@ void COMPLEX_EXPORT print(std::ostream& out, const char* sep, complex::Rgba rgb) * @param rhs * @return bool */ -bool COMPLEX_EXPORT isEqual(complex::Rgba lhs, complex::Rgba rhs); +bool SIMPLNX_EXPORT isEqual(nx::core::Rgba lhs, nx::core::Rgba rhs); /** * @brief Converts an Rgba value to a tuple of floats * @param rgb * @return tuple */ -std::tuple COMPLEX_EXPORT fRgb(complex::Rgba rgb); +std::tuple SIMPLNX_EXPORT fRgb(nx::core::Rgba rgb); /** * @brief Generate a color table. * @param numColors The number of colors to generate * @param colorsOut The vector to store the colors into. */ -void COMPLEX_EXPORT GetColorTable(int numColors, std::vector& colorsOut); +void SIMPLNX_EXPORT GetColorTable(int numColors, std::vector& colorsOut); } // namespace RgbColor -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/ScopeGuard.hpp b/src/simplnx/Common/ScopeGuard.hpp similarity index 97% rename from src/complex/Common/ScopeGuard.hpp rename to src/simplnx/Common/ScopeGuard.hpp index c61654c7aa..ef57b211e3 100644 --- a/src/complex/Common/ScopeGuard.hpp +++ b/src/simplnx/Common/ScopeGuard.hpp @@ -3,7 +3,7 @@ #include #include -namespace complex +namespace nx::core { /** * @brief ScopeGuard executes its callable when it is destructed @@ -73,4 +73,4 @@ template { return ScopeGuard>>(std::forward(func)); } -} // namespace complex +} // namespace nx::core diff --git a/src/simplnx/Common/SimplnxConstants.hpp b/src/simplnx/Common/SimplnxConstants.hpp new file mode 100644 index 0000000000..047feb8d77 --- /dev/null +++ b/src/simplnx/Common/SimplnxConstants.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include "simplnx/Common/StringLiteral.hpp" + +#define SIMPLNX_DEF_STRING_CONSTANT(name) StringLiteral k_##name = #name + +namespace nx::core +{ +namespace Constants +{ +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(Int8); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(UInt8); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(Int16); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(UInt16); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(Int32); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(UInt32); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(Int64); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(UInt64); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(Float32); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(Float64); +inline constexpr SIMPLNX_DEF_STRING_CONSTANT(USize); +} // namespace Constants +} // namespace nx::core + +#undef SIMPLNX_DEF_STRING_CONSTANT diff --git a/src/complex/Common/StringLiteral.hpp b/src/simplnx/Common/StringLiteral.hpp similarity index 95% rename from src/complex/Common/StringLiteral.hpp rename to src/simplnx/Common/StringLiteral.hpp index b872f474aa..fdea059dd9 100644 --- a/src/complex/Common/StringLiteral.hpp +++ b/src/simplnx/Common/StringLiteral.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Types.hpp" #include #include @@ -9,7 +9,7 @@ #include #include -namespace complex +namespace nx::core { namespace detail { @@ -210,10 +210,10 @@ using StringLiteral = BasicStringLiteral; using WStringLiteral = BasicStringLiteral; using String16Literal = BasicStringLiteral; using String32Literal = BasicStringLiteral; -} // namespace complex +} // namespace nx::core template -struct fmt::formatter> +struct fmt::formatter> { static constexpr const CharT* GetFormatString() { @@ -240,7 +240,7 @@ struct fmt::formatter> return ctx.begin(); } - typename buffer_context::iterator format(const complex::BasicStringLiteral& p, buffer_context& ctx) const + typename buffer_context::iterator format(const nx::core::BasicStringLiteral& p, buffer_context& ctx) const { static constexpr const CharT* formatStr = GetFormatString(); diff --git a/src/complex/Common/TypeTraits.hpp b/src/simplnx/Common/TypeTraits.hpp similarity index 88% rename from src/complex/Common/TypeTraits.hpp rename to src/simplnx/Common/TypeTraits.hpp index 3bd1c092c8..5c8079047c 100644 --- a/src/complex/Common/TypeTraits.hpp +++ b/src/simplnx/Common/TypeTraits.hpp @@ -2,7 +2,7 @@ #include -namespace complex +namespace nx::core { // Based on P1830R1 template @@ -14,4 +14,4 @@ constexpr std::underlying_type_t to_underlying(Enum e) noexcept { return static_cast>(e); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Types.hpp b/src/simplnx/Common/Types.hpp similarity index 68% rename from src/complex/Common/Types.hpp rename to src/simplnx/Common/Types.hpp index 7a52d50e2c..c392e4be85 100644 --- a/src/complex/Common/Types.hpp +++ b/src/simplnx/Common/Types.hpp @@ -4,7 +4,7 @@ #include #include -namespace complex +namespace nx::core { namespace types { @@ -93,24 +93,24 @@ enum class FaultState inline const std::set& GetAllDataTypes() { - static const std::set dataTypes = {complex::DataType::int8, complex::DataType::uint8, complex::DataType::int16, complex::DataType::uint16, - complex::DataType::int32, complex::DataType::uint32, complex::DataType::int64, complex::DataType::uint64, - complex::DataType::float32, complex::DataType::float64, complex::DataType::boolean}; + static const std::set dataTypes = {nx::core::DataType::int8, nx::core::DataType::uint8, nx::core::DataType::int16, nx::core::DataType::uint16, + nx::core::DataType::int32, nx::core::DataType::uint32, nx::core::DataType::int64, nx::core::DataType::uint64, + nx::core::DataType::float32, nx::core::DataType::float64, nx::core::DataType::boolean}; return dataTypes; } inline const std::set& GetAllNumericTypes() { - static const std::set dataTypes = {complex::DataType::int8, complex::DataType::uint8, complex::DataType::int16, complex::DataType::uint16, complex::DataType::int32, - complex::DataType::uint32, complex::DataType::int64, complex::DataType::uint64, complex::DataType::float32, complex::DataType::float64}; + static const std::set dataTypes = {nx::core::DataType::int8, nx::core::DataType::uint8, nx::core::DataType::int16, nx::core::DataType::uint16, nx::core::DataType::int32, + nx::core::DataType::uint32, nx::core::DataType::int64, nx::core::DataType::uint64, nx::core::DataType::float32, nx::core::DataType::float64}; return dataTypes; } inline const std::set& GetIntegerDataTypes() { - static const std::set dataTypes = {complex::DataType::int8, complex::DataType::uint8, complex::DataType::int16, complex::DataType::uint16, - complex::DataType::int32, complex::DataType::uint32, complex::DataType::int64, complex::DataType::uint64}; + static const std::set dataTypes = {nx::core::DataType::int8, nx::core::DataType::uint8, nx::core::DataType::int16, nx::core::DataType::uint16, + nx::core::DataType::int32, nx::core::DataType::uint32, nx::core::DataType::int64, nx::core::DataType::uint64}; return dataTypes; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/TypesUtility.hpp b/src/simplnx/Common/TypesUtility.hpp similarity index 83% rename from src/complex/Common/TypesUtility.hpp rename to src/simplnx/Common/TypesUtility.hpp index e3da359777..6713ef5af0 100644 --- a/src/complex/Common/TypesUtility.hpp +++ b/src/simplnx/Common/TypesUtility.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/Types.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/Types.hpp" #include #include #include -namespace complex +namespace nx::core { /** * @brief Returns the NumericType associated with T. @@ -60,7 +60,7 @@ constexpr NumericType GetNumericType() noexcept } else { - static_assert(dependent_false, "complex::GetNumericType: Unsupported type"); + static_assert(dependent_false, "nx::core::GetNumericType: Unsupported type"); } } @@ -118,7 +118,7 @@ constexpr DataType GetDataType() noexcept } else { - static_assert(dependent_false, "complex::GetDataType: Unsupported type"); + static_assert(dependent_false, "nx::core::GetDataType: Unsupported type"); } } @@ -152,7 +152,7 @@ inline constexpr usize GetNumericTypeSize(NumericType numericType) case NumericType::float64: return sizeof(float64); default: - throw std::runtime_error("complex::GetNumericTypeSize: Unsupported type"); + throw std::runtime_error("nx::core::GetNumericTypeSize: Unsupported type"); } } @@ -196,7 +196,7 @@ inline constexpr StringLiteral NumericTypeToString(NumericType numericType) return "float64"; } default: - throw std::runtime_error("complex::NumericTypeToString: Unknown NumericType"); + throw std::runtime_error("nx::core::NumericTypeToString: Unknown NumericType"); } } @@ -243,7 +243,7 @@ inline constexpr StringLiteral DataTypeToString(DataType dataType) return "boolean"; } default: - throw std::runtime_error("complex::DataTypeToString: Unknown DataType"); + throw std::runtime_error("nx::core::DataTypeToString: Unknown DataType"); } } @@ -253,10 +253,10 @@ inline constexpr StringLiteral DataTypeToString(DataType dataType) */ inline const std::vector& GetAllDataTypesAsStrings() { - static const std::vector dataTypes = {DataTypeToString(complex::DataType::int8), DataTypeToString(complex::DataType::uint8), DataTypeToString(complex::DataType::int16), - DataTypeToString(complex::DataType::uint16), DataTypeToString(complex::DataType::int32), DataTypeToString(complex::DataType::uint32), - DataTypeToString(complex::DataType::int64), DataTypeToString(complex::DataType::uint64), DataTypeToString(complex::DataType::float32), - DataTypeToString(complex::DataType::float64), DataTypeToString(complex::DataType::boolean)}; + static const std::vector dataTypes = {DataTypeToString(nx::core::DataType::int8), DataTypeToString(nx::core::DataType::uint8), DataTypeToString(nx::core::DataType::int16), + DataTypeToString(nx::core::DataType::uint16), DataTypeToString(nx::core::DataType::int32), DataTypeToString(nx::core::DataType::uint32), + DataTypeToString(nx::core::DataType::int64), DataTypeToString(nx::core::DataType::uint64), DataTypeToString(nx::core::DataType::float32), + DataTypeToString(nx::core::DataType::float64), DataTypeToString(nx::core::DataType::boolean)}; return dataTypes; } @@ -298,7 +298,7 @@ inline constexpr StringLiteral DataTypeToHumanString(DataType dataType) return "boolean"; } default: - throw std::runtime_error("complex::DataTypeToString: Unknown DataType"); + throw std::runtime_error("nx::core::DataTypeToString: Unknown DataType"); } } @@ -310,10 +310,10 @@ inline constexpr StringLiteral DataTypeToHumanString(DataType dataType) inline const std::vector& GetAllDataTypesAsHumanStrings() { static const std::vector dataTypes = { - DataTypeToHumanString(complex::DataType::int8), DataTypeToHumanString(complex::DataType::uint8), DataTypeToHumanString(complex::DataType::int16), - DataTypeToHumanString(complex::DataType::uint16), DataTypeToHumanString(complex::DataType::int32), DataTypeToHumanString(complex::DataType::uint32), - DataTypeToHumanString(complex::DataType::int64), DataTypeToHumanString(complex::DataType::uint64), DataTypeToHumanString(complex::DataType::float32), - DataTypeToHumanString(complex::DataType::float64), DataTypeToHumanString(complex::DataType::boolean)}; + DataTypeToHumanString(nx::core::DataType::int8), DataTypeToHumanString(nx::core::DataType::uint8), DataTypeToHumanString(nx::core::DataType::int16), + DataTypeToHumanString(nx::core::DataType::uint16), DataTypeToHumanString(nx::core::DataType::int32), DataTypeToHumanString(nx::core::DataType::uint32), + DataTypeToHumanString(nx::core::DataType::int64), DataTypeToHumanString(nx::core::DataType::uint64), DataTypeToHumanString(nx::core::DataType::float32), + DataTypeToHumanString(nx::core::DataType::float64), DataTypeToHumanString(nx::core::DataType::boolean)}; return dataTypes; } @@ -370,7 +370,7 @@ inline constexpr DataType StringToDataType(std::string_view dataTypeString) } else { - throw std::runtime_error("complex::StringToDataType: No known DataType matches the given string value."); + throw std::runtime_error("nx::core::StringToDataType: No known DataType matches the given string value."); } } @@ -485,8 +485,8 @@ inline constexpr DataType ConvertNumericTypeToDataType(NumericType numericType) return DataType::float64; } default: { - throw std::runtime_error("complex::ConvertNumericTypeToDataType: Invalid NumericType"); + throw std::runtime_error("nx::core::ConvertNumericTypeToDataType: Invalid NumericType"); } } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Common/Uuid.hpp b/src/simplnx/Common/Uuid.hpp similarity index 93% rename from src/complex/Common/Uuid.hpp rename to src/simplnx/Common/Uuid.hpp index f8a3a0d149..89528a4ac7 100644 --- a/src/complex/Common/Uuid.hpp +++ b/src/simplnx/Common/Uuid.hpp @@ -11,11 +11,11 @@ #include -#include "complex/Common/Bit.hpp" -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Bit.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { namespace detail { @@ -78,7 +78,7 @@ inline constexpr usize String2Bytes(std::string_view string, usize offset, usize * @brief Uuid struct * Stored in big-endian order as according to RFC 4122 */ -struct COMPLEX_EXPORT Uuid +struct SIMPLNX_EXPORT Uuid { static inline constexpr usize k_Size = 16; @@ -297,17 +297,17 @@ inline constexpr bool operator>=(const Uuid& lhs, const Uuid& rhs) noexcept { return !(lhs < rhs); } -} // namespace complex +} // namespace nx::core namespace std { template <> -struct hash<::complex::Uuid> +struct hash<::nx::core::Uuid> { - std::size_t operator()(const ::complex::Uuid& value) const noexcept + std::size_t operator()(const ::nx::core::Uuid& value) const noexcept { - std::uint64_t v1 = ::complex::bit_cast_ptr(value.data.data()); - std::uint64_t v2 = ::complex::bit_cast_ptr(value.data.data() + sizeof(v1)); + std::uint64_t v1 = ::nx::core::bit_cast_ptr(value.data.data()); + std::uint64_t v2 = ::nx::core::bit_cast_ptr(value.data.data() + sizeof(v1)); return v1 ^ v2; } }; diff --git a/src/complex/Core/Application.cpp b/src/simplnx/Core/Application.cpp similarity index 90% rename from src/complex/Core/Application.cpp rename to src/simplnx/Core/Application.cpp index 97583c84bb..bb58b3968b 100644 --- a/src/complex/Core/Application.cpp +++ b/src/simplnx/Core/Application.cpp @@ -1,9 +1,9 @@ #include "Application.hpp" -#include "complex/Filter/FilterList.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" -#include "complex/Plugin/PluginLoader.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Filter/FilterList.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/PluginLoader.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include @@ -23,14 +23,14 @@ #include -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/IO/Generic/DataIOCollection.hpp" -#include "complex/DataStructure/IO/Generic/IDataIOManager.hpp" -#include "complex/Filter/FilterList.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" -#include "complex/Plugin/PluginLoader.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/IO/Generic/DataIOCollection.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataIOManager.hpp" +#include "simplnx/Filter/FilterList.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/PluginLoader.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -195,12 +195,12 @@ std::optional Application::getComplexUuid(const Uuid& simplUuid) return {}; } -std::vector Application::getSimplUuid(const Uuid& complexUuid) +std::vector Application::getSimplUuid(const Uuid& simplnxUuid) { std::vector indices; for(usize index = 0; index < m_Complex_Uuids.size(); index++) { - if(m_Complex_Uuids[index] == complexUuid) + if(m_Complex_Uuids[index] == simplnxUuid) { indices.push_back(index); } @@ -223,9 +223,9 @@ void Application::loadPlugins(const std::filesystem::path& pluginDir, bool verbo { std::filesystem::path path = entry.path(); #ifdef NDEBUG // Release mode - if(!StringUtilities::ends_with(path.string(), "_d.complex") && StringUtilities::ends_with(path.string(), ".complex")) + if(!StringUtilities::ends_with(path.string(), "_d.simplnx") && StringUtilities::ends_with(path.string(), ".simplnx")) #else - if(StringUtilities::ends_with(path.string(), "_d.complex")) + if(StringUtilities::ends_with(path.string(), "_d.simplnx")) #endif { loadPlugin(path, verbose); @@ -294,7 +294,7 @@ void Application::loadPlugin(const std::filesystem::path& path, bool verbose) return; } - AbstractPlugin::SIMPLMapType simplToComplexUuids = plugin->getSimplToComplexMap(); + AbstractPlugin::SIMPLMapType simplToComplexUuids = plugin->getSimplToSimplnxMap(); for(auto const& [simplUuid, simplData] : simplToComplexUuids) { for(const auto& uuid : m_Simpl_Uuids) @@ -305,7 +305,7 @@ void Application::loadPlugin(const std::filesystem::path& path, bool verbose) } } m_Simpl_Uuids.push_back(simplUuid); - m_Complex_Uuids.push_back(simplData.complexUuid); + m_Complex_Uuids.push_back(simplData.simplnxUuid); } if(m_Simpl_Uuids.size() != m_Complex_Uuids.size()) diff --git a/src/complex/Core/Application.hpp b/src/simplnx/Core/Application.hpp similarity index 90% rename from src/complex/Core/Application.hpp rename to src/simplnx/Core/Application.hpp index 41396d96b9..25d5853476 100644 --- a/src/complex/Core/Application.hpp +++ b/src/simplnx/Core/Application.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/Core/Preferences.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/Filter/FilterList.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Core/Preferences.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/Filter/FilterList.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include #include -namespace complex +namespace nx::core { class DataIOCollection; class IDataIOManager; @@ -28,7 +28,7 @@ class JsonPipelineBuilder; * the REST server, but plugin-specific information or calculations will be * made unavailable. */ -class COMPLEX_EXPORT Application +class SIMPLNX_EXPORT Application { public: using name_type_map = std::map; @@ -41,7 +41,7 @@ class COMPLEX_EXPORT Application /** * @brief Returns a pointer to the current Application. This pointer is - * replaced when a new complex::Application is created, replacing the + * replaced when a new nx::core::Application is created, replacing the * previous value. If the current Application is destroyed, this method will * return nullptr until a new Application is created. * @return std::shared_ptr @@ -55,7 +55,7 @@ class COMPLEX_EXPORT Application /** * @brief Finds and loads plugins in the target directory. * - * Plugins are found by using the file extension of ".complex". + * Plugins are found by using the file extension of "". * @param pluginDir */ void loadPlugins(const std::filesystem::path& pluginDir, bool verbose = false); @@ -140,7 +140,7 @@ class COMPLEX_EXPORT Application * @brief Returns the SIMPL filter UUID(s) [v5] from the Complex filter UUID [v4] * @return std::optional> */ - std::vector getSimplUuid(const Uuid& complexUuid); + std::vector getSimplUuid(const Uuid& simplnxUuid); void addDataType(DataObject::Type type, const std::string& name); @@ -182,7 +182,7 @@ class COMPLEX_EXPORT Application //////////// // Variables - std::unique_ptr m_FilterList; + std::unique_ptr m_FilterList; std::filesystem::path m_CurrentPath = ""; std::vector m_Simpl_Uuids; // no duplicates; index must match m_Complex_Uuids std::vector m_Complex_Uuids; // duplicate allowed conditionally; index must match m_Simpl_Uuids @@ -190,4 +190,4 @@ class COMPLEX_EXPORT Application name_type_map m_NamedTypesMap; std::unique_ptr m_Preferences = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Core/Preferences.cpp b/src/simplnx/Core/Preferences.cpp similarity index 97% rename from src/complex/Core/Preferences.cpp rename to src/simplnx/Core/Preferences.cpp index 16bb406126..04c7943550 100644 --- a/src/complex/Core/Preferences.cpp +++ b/src/simplnx/Core/Preferences.cpp @@ -1,7 +1,7 @@ #include "Preferences.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" -#include "complex/Utilities/MemoryUtilities.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" +#include "simplnx/Utilities/MemoryUtilities.hpp" #include @@ -15,7 +15,7 @@ #include #endif -namespace complex +namespace nx::core { namespace @@ -78,7 +78,7 @@ void Preferences::setDefaultValues() updateMemoryDefaults(); -#ifdef COMPLEX_FORCE_OUT_OF_CORE_DATA +#ifdef SIMPLNX_FORCE_OUT_OF_CORE_DATA m_DefaultValues[k_ForceOocData_Key] = true; #else m_DefaultValues[k_ForceOocData_Key] = false; @@ -281,4 +281,4 @@ uint64 Preferences::largeDataStructureSize() const { return value(k_LargeDataStructureSize_Key).get(); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Core/Preferences.hpp b/src/simplnx/Core/Preferences.hpp similarity index 93% rename from src/complex/Core/Preferences.hpp rename to src/simplnx/Core/Preferences.hpp index fc4b7d1659..a2099f63c8 100644 --- a/src/complex/Core/Preferences.hpp +++ b/src/simplnx/Core/Preferences.hpp @@ -1,20 +1,20 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" -#include "complex/Common/Result.hpp" -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/StringLiteral.hpp" #include #include #include -namespace complex +namespace nx::core { class AbstractPlugin; -class COMPLEX_EXPORT Preferences +class SIMPLNX_EXPORT Preferences { friend class AbstractPlugin; @@ -100,4 +100,4 @@ class COMPLEX_EXPORT Preferences nlohmann::json m_Values; bool m_UseOoc = false; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/AbstractDataStore.hpp b/src/simplnx/DataStructure/AbstractDataStore.hpp similarity index 98% rename from src/complex/DataStructure/AbstractDataStore.hpp rename to src/simplnx/DataStructure/AbstractDataStore.hpp index f3316804ae..98bddffb68 100644 --- a/src/complex/DataStructure/AbstractDataStore.hpp +++ b/src/simplnx/DataStructure/AbstractDataStore.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/IteratorUtility.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/IDataStore.hpp" +#include "simplnx/Common/IteratorUtility.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" #include @@ -12,7 +12,7 @@ #include #include -namespace complex +namespace nx::core { /** * @class AbstractDataStore @@ -982,4 +982,4 @@ using BoolAbstractDataStore = AbstractDataStore; using Float32AbstractDataStore = AbstractDataStore; using Float64AbstractDataStore = AbstractDataStore; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/AttributeMatrix.cpp b/src/simplnx/DataStructure/AttributeMatrix.cpp similarity index 96% rename from src/complex/DataStructure/AttributeMatrix.cpp rename to src/simplnx/DataStructure/AttributeMatrix.cpp index 546561a16e..2b1e68af87 100644 --- a/src/complex/DataStructure/AttributeMatrix.cpp +++ b/src/simplnx/DataStructure/AttributeMatrix.cpp @@ -1,11 +1,11 @@ #include "AttributeMatrix.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IArray.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IArray.hpp" #include -using namespace complex; +using namespace nx::core; AttributeMatrix::AttributeMatrix(DataStructure& dataStructure, std::string name, ShapeType tupleShape) : BaseGroup(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/AttributeMatrix.hpp b/src/simplnx/DataStructure/AttributeMatrix.hpp similarity index 96% rename from src/complex/DataStructure/AttributeMatrix.hpp rename to src/simplnx/DataStructure/AttributeMatrix.hpp index 4ad881117c..74da047900 100644 --- a/src/complex/DataStructure/AttributeMatrix.hpp +++ b/src/simplnx/DataStructure/AttributeMatrix.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class AttributeMatrix * @brief The AttributeMatrix class is an instantiable implementation of BaseGroup. * AttributeMatrix only accepts DataArrays of a certain tuple size. */ -class COMPLEX_EXPORT AttributeMatrix : public BaseGroup +class SIMPLNX_EXPORT AttributeMatrix : public BaseGroup { public: using ShapeType = std::vector; @@ -169,4 +169,4 @@ class COMPLEX_EXPORT AttributeMatrix : public BaseGroup private: ShapeType m_TupleShape; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/BaseGroup.cpp b/src/simplnx/DataStructure/BaseGroup.cpp similarity index 98% rename from src/complex/DataStructure/BaseGroup.cpp rename to src/simplnx/DataStructure/BaseGroup.cpp index fda33c41a7..37af7527f5 100644 --- a/src/complex/DataStructure/BaseGroup.cpp +++ b/src/simplnx/DataStructure/BaseGroup.cpp @@ -1,9 +1,9 @@ #include "BaseGroup.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" -using namespace complex; +using namespace nx::core; BaseGroup::BaseGroup(DataStructure& dataStructure, std::string name) : DataObject(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/BaseGroup.hpp b/src/simplnx/DataStructure/BaseGroup.hpp similarity index 97% rename from src/complex/DataStructure/BaseGroup.hpp rename to src/simplnx/DataStructure/BaseGroup.hpp index 290a005d71..ad500392da 100644 --- a/src/complex/DataStructure/BaseGroup.hpp +++ b/src/simplnx/DataStructure/BaseGroup.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataMap.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataMap.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include #include -namespace complex +namespace nx::core { /** * @class BaseGroup @@ -25,7 +25,7 @@ namespace complex * already exists in the group. Additional rules can be added in derived * classes. */ -class COMPLEX_EXPORT BaseGroup : public DataObject +class SIMPLNX_EXPORT BaseGroup : public DataObject { public: using Iterator = typename DataMap::Iterator; @@ -374,4 +374,4 @@ class COMPLEX_EXPORT BaseGroup : public DataObject private: DataMap m_DataMap; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataArray.hpp b/src/simplnx/DataStructure/DataArray.hpp similarity index 97% rename from src/complex/DataStructure/DataArray.hpp rename to src/simplnx/DataStructure/DataArray.hpp index dbde09762a..97db380a05 100644 --- a/src/complex/DataStructure/DataArray.hpp +++ b/src/simplnx/DataStructure/DataArray.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/Common/Bit.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/EmptyDataStore.hpp" -#include "complex/DataStructure/IDataArray.hpp" +#include "simplnx/Common/Bit.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" #include -namespace complex +namespace nx::core { template class NeighborList; @@ -337,7 +337,7 @@ class DataArray : public IDataArray { for(auto& value : *this) { - value = complex::byteswap(value); + value = nx::core::byteswap(value); } } @@ -744,4 +744,4 @@ using Float32Array = DataArray; using Float64Array = DataArray; using BoolArray = DataArray; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataGroup.cpp b/src/simplnx/DataStructure/DataGroup.cpp similarity index 96% rename from src/complex/DataStructure/DataGroup.cpp rename to src/simplnx/DataStructure/DataGroup.cpp index 9c5758ef71..64a5d50fa4 100644 --- a/src/complex/DataStructure/DataGroup.cpp +++ b/src/simplnx/DataStructure/DataGroup.cpp @@ -1,7 +1,7 @@ #include "DataGroup.hpp" -#include "complex/DataStructure/DataStructure.hpp" -using namespace complex; +#include "simplnx/DataStructure/DataStructure.hpp" +using namespace nx::core; DataGroup::DataGroup(DataStructure& dataStructure, std::string name) : BaseGroup(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/DataGroup.hpp b/src/simplnx/DataStructure/DataGroup.hpp similarity index 95% rename from src/complex/DataStructure/DataGroup.hpp rename to src/simplnx/DataStructure/DataGroup.hpp index acccc56070..8c144097ab 100644 --- a/src/complex/DataStructure/DataGroup.hpp +++ b/src/simplnx/DataStructure/DataGroup.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class DataGroup @@ -11,7 +11,7 @@ namespace complex * The DataGroup class does not impose restrictions on which types of * DataObject can be inserted. */ -class COMPLEX_EXPORT DataGroup : public BaseGroup +class SIMPLNX_EXPORT DataGroup : public BaseGroup { public: static constexpr StringLiteral k_TypeName = "DataGroup"; @@ -128,4 +128,4 @@ class COMPLEX_EXPORT DataGroup : public BaseGroup */ bool canInsert(const DataObject* obj) const override; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataMap.cpp b/src/simplnx/DataStructure/DataMap.cpp similarity index 96% rename from src/complex/DataStructure/DataMap.cpp rename to src/simplnx/DataStructure/DataMap.cpp index 6526284767..be0fed6187 100644 --- a/src/complex/DataStructure/DataMap.cpp +++ b/src/simplnx/DataStructure/DataMap.cpp @@ -1,12 +1,12 @@ -#include "complex/DataStructure/DataMap.hpp" +#include "simplnx/DataStructure/DataMap.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" #include -using namespace complex; +using namespace nx::core; DataMap::DataMap() = default; DataMap::DataMap(const DataMap& other) diff --git a/src/complex/DataStructure/DataMap.hpp b/src/simplnx/DataStructure/DataMap.hpp similarity index 98% rename from src/complex/DataStructure/DataMap.hpp rename to src/simplnx/DataStructure/DataMap.hpp index ac94265e0b..87a796dd9b 100644 --- a/src/complex/DataStructure/DataMap.hpp +++ b/src/simplnx/DataStructure/DataMap.hpp @@ -1,7 +1,7 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -9,7 +9,7 @@ #include #include -namespace complex +namespace nx::core { class DataStructure; class DataObject; @@ -21,7 +21,7 @@ class DataPath; * using the objects' ID values or names. The DataMap class is primarily used * within the BaseGroup and DataStructure classes as a consistent. */ -class COMPLEX_EXPORT DataMap +class SIMPLNX_EXPORT DataMap { public: using IdType = uint64; @@ -293,4 +293,4 @@ class COMPLEX_EXPORT DataMap private: MapType m_Map; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataObject.cpp b/src/simplnx/DataStructure/DataObject.cpp similarity index 97% rename from src/complex/DataStructure/DataObject.cpp rename to src/simplnx/DataStructure/DataObject.cpp index 0160326a8f..3d8823774f 100644 --- a/src/complex/DataStructure/DataObject.cpp +++ b/src/simplnx/DataStructure/DataObject.cpp @@ -1,15 +1,15 @@ #include "DataObject.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { bool DataObject::IsValidName(std::string_view name) { @@ -337,4 +337,4 @@ uint64 DataObject::memoryUsage() const { return 0; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataObject.hpp b/src/simplnx/DataStructure/DataObject.hpp similarity index 97% rename from src/complex/DataStructure/DataObject.hpp rename to src/simplnx/DataStructure/DataObject.hpp index c681308fde..adc004913c 100644 --- a/src/complex/DataStructure/DataObject.hpp +++ b/src/simplnx/DataStructure/DataObject.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/Metadata.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/Metadata.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -12,7 +12,7 @@ #include #include -namespace complex +namespace nx::core { class BaseGroup; class DataPath; @@ -27,7 +27,7 @@ class DataStructure; * DataObjects can have multiple parents and are deleted when they are removed * from their last remaining parent. */ -class COMPLEX_EXPORT DataObject +class SIMPLNX_EXPORT DataObject { public: using EnumType = uint32; @@ -340,4 +340,4 @@ class COMPLEX_EXPORT DataObject std::string m_Name; Metadata m_Metadata; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataPath.cpp b/src/simplnx/DataStructure/DataPath.cpp similarity index 93% rename from src/complex/DataStructure/DataPath.cpp rename to src/simplnx/DataStructure/DataPath.cpp index 4bb54de156..bb54a60370 100644 --- a/src/complex/DataStructure/DataPath.cpp +++ b/src/simplnx/DataStructure/DataPath.cpp @@ -1,17 +1,17 @@ #include "DataPath.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { DataPath::DataPath() = default; @@ -157,4 +157,4 @@ std::string DataPath::toString(std::string_view div) const { return fmt::format("{}", fmt::join(m_Path, div)); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataPath.hpp b/src/simplnx/DataStructure/DataPath.hpp similarity index 96% rename from src/complex/DataStructure/DataPath.hpp rename to src/simplnx/DataStructure/DataPath.hpp index aa938c05aa..eb384d590d 100644 --- a/src/complex/DataStructure/DataPath.hpp +++ b/src/simplnx/DataStructure/DataPath.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include #include -namespace complex +namespace nx::core { /** * @class DataPath @@ -18,7 +18,7 @@ namespace complex * which set of siblings a user may be interested in or iterate over a data * group with common children names. */ -class COMPLEX_EXPORT DataPath +class SIMPLNX_EXPORT DataPath { public: /** @@ -173,4 +173,4 @@ class COMPLEX_EXPORT DataPath private: std::vector m_Path; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataStore.hpp b/src/simplnx/DataStructure/DataStore.hpp similarity index 99% rename from src/complex/DataStructure/DataStore.hpp rename to src/simplnx/DataStructure/DataStore.hpp index 671ac5e8c5..849699438d 100644 --- a/src/complex/DataStructure/DataStore.hpp +++ b/src/simplnx/DataStructure/DataStore.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/DataStructure/AbstractDataStore.hpp" +#include "simplnx/DataStructure/AbstractDataStore.hpp" #include #include @@ -15,7 +15,7 @@ #include #include -namespace complex +namespace nx::core { /** * @class DataStore @@ -375,4 +375,4 @@ using BoolDataStore = DataStore; using Float32DataStore = DataStore; using Float64DataStore = DataStore; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataStructure.cpp b/src/simplnx/DataStructure/DataStructure.cpp similarity index 95% rename from src/complex/DataStructure/DataStructure.cpp rename to src/simplnx/DataStructure/DataStructure.cpp index df8b447352..519adc74c3 100644 --- a/src/complex/DataStructure/DataStructure.cpp +++ b/src/simplnx/DataStructure/DataStructure.cpp @@ -1,18 +1,18 @@ #include "DataStructure.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/LinkedPath.hpp" -#include "complex/DataStructure/Messaging/DataAddedMessage.hpp" -#include "complex/DataStructure/Messaging/DataRemovedMessage.hpp" -#include "complex/DataStructure/Messaging/DataReparentedMessage.hpp" -#include "complex/DataStructure/Observers/AbstractDataStructureObserver.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/LinkedPath.hpp" +#include "simplnx/DataStructure/Messaging/DataAddedMessage.hpp" +#include "simplnx/DataStructure/Messaging/DataRemovedMessage.hpp" +#include "simplnx/DataStructure/Messaging/DataReparentedMessage.hpp" +#include "simplnx/DataStructure/Observers/AbstractDataStructureObserver.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" #include @@ -25,7 +25,7 @@ namespace inline const std::string k_Delimiter = "|--"; } -namespace complex +namespace nx::core { namespace Constants @@ -171,7 +171,7 @@ Result DataStructure::makePath(const DataPath& path) const DataObject* data = m_RootGroup[name]; if(data == nullptr) { - data = complex::DataGroup::Create(*this, name); + data = nx::core::DataGroup::Create(*this, name); createdIds.push_back(data->getId()); } const BaseGroup* parent = dynamic_cast(data); @@ -181,7 +181,7 @@ Result DataStructure::makePath(const DataPath& path) { if(parent == nullptr) { - return complex::MakeErrorResult(-3, fmt::format("Target parent object '{}' in path '{}' is not derived from BaseGroup.", name, path.toString())); + return nx::core::MakeErrorResult(-3, fmt::format("Target parent object '{}' in path '{}' is not derived from BaseGroup.", name, path.toString())); } name = path[i]; @@ -204,7 +204,7 @@ Result DataStructure::makePath(const DataPath& path) removeData(id); } - return complex::MakeErrorResult(-2, fmt::format("Exception thrown when attempting to create a path '{}' in the DataStructure: '{}'", path.toString(), e.what())); + return nx::core::MakeErrorResult(-2, fmt::format("Exception thrown when attempting to create a path '{}' in the DataStructure: '{}'", path.toString(), e.what())); } } @@ -1014,4 +1014,4 @@ Result<> DataStructure::transferDataArraysOoc() return result; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DataStructure.hpp b/src/simplnx/DataStructure/DataStructure.hpp similarity index 98% rename from src/complex/DataStructure/DataStructure.hpp rename to src/simplnx/DataStructure/DataStructure.hpp index 3a9af13e1b..5f1c6823ae 100644 --- a/src/complex/DataStructure/DataStructure.hpp +++ b/src/simplnx/DataStructure/DataStructure.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataMap.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/LinkedPath.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataMap.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/LinkedPath.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -18,7 +18,7 @@ #include #include -namespace complex +namespace nx::core { class AbstractDataStructureMessage; class DataGroup; @@ -40,7 +40,7 @@ inline const std::string k_ImportableTag = "Importable"; * geometries, and scalars are added to the structure. The DataStructure allows * parents to be added to or removed from DataObjects. */ -class COMPLEX_EXPORT DataStructure +class SIMPLNX_EXPORT DataStructure { using WeakCollectionType = std::map>; @@ -826,4 +826,4 @@ class COMPLEX_EXPORT DataStructure bool m_IsValid = false; DataObject::IdType m_NextId = 1; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/DynamicListArray.hpp b/src/simplnx/DataStructure/DynamicListArray.hpp similarity index 98% rename from src/complex/DataStructure/DynamicListArray.hpp rename to src/simplnx/DataStructure/DynamicListArray.hpp index 4d97ad2047..90e60148e5 100644 --- a/src/complex/DataStructure/DynamicListArray.hpp +++ b/src/simplnx/DataStructure/DynamicListArray.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" -#include "complex/DataStructure/DataObject.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/DataStructure/DataObject.hpp" #include #include #include #include -namespace complex +namespace nx::core { namespace DynamicListArrayConstants @@ -389,4 +389,4 @@ class DynamicListArray : public DataObject using Int32Int32DynamicListArray = DynamicListArray; using UInt16Int64DynamicListArray = DynamicListArray; using Int64Int64DynamicListArray = DynamicListArray; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/EmptyDataStore.hpp b/src/simplnx/DataStructure/EmptyDataStore.hpp similarity index 98% rename from src/complex/DataStructure/EmptyDataStore.hpp rename to src/simplnx/DataStructure/EmptyDataStore.hpp index 746f416fd8..fdd25ce953 100644 --- a/src/complex/DataStructure/EmptyDataStore.hpp +++ b/src/simplnx/DataStructure/EmptyDataStore.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/DataStructure/AbstractDataStore.hpp" +#include "simplnx/DataStructure/AbstractDataStore.hpp" #include @@ -8,7 +8,7 @@ #include #include -namespace complex +namespace nx::core { /** * @class EmptyDataStore @@ -223,4 +223,4 @@ class EmptyDataStore : public AbstractDataStore size_t m_NumTuples = {0}; std::string m_DataFormat = ""; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/EdgeGeom.cpp b/src/simplnx/DataStructure/Geometry/EdgeGeom.cpp similarity index 97% rename from src/complex/DataStructure/Geometry/EdgeGeom.cpp rename to src/simplnx/DataStructure/Geometry/EdgeGeom.cpp index 0822c54239..a01e1eb648 100644 --- a/src/complex/DataStructure/Geometry/EdgeGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/EdgeGeom.cpp @@ -1,12 +1,12 @@ #include "EdgeGeom.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -using namespace complex; +using namespace nx::core; EdgeGeom::EdgeGeom(DataStructure& dataStructure, std::string name) : INodeGeometry1D(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/EdgeGeom.hpp b/src/simplnx/DataStructure/Geometry/EdgeGeom.hpp similarity index 94% rename from src/complex/DataStructure/Geometry/EdgeGeom.hpp rename to src/simplnx/DataStructure/Geometry/EdgeGeom.hpp index 325a373e19..ffd0f67c48 100644 --- a/src/complex/DataStructure/Geometry/EdgeGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/EdgeGeom.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry1D.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry1D.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class EdgeGeom * @brief */ -class COMPLEX_EXPORT EdgeGeom : public INodeGeometry1D +class SIMPLNX_EXPORT EdgeGeom : public INodeGeometry1D { public: friend class DataStructure; @@ -147,4 +147,4 @@ class COMPLEX_EXPORT EdgeGeom : public INodeGeometry1D */ EdgeGeom(DataStructure& dataStructure, std::string name, IdType importId); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/HexahedralGeom.cpp b/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp similarity index 98% rename from src/complex/DataStructure/Geometry/HexahedralGeom.cpp rename to src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp index 69f2923fa1..a49acfffa0 100644 --- a/src/complex/DataStructure/Geometry/HexahedralGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/HexahedralGeom.cpp @@ -1,12 +1,12 @@ #include "HexahedralGeom.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -using namespace complex; +using namespace nx::core; HexahedralGeom::HexahedralGeom(DataStructure& dataStructure, std::string name) : INodeGeometry3D(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/HexahedralGeom.hpp b/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp similarity index 95% rename from src/complex/DataStructure/Geometry/HexahedralGeom.hpp rename to src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp index 5dca5756a4..0df3a27f3a 100644 --- a/src/complex/DataStructure/Geometry/HexahedralGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/HexahedralGeom.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry3D.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry3D.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class HexahedralGeom * @brief */ -class COMPLEX_EXPORT HexahedralGeom : public INodeGeometry3D +class SIMPLNX_EXPORT HexahedralGeom : public INodeGeometry3D { public: friend class DataStructure; @@ -191,4 +191,4 @@ class COMPLEX_EXPORT HexahedralGeom : public INodeGeometry3D */ HexahedralGeom(DataStructure& dataStructure, std::string name, IdType importId); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/IGeometry.cpp b/src/simplnx/DataStructure/Geometry/IGeometry.cpp similarity index 99% rename from src/complex/DataStructure/Geometry/IGeometry.cpp rename to src/simplnx/DataStructure/Geometry/IGeometry.cpp index 75876d8f50..a328a6ecd3 100644 --- a/src/complex/DataStructure/Geometry/IGeometry.cpp +++ b/src/simplnx/DataStructure/Geometry/IGeometry.cpp @@ -1,6 +1,6 @@ #include "IGeometry.hpp" -namespace complex +namespace nx::core { IGeometry::IGeometry(DataStructure& dataStructure, std::string name) : BaseGroup(dataStructure, std::move(name)) @@ -213,4 +213,4 @@ void IGeometry::checkUpdatedIdsImpl(const std::vector> } } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/IGeometry.hpp b/src/simplnx/DataStructure/Geometry/IGeometry.hpp similarity index 91% rename from src/complex/DataStructure/Geometry/IGeometry.hpp rename to src/simplnx/DataStructure/Geometry/IGeometry.hpp index f13c540f60..a38d61a0f7 100644 --- a/src/complex/DataStructure/Geometry/IGeometry.hpp +++ b/src/simplnx/DataStructure/Geometry/IGeometry.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/DynamicListArray.hpp" -#include "complex/DataStructure/Geometry/LinkedGeometryData.hpp" - -namespace complex +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DynamicListArray.hpp" +#include "simplnx/DataStructure/Geometry/LinkedGeometryData.hpp" + +namespace nx::core { -class COMPLEX_EXPORT IGeometry : public BaseGroup +class SIMPLNX_EXPORT IGeometry : public BaseGroup { public: friend class DataStructure; @@ -213,4 +213,4 @@ class COMPLEX_EXPORT IGeometry : public BaseGroup LinkedGeometryData m_LinkedGeometryData; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/IGridGeometry.cpp b/src/simplnx/DataStructure/Geometry/IGridGeometry.cpp similarity index 97% rename from src/complex/DataStructure/Geometry/IGridGeometry.cpp rename to src/simplnx/DataStructure/Geometry/IGridGeometry.cpp index 9266ed1521..92b7f2d364 100644 --- a/src/complex/DataStructure/Geometry/IGridGeometry.cpp +++ b/src/simplnx/DataStructure/Geometry/IGridGeometry.cpp @@ -1,6 +1,6 @@ #include "IGridGeometry.hpp" -namespace complex +namespace nx::core { IGridGeometry::IGridGeometry(DataStructure& dataStructure, std::string name) : IGeometry(dataStructure, std::move(name)) @@ -64,4 +64,4 @@ void IGridGeometry::checkUpdatedIdsImpl(const std::vector m_CellDataId; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/INodeGeometry0D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry0D.cpp similarity index 99% rename from src/complex/DataStructure/Geometry/INodeGeometry0D.cpp rename to src/simplnx/DataStructure/Geometry/INodeGeometry0D.cpp index acd2fa096c..6a32ed62e3 100644 --- a/src/complex/DataStructure/Geometry/INodeGeometry0D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry0D.cpp @@ -1,6 +1,6 @@ #include "INodeGeometry0D.hpp" -namespace complex +namespace nx::core { INodeGeometry0D::INodeGeometry0D(DataStructure& dataStructure, std::string name) : IGeometry(dataStructure, std::move(name)) @@ -219,4 +219,4 @@ void INodeGeometry0D::checkUpdatedIdsImpl(const std::vector -namespace complex +namespace nx::core { -class COMPLEX_EXPORT INodeGeometry0D : public IGeometry +class SIMPLNX_EXPORT INodeGeometry0D : public IGeometry { public: static inline constexpr StringLiteral k_VertexDataName = "Vertex Data"; @@ -202,4 +202,4 @@ class COMPLEX_EXPORT INodeGeometry0D : public IGeometry */ Result isPlane(usize dimensionIndex) const; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/INodeGeometry1D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry1D.cpp similarity index 99% rename from src/complex/DataStructure/Geometry/INodeGeometry1D.cpp rename to src/simplnx/DataStructure/Geometry/INodeGeometry1D.cpp index 70345d90fc..25af60551d 100644 --- a/src/complex/DataStructure/Geometry/INodeGeometry1D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry1D.cpp @@ -1,6 +1,6 @@ #include "INodeGeometry1D.hpp" -namespace complex +namespace nx::core { INodeGeometry1D::INodeGeometry1D(DataStructure& dataStructure, std::string name) : INodeGeometry0D(dataStructure, std::move(name)) @@ -254,4 +254,4 @@ void INodeGeometry1D::checkUpdatedIdsImpl(const std::vector m_CellNeighborsDataArrayId; std::optional m_CellCentroidsDataArrayId; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/INodeGeometry2D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp similarity index 99% rename from src/complex/DataStructure/Geometry/INodeGeometry2D.cpp rename to src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp index 950e00398c..27fcf14ecd 100644 --- a/src/complex/DataStructure/Geometry/INodeGeometry2D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry2D.cpp @@ -1,6 +1,6 @@ #include "INodeGeometry2D.hpp" -namespace complex +namespace nx::core { INodeGeometry2D::INodeGeometry2D(DataStructure& dataStructure, std::string name) : INodeGeometry1D(dataStructure, std::move(name)) @@ -196,4 +196,4 @@ void INodeGeometry2D::checkUpdatedIdsImpl(const std::vector m_FaceAttributeMatrixId; std::optional m_UnsharedEdgeListId; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/INodeGeometry3D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp similarity index 99% rename from src/complex/DataStructure/Geometry/INodeGeometry3D.cpp rename to src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp index 354bb4327b..8a38b017db 100644 --- a/src/complex/DataStructure/Geometry/INodeGeometry3D.cpp +++ b/src/simplnx/DataStructure/Geometry/INodeGeometry3D.cpp @@ -1,6 +1,6 @@ #include "INodeGeometry3D.hpp" -namespace complex +namespace nx::core { INodeGeometry3D::INodeGeometry3D(DataStructure& dataStructure, std::string name) : INodeGeometry2D(dataStructure, std::move(name)) @@ -206,4 +206,4 @@ void INodeGeometry3D::checkUpdatedIdsImpl(const std::vector m_PolyhedronAttributeMatrixId; std::optional m_UnsharedFaceListId; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/ImageGeom.cpp b/src/simplnx/DataStructure/Geometry/ImageGeom.cpp similarity index 98% rename from src/complex/DataStructure/Geometry/ImageGeom.cpp rename to src/simplnx/DataStructure/Geometry/ImageGeom.cpp index 993f374f7d..94743edb6b 100644 --- a/src/complex/DataStructure/Geometry/ImageGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/ImageGeom.cpp @@ -1,13 +1,13 @@ #include "ImageGeom.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; ImageGeom::ImageGeom(DataStructure& dataStructure, std::string name) : IGridGeometry(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/ImageGeom.hpp b/src/simplnx/DataStructure/Geometry/ImageGeom.hpp similarity index 95% rename from src/complex/DataStructure/Geometry/ImageGeom.hpp rename to src/simplnx/DataStructure/Geometry/ImageGeom.hpp index ef5ea0214d..63fc282cc6 100644 --- a/src/complex/DataStructure/Geometry/ImageGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/ImageGeom.hpp @@ -1,22 +1,22 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/Common/BoundingBox.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/Common/BoundingBox.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @class ImageGeom * @brief */ -class COMPLEX_EXPORT ImageGeom : public IGridGeometry +class SIMPLNX_EXPORT ImageGeom : public IGridGeometry { public: friend class DataStructure; @@ -361,4 +361,4 @@ class COMPLEX_EXPORT ImageGeom : public IGridGeometry FloatVec3 m_Origin; SizeVec3 m_Dimensions; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/LinkedGeometryData.cpp b/src/simplnx/DataStructure/Geometry/LinkedGeometryData.cpp similarity index 98% rename from src/complex/DataStructure/Geometry/LinkedGeometryData.cpp rename to src/simplnx/DataStructure/Geometry/LinkedGeometryData.cpp index e7e4e6790d..2cc6752e7e 100644 --- a/src/complex/DataStructure/Geometry/LinkedGeometryData.cpp +++ b/src/simplnx/DataStructure/Geometry/LinkedGeometryData.cpp @@ -1,6 +1,6 @@ #include "LinkedGeometryData.hpp" -using namespace complex; +using namespace nx::core; LinkedGeometryData::LinkedGeometryData() = default; diff --git a/src/complex/DataStructure/Geometry/LinkedGeometryData.hpp b/src/simplnx/DataStructure/Geometry/LinkedGeometryData.hpp similarity index 89% rename from src/complex/DataStructure/Geometry/LinkedGeometryData.hpp rename to src/simplnx/DataStructure/Geometry/LinkedGeometryData.hpp index 5ed0373070..e9e0510920 100644 --- a/src/complex/DataStructure/Geometry/LinkedGeometryData.hpp +++ b/src/simplnx/DataStructure/Geometry/LinkedGeometryData.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { /** @@ -27,7 +27,7 @@ namespace complex * stored in a std::set so there can only be a single instance in the list of the * same exact path. */ -class COMPLEX_EXPORT LinkedGeometryData +class SIMPLNX_EXPORT LinkedGeometryData { public: LinkedGeometryData(); @@ -70,4 +70,4 @@ class COMPLEX_EXPORT LinkedGeometryData std::set m_CellData; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/QuadGeom.cpp b/src/simplnx/DataStructure/Geometry/QuadGeom.cpp similarity index 98% rename from src/complex/DataStructure/Geometry/QuadGeom.cpp rename to src/simplnx/DataStructure/Geometry/QuadGeom.cpp index b81b088747..eeeedc92dd 100644 --- a/src/complex/DataStructure/Geometry/QuadGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/QuadGeom.cpp @@ -1,12 +1,12 @@ #include "QuadGeom.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -using namespace complex; +using namespace nx::core; QuadGeom::QuadGeom(DataStructure& dataStructure, std::string name) : INodeGeometry2D(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/QuadGeom.hpp b/src/simplnx/DataStructure/Geometry/QuadGeom.hpp similarity index 94% rename from src/complex/DataStructure/Geometry/QuadGeom.hpp rename to src/simplnx/DataStructure/Geometry/QuadGeom.hpp index a8370c7996..7e4adbfd71 100644 --- a/src/complex/DataStructure/Geometry/QuadGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/QuadGeom.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class QuadGeom * @brief */ -class COMPLEX_EXPORT QuadGeom : public INodeGeometry2D +class SIMPLNX_EXPORT QuadGeom : public INodeGeometry2D { public: friend class DataStructure; @@ -172,4 +172,4 @@ class COMPLEX_EXPORT QuadGeom : public INodeGeometry2D */ QuadGeom(DataStructure& dataStructure, std::string name, IdType importId); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/RectGridGeom.cpp b/src/simplnx/DataStructure/Geometry/RectGridGeom.cpp similarity index 99% rename from src/complex/DataStructure/Geometry/RectGridGeom.cpp rename to src/simplnx/DataStructure/Geometry/RectGridGeom.cpp index 8a153b5033..2dbad4a113 100644 --- a/src/complex/DataStructure/Geometry/RectGridGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/RectGridGeom.cpp @@ -1,13 +1,13 @@ #include "RectGridGeom.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include #include -using namespace complex; +using namespace nx::core; RectGridGeom::RectGridGeom(DataStructure& dataStructure, std::string name) : IGridGeometry(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/RectGridGeom.hpp b/src/simplnx/DataStructure/Geometry/RectGridGeom.hpp similarity index 96% rename from src/complex/DataStructure/Geometry/RectGridGeom.hpp rename to src/simplnx/DataStructure/Geometry/RectGridGeom.hpp index 6d76bded00..f3eb646dcc 100644 --- a/src/complex/DataStructure/Geometry/RectGridGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/RectGridGeom.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/simplnx_export.hpp" -#include "complex/Common/Array.hpp" +#include "simplnx/Common/Array.hpp" #include -namespace complex +namespace nx::core { /** * @class RectGridGeom * @brief */ -class COMPLEX_EXPORT RectGridGeom : public IGridGeometry +class SIMPLNX_EXPORT RectGridGeom : public IGridGeometry { public: friend class DataStructure; @@ -395,4 +395,4 @@ class COMPLEX_EXPORT RectGridGeom : public IGridGeometry std::optional m_zBoundsId; SizeVec3 m_Dimensions; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/TetrahedralGeom.cpp b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp similarity index 98% rename from src/complex/DataStructure/Geometry/TetrahedralGeom.cpp rename to src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp index 9b05e39c6a..f3cf010063 100644 --- a/src/complex/DataStructure/Geometry/TetrahedralGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.cpp @@ -1,12 +1,12 @@ #include "TetrahedralGeom.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -using namespace complex; +using namespace nx::core; TetrahedralGeom::TetrahedralGeom(DataStructure& dataStructure, std::string name) : INodeGeometry3D(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/TetrahedralGeom.hpp b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp similarity index 95% rename from src/complex/DataStructure/Geometry/TetrahedralGeom.hpp rename to src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp index 26f80e1cb2..7f117724d0 100644 --- a/src/complex/DataStructure/Geometry/TetrahedralGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/TetrahedralGeom.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry3D.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry3D.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class TetrahedralGeom * @brief */ -class COMPLEX_EXPORT TetrahedralGeom : public INodeGeometry3D +class SIMPLNX_EXPORT TetrahedralGeom : public INodeGeometry3D { public: friend class DataStructure; @@ -192,4 +192,4 @@ class COMPLEX_EXPORT TetrahedralGeom : public INodeGeometry3D */ TetrahedralGeom(DataStructure& dataStructure, std::string name, IdType importId); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/TriangleGeom.cpp b/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp similarity index 97% rename from src/complex/DataStructure/Geometry/TriangleGeom.cpp rename to src/simplnx/DataStructure/Geometry/TriangleGeom.cpp index 48f3313159..6edd32b351 100644 --- a/src/complex/DataStructure/Geometry/TriangleGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/TriangleGeom.cpp @@ -1,13 +1,13 @@ #include "TriangleGeom.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/DynamicListArray.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DynamicListArray.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -using namespace complex; +using namespace nx::core; TriangleGeom::TriangleGeom(DataStructure& dataStructure, std::string name) : INodeGeometry2D(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/TriangleGeom.hpp b/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp similarity index 95% rename from src/complex/DataStructure/Geometry/TriangleGeom.hpp rename to src/simplnx/DataStructure/Geometry/TriangleGeom.hpp index 34e357dfb6..e81df58c4b 100644 --- a/src/complex/DataStructure/Geometry/TriangleGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/TriangleGeom.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { /** * @class TriangleGeom * @brief */ -class COMPLEX_EXPORT TriangleGeom : public INodeGeometry2D +class SIMPLNX_EXPORT TriangleGeom : public INodeGeometry2D { public: friend class DataStructure; @@ -176,4 +176,4 @@ class COMPLEX_EXPORT TriangleGeom : public INodeGeometry2D */ TriangleGeom(DataStructure& dataStructure, std::string name, IdType importId); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Geometry/VertexGeom.cpp b/src/simplnx/DataStructure/Geometry/VertexGeom.cpp similarity index 94% rename from src/complex/DataStructure/Geometry/VertexGeom.cpp rename to src/simplnx/DataStructure/Geometry/VertexGeom.cpp index 4801941327..b9f515ffad 100644 --- a/src/complex/DataStructure/Geometry/VertexGeom.cpp +++ b/src/simplnx/DataStructure/Geometry/VertexGeom.cpp @@ -1,13 +1,13 @@ #include "VertexGeom.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Utilities/GeometryHelpers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Utilities/GeometryHelpers.hpp" #include -using namespace complex; +using namespace nx::core; VertexGeom::VertexGeom(DataStructure& dataStructure, std::string name) : INodeGeometry0D(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Geometry/VertexGeom.hpp b/src/simplnx/DataStructure/Geometry/VertexGeom.hpp similarity index 91% rename from src/complex/DataStructure/Geometry/VertexGeom.hpp rename to src/simplnx/DataStructure/Geometry/VertexGeom.hpp index f2296722a7..83a6fd2b3f 100644 --- a/src/complex/DataStructure/Geometry/VertexGeom.hpp +++ b/src/simplnx/DataStructure/Geometry/VertexGeom.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class VertexGeom * @brief */ -class COMPLEX_EXPORT VertexGeom : public INodeGeometry0D +class SIMPLNX_EXPORT VertexGeom : public INodeGeometry0D { public: friend class DataStructure; @@ -98,7 +98,7 @@ class COMPLEX_EXPORT VertexGeom : public INodeGeometry0D /** * @brief - * @return complex::Point3D + * @return nx::core::Point3D */ Point3D getParametricCenter() const override; @@ -125,4 +125,4 @@ class COMPLEX_EXPORT VertexGeom : public INodeGeometry0D */ VertexGeom(DataStructure& dataStructure, std::string name, IdType importId); }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IArray.hpp b/src/simplnx/DataStructure/IArray.hpp similarity index 95% rename from src/complex/DataStructure/IArray.hpp rename to src/simplnx/DataStructure/IArray.hpp index 5cc17933ce..3345672279 100644 --- a/src/complex/DataStructure/IArray.hpp +++ b/src/simplnx/DataStructure/IArray.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataObject.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT IArray : public DataObject +class SIMPLNX_EXPORT IArray : public DataObject { public: using ShapeType = std::vector; @@ -121,4 +121,4 @@ class COMPLEX_EXPORT IArray : public DataObject { } }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IDataArray.hpp b/src/simplnx/DataStructure/IDataArray.hpp similarity index 95% rename from src/complex/DataStructure/IDataArray.hpp rename to src/simplnx/DataStructure/IDataArray.hpp index 8e8ea0a424..553698825a 100644 --- a/src/complex/DataStructure/IDataArray.hpp +++ b/src/simplnx/DataStructure/IDataArray.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" -#include "complex/DataStructure/IDataStore.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" -namespace complex +namespace nx::core { /** * @class IDataArray * @brief The IDataArray class is a typeless interface for the templated DataArray class. */ -class COMPLEX_EXPORT IDataArray : public IArray +class SIMPLNX_EXPORT IDataArray : public IArray { public: static inline constexpr StringLiteral k_TypeName = "IDataArray"; @@ -168,4 +168,4 @@ class COMPLEX_EXPORT IDataArray : public IArray { } }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IDataStore.hpp b/src/simplnx/DataStructure/IDataStore.hpp similarity index 95% rename from src/complex/DataStructure/IDataStore.hpp rename to src/simplnx/DataStructure/IDataStore.hpp index c6d41e8a34..5e79b73dd6 100644 --- a/src/complex/DataStructure/IDataStore.hpp +++ b/src/simplnx/DataStructure/IDataStore.hpp @@ -1,7 +1,7 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -10,7 +10,7 @@ #include #include -namespace complex +namespace nx::core { /** * @class IDataStore @@ -19,7 +19,7 @@ namespace complex * are defined but the specifics relating to how data is stored are implemented * in subclasses. */ -class COMPLEX_EXPORT IDataStore +class SIMPLNX_EXPORT IDataStore { public: using ShapeType = typename std::vector; @@ -126,4 +126,4 @@ class COMPLEX_EXPORT IDataStore */ IDataStore() = default; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/INeighborList.cpp b/src/simplnx/DataStructure/INeighborList.cpp similarity index 93% rename from src/complex/DataStructure/INeighborList.cpp rename to src/simplnx/DataStructure/INeighborList.cpp index dc95de65c9..ba61dc67b5 100644 --- a/src/complex/DataStructure/INeighborList.cpp +++ b/src/simplnx/DataStructure/INeighborList.cpp @@ -1,8 +1,8 @@ #include "INeighborList.hpp" -#include "complex/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" -namespace complex +namespace nx::core { INeighborList::INeighborList(DataStructure& dataStructure, const std::string& name, usize numTuples) : IArray(dataStructure, name) @@ -63,4 +63,4 @@ IArray::ShapeType INeighborList::getComponentShape() const return {1}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/INeighborList.hpp b/src/simplnx/DataStructure/INeighborList.hpp similarity index 94% rename from src/complex/DataStructure/INeighborList.hpp rename to src/simplnx/DataStructure/INeighborList.hpp index b6bc85ad48..5edeaa43ab 100644 --- a/src/complex/DataStructure/INeighborList.hpp +++ b/src/simplnx/DataStructure/INeighborList.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" +#include "simplnx/DataStructure/IArray.hpp" -namespace complex +namespace nx::core { /** * @brief Non-templated base class for NeighborList class. */ -class COMPLEX_EXPORT INeighborList : public IArray +class SIMPLNX_EXPORT INeighborList : public IArray { public: static inline constexpr StringLiteral k_TypeName = "INeighborList"; @@ -106,4 +106,4 @@ class COMPLEX_EXPORT INeighborList : public IArray std::string m_NumNeighborsArrayName; usize m_NumTuples; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/CoreDataIOManager.cpp b/src/simplnx/DataStructure/IO/Generic/CoreDataIOManager.cpp similarity index 88% rename from src/complex/DataStructure/IO/Generic/CoreDataIOManager.cpp rename to src/simplnx/DataStructure/IO/Generic/CoreDataIOManager.cpp index 84622e72cc..4746130f21 100644 --- a/src/complex/DataStructure/IO/Generic/CoreDataIOManager.cpp +++ b/src/simplnx/DataStructure/IO/Generic/CoreDataIOManager.cpp @@ -1,8 +1,8 @@ #include "CoreDataIOManager.hpp" -#include "complex/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStore.hpp" -namespace complex::Generic +namespace nx::core::Generic { CoreDataIOManager::CoreDataIOManager() : IDataIOManager() @@ -24,7 +24,7 @@ void CoreDataIOManager::addCoreFactories() void CoreDataIOManager::addDataStoreFnc() { - DataStoreCreateFnc dataStoreFnc = [](complex::DataType numericType, const typename IDataStore::ShapeType& tupleShape, const typename IDataStore::ShapeType& componentShape, + DataStoreCreateFnc dataStoreFnc = [](nx::core::DataType numericType, const typename IDataStore::ShapeType& tupleShape, const typename IDataStore::ShapeType& componentShape, const std::optional& chunkShape) { std::unique_ptr dataStore = nullptr; switch(numericType) @@ -67,4 +67,4 @@ void CoreDataIOManager::addDataStoreFnc() }; addDataStoreCreationFnc(formatName(), dataStoreFnc); } -} // namespace complex::Generic +} // namespace nx::core::Generic diff --git a/src/complex/DataStructure/IO/Generic/CoreDataIOManager.hpp b/src/simplnx/DataStructure/IO/Generic/CoreDataIOManager.hpp similarity index 72% rename from src/complex/DataStructure/IO/Generic/CoreDataIOManager.hpp rename to src/simplnx/DataStructure/IO/Generic/CoreDataIOManager.hpp index f8b125bd2b..8666d466aa 100644 --- a/src/complex/DataStructure/IO/Generic/CoreDataIOManager.hpp +++ b/src/simplnx/DataStructure/IO/Generic/CoreDataIOManager.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/IO/Generic/IDataIOManager.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataIOManager.hpp" -namespace complex +namespace nx::core { namespace Generic { /** * @brief The HDF5::DataIOManager class stores and returns the corresponding IO class for HDF5. */ -class COMPLEX_EXPORT CoreDataIOManager : public IDataIOManager +class SIMPLNX_EXPORT CoreDataIOManager : public IDataIOManager { public: /** @@ -26,7 +26,7 @@ class COMPLEX_EXPORT CoreDataIOManager : public IDataIOManager private: /** - * @brief Adds all core complex DataObject IO classes. + * @brief Adds all core simplnx DataObject IO classes. */ void addCoreFactories(); @@ -35,4 +35,4 @@ class COMPLEX_EXPORT CoreDataIOManager : public IDataIOManager factory_collection m_FactoryCollection; }; } // namespace Generic -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/DataIOCollection.cpp b/src/simplnx/DataStructure/IO/Generic/DataIOCollection.cpp similarity index 86% rename from src/complex/DataStructure/IO/Generic/DataIOCollection.cpp rename to src/simplnx/DataStructure/IO/Generic/DataIOCollection.cpp index 5a0c87bd85..f34f9214fb 100644 --- a/src/complex/DataStructure/IO/Generic/DataIOCollection.cpp +++ b/src/simplnx/DataStructure/IO/Generic/DataIOCollection.cpp @@ -1,16 +1,16 @@ #include "DataIOCollection.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/IO/Generic/CoreDataIOManager.hpp" -#include "complex/DataStructure/IO/Generic/IDataIOManager.hpp" -#include "complex/DataStructure/IO/HDF5/DataIOManager.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/IO/Generic/CoreDataIOManager.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataIOManager.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataIOManager.hpp" -namespace complex +namespace nx::core { DataIOCollection::DataIOCollection() { - addIOManager(std::make_shared()); - addIOManager(std::make_shared()); + addIOManager(std::make_shared()); + addIOManager(std::make_shared()); } DataIOCollection::~DataIOCollection() noexcept = default; @@ -105,4 +105,4 @@ DataIOCollection::const_iterator DataIOCollection::end() const { return m_ManagerMap.end(); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/DataIOCollection.hpp b/src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp similarity index 89% rename from src/complex/DataStructure/IO/Generic/DataIOCollection.hpp rename to src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp index 832afcb0c9..e0ae9d25c0 100644 --- a/src/complex/DataStructure/IO/Generic/DataIOCollection.hpp +++ b/src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/DataStructure/AbstractDataStore.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/AbstractDataStore.hpp" +#include "simplnx/simplnx_export.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Common/TypesUtility.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Common/TypesUtility.hpp" #include #include #include -namespace complex +namespace nx::core { template class AbstractDataStore; @@ -19,7 +19,7 @@ class IDataIOManager; /** * @brief The DataIOCollection class contains all known IDataIOManagers for the current Application instance. */ -class COMPLEX_EXPORT DataIOCollection +class SIMPLNX_EXPORT DataIOCollection { public: using map_type = std::map>; @@ -74,4 +74,4 @@ class COMPLEX_EXPORT DataIOCollection private: map_type m_ManagerMap; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/IDataFactory.hpp b/src/simplnx/DataStructure/IO/Generic/IDataFactory.hpp similarity index 81% rename from src/complex/DataStructure/IO/Generic/IDataFactory.hpp rename to src/simplnx/DataStructure/IO/Generic/IDataFactory.hpp index 56b8718d7c..beeb0a43e1 100644 --- a/src/complex/DataStructure/IO/Generic/IDataFactory.hpp +++ b/src/simplnx/DataStructure/IO/Generic/IDataFactory.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" #include -namespace complex +namespace nx::core { class IDataStructureReader; @@ -13,7 +13,7 @@ class IDataStructureReader; * @class IDataFactory * @brief Base class for reading and writing DataObjects to file */ -class COMPLEX_EXPORT IDataFactory +class SIMPLNX_EXPORT IDataFactory { public: virtual ~IDataFactory() noexcept = default; @@ -36,4 +36,4 @@ class COMPLEX_EXPORT IDataFactory */ IDataFactory() = default; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/IDataIOManager.cpp b/src/simplnx/DataStructure/IO/Generic/IDataIOManager.cpp similarity index 96% rename from src/complex/DataStructure/IO/Generic/IDataIOManager.cpp rename to src/simplnx/DataStructure/IO/Generic/IDataIOManager.cpp index 1200b807de..44a1b0ef79 100644 --- a/src/complex/DataStructure/IO/Generic/IDataIOManager.cpp +++ b/src/simplnx/DataStructure/IO/Generic/IDataIOManager.cpp @@ -1,6 +1,6 @@ #include "IDataIOManager.hpp" -namespace complex +namespace nx::core { IDataIOManager::IDataIOManager() = default; IDataIOManager::~IDataIOManager() noexcept = default; @@ -38,4 +38,4 @@ void IDataIOManager::addDataStoreCreationFnc(const std::string& type, DataStoreC { m_DataStoreCreationMap[type] = creationFnc; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/IDataIOManager.hpp b/src/simplnx/DataStructure/IO/Generic/IDataIOManager.hpp similarity index 88% rename from src/complex/DataStructure/IO/Generic/IDataIOManager.hpp rename to src/simplnx/DataStructure/IO/Generic/IDataIOManager.hpp index 6936c04cb0..e9b742cbce 100644 --- a/src/complex/DataStructure/IO/Generic/IDataIOManager.hpp +++ b/src/simplnx/DataStructure/IO/Generic/IDataIOManager.hpp @@ -1,18 +1,18 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/IDataStore.hpp" -#include "complex/DataStructure/IO/Generic/IDataFactory.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataFactory.hpp" +#include "simplnx/simplnx_export.hpp" -#include "complex/Common/Types.hpp" +#include "simplnx/Common/Types.hpp" #include #include #include #include -namespace complex +namespace nx::core { class IDataFactory; @@ -20,7 +20,7 @@ class IDataFactory; * @brief The IDataIOManager class serves as a base point for reading and writing DataStructures to specific file formats. * To support a new file format, create a derived class and provide subclasses of IDataFactory for all concrete DataObject types. */ -class COMPLEX_EXPORT IDataIOManager +class SIMPLNX_EXPORT IDataIOManager { public: using factory_id_type = std::string; @@ -85,4 +85,4 @@ class COMPLEX_EXPORT IDataIOManager factory_collection m_FactoryCollection; DataStoreCreationMap m_DataStoreCreationMap; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/Generic/IOConstants.hpp b/src/simplnx/DataStructure/IO/Generic/IOConstants.hpp similarity index 95% rename from src/complex/DataStructure/IO/Generic/IOConstants.hpp rename to src/simplnx/DataStructure/IO/Generic/IOConstants.hpp index 6d8c98e27e..e1cfe3bdd9 100644 --- a/src/complex/DataStructure/IO/Generic/IOConstants.hpp +++ b/src/simplnx/DataStructure/IO/Generic/IOConstants.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/StringLiteral.hpp" -namespace complex::IOConstants +namespace nx::core::IOConstants { // DataArray inline constexpr StringLiteral k_TupleShapeTag = "TupleDimensions"; @@ -54,4 +54,4 @@ inline constexpr StringLiteral k_XBoundsTag = "X Bounds ID"; inline constexpr StringLiteral k_YBoundsTag = "Y Bounds ID"; inline constexpr StringLiteral k_ZBoundsTag = "Z Bounds ID"; inline constexpr StringLiteral k_DimensionsTag = "Dimensions"; -} // namespace complex::IOConstants +} // namespace nx::core::IOConstants diff --git a/src/complex/DataStructure/IO/HDF5/AttributeMatrixIO.cpp b/src/simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.cpp similarity index 82% rename from src/complex/DataStructure/IO/HDF5/AttributeMatrixIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.cpp index bc03cd92ec..d1c9b9facc 100644 --- a/src/complex/DataStructure/IO/HDF5/AttributeMatrixIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.cpp @@ -1,13 +1,13 @@ #include "AttributeMatrixIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/AttributeReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/AttributeReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { AttributeMatrixIO::AttributeMatrixIO() = default; AttributeMatrixIO::~AttributeMatrixIO() noexcept = default; @@ -50,7 +50,7 @@ Result<> AttributeMatrixIO::writeData(DataStructureWriter& dataStructureWriter, auto groupWriter = parentGroup.createGroupWriter(attributeMatrix.getName()); auto tupleShape = attributeMatrix.getShape(); auto tupleDimsAttribute = groupWriter.createAttribute(IOConstants::k_TupleDims); - auto error = tupleDimsAttribute.writeVector(complex::HDF5::AttributeWriter::DimsVector{tupleShape.size()}, tupleShape); + auto error = tupleDimsAttribute.writeVector(nx::core::HDF5::AttributeWriter::DimsVector{tupleShape.size()}, tupleShape); return WriteBaseGroupData(dataStructureWriter, attributeMatrix, parentGroup, importable); } @@ -59,4 +59,4 @@ Result<> AttributeMatrixIO::writeDataObject(DataStructureWriter& dataStructureWr { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/AttributeMatrixIO.hpp b/src/simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.hpp similarity index 93% rename from src/complex/DataStructure/IO/HDF5/AttributeMatrixIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.hpp index ccbf213bdc..436574c382 100644 --- a/src/complex/DataStructure/IO/HDF5/AttributeMatrixIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/BaseGroupIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp" -namespace complex +namespace nx::core { class AttributeMatrix; @@ -11,7 +11,7 @@ namespace HDF5 /** * @brief AttributeMatrix reader / writer class using HDF5. */ -class COMPLEX_EXPORT AttributeMatrixIO : public BaseGroupIO +class SIMPLNX_EXPORT AttributeMatrixIO : public BaseGroupIO { public: using data_type = AttributeMatrix; @@ -72,4 +72,4 @@ class COMPLEX_EXPORT AttributeMatrixIO : public BaseGroupIO std::string getTypeName() const override; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/BaseGroupIO.cpp b/src/simplnx/DataStructure/IO/HDF5/BaseGroupIO.cpp similarity index 87% rename from src/complex/DataStructure/IO/HDF5/BaseGroupIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/BaseGroupIO.cpp index 93e58280c1..3d333d652f 100644 --- a/src/complex/DataStructure/IO/HDF5/BaseGroupIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/BaseGroupIO.cpp @@ -1,10 +1,10 @@ #include "BaseGroupIO.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/DataStructure/IO/HDF5/IOUtilities.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/DataStructure/IO/HDF5/IOUtilities.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { BaseGroupIO::BaseGroupIO() = default; BaseGroupIO::~BaseGroupIO() noexcept = default; @@ -40,4 +40,4 @@ Result<> BaseGroupIO::WriteDataMap(DataStructureWriter& dataStructureWriter, con } return {}; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/BaseGroupIO.hpp b/src/simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp similarity index 90% rename from src/complex/DataStructure/IO/HDF5/BaseGroupIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp index 8e126c6d6f..8de1047c45 100644 --- a/src/complex/DataStructure/IO/HDF5/BaseGroupIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" -namespace complex +namespace nx::core { class BaseGroup; @@ -12,7 +12,7 @@ namespace HDF5 /** * @brief The BaseGroupIO class serves as the base IO class for reading and writing BaseGroups to HDF5 */ -class COMPLEX_EXPORT BaseGroupIO : public IDataIO +class SIMPLNX_EXPORT BaseGroupIO : public IDataIO { public: BaseGroupIO(); @@ -62,4 +62,4 @@ class COMPLEX_EXPORT BaseGroupIO : public IDataIO static Result<> WriteBaseGroupData(DataStructureWriter& dataStructureWriter, const BaseGroup& baseGroup, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/DataArrayIO.hpp b/src/simplnx/DataStructure/IO/HDF5/DataArrayIO.hpp similarity index 83% rename from src/complex/DataStructure/IO/HDF5/DataArrayIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/DataArrayIO.hpp index a61d1e8e8a..ef113121af 100644 --- a/src/complex/DataStructure/IO/HDF5/DataArrayIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataArrayIO.hpp @@ -1,18 +1,18 @@ #pragma once #include "DataStructureWriter.hpp" -#include "complex/DataStructure/AbstractDataStore.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/DataStructure/IO/HDF5/DataStoreIO.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureReader.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp" -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/DataStructure/AbstractDataStore.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStoreIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" #include -namespace complex::HDF5 +namespace nx::core::HDF5 { /** * @brief The DataArrayIO class serves as the basis for reading and writing DataArrays from HDF5 @@ -38,8 +38,8 @@ class DataArrayIO : public IDataIO * @param preflight */ template - static void importDataArray(DataStructure& dataStructure, const complex::HDF5::DatasetReader& datasetReader, const std::string dataArrayName, DataObject::IdType importId, - complex::HDF5::ErrorType& err, const std::optional& parentId, bool preflight) + static void importDataArray(DataStructure& dataStructure, const nx::core::HDF5::DatasetReader& datasetReader, const std::string dataArrayName, DataObject::IdType importId, + nx::core::HDF5::ErrorType& err, const std::optional& parentId, bool preflight) { std::unique_ptr> dataStore = preflight ? std::unique_ptr>(EmptyDataStoreIO::ReadDataStore(datasetReader)) : std::unique_ptr>(DataStoreIO::ReadDataStore(datasetReader)); @@ -68,8 +68,8 @@ class DataArrayIO : public IDataIO return MakeErrorResult(-900, ss); } - complex::HDF5::Type type = datasetReader.getType(); - if(type == complex::HDF5::Type::unknown) + nx::core::HDF5::Type type = datasetReader.getType(); + if(type == nx::core::HDF5::Type::unknown) { std::string ss = "Invalid Dataset data type"; return MakeErrorResult(-901, ss); @@ -85,29 +85,29 @@ class DataArrayIO : public IDataIO return {}; } - complex::HDF5::ErrorType err = 0; + nx::core::HDF5::ErrorType err = 0; switch(type) { - case complex::HDF5::Type::float32: + case nx::core::HDF5::Type::float32: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::float64: + case nx::core::HDF5::Type::float64: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::int8: + case nx::core::HDF5::Type::int8: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::int16: + case nx::core::HDF5::Type::int16: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::int32: + case nx::core::HDF5::Type::int32: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::int64: + case nx::core::HDF5::Type::int64: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::uint8: + case nx::core::HDF5::Type::uint8: if(isBoolArray) { importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); @@ -117,13 +117,13 @@ class DataArrayIO : public IDataIO importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); } break; - case complex::HDF5::Type::uint16: + case nx::core::HDF5::Type::uint16: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::uint32: + case nx::core::HDF5::Type::uint32: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; - case complex::HDF5::Type::uint64: + case nx::core::HDF5::Type::uint64: importDataArray(dataStructureReader.getDataStructure(), datasetReader, dataArrayName, importId, err, parentId, useEmptyDataStore); break; default: @@ -149,7 +149,7 @@ class DataArrayIO : public IDataIO * @param importable * @return Result<> */ - Result<> writeData(DataStructureWriter& dataStructureWriter, const complex::DataArray& dataArray, group_writer_type& parentGroup, bool importable) const + Result<> writeData(DataStructureWriter& dataStructureWriter, const nx::core::DataArray& dataArray, group_writer_type& parentGroup, bool importable) const { auto datasetWriter = parentGroup.createDatasetWriter(dataArray.getName()); Result<> result = DataStoreIO::WriteDataStore(datasetWriter, dataArray.getDataStoreRef()); @@ -212,4 +212,4 @@ using UInt64ArrayIO = DataArrayIO; using BoolArrayIO = DataArrayIO; using Float32ArrayIO = DataArrayIO; using Float64ArrayIO = DataArrayIO; -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataGroupIO.cpp b/src/simplnx/DataStructure/IO/HDF5/DataGroupIO.cpp similarity index 89% rename from src/complex/DataStructure/IO/HDF5/DataGroupIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/DataGroupIO.cpp index bcfae5649d..18e31ab81f 100644 --- a/src/complex/DataStructure/IO/HDF5/DataGroupIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataGroupIO.cpp @@ -1,11 +1,11 @@ #include "DataGroupIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { DataGroupIO::DataGroupIO() = default; DataGroupIO::~DataGroupIO() noexcept = default; @@ -37,4 +37,4 @@ Result<> DataGroupIO::writeDataObject(DataStructureWriter& dataStructureWriter, { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataGroupIO.hpp b/src/simplnx/DataStructure/IO/HDF5/DataGroupIO.hpp similarity index 92% rename from src/complex/DataStructure/IO/HDF5/DataGroupIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/DataGroupIO.hpp index f207f47b98..10569586cf 100644 --- a/src/complex/DataStructure/IO/HDF5/DataGroupIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataGroupIO.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/BaseGroupIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp" -namespace complex +namespace nx::core { class DataGroup; @@ -11,7 +11,7 @@ namespace HDF5 /** * @brief The DataGroupIO class serves as the basis for writing DataGroups to HDF5. */ -class COMPLEX_EXPORT DataGroupIO : public BaseGroupIO +class SIMPLNX_EXPORT DataGroupIO : public BaseGroupIO { public: using data_type = DataGroup; @@ -64,4 +64,4 @@ class COMPLEX_EXPORT DataGroupIO : public BaseGroupIO std::string getTypeName() const override; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/DataIOManager.cpp b/src/simplnx/DataStructure/IO/HDF5/DataIOManager.cpp similarity index 65% rename from src/complex/DataStructure/IO/HDF5/DataIOManager.cpp rename to src/simplnx/DataStructure/IO/HDF5/DataIOManager.cpp index ad58ab8069..cc0baa23b6 100644 --- a/src/complex/DataStructure/IO/HDF5/DataIOManager.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataIOManager.cpp @@ -1,21 +1,21 @@ #include "DataIOManager.hpp" -#include "complex/DataStructure/IO/HDF5/AttributeMatrixIO.hpp" -#include "complex/DataStructure/IO/HDF5/DataArrayIO.hpp" -#include "complex/DataStructure/IO/HDF5/DataGroupIO.hpp" -#include "complex/DataStructure/IO/HDF5/EdgeGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/HexahedralGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/ImageGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/NeighborListIO.hpp" -#include "complex/DataStructure/IO/HDF5/QuadGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/RectGridGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/ScalarDataIO.hpp" -#include "complex/DataStructure/IO/HDF5/StringArrayIO.hpp" -#include "complex/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/TriangleGeomIO.hpp" -#include "complex/DataStructure/IO/HDF5/VertexGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/AttributeMatrixIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataArrayIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataGroupIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/EdgeGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/ImageGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/NeighborListIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/QuadGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/RectGridGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/ScalarDataIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/StringArrayIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/TriangleGeomIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/VertexGeomIO.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { DataIOManager::DataIOManager() : IDataIOManager() @@ -79,4 +79,4 @@ void DataIOManager::addCoreFactories() addFactory(); addFactory(); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataIOManager.hpp b/src/simplnx/DataStructure/IO/HDF5/DataIOManager.hpp similarity index 68% rename from src/complex/DataStructure/IO/HDF5/DataIOManager.hpp rename to src/simplnx/DataStructure/IO/HDF5/DataIOManager.hpp index 67534a42d5..948a76c9a6 100644 --- a/src/complex/DataStructure/IO/HDF5/DataIOManager.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataIOManager.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/DataStructure/IO/Generic/IDataIOManager.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataIOManager.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { /** * @brief The HDF5::DataIOManager class stores and returns the corresponding IO class for HDF5. */ -class COMPLEX_EXPORT DataIOManager : public IDataIOManager +class SIMPLNX_EXPORT DataIOManager : public IDataIOManager { public: /** @@ -24,10 +24,10 @@ class COMPLEX_EXPORT DataIOManager : public IDataIOManager private: /** - * @brief Adds all core complex DataObject IO classes. + * @brief Adds all core simplnx DataObject IO classes. */ void addCoreFactories(); factory_collection m_FactoryCollection; }; -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataStoreIO.hpp b/src/simplnx/DataStructure/IO/HDF5/DataStoreIO.hpp similarity index 79% rename from src/complex/DataStructure/IO/HDF5/DataStoreIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/DataStoreIO.hpp index 02e67f930a..ebfa4c9283 100644 --- a/src/complex/DataStructure/IO/HDF5/DataStoreIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataStoreIO.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/IO/HDF5/IDataStoreIO.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataStoreIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/DatasetWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/DatasetWriter.hpp" #include "fmt/format.h" -namespace complex +namespace nx::core { namespace HDF5 { @@ -18,8 +18,8 @@ namespace Chunks constexpr int32 k_DimensionMismatchError = -2654; template -inline Result<> WriteDataStoreChunk(complex::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims, - const complex::HDF5::DatasetWriter::DimsType& chunkDims, const IDataStore::ShapeType& index) +inline Result<> WriteDataStoreChunk(nx::core::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims, + const nx::core::HDF5::DatasetWriter::DimsType& chunkDims, const IDataStore::ShapeType& index) { auto rank = chunkDims.size(); @@ -53,8 +53,8 @@ inline Result<> WriteDataStoreChunk(complex::HDF5::DatasetWriter& datasetWriter, } template <> -inline Result<> WriteDataStoreChunk(complex::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims, - const complex::HDF5::DatasetWriter::DimsType& chunkDims, const IDataStore::ShapeType& index) +inline Result<> WriteDataStoreChunk(nx::core::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims, + const nx::core::HDF5::DatasetWriter::DimsType& chunkDims, const IDataStore::ShapeType& index) { auto rank = chunkDims.size(); @@ -83,8 +83,8 @@ inline Result<> WriteDataStoreChunk(complex::HDF5::DatasetWriter& datasetW } template -inline Result<> RecursivelyWriteChunks(complex::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims, - const complex::HDF5::DatasetWriter::DimsType& chunkDims, IDataStore::ShapeType index, const std::vector& chunkLayout, uint64 i = 0) +inline Result<> RecursivelyWriteChunks(nx::core::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims, + const nx::core::HDF5::DatasetWriter::DimsType& chunkDims, IDataStore::ShapeType index, const std::vector& chunkLayout, uint64 i = 0) { // uint64 rank = chunkLayout.size(); const uint64 rank = chunkDims.size(); @@ -117,14 +117,14 @@ inline Result<> RecursivelyWriteChunks(complex::HDF5::DatasetWriter& datasetWrit } template -inline Result<> WriteDataStoreChunks(complex::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims) +inline Result<> WriteDataStoreChunks(nx::core::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& store, const std::vector& h5dims) { auto shapeDims = store.getTupleShape(); const auto componentDims = store.getComponentShape(); shapeDims.insert(shapeDims.end(), componentDims.begin(), componentDims.end()); const auto storeChunkShape = store.getChunkShape().value(); - complex::HDF5::DatasetWriter::DimsType chunkDims(storeChunkShape.begin(), storeChunkShape.end()); + nx::core::HDF5::DatasetWriter::DimsType chunkDims(storeChunkShape.begin(), storeChunkShape.end()); usize rank = shapeDims.size(); @@ -153,7 +153,7 @@ inline Result<> WriteDataStoreChunks(complex::HDF5::DatasetWriter& datasetWriter * @return H5::ErrorType */ template -inline Result<> WriteDataStore(complex::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& dataStore) +inline Result<> WriteDataStore(nx::core::HDF5::DatasetWriter& datasetWriter, const AbstractDataStore& dataStore) { if(!datasetWriter.isValid()) { @@ -224,7 +224,7 @@ inline Result<> WriteDataStore(complex::HDF5::DatasetWriter& datasetWriter, cons * @return std::unique_ptr> */ template -inline std::unique_ptr> ReadDataStore(const complex::HDF5::DatasetReader& datasetReader) +inline std::unique_ptr> ReadDataStore(const nx::core::HDF5::DatasetReader& datasetReader) { auto tupleShape = IDataStoreIO::ReadTupleShape(datasetReader); auto componentShape = IDataStoreIO::ReadComponentShape(datasetReader); @@ -233,11 +233,11 @@ inline std::unique_ptr> ReadDataStore(const complex::HDF5::DatasetR auto dataStore = std::make_unique>(tupleShape, componentShape, static_cast(0)); if(!datasetReader.readIntoSpan(dataStore->createSpan())) { - throw std::runtime_error(fmt::format("Error reading data array from DataStore from HDF5 at {}/{}", complex::HDF5::Support::GetObjectPath(datasetReader.getParentId()), datasetReader.getName())); + throw std::runtime_error(fmt::format("Error reading data array from DataStore from HDF5 at {}/{}", nx::core::HDF5::Support::GetObjectPath(datasetReader.getParentId()), datasetReader.getName())); } return dataStore; } } // namespace DataStoreIO } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/DataStructureReader.cpp b/src/simplnx/DataStructure/IO/HDF5/DataStructureReader.cpp similarity index 79% rename from src/complex/DataStructure/IO/HDF5/DataStructureReader.cpp rename to src/simplnx/DataStructure/IO/HDF5/DataStructureReader.cpp index c8e8389512..9e9ba2d8a8 100644 --- a/src/complex/DataStructure/IO/HDF5/DataStructureReader.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataStructureReader.cpp @@ -1,15 +1,15 @@ -#include "complex/DataStructure/IO/HDF5/DataStructureReader.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/DataMap.hpp" -#include "complex/DataStructure/IO/HDF5/BaseGroupIO.hpp" -#include "complex/DataStructure/IO/HDF5/DataIOManager.hpp" -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" -#include "complex/DataStructure/IO/HDF5/IOUtilities.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/DataMap.hpp" +#include "simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataIOManager.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IOUtilities.hpp" #include "fmt/format.h" -namespace complex::HDF5 +namespace nx::core::HDF5 { DataStructureReader::DataStructureReader(DataIOManager* factoryManager) : m_IOManager(factoryManager) @@ -19,17 +19,17 @@ DataStructureReader::~DataStructureReader() noexcept = default; Result DataStructureReader::ReadFile(const std::filesystem::path& path, bool useEmptyDataStores) { - const complex::HDF5::FileReader fileReader(path); + const nx::core::HDF5::FileReader fileReader(path); return ReadFile(fileReader); } -Result DataStructureReader::ReadFile(const complex::HDF5::FileReader& fileReader, bool useEmptyDataStores) +Result DataStructureReader::ReadFile(const nx::core::HDF5::FileReader& fileReader, bool useEmptyDataStores) { DataStructureReader dataStructureReader; auto groupReader = fileReader.openGroup(Constants::k_DataStructureTag); return dataStructureReader.readGroup(groupReader, useEmptyDataStores); } -Result DataStructureReader::readGroup(const complex::HDF5::GroupReader& groupReader, bool useEmptyDataStores) +Result DataStructureReader::readGroup(const nx::core::HDF5::GroupReader& groupReader, bool useEmptyDataStores) { clearDataStructure(); @@ -57,13 +57,13 @@ Result DataStructureReader::readGroup(const complex::HDF5::GroupR return {m_CurrentStructure}; } -Result<> DataStructureReader::readObjectFromGroup(const complex::HDF5::GroupReader& parentGroup, const std::string& objectName, const std::optional& parentId, +Result<> DataStructureReader::readObjectFromGroup(const nx::core::HDF5::GroupReader& parentGroup, const std::string& objectName, const std::optional& parentId, bool useEmptyDataStores) { std::shared_ptr factory = nullptr; DataObject::IdType objectId = 0; - // Get complex::HDF5::IDataFactory and check DataObject ID + // Get nx::core::HDF5::IDataFactory and check DataObject ID { auto childObj = parentGroup.openObject(objectName); @@ -148,4 +148,4 @@ std::shared_ptr DataStructureReader::getDataFactory(typename IDataIOMan return getDataReader()->getFactoryAs(typeName); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataStructureReader.hpp b/src/simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp similarity index 66% rename from src/complex/DataStructure/IO/HDF5/DataStructureReader.hpp rename to src/simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp index 203818b164..fdce7994e7 100644 --- a/src/complex/DataStructure/IO/HDF5/DataStructureReader.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/Generic/IDataIOManager.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataIOManager.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { class IDataIO; class DataIOManager; @@ -15,7 +15,7 @@ class DataIOManager; /** * @brief The DataStructureReader class exists to read DataStructures from an HDF5 file or group. */ -class COMPLEX_EXPORT DataStructureReader +class SIMPLNX_EXPORT DataStructureReader { public: DataStructureReader(DataIOManager* ioManager = nullptr); @@ -35,17 +35,17 @@ class COMPLEX_EXPORT DataStructureReader * @param useEmptyDataStores = false * @return Result */ - static Result ReadFile(const complex::HDF5::FileReader& fileReader, bool useEmptyDataStores = false); + static Result ReadFile(const nx::core::HDF5::FileReader& fileReader, bool useEmptyDataStores = false); /** - * @brief Imports and returns a DataStructure from a target complex::HDF5::GroupReader. + * @brief Imports and returns a DataStructure from a target nx::core::HDF5::GroupReader. * Returns any HDF5 error code that occur by reference. Otherwise, this value * is set to 0. * @param groupReader Target HDF5 group reader * @param useEmptyDataStores = false * @return Result */ - Result readGroup(const complex::HDF5::GroupReader& groupReader, bool useEmptyDataStores = false); + Result readGroup(const nx::core::HDF5::GroupReader& groupReader, bool useEmptyDataStores = false); /** * @brief Imports a DataObject with the specified name from the target @@ -56,7 +56,7 @@ class COMPLEX_EXPORT DataStructureReader * @param useEmptyDataStores = false * @return Result<> */ - Result<> readObjectFromGroup(const complex::HDF5::GroupReader& parentGroup, const std::string& objectName, const std::optional& parentId = {}, bool useEmptyDataStores = false); + Result<> readObjectFromGroup(const nx::core::HDF5::GroupReader& parentGroup, const std::string& objectName, const std::optional& parentId = {}, bool useEmptyDataStores = false); /** * @brief Returns a reference to the current DataStructure. Returns an empty @@ -72,15 +72,15 @@ class COMPLEX_EXPORT DataStructureReader protected: /** - * @brief Returns a pointer to the complex::HDF5::DataFactoryManager used for finding the + * @brief Returns a pointer to the nx::core::HDF5::DataFactoryManager used for finding the * appropriate. If one was not provided in the constructor, this returns the - * Application instance's complex::HDF5::DataFactoryManager. + * Application instance's nx::core::HDF5::DataFactoryManager. * @return std::shared_ptr */ std::shared_ptr getDataReader() const; /** - * Returns a pointer to the appropriate complex::HDF5::IDataFactory based on a target + * Returns a pointer to the appropriate nx::core::HDF5::IDataFactory based on a target * data type. * @return std::shared_ptr */ @@ -90,4 +90,4 @@ class COMPLEX_EXPORT DataStructureReader std::shared_ptr m_IOManager = nullptr; DataStructure m_CurrentStructure; }; -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataStructureWriter.cpp b/src/simplnx/DataStructure/IO/HDF5/DataStructureWriter.cpp similarity index 82% rename from src/complex/DataStructure/IO/HDF5/DataStructureWriter.cpp rename to src/simplnx/DataStructure/IO/HDF5/DataStructureWriter.cpp index 43d09d8748..1cb9147f0a 100644 --- a/src/complex/DataStructure/IO/HDF5/DataStructureWriter.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataStructureWriter.cpp @@ -1,16 +1,16 @@ #include "DataStructureWriter.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/INeighborList.hpp" -#include "complex/DataStructure/IO/HDF5/DataIOManager.hpp" -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataIOManager.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include "fmt/format.h" -namespace complex::HDF5 +namespace nx::core::HDF5 { DataStructureWriter::DataStructureWriter() { @@ -22,24 +22,24 @@ DataStructureWriter::~DataStructureWriter() noexcept = default; Result<> DataStructureWriter::WriteFile(const DataStructure& dataStructure, const std::filesystem::path& filepath) { - auto fileWriterResult = complex::HDF5::FileWriter::CreateFile(filepath); + auto fileWriterResult = nx::core::HDF5::FileWriter::CreateFile(filepath); if(fileWriterResult.invalid()) { auto error = fileWriterResult.errors()[0]; return MakeErrorResult(error.code, error.message); } - complex::HDF5::FileWriter fileWriter = std::move(fileWriterResult.value()); + nx::core::HDF5::FileWriter fileWriter = std::move(fileWriterResult.value()); return WriteFile(dataStructure, fileWriter); } -Result<> DataStructureWriter::WriteFile(const DataStructure& dataStructure, complex::HDF5::FileWriter& fileWriter) +Result<> DataStructureWriter::WriteFile(const DataStructure& dataStructure, nx::core::HDF5::FileWriter& fileWriter) { HDF5::DataStructureWriter dataStructureWriter; auto groupWriter = fileWriter.createGroupWriter(Constants::k_DataStructureTag); return dataStructureWriter.writeDataStructure(dataStructure, groupWriter); } -Result<> DataStructureWriter::writeDataObject(const DataObject* dataObject, complex::HDF5::GroupWriter& parentGroup) +Result<> DataStructureWriter::writeDataObject(const DataObject* dataObject, nx::core::HDF5::GroupWriter& parentGroup) { // Check if data has already been written if(hasDataBeenWritten(dataObject)) @@ -67,7 +67,7 @@ Result<> DataStructureWriter::writeDataObject(const DataObject* dataObject, comp return {}; } -Result<> DataStructureWriter::writeDataMap(const DataMap& dataMap, complex::HDF5::GroupWriter& parentGroup) +Result<> DataStructureWriter::writeDataMap(const DataMap& dataMap, nx::core::HDF5::GroupWriter& parentGroup) { for(auto [key, object] : dataMap) { @@ -81,7 +81,7 @@ Result<> DataStructureWriter::writeDataMap(const DataMap& dataMap, complex::HDF5 return {}; } -Result<> DataStructureWriter::writeDataStructure(const DataStructure& dataStructure, complex::HDF5::GroupWriter& groupWriter) +Result<> DataStructureWriter::writeDataStructure(const DataStructure& dataStructure, nx::core::HDF5::GroupWriter& groupWriter) { auto idAttribute = groupWriter.createAttribute(Constants::k_NextIdTag); auto result = idAttribute.writeValue(dataStructure.getNextId()); @@ -94,7 +94,7 @@ Result<> DataStructureWriter::writeDataStructure(const DataStructure& dataStruct return writeDataMap(dataStructure.getDataMap(), groupWriter); } -Result<> DataStructureWriter::writeDataObjectLink(const DataObject* dataObject, complex::HDF5::GroupWriter& parentGroup) +Result<> DataStructureWriter::writeDataObjectLink(const DataObject* dataObject, nx::core::HDF5::GroupWriter& parentGroup) { auto objectPath = getPathForObjectId(dataObject->getId()); auto result = parentGroup.createLink(objectPath); @@ -172,8 +172,8 @@ void DataStructureWriter::clearIdMap() m_ParentId = 0; } -void DataStructureWriter::addWriter(complex::HDF5::ObjectWriter& objectWriter, DataObject::IdType objectId) +void DataStructureWriter::addWriter(nx::core::HDF5::ObjectWriter& objectWriter, DataObject::IdType objectId) { m_IdMap[objectId] = objectWriter.getObjectPath(); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/DataStructureWriter.hpp b/src/simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp similarity index 88% rename from src/complex/DataStructure/IO/HDF5/DataStructureWriter.hpp rename to src/simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp index afae1141f3..dce156f383 100644 --- a/src/complex/DataStructure/IO/HDF5/DataStructureWriter.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/IOUtilities.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/IOUtilities.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" #include #include #include -namespace complex +namespace nx::core { class DataStructure; class DataFactoryManager; @@ -23,10 +23,10 @@ class IDataIO; /** * @brief The DataStructureWriter class serves to write DataStructures to HDF5 file or groups. */ -class COMPLEX_EXPORT DataStructureWriter +class SIMPLNX_EXPORT DataStructureWriter { friend class DataObject; - friend COMPLEX_EXPORT Result<> WriteObjectAttributes(DataStructureWriter&, ObjectWriter&, const DataObject*, bool); + friend SIMPLNX_EXPORT Result<> WriteObjectAttributes(DataStructureWriter&, ObjectWriter&, const DataObject*, bool); friend class HDF5::IDataIO; using DataMapType = std::map; @@ -122,7 +122,7 @@ class COMPLEX_EXPORT DataStructureWriter void clearIdMap(); /** - * @brief Adds the complex::HDF5::ObjectWriter to the DataStructureWriter for the given DataObject ID + * @brief Adds the nx::core::HDF5::ObjectWriter to the DataStructureWriter for the given DataObject ID * @param objectWriter * @param objectId */ @@ -135,4 +135,4 @@ class COMPLEX_EXPORT DataStructureWriter std::shared_ptr m_IOManager; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/EdgeGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/EdgeGeomIO.cpp similarity index 93% rename from src/complex/DataStructure/IO/HDF5/EdgeGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/EdgeGeomIO.cpp index 3aacc23d91..46d3c001d9 100644 --- a/src/complex/DataStructure/IO/HDF5/EdgeGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/EdgeGeomIO.cpp @@ -1,12 +1,12 @@ #include "EdgeGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/EdgeGeom.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/EdgeGeom.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { EdgeGeomIO::EdgeGeomIO() = default; EdgeGeomIO::~EdgeGeomIO() noexcept = default; @@ -91,4 +91,4 @@ Result<> EdgeGeomIO::writeDataObject(DataStructureWriter& dataStructureWriter, c { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/EdgeGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/EdgeGeomIO.hpp similarity index 89% rename from src/complex/DataStructure/IO/HDF5/EdgeGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/EdgeGeomIO.hpp index 3590e343a9..1e1d71c773 100644 --- a/src/complex/DataStructure/IO/HDF5/EdgeGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/EdgeGeomIO.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/DataStructure/Geometry/INodeGeometry1D.hpp" -#include "complex/DataStructure/IO/HDF5/INodeGeom1dIO.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry1D.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.hpp" -namespace complex +namespace nx::core { class EdgeGeom; @@ -12,7 +12,7 @@ namespace HDF5 /** * @brief The EdgeGeomIO class exists to read and write EdgeGeoms using HDF5. */ -class COMPLEX_EXPORT EdgeGeomIO : public INodeGeom1dIO +class SIMPLNX_EXPORT EdgeGeomIO : public INodeGeom1dIO { public: using data_type = EdgeGeom; @@ -62,4 +62,4 @@ class COMPLEX_EXPORT EdgeGeomIO : public INodeGeom1dIO EdgeGeomIO& operator=(EdgeGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp b/src/simplnx/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp similarity index 65% rename from src/complex/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp index 9b24b9e6d8..6ea8ba17e5 100644 --- a/src/complex/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/EmptyDataStoreIO.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/DataStructure/EmptyDataStore.hpp" -#include "complex/DataStructure/IO/HDF5/IDataStoreIO.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataStoreIO.hpp" #include -namespace complex::HDF5 +namespace nx::core::HDF5 { namespace EmptyDataStoreIO { @@ -15,7 +15,7 @@ namespace EmptyDataStoreIO * @return std::unique_ptr> */ template -static std::unique_ptr> ReadDataStore(const complex::HDF5::DatasetReader& datasetReader) +static std::unique_ptr> ReadDataStore(const nx::core::HDF5::DatasetReader& datasetReader) { auto tupleShape = IDataStoreIO::ReadTupleShape(datasetReader); auto componentShape = IDataStoreIO::ReadComponentShape(datasetReader); @@ -25,4 +25,4 @@ static std::unique_ptr> ReadDataStore(const complex::HDF5::Dat return dataStore; } } // namespace EmptyDataStoreIO -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/GridMontageIO.cpp b/src/simplnx/DataStructure/IO/HDF5/GridMontageIO.cpp similarity index 89% rename from src/complex/DataStructure/IO/HDF5/GridMontageIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/GridMontageIO.cpp index bc42a1e6b6..4d06c30712 100644 --- a/src/complex/DataStructure/IO/HDF5/GridMontageIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/GridMontageIO.cpp @@ -1,11 +1,11 @@ #include "GridMontageIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Montage/GridMontage.hpp" +#include "simplnx/DataStructure/Montage/GridMontage.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { GridMontageIO::GridMontageIO() = default; GridMontageIO::~GridMontageIO() noexcept = default; @@ -36,4 +36,4 @@ Result<> GridMontageIO::writeDataObject(DataStructureWriter& dataStructureWriter { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/GridMontageIO.hpp b/src/simplnx/DataStructure/IO/HDF5/GridMontageIO.hpp similarity index 92% rename from src/complex/DataStructure/IO/HDF5/GridMontageIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/GridMontageIO.hpp index 922a5529ff..51e3ba2388 100644 --- a/src/complex/DataStructure/IO/HDF5/GridMontageIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/GridMontageIO.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/BaseGroupIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp" -namespace complex +namespace nx::core { class GridMontage; @@ -11,7 +11,7 @@ namespace HDF5 /** * @brief The GridMontageIO class serves as a reader and writer for GridMontages using HDF5. */ -class COMPLEX_EXPORT GridMontageIO : public BaseGroupIO +class SIMPLNX_EXPORT GridMontageIO : public BaseGroupIO { public: using data_type = GridMontage; @@ -61,4 +61,4 @@ class COMPLEX_EXPORT GridMontageIO : public BaseGroupIO GridMontageIO& operator=(GridMontageIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/HexahedralGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.cpp similarity index 89% rename from src/complex/DataStructure/IO/HDF5/HexahedralGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.cpp index 34e29de36e..f515a67b48 100644 --- a/src/complex/DataStructure/IO/HDF5/HexahedralGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.cpp @@ -1,11 +1,11 @@ #include "HexahedralGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/HexahedralGeom.hpp" +#include "simplnx/DataStructure/Geometry/HexahedralGeom.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { HexahedralGeomIO::HexahedralGeomIO() = default; HexahedralGeomIO::~HexahedralGeomIO() noexcept = default; @@ -36,4 +36,4 @@ Result<> HexahedralGeomIO::writeDataObject(DataStructureWriter& dataStructureWri { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/HexahedralGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/HexahedralGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.hpp index a518740775..c72cae453e 100644 --- a/src/complex/DataStructure/IO/HDF5/HexahedralGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/HexahedralGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/INodeGeom3dIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.hpp" -namespace complex +namespace nx::core { class HexahedralGeom; namespace HDF5 { -class COMPLEX_EXPORT HexahedralGeomIO : public INodeGeom3dIO +class SIMPLNX_EXPORT HexahedralGeomIO : public INodeGeom3dIO { public: using data_type = HexahedralGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT HexahedralGeomIO : public INodeGeom3dIO HexahedralGeomIO& operator=(HexahedralGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/IDataIO.cpp b/src/simplnx/DataStructure/IO/HDF5/IDataIO.cpp similarity index 90% rename from src/complex/DataStructure/IO/HDF5/IDataIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/IDataIO.cpp index cd106b9276..54aa4f320e 100644 --- a/src/complex/DataStructure/IO/HDF5/IDataIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/IDataIO.cpp @@ -1,13 +1,13 @@ #include "IDataIO.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp" #include "fmt/format.h" -namespace complex::HDF5 +namespace nx::core::HDF5 { IDataIO::IDataIO() = default; IDataIO::~IDataIO() noexcept = default; @@ -77,4 +77,4 @@ Result<> IDataIO::WriteObjectAttributes(DataStructureWriter& dataStructureWriter return {}; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/IDataIO.hpp b/src/simplnx/DataStructure/IO/HDF5/IDataIO.hpp similarity index 80% rename from src/complex/DataStructure/IO/HDF5/IDataIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/IDataIO.hpp index a56d724b32..f7c23895e3 100644 --- a/src/complex/DataStructure/IO/HDF5/IDataIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/IDataIO.hpp @@ -1,25 +1,25 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/IO/Generic/IDataFactory.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/IO/Generic/IDataFactory.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" -namespace complex +namespace nx::core { namespace HDF5 { class DataStructureReader; class DataStructureWriter; -class COMPLEX_EXPORT IDataIO : public complex::IDataFactory +class SIMPLNX_EXPORT IDataIO : public nx::core::IDataFactory { public: - using group_reader_type = complex::HDF5::GroupReader; - using group_writer_type = complex::HDF5::GroupWriter; - using object_writer_type = complex::HDF5::ObjectWriter; - using object_reader_type = complex::HDF5::ObjectReader; + using group_reader_type = nx::core::HDF5::GroupReader; + using group_writer_type = nx::core::HDF5::GroupWriter; + using object_writer_type = nx::core::HDF5::ObjectWriter; + using object_reader_type = nx::core::HDF5::ObjectReader; virtual ~IDataIO() noexcept; @@ -73,4 +73,4 @@ class COMPLEX_EXPORT IDataIO : public complex::IDataFactory } }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.cpp b/src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.cpp new file mode 100644 index 0000000000..c645d57c7a --- /dev/null +++ b/src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.cpp @@ -0,0 +1,31 @@ +#include "IDataStoreIO.hpp" + +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" + +#include "simplnx/Utilities/Parsing/HDF5/H5Support.hpp" + +#include "simplnx/Common/Types.hpp" + +#include + +using namespace nx::core; + +typename nx::core::IDataStore::ShapeType nx::core::HDF5::IDataStoreIO::ReadTupleShape(const nx::core::HDF5::DatasetReader& datasetReader) +{ + nx::core::HDF5::AttributeReader tupleShapeAttribute = datasetReader.getAttribute(IOConstants::k_TupleShapeTag); + if(!tupleShapeAttribute.isValid()) + { + throw std::runtime_error(fmt::format("Error reading Tuple Shape from HDF5 at {}/{}", nx::core::HDF5::Support::GetObjectPath(datasetReader.getParentId()), datasetReader.getName())); + } + return tupleShapeAttribute.readAsVector(); +} + +typename nx::core::IDataStore::ShapeType nx::core::HDF5::IDataStoreIO::ReadComponentShape(const nx::core::HDF5::DatasetReader& datasetReader) +{ + nx::core::HDF5::AttributeReader componentShapeAttribute = datasetReader.getAttribute(IOConstants::k_ComponentShapeTag); + if(!componentShapeAttribute.isValid()) + { + throw std::runtime_error(fmt::format("Error reading Component Shape from HDF5 at {}/{}", nx::core::HDF5::Support::GetObjectPath(datasetReader.getParentId()), datasetReader.getName())); + } + return componentShapeAttribute.readAsVector(); +} diff --git a/src/complex/DataStructure/IO/HDF5/IDataStoreIO.hpp b/src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.hpp similarity index 57% rename from src/complex/DataStructure/IO/HDF5/IDataStoreIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.hpp index c50200cd94..9210dec616 100644 --- a/src/complex/DataStructure/IO/HDF5/IDataStoreIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/IDataStoreIO.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/DataStructure/IDataStore.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/DatasetReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/DatasetReader.hpp" -namespace complex +namespace nx::core { namespace HDF5 { @@ -16,7 +16,7 @@ namespace IDataStoreIO * @param datasetReader * @return Result<> */ -typename IDataStore::ShapeType COMPLEX_EXPORT ReadTupleShape(const complex::HDF5::DatasetReader& datasetReader); +typename IDataStore::ShapeType SIMPLNX_EXPORT ReadTupleShape(const nx::core::HDF5::DatasetReader& datasetReader); /** * @brief Attempts to read the DataStore component shape from HDF5. @@ -24,7 +24,7 @@ typename IDataStore::ShapeType COMPLEX_EXPORT ReadTupleShape(const complex::HDF5 * @param datasetReader * @return Result<> */ -typename IDataStore::ShapeType COMPLEX_EXPORT ReadComponentShape(const complex::HDF5::DatasetReader& datasetReader); +typename IDataStore::ShapeType SIMPLNX_EXPORT ReadComponentShape(const nx::core::HDF5::DatasetReader& datasetReader); } // namespace IDataStoreIO } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/IGeometryIO.cpp b/src/simplnx/DataStructure/IO/HDF5/IGeometryIO.cpp similarity index 82% rename from src/complex/DataStructure/IO/HDF5/IGeometryIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/IGeometryIO.cpp index a04e999fde..922845eb17 100644 --- a/src/complex/DataStructure/IO/HDF5/IGeometryIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/IGeometryIO.cpp @@ -1,10 +1,10 @@ #include "IGeometryIO.hpp" #include "DataStructureWriter.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { IGeometryIO::IGeometryIO() = default; IGeometryIO::~IGeometryIO() noexcept = default; @@ -25,7 +25,7 @@ Result<> IGeometryIO::ReadGeometryData(DataStructureReader& dataStructureReader, } Result<> IGeometryIO::WriteGeometryData(DataStructureWriter& dataStructureWriter, const IGeometry& geometry, group_writer_type& parentGroup, bool importable) { - complex::HDF5::GroupWriter groupWriter = parentGroup.createGroupWriter(geometry.getName()); + nx::core::HDF5::GroupWriter groupWriter = parentGroup.createGroupWriter(geometry.getName()); Result<> result = WriteDataId(groupWriter, geometry.getElementSizesId(), IOConstants::k_ElementSizesTag); if(result.invalid()) { @@ -35,4 +35,4 @@ Result<> IGeometryIO::WriteGeometryData(DataStructureWriter& dataStructureWriter return BaseGroupIO::WriteBaseGroupData(dataStructureWriter, geometry, parentGroup, importable); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/IGeometryIO.hpp b/src/simplnx/DataStructure/IO/HDF5/IGeometryIO.hpp similarity index 85% rename from src/complex/DataStructure/IO/HDF5/IGeometryIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/IGeometryIO.hpp index 119cd832d2..9aab08cf63 100644 --- a/src/complex/DataStructure/IO/HDF5/IGeometryIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/IGeometryIO.hpp @@ -1,18 +1,18 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/BaseGroupIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/BaseGroupIO.hpp" -namespace complex +namespace nx::core { class IGeometry; namespace HDF5 { /** - * @brief Base class for complex geometry IO using HDF5 + * @brief Base class for simplnx geometry IO using HDF5 */ -class COMPLEX_EXPORT IGeometryIO : public BaseGroupIO +class SIMPLNX_EXPORT IGeometryIO : public BaseGroupIO { public: IGeometryIO(); @@ -51,4 +51,4 @@ class COMPLEX_EXPORT IGeometryIO : public BaseGroupIO static Result<> WriteGeometryData(DataStructureWriter& dataStructureWriter, const IGeometry& geometry, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/IGridGeometryIO.cpp b/src/simplnx/DataStructure/IO/HDF5/IGridGeometryIO.cpp similarity index 83% rename from src/complex/DataStructure/IO/HDF5/IGridGeometryIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/IGridGeometryIO.cpp index 2107d4a6c2..5126b07728 100644 --- a/src/complex/DataStructure/IO/HDF5/IGridGeometryIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/IGridGeometryIO.cpp @@ -1,10 +1,10 @@ #include "IGridGeometryIO.hpp" #include "DataStructureWriter.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { IGridGeometryIO::IGridGeometryIO() = default; IGridGeometryIO::~IGridGeometryIO() noexcept = default; @@ -33,8 +33,8 @@ Result<> IGridGeometryIO::WriteGridGeometryData(DataStructureWriter& dataStructu return result; } - complex::HDF5::GroupWriter groupWriter = parentGroup.createGroupWriter(geometry.getName()); + nx::core::HDF5::GroupWriter groupWriter = parentGroup.createGroupWriter(geometry.getName()); Result<> writeResult = WriteDataId(groupWriter, geometry.getCellDataId(), IOConstants::k_CellDataTag); return writeResult; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/IGridGeometryIO.hpp b/src/simplnx/DataStructure/IO/HDF5/IGridGeometryIO.hpp similarity index 87% rename from src/complex/DataStructure/IO/HDF5/IGridGeometryIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/IGridGeometryIO.hpp index 83880e2041..bb151a3487 100644 --- a/src/complex/DataStructure/IO/HDF5/IGridGeometryIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/IGridGeometryIO.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/IGeometryIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/IGeometryIO.hpp" -namespace complex +namespace nx::core { class IGridGeometry; namespace HDF5 { -class COMPLEX_EXPORT IGridGeometryIO : public IGeometryIO +class SIMPLNX_EXPORT IGridGeometryIO : public IGeometryIO { public: IGridGeometryIO(); @@ -47,4 +47,4 @@ class COMPLEX_EXPORT IGridGeometryIO : public IGeometryIO static Result<> WriteGridGeometryData(DataStructureWriter& dataStructureWriter, const IGridGeometry& geometry, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom0dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.cpp similarity index 83% rename from src/complex/DataStructure/IO/HDF5/INodeGeom0dIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.cpp index c3552084ff..27233ee551 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom0dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.cpp @@ -1,10 +1,10 @@ #include "INodeGeom0dIO.hpp" #include "DataStructureWriter.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry0D.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { INodeGeom0dIO::INodeGeom0dIO() = default; INodeGeom0dIO::~INodeGeom0dIO() noexcept = default; @@ -33,7 +33,7 @@ Result<> INodeGeom0dIO::WriteNodeGeom0dData(DataStructureWriter& dataStructureWr return result; } - complex::HDF5::GroupWriter groupWriter = parentGroupWriter.createGroupWriter(geometry.getName()); + nx::core::HDF5::GroupWriter groupWriter = parentGroupWriter.createGroupWriter(geometry.getName()); DataObject::OptionalId vertexListId = geometry.getVertexListId(); @@ -52,7 +52,7 @@ Result<> INodeGeom0dIO::WriteNodeGeom0dData(DataStructureWriter& dataStructureWr { indices[i] = i; } - result = datasetWriter.writeSpan(complex::HDF5::DatasetWriter::DimsType{numVerts, 1}, nonstd::span{indices}); + result = datasetWriter.writeSpan(nx::core::HDF5::DatasetWriter::DimsType{numVerts, 1}, nonstd::span{indices}); if(result.invalid()) { std::string ss = "Failed to write indices to dataset"; @@ -68,4 +68,4 @@ Result<> INodeGeom0dIO::WriteNodeGeom0dData(DataStructureWriter& dataStructureWr return {}; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom0dIO.hpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.hpp similarity index 87% rename from src/complex/DataStructure/IO/HDF5/INodeGeom0dIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.hpp index 824209a25d..0ea3e51dad 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom0dIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/IGeometryIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/IGeometryIO.hpp" -namespace complex +namespace nx::core { class INodeGeometry0D; namespace HDF5 { -class COMPLEX_EXPORT INodeGeom0dIO : public IGeometryIO +class SIMPLNX_EXPORT INodeGeom0dIO : public IGeometryIO { public: INodeGeom0dIO(); @@ -47,4 +47,4 @@ class COMPLEX_EXPORT INodeGeom0dIO : public IGeometryIO static Result<> WriteNodeGeom0dData(DataStructureWriter& dataStructureWriter, const INodeGeometry0D& geometry, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom1dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.cpp similarity index 89% rename from src/complex/DataStructure/IO/HDF5/INodeGeom1dIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.cpp index ddfd0959c9..e97fee4093 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom1dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.cpp @@ -1,10 +1,10 @@ #include "INodeGeom1dIO.hpp" #include "DataStructureWriter.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry1D.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry1D.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { INodeGeom1dIO::INodeGeom1dIO() = default; INodeGeom1dIO::~INodeGeom1dIO() noexcept = default; @@ -36,7 +36,7 @@ Result<> INodeGeom1dIO::WriteNodeGeom1dData(DataStructureWriter& dataStructureWr return result; } - complex::HDF5::GroupWriter groupWriter = parentGroupWriter.createGroupWriter(geometry.getName()); + nx::core::HDF5::GroupWriter groupWriter = parentGroupWriter.createGroupWriter(geometry.getName()); result = WriteDataId(groupWriter, geometry.getEdgeListId(), IOConstants::k_EdgeListTag); if(result.invalid()) { @@ -69,4 +69,4 @@ Result<> INodeGeom1dIO::WriteNodeGeom1dData(DataStructureWriter& dataStructureWr return {}; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom1dIO.hpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.hpp similarity index 87% rename from src/complex/DataStructure/IO/HDF5/INodeGeom1dIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.hpp index 713ceaa8a3..81060df615 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom1dIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/INodeGeom0dIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.hpp" -namespace complex +namespace nx::core { class INodeGeometry1D; namespace HDF5 { -class COMPLEX_EXPORT INodeGeom1dIO : public INodeGeom0dIO +class SIMPLNX_EXPORT INodeGeom1dIO : public INodeGeom0dIO { public: INodeGeom1dIO(); @@ -47,4 +47,4 @@ class COMPLEX_EXPORT INodeGeom1dIO : public INodeGeom0dIO static Result<> WriteNodeGeom1dData(DataStructureWriter& dataStructureWriter, const INodeGeometry1D& geometry, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom2dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp similarity index 86% rename from src/complex/DataStructure/IO/HDF5/INodeGeom2dIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp index 1a4a1cf718..c52943e2fd 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom2dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.cpp @@ -1,10 +1,10 @@ #include "INodeGeom2dIO.hpp" #include "DataStructureWriter.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry2D.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { INodeGeom2dIO::INodeGeom2dIO() = default; INodeGeom2dIO::~INodeGeom2dIO() noexcept = default; @@ -34,7 +34,7 @@ Result<> INodeGeom2dIO::WriteNodeGeom2dData(DataStructureWriter& dataStructureWr return result; } - complex::HDF5::GroupWriter groupWriter = parentGroupWriter.createGroupWriter(geometry.getName()); + nx::core::HDF5::GroupWriter groupWriter = parentGroupWriter.createGroupWriter(geometry.getName()); result = WriteDataId(groupWriter, geometry.getFaceListId(), IOConstants::k_FaceListTag); if(result.invalid()) { @@ -55,4 +55,4 @@ Result<> INodeGeom2dIO::WriteNodeGeom2dData(DataStructureWriter& dataStructureWr return {}; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom2dIO.hpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.hpp similarity index 87% rename from src/complex/DataStructure/IO/HDF5/INodeGeom2dIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.hpp index 13522417a2..5d9ad17f2f 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom2dIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/INodeGeom1dIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom1dIO.hpp" -namespace complex +namespace nx::core { class INodeGeometry2D; namespace HDF5 { -class COMPLEX_EXPORT INodeGeom2dIO : public INodeGeom1dIO +class SIMPLNX_EXPORT INodeGeom2dIO : public INodeGeom1dIO { public: INodeGeom2dIO(); @@ -47,4 +47,4 @@ class COMPLEX_EXPORT INodeGeom2dIO : public INodeGeom1dIO static Result<> WriteNodeGeom2dData(DataStructureWriter& dataStructureWriter, const INodeGeometry2D& geometry, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom3dIO.cpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/INodeGeom3dIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp index 7cce8b789c..dd943c64d0 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom3dIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.cpp @@ -1,10 +1,10 @@ #include "INodeGeom3dIO.hpp" #include "DataStructureWriter.hpp" -#include "complex/DataStructure/Geometry/INodeGeometry3D.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry3D.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { INodeGeom3dIO::INodeGeom3dIO() = default; INodeGeom3dIO::~INodeGeom3dIO() noexcept = default; @@ -55,4 +55,4 @@ Result<> INodeGeom3dIO::WriteNodeGeom3dData(DataStructureWriter& dataStructureWr return {}; } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/INodeGeom3dIO.hpp b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.hpp similarity index 87% rename from src/complex/DataStructure/IO/HDF5/INodeGeom3dIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.hpp index 5c4ffd8748..da0acee2a4 100644 --- a/src/complex/DataStructure/IO/HDF5/INodeGeom3dIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/INodeGeom2dIO.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.hpp" -namespace complex +namespace nx::core { class INodeGeometry3D; namespace HDF5 { -class COMPLEX_EXPORT INodeGeom3dIO : public INodeGeom2dIO +class SIMPLNX_EXPORT INodeGeom3dIO : public INodeGeom2dIO { public: INodeGeom3dIO(); @@ -47,4 +47,4 @@ class COMPLEX_EXPORT INodeGeom3dIO : public INodeGeom2dIO static Result<> WriteNodeGeom3dData(DataStructureWriter& dataStructureWriter, const INodeGeometry3D& geometry, group_writer_type& parentGroup, bool importable); }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/IOUtilities.cpp b/src/simplnx/DataStructure/IO/HDF5/IOUtilities.cpp similarity index 69% rename from src/complex/DataStructure/IO/HDF5/IOUtilities.cpp rename to src/simplnx/DataStructure/IO/HDF5/IOUtilities.cpp index 3216f0a59a..d58816ac78 100644 --- a/src/complex/DataStructure/IO/HDF5/IOUtilities.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/IOUtilities.cpp @@ -1,22 +1,22 @@ #include "IOUtilities.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataMap.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureReader.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataMap.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureReader.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/ObjectWriter.hpp" #include "fmt/format.h" -namespace complex +namespace nx::core { -Result<> HDF5::WriteObjectAttributes(DataStructureWriter& dataStructureWriter, complex::HDF5::ObjectWriter& objectWriter, const DataObject* dataObject, bool importable) +Result<> HDF5::WriteObjectAttributes(DataStructureWriter& dataStructureWriter, nx::core::HDF5::ObjectWriter& objectWriter, const DataObject* dataObject, bool importable) { // Add to DataStructureWriter for use in linking dataStructureWriter.addWriter(objectWriter, dataObject->getId()); @@ -48,12 +48,12 @@ Result<> HDF5::WriteObjectAttributes(DataStructureWriter& dataStructureWriter, c return {}; } -Result<> HDF5::ReadBaseGroup(DataStructureReader& dataStructureReader, const complex::HDF5::GroupReader& groupReader, BaseGroup* baseGroup, bool useEmptyDataStores) +Result<> HDF5::ReadBaseGroup(DataStructureReader& dataStructureReader, const nx::core::HDF5::GroupReader& groupReader, BaseGroup* baseGroup, bool useEmptyDataStores) { return ReadDataMap(dataStructureReader, baseGroup->getDataMap(), groupReader, baseGroup->getId(), useEmptyDataStores); } -Result<> HDF5::ReadDataMap(DataStructureReader& dataStructureReader, DataMap& dataMap, const complex::HDF5::GroupReader& groupReader, DataObject::IdType parentId, bool useEmptyDataStore) +Result<> HDF5::ReadDataMap(DataStructureReader& dataStructureReader, DataMap& dataMap, const nx::core::HDF5::GroupReader& groupReader, DataObject::IdType parentId, bool useEmptyDataStore) { auto childrenNames = groupReader.getChildNames(); if(childrenNames.empty()) @@ -72,7 +72,7 @@ Result<> HDF5::ReadDataMap(DataStructureReader& dataStructureReader, DataMap& da return {}; } -Result<> HDF5::WriteBaseGroup(DataStructureWriter& dataStructureWriter, complex::HDF5::GroupWriter& parentGroupWriter, const BaseGroup* baseGroup, bool importable) +Result<> HDF5::WriteBaseGroup(DataStructureWriter& dataStructureWriter, nx::core::HDF5::GroupWriter& parentGroupWriter, const BaseGroup* baseGroup, bool importable) { auto groupWriter = parentGroupWriter.createGroupWriter(baseGroup->getName()); Result<> error = WriteObjectAttributes(dataStructureWriter, groupWriter, baseGroup, importable); @@ -84,7 +84,7 @@ Result<> HDF5::WriteBaseGroup(DataStructureWriter& dataStructureWriter, complex: return WriteDataMap(dataStructureWriter, groupWriter, baseGroup->getDataMap()); } -Result<> HDF5::WriteDataMap(DataStructureWriter& dataStructureWriter, complex::HDF5::GroupWriter& h5Group, const DataMap& dataMap) +Result<> HDF5::WriteDataMap(DataStructureWriter& dataStructureWriter, nx::core::HDF5::GroupWriter& h5Group, const DataMap& dataMap) { for(const auto& [id, dataObject] : dataMap) { @@ -96,4 +96,4 @@ Result<> HDF5::WriteDataMap(DataStructureWriter& dataStructureWriter, complex::H } return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/IOUtilities.hpp b/src/simplnx/DataStructure/IO/HDF5/IOUtilities.hpp similarity index 76% rename from src/complex/DataStructure/IO/HDF5/IOUtilities.hpp rename to src/simplnx/DataStructure/IO/HDF5/IOUtilities.hpp index 8e8e56f610..0354decc3f 100644 --- a/src/complex/DataStructure/IO/HDF5/IOUtilities.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/IOUtilities.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/simplnx_export.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" -namespace complex +namespace nx::core { class BaseGroup; class DataMap; @@ -31,7 +31,7 @@ class ObjectWriter; * @param importable * @return Result<> */ -Result<> COMPLEX_EXPORT WriteObjectAttributes(DataStructureWriter& dataStructureWriter, ObjectWriter& objectWriter, const DataObject* dataObject, bool importable); +Result<> SIMPLNX_EXPORT WriteObjectAttributes(DataStructureWriter& dataStructureWriter, ObjectWriter& objectWriter, const DataObject* dataObject, bool importable); /** * @brief Attempts to read the DataMap from HDF5. @@ -43,7 +43,7 @@ Result<> COMPLEX_EXPORT WriteObjectAttributes(DataStructureWriter& dataStructure * @param useEmptyDataStore = false * @return Result<> */ -Result<> COMPLEX_EXPORT ReadDataMap(DataStructureReader& dataStructureReader, DataMap& dataMap, const GroupReader& parentGroup, DataObject::IdType parentId, bool useEmptyDataStore = false); +Result<> SIMPLNX_EXPORT ReadDataMap(DataStructureReader& dataStructureReader, DataMap& dataMap, const GroupReader& parentGroup, DataObject::IdType parentId, bool useEmptyDataStore = false); /** * @brief Attempts to read the BaseGroup from HDF5. @@ -54,7 +54,7 @@ Result<> COMPLEX_EXPORT ReadDataMap(DataStructureReader& dataStructureReader, Da * @param useEmptyDataStore = false * @return Result<> */ -Result<> COMPLEX_EXPORT ReadBaseGroup(DataStructureReader& dataStructureReader, const GroupReader& groupReader, BaseGroup* baseGroup, bool useEmptyDataStore = false); +Result<> SIMPLNX_EXPORT ReadBaseGroup(DataStructureReader& dataStructureReader, const GroupReader& groupReader, BaseGroup* baseGroup, bool useEmptyDataStore = false); /** * @brief Attempts to write the BaseGroup to HDF5. @@ -65,7 +65,7 @@ Result<> COMPLEX_EXPORT ReadBaseGroup(DataStructureReader& dataStructureReader, * @param importable = true * @return Result<> */ -Result<> COMPLEX_EXPORT WriteBaseGroup(DataStructureWriter& dataStructureWriter, GroupWriter& groupWriter, const BaseGroup* dataMap, bool importable = true); +Result<> SIMPLNX_EXPORT WriteBaseGroup(DataStructureWriter& dataStructureWriter, GroupWriter& groupWriter, const BaseGroup* dataMap, bool importable = true); /** * @brief Attempts to write the DataMap to HDF5. @@ -75,6 +75,6 @@ Result<> COMPLEX_EXPORT WriteBaseGroup(DataStructureWriter& dataStructureWriter, * @param dataMap * @return Result<> */ -Result<> COMPLEX_EXPORT WriteDataMap(DataStructureWriter& dataStructureWriter, GroupWriter& groupWriter, const DataMap& dataMap); +Result<> SIMPLNX_EXPORT WriteDataMap(DataStructureWriter& dataStructureWriter, GroupWriter& groupWriter, const DataMap& dataMap); } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/ImageGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/ImageGeomIO.cpp similarity index 89% rename from src/complex/DataStructure/IO/HDF5/ImageGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/ImageGeomIO.cpp index cd19ad899d..ee761e4892 100644 --- a/src/complex/DataStructure/IO/HDF5/ImageGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/ImageGeomIO.cpp @@ -1,19 +1,19 @@ #include "ImageGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/Common/Array.hpp" -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/DataStructure/IO/HDF5/DataArrayIO.hpp" -#include "complex/DataStructure/IO/HDF5/IOUtilities.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataArrayIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IOUtilities.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/AttributeWriter.hpp" #include "fmt/format.h" -using namespace complex; +using namespace nx::core; namespace { @@ -27,7 +27,7 @@ constexpr StringLiteral k_ReadingSpacingError_Message = "Error opening HDF5 spac constexpr StringLiteral k_ReadingOriginError_Message = "Error opening HDF5 origin attribute while reading ImageGeom"; } // namespace -namespace complex::HDF5 +namespace nx::core::HDF5 { ImageGeomIO::ImageGeomIO() = default; ImageGeomIO::~ImageGeomIO() noexcept = default; @@ -105,7 +105,7 @@ Result<> ImageGeomIO::writeData(DataStructureWriter& dataStructureWriter, const SizeVec3 volDims = geometry.getDimensions(); FloatVec3 spacing = geometry.getSpacing(); FloatVec3 origin = geometry.getOrigin(); - complex::HDF5::AttributeWriter::DimsVector dims = {3}; + nx::core::HDF5::AttributeWriter::DimsVector dims = {3}; std::vector volDimsVector(3); std::vector spacingVector(3); std::vector originVector(3); @@ -144,4 +144,4 @@ Result<> ImageGeomIO::writeDataObject(DataStructureWriter& dataStructureWriter, { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/ImageGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/ImageGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/ImageGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/ImageGeomIO.hpp index 6b5f94bef8..e7633ffb24 100644 --- a/src/complex/DataStructure/IO/HDF5/ImageGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/ImageGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/IGridGeometryIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IGridGeometryIO.hpp" -namespace complex +namespace nx::core { class ImageGeom; namespace HDF5 { -class COMPLEX_EXPORT ImageGeomIO : public IGridGeometryIO +class SIMPLNX_EXPORT ImageGeomIO : public IGridGeometryIO { public: using data_type = ImageGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT ImageGeomIO : public IGridGeometryIO ImageGeomIO& operator=(ImageGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/NeighborListIO.hpp b/src/simplnx/DataStructure/IO/HDF5/NeighborListIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/NeighborListIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/NeighborListIO.hpp index 2bfb0bddbc..fe203ead39 100644 --- a/src/complex/DataStructure/IO/HDF5/NeighborListIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/NeighborListIO.hpp @@ -1,16 +1,16 @@ #pragma once #include "DataStructureReader.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/IO/HDF5/DataArrayIO.hpp" -#include "complex/DataStructure/IO/HDF5/DataStoreIO.hpp" -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" -#include "complex/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataArrayIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStoreIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" #include -namespace complex +namespace nx::core { namespace HDF5 { @@ -31,7 +31,7 @@ class NeighborListIO : public IDataIO * @param dataReader * @return Result<> */ - static std::vector ReadHdf5Data(const complex::HDF5::GroupReader& parentGroup, const complex::HDF5::DatasetReader& dataReader) + static std::vector ReadHdf5Data(const nx::core::HDF5::GroupReader& parentGroup, const nx::core::HDF5::DatasetReader& dataReader) { auto numNeighborsAttributeName = dataReader.getAttribute("Linked NumNeighbors Dataset"); auto numNeighborsName = numNeighborsAttributeName.readAsString(); @@ -44,7 +44,7 @@ class NeighborListIO : public IDataIO std::vector flatDataStore = dataReader.template readAsVector(); if(flatDataStore.empty()) { - throw std::runtime_error(fmt::format("Error reading neighbor list from DataStore from HDF5 at {}/{}", complex::HDF5::Support::GetObjectPath(dataReader.getParentId()), dataReader.getName())); + throw std::runtime_error(fmt::format("Error reading neighbor list from DataStore from HDF5 at {}/{}", nx::core::HDF5::Support::GetObjectPath(dataReader.getParentId()), dataReader.getName())); } std::vector dataVector; @@ -200,4 +200,4 @@ using UInt64NeighborIO = NeighborListIO; using Float32NeighborIO = NeighborListIO; using Float64NeighborIO = NeighborListIO; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/QuadGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/QuadGeomIO.cpp similarity index 88% rename from src/complex/DataStructure/IO/HDF5/QuadGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/QuadGeomIO.cpp index 0f5a708295..170077621e 100644 --- a/src/complex/DataStructure/IO/HDF5/QuadGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/QuadGeomIO.cpp @@ -1,11 +1,11 @@ #include "QuadGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/QuadGeom.hpp" +#include "simplnx/DataStructure/Geometry/QuadGeom.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { QuadGeomIO::QuadGeomIO() = default; QuadGeomIO::~QuadGeomIO() noexcept = default; @@ -35,4 +35,4 @@ Result<> QuadGeomIO::writeDataObject(DataStructureWriter& dataStructureWriter, c { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/QuadGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/QuadGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/QuadGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/QuadGeomIO.hpp index 12f85e8af0..65e1354164 100644 --- a/src/complex/DataStructure/IO/HDF5/QuadGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/QuadGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/INodeGeom2dIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom2dIO.hpp" -namespace complex +namespace nx::core { class QuadGeom; namespace HDF5 { -class COMPLEX_EXPORT QuadGeomIO : public INodeGeom2dIO +class SIMPLNX_EXPORT QuadGeomIO : public INodeGeom2dIO { public: using data_type = QuadGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT QuadGeomIO : public INodeGeom2dIO QuadGeomIO& operator=(QuadGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/RectGridGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/RectGridGeomIO.cpp similarity index 90% rename from src/complex/DataStructure/IO/HDF5/RectGridGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/RectGridGeomIO.cpp index 5075ae9436..a2c1c2f78f 100644 --- a/src/complex/DataStructure/IO/HDF5/RectGridGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/RectGridGeomIO.cpp @@ -1,15 +1,15 @@ #include "RectGridGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" #include "fmt/format.h" -namespace complex::HDF5 +namespace nx::core::HDF5 { RectGridGeomIO::RectGridGeomIO() = default; RectGridGeomIO::~RectGridGeomIO() noexcept = default; @@ -67,7 +67,7 @@ Result<> RectGridGeomIO::writeData(DataStructureWriter& dataStructureWriter, con // Write dimensions auto dimensions = geometry.getDimensions(); - complex::HDF5::AttributeWriter::DimsVector dims = {3}; + nx::core::HDF5::AttributeWriter::DimsVector dims = {3}; std::vector dimsVector(3); for(size_t i = 0; i < 3; i++) { @@ -108,4 +108,4 @@ Result<> RectGridGeomIO::writeDataObject(DataStructureWriter& dataStructureWrite { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/RectGridGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/RectGridGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/RectGridGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/RectGridGeomIO.hpp index 288fcd8f2b..c8ef339e62 100644 --- a/src/complex/DataStructure/IO/HDF5/RectGridGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/RectGridGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/IGridGeometryIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IGridGeometryIO.hpp" -namespace complex +namespace nx::core { class RectGridGeom; namespace HDF5 { -class COMPLEX_EXPORT RectGridGeomIO : public IGridGeometryIO +class SIMPLNX_EXPORT RectGridGeomIO : public IGridGeometryIO { public: using data_type = RectGridGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT RectGridGeomIO : public IGridGeometryIO RectGridGeomIO& operator=(RectGridGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/ScalarDataIO.hpp b/src/simplnx/DataStructure/IO/HDF5/ScalarDataIO.hpp similarity index 93% rename from src/complex/DataStructure/IO/HDF5/ScalarDataIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/ScalarDataIO.hpp index dee388b1ed..6fb01fad93 100644 --- a/src/complex/DataStructure/IO/HDF5/ScalarDataIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/ScalarDataIO.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" -#include "complex/DataStructure/ScalarData.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/DataStructure/ScalarData.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { template class ScalarDataIO : public IDataIO @@ -59,7 +59,7 @@ class ScalarDataIO : public IDataIO { auto datasetWriter = parentGroup.createDatasetWriter(scalarData.getName()); - complex::HDF5::DatasetWriter::DimsType dims = {1}; + nx::core::HDF5::DatasetWriter::DimsType dims = {1}; std::array dataVector = {scalarData.getValue()}; Result<> h5Result = datasetWriter.writeSpan(dims, nonstd::span{dataVector}); if(h5Result.invalid()) @@ -95,4 +95,4 @@ class ScalarDataIO : public IDataIO ScalarDataIO& operator=(const ScalarDataIO& rhs) = delete; ScalarDataIO& operator=(ScalarDataIO&& rhs) = delete; }; -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/StringArrayIO.cpp b/src/simplnx/DataStructure/IO/HDF5/StringArrayIO.cpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/StringArrayIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/StringArrayIO.cpp index b4d1758b42..01846d8993 100644 --- a/src/complex/DataStructure/IO/HDF5/StringArrayIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/StringArrayIO.cpp @@ -1,16 +1,16 @@ #include "StringArrayIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/StringArray.hpp" +#include "simplnx/DataStructure/StringArray.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" namespace { -constexpr complex::StringLiteral k_TupleDimsAttrName = "TupleDimensions"; +constexpr nx::core::StringLiteral k_TupleDimsAttrName = "TupleDimensions"; } -namespace complex::HDF5 +namespace nx::core::HDF5 { StringArrayIO::StringArrayIO() = default; StringArrayIO::~StringArrayIO() noexcept = default; @@ -83,4 +83,4 @@ Result<> StringArrayIO::writeDataObject(DataStructureWriter& dataStructureWriter { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/StringArrayIO.hpp b/src/simplnx/DataStructure/IO/HDF5/StringArrayIO.hpp similarity index 92% rename from src/complex/DataStructure/IO/HDF5/StringArrayIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/StringArrayIO.hpp index adaafc1605..cd2d1184c4 100644 --- a/src/complex/DataStructure/IO/HDF5/StringArrayIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/StringArrayIO.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/IDataIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/IDataIO.hpp" -namespace complex +namespace nx::core { class StringArray; @@ -11,7 +11,7 @@ namespace HDF5 /** * @brief The StringArrayIO class serves as a reader and writer between StringArrays and HDF5 */ -class COMPLEX_EXPORT StringArrayIO : public IDataIO +class SIMPLNX_EXPORT StringArrayIO : public IDataIO { public: using data_type = StringArray; @@ -61,4 +61,4 @@ class COMPLEX_EXPORT StringArrayIO : public IDataIO std::string getTypeName() const override; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp similarity index 82% rename from src/complex/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp index bcad3f1bc9..e2e4fc6f9f 100644 --- a/src/complex/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.cpp @@ -1,13 +1,13 @@ #include "TetrahedralGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/TetrahedralGeom.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/TetrahedralGeom.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -#include "complex/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Writers/GroupWriter.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { TetrahedralGeomIO::TetrahedralGeomIO() = default; TetrahedralGeomIO::~TetrahedralGeomIO() noexcept = default; @@ -37,4 +37,4 @@ Result<> TetrahedralGeomIO::writeDataObject(DataStructureWriter& dataStructureWr { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp index 44874eb5bd..d9027c8cec 100644 --- a/src/complex/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/TetrahedralGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/INodeGeom3dIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.hpp" -namespace complex +namespace nx::core { class TetrahedralGeom; namespace HDF5 { -class COMPLEX_EXPORT TetrahedralGeomIO : public INodeGeom3dIO +class SIMPLNX_EXPORT TetrahedralGeomIO : public INodeGeom3dIO { public: using data_type = TetrahedralGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT TetrahedralGeomIO : public INodeGeom3dIO TetrahedralGeomIO& operator=(TetrahedralGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex \ No newline at end of file +} // namespace nx::core \ No newline at end of file diff --git a/src/complex/DataStructure/IO/HDF5/TriangleGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/TriangleGeomIO.cpp similarity index 85% rename from src/complex/DataStructure/IO/HDF5/TriangleGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/TriangleGeomIO.cpp index 63b3a92da8..a68f363583 100644 --- a/src/complex/DataStructure/IO/HDF5/TriangleGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/TriangleGeomIO.cpp @@ -1,12 +1,12 @@ #include "TriangleGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/DataStructure/IO/Generic/IOConstants.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/IO/Generic/IOConstants.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { TriangleGeomIO::TriangleGeomIO() = default; TriangleGeomIO::~TriangleGeomIO() noexcept = default; @@ -36,4 +36,4 @@ Result<> TriangleGeomIO::writeDataObject(DataStructureWriter& dataStructureWrite { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/TriangleGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/TriangleGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/TriangleGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/TriangleGeomIO.hpp index fae843dbcd..5dbae01ecf 100644 --- a/src/complex/DataStructure/IO/HDF5/TriangleGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/TriangleGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/INodeGeom3dIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom3dIO.hpp" -namespace complex +namespace nx::core { class TriangleGeom; namespace HDF5 { -class COMPLEX_EXPORT TriangleGeomIO : public INodeGeom3dIO +class SIMPLNX_EXPORT TriangleGeomIO : public INodeGeom3dIO { public: using data_type = TriangleGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT TriangleGeomIO : public INodeGeom3dIO TriangleGeomIO& operator=(TriangleGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/IO/HDF5/VertexGeomIO.cpp b/src/simplnx/DataStructure/IO/HDF5/VertexGeomIO.cpp similarity index 88% rename from src/complex/DataStructure/IO/HDF5/VertexGeomIO.cpp rename to src/simplnx/DataStructure/IO/HDF5/VertexGeomIO.cpp index d801ce869d..f23c40f917 100644 --- a/src/complex/DataStructure/IO/HDF5/VertexGeomIO.cpp +++ b/src/simplnx/DataStructure/IO/HDF5/VertexGeomIO.cpp @@ -1,11 +1,11 @@ #include "VertexGeomIO.hpp" #include "DataStructureReader.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/GroupReader.hpp" -namespace complex::HDF5 +namespace nx::core::HDF5 { VertexGeomIO::VertexGeomIO() = default; VertexGeomIO::~VertexGeomIO() noexcept = default; @@ -35,4 +35,4 @@ Result<> VertexGeomIO::writeDataObject(DataStructureWriter& dataStructureWriter, { return WriteDataObjectImpl(this, dataStructureWriter, dataObject, parentWriter); } -} // namespace complex::HDF5 +} // namespace nx::core::HDF5 diff --git a/src/complex/DataStructure/IO/HDF5/VertexGeomIO.hpp b/src/simplnx/DataStructure/IO/HDF5/VertexGeomIO.hpp similarity index 91% rename from src/complex/DataStructure/IO/HDF5/VertexGeomIO.hpp rename to src/simplnx/DataStructure/IO/HDF5/VertexGeomIO.hpp index 7e897e8873..f6207f1c92 100644 --- a/src/complex/DataStructure/IO/HDF5/VertexGeomIO.hpp +++ b/src/simplnx/DataStructure/IO/HDF5/VertexGeomIO.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/DataStructure/IO/HDF5/INodeGeom0dIO.hpp" +#include "simplnx/DataStructure/IO/HDF5/INodeGeom0dIO.hpp" -namespace complex +namespace nx::core { class VertexGeom; namespace HDF5 { -class COMPLEX_EXPORT VertexGeomIO : public INodeGeom0dIO +class SIMPLNX_EXPORT VertexGeomIO : public INodeGeom0dIO { public: using data_type = VertexGeom; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT VertexGeomIO : public INodeGeom0dIO VertexGeomIO& operator=(VertexGeomIO&& rhs) = delete; }; } // namespace HDF5 -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/LinkedPath.cpp b/src/simplnx/DataStructure/LinkedPath.cpp similarity index 96% rename from src/complex/DataStructure/LinkedPath.cpp rename to src/simplnx/DataStructure/LinkedPath.cpp index b31d116e69..b55a24d248 100644 --- a/src/complex/DataStructure/LinkedPath.cpp +++ b/src/simplnx/DataStructure/LinkedPath.cpp @@ -1,9 +1,9 @@ -#include "complex/DataStructure/LinkedPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/LinkedPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" #include -using namespace complex; +using namespace nx::core; LinkedPath::LinkedPath() = default; diff --git a/src/complex/DataStructure/LinkedPath.hpp b/src/simplnx/DataStructure/LinkedPath.hpp similarity index 95% rename from src/complex/DataStructure/LinkedPath.hpp rename to src/simplnx/DataStructure/LinkedPath.hpp index b45362d9e6..78bfdd1a5d 100644 --- a/src/complex/DataStructure/LinkedPath.hpp +++ b/src/simplnx/DataStructure/LinkedPath.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** @@ -15,7 +15,7 @@ namespace complex * LinkedPath objects can be used to directly create a corresponding DataPath * or find the DataObject at any point along the path. */ -class COMPLEX_EXPORT LinkedPath +class SIMPLNX_EXPORT LinkedPath { public: friend class DataStructure; @@ -184,4 +184,4 @@ class COMPLEX_EXPORT LinkedPath const DataStructure* m_DataStructure = nullptr; std::vector m_IdPath; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Messaging/AbstractDataStructureMessage.cpp b/src/simplnx/DataStructure/Messaging/AbstractDataStructureMessage.cpp similarity index 96% rename from src/complex/DataStructure/Messaging/AbstractDataStructureMessage.cpp rename to src/simplnx/DataStructure/Messaging/AbstractDataStructureMessage.cpp index d3a7bc9e62..96e6a5c9f3 100644 --- a/src/complex/DataStructure/Messaging/AbstractDataStructureMessage.cpp +++ b/src/simplnx/DataStructure/Messaging/AbstractDataStructureMessage.cpp @@ -2,7 +2,7 @@ #include -using namespace complex; +using namespace nx::core; AbstractDataStructureMessage::AbstractDataStructureMessage(const DataStructure* dataStructure) : m_DataStructure(dataStructure) diff --git a/src/complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp b/src/simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp similarity index 87% rename from src/complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp rename to src/simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp index 6723ee8739..7092ef5fd3 100644 --- a/src/complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp +++ b/src/simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { class DataStructure; @@ -12,7 +12,7 @@ class DataStructure; * @brief The AbstractDataStructureMessage class is the base class for all * DataStructure messages emitted to observers. */ -class COMPLEX_EXPORT AbstractDataStructureMessage +class SIMPLNX_EXPORT AbstractDataStructureMessage { public: using MessageType = int32; @@ -53,4 +53,4 @@ class COMPLEX_EXPORT AbstractDataStructureMessage private: const DataStructure* m_DataStructure = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Messaging/DataAddedMessage.cpp b/src/simplnx/DataStructure/Messaging/DataAddedMessage.cpp similarity index 92% rename from src/complex/DataStructure/Messaging/DataAddedMessage.cpp rename to src/simplnx/DataStructure/Messaging/DataAddedMessage.cpp index a7d535c8c6..44f46cde29 100644 --- a/src/complex/DataStructure/Messaging/DataAddedMessage.cpp +++ b/src/simplnx/DataStructure/Messaging/DataAddedMessage.cpp @@ -1,8 +1,8 @@ #include "DataAddedMessage.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" -using namespace complex; +using namespace nx::core; DataAddedMessage::DataAddedMessage(const DataStructure* dataStructure, DataObject::IdType addedId) : AbstractDataStructureMessage(dataStructure) diff --git a/src/complex/DataStructure/Messaging/DataAddedMessage.hpp b/src/simplnx/DataStructure/Messaging/DataAddedMessage.hpp similarity index 83% rename from src/complex/DataStructure/Messaging/DataAddedMessage.hpp rename to src/simplnx/DataStructure/Messaging/DataAddedMessage.hpp index c3d0676a8a..c6549d4190 100644 --- a/src/complex/DataStructure/Messaging/DataAddedMessage.hpp +++ b/src/simplnx/DataStructure/Messaging/DataAddedMessage.hpp @@ -2,12 +2,12 @@ #include -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** @@ -17,7 +17,7 @@ namespace complex * The message can be used to retrieve the DataObject in question and all * DataPaths to the created object. */ -class COMPLEX_EXPORT DataAddedMessage : public AbstractDataStructureMessage +class SIMPLNX_EXPORT DataAddedMessage : public AbstractDataStructureMessage { public: static const MessageType MsgType = 1; @@ -71,4 +71,4 @@ class COMPLEX_EXPORT DataAddedMessage : public AbstractDataStructureMessage private: DataObject::IdType m_Id; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Messaging/DataRemovedMessage.cpp b/src/simplnx/DataStructure/Messaging/DataRemovedMessage.cpp similarity index 97% rename from src/complex/DataStructure/Messaging/DataRemovedMessage.cpp rename to src/simplnx/DataStructure/Messaging/DataRemovedMessage.cpp index 195d1ca936..d633a30d6d 100644 --- a/src/complex/DataStructure/Messaging/DataRemovedMessage.cpp +++ b/src/simplnx/DataStructure/Messaging/DataRemovedMessage.cpp @@ -1,6 +1,6 @@ #include "DataRemovedMessage.hpp" -using namespace complex; +using namespace nx::core; DataRemovedMessage::DataRemovedMessage(const DataStructure* dataStructure, DataObject::IdType identifier, const std::string& name) : AbstractDataStructureMessage(dataStructure) diff --git a/src/complex/DataStructure/Messaging/DataRemovedMessage.hpp b/src/simplnx/DataStructure/Messaging/DataRemovedMessage.hpp similarity index 84% rename from src/complex/DataStructure/Messaging/DataRemovedMessage.hpp rename to src/simplnx/DataStructure/Messaging/DataRemovedMessage.hpp index cd33370e3d..12d95d1ef4 100644 --- a/src/complex/DataStructure/Messaging/DataRemovedMessage.hpp +++ b/src/simplnx/DataStructure/Messaging/DataRemovedMessage.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** @@ -16,7 +16,7 @@ namespace complex * available because parent information is not available when a DataObject is * being deleted. */ -class COMPLEX_EXPORT DataRemovedMessage : public AbstractDataStructureMessage +class SIMPLNX_EXPORT DataRemovedMessage : public AbstractDataStructureMessage { public: static const MessageType MsgType = 2; @@ -68,4 +68,4 @@ class COMPLEX_EXPORT DataRemovedMessage : public AbstractDataStructureMessage std::string m_Name; DataObject::IdType m_Id; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Messaging/DataRenamedMessage.cpp b/src/simplnx/DataStructure/Messaging/DataRenamedMessage.cpp similarity index 94% rename from src/complex/DataStructure/Messaging/DataRenamedMessage.cpp rename to src/simplnx/DataStructure/Messaging/DataRenamedMessage.cpp index 21cf9a112c..2467b78caf 100644 --- a/src/complex/DataStructure/Messaging/DataRenamedMessage.cpp +++ b/src/simplnx/DataStructure/Messaging/DataRenamedMessage.cpp @@ -1,8 +1,8 @@ #include "DataRenamedMessage.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" -using namespace complex; +using namespace nx::core; DataRenamedMessage::DataRenamedMessage(const DataStructure* dataStructure, DataObject::IdType identifier, const std::string& oldName, const std::string& newName) : AbstractDataStructureMessage(dataStructure) diff --git a/src/complex/DataStructure/Messaging/DataRenamedMessage.hpp b/src/simplnx/DataStructure/Messaging/DataRenamedMessage.hpp similarity index 85% rename from src/complex/DataStructure/Messaging/DataRenamedMessage.hpp rename to src/simplnx/DataStructure/Messaging/DataRenamedMessage.hpp index 6e280d6118..85390feed4 100644 --- a/src/complex/DataStructure/Messaging/DataRenamedMessage.hpp +++ b/src/simplnx/DataStructure/Messaging/DataRenamedMessage.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class DataRenamedMessage @@ -13,7 +13,7 @@ namespace complex * to signal that a DataObject's name was changed. The message includes the * target DataObject's ID, the previous name, and the name it was changed to. */ -class COMPLEX_EXPORT DataRenamedMessage : public AbstractDataStructureMessage +class SIMPLNX_EXPORT DataRenamedMessage : public AbstractDataStructureMessage { public: static const MessageType MsgType = 3; @@ -77,4 +77,4 @@ class COMPLEX_EXPORT DataRenamedMessage : public AbstractDataStructureMessage std::string m_OldName; std::string m_NewName; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Messaging/DataReparentedMessage.cpp b/src/simplnx/DataStructure/Messaging/DataReparentedMessage.cpp similarity index 95% rename from src/complex/DataStructure/Messaging/DataReparentedMessage.cpp rename to src/simplnx/DataStructure/Messaging/DataReparentedMessage.cpp index 14c940ebb7..48b89b1203 100644 --- a/src/complex/DataStructure/Messaging/DataReparentedMessage.cpp +++ b/src/simplnx/DataStructure/Messaging/DataReparentedMessage.cpp @@ -1,8 +1,8 @@ #include "DataReparentedMessage.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" -using namespace complex; +using namespace nx::core; DataReparentedMessage::DataReparentedMessage(const DataStructure* dataStructure, DataObject::IdType targetData, DataObject::IdType targetParent, bool parentAdded) : AbstractDataStructureMessage(dataStructure) diff --git a/src/complex/DataStructure/Messaging/DataReparentedMessage.hpp b/src/simplnx/DataStructure/Messaging/DataReparentedMessage.hpp similarity index 87% rename from src/complex/DataStructure/Messaging/DataReparentedMessage.hpp rename to src/simplnx/DataStructure/Messaging/DataReparentedMessage.hpp index 336373460b..fe469f6e82 100644 --- a/src/complex/DataStructure/Messaging/DataReparentedMessage.hpp +++ b/src/simplnx/DataStructure/Messaging/DataReparentedMessage.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/Messaging/AbstractDataStructureMessage.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Messaging/AbstractDataStructureMessage.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** @@ -15,7 +15,7 @@ namespace complex * includes the target object's ID, the target parent's ID, and whether or not * the parent was added or removed. */ -class COMPLEX_EXPORT DataReparentedMessage : public AbstractDataStructureMessage +class SIMPLNX_EXPORT DataReparentedMessage : public AbstractDataStructureMessage { public: static const MessageType MsgType = 4; @@ -92,4 +92,4 @@ class COMPLEX_EXPORT DataReparentedMessage : public AbstractDataStructureMessage DataObject::IdType m_ParentId; bool m_ParentAdded = true; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Metadata.cpp b/src/simplnx/DataStructure/Metadata.cpp similarity index 94% rename from src/complex/DataStructure/Metadata.cpp rename to src/simplnx/DataStructure/Metadata.cpp index 61e26f5d9d..78c5f80c5c 100644 --- a/src/complex/DataStructure/Metadata.cpp +++ b/src/simplnx/DataStructure/Metadata.cpp @@ -1,8 +1,8 @@ #include "Metadata.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { Metadata::Metadata() = default; @@ -65,4 +65,4 @@ Metadata::ConstIterator Metadata::end() const { return m_Map.end(); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Metadata.hpp b/src/simplnx/DataStructure/Metadata.hpp similarity index 96% rename from src/complex/DataStructure/Metadata.hpp rename to src/simplnx/DataStructure/Metadata.hpp index 51482b763d..2290095b91 100644 --- a/src/complex/DataStructure/Metadata.hpp +++ b/src/simplnx/DataStructure/Metadata.hpp @@ -1,12 +1,12 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include -namespace complex +namespace nx::core { /** @@ -17,7 +17,7 @@ namespace complex * class is designed such that any type of information can be included from * color formats, descriptions, data source, etc. */ -class COMPLEX_EXPORT Metadata +class SIMPLNX_EXPORT Metadata { public: using KeyType = std::string; @@ -125,4 +125,4 @@ class COMPLEX_EXPORT Metadata private: std::map m_Map; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Montage/AbstractMontage.cpp b/src/simplnx/DataStructure/Montage/AbstractMontage.cpp similarity index 96% rename from src/complex/DataStructure/Montage/AbstractMontage.cpp rename to src/simplnx/DataStructure/Montage/AbstractMontage.cpp index 982a979abd..9959eecec5 100644 --- a/src/complex/DataStructure/Montage/AbstractMontage.cpp +++ b/src/simplnx/DataStructure/Montage/AbstractMontage.cpp @@ -1,8 +1,8 @@ #include "AbstractMontage.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" -using namespace complex; +using namespace nx::core; AbstractMontage::AbstractMontage(DataStructure& dataStructure, std::string name) : BaseGroup(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Montage/AbstractMontage.hpp b/src/simplnx/DataStructure/Montage/AbstractMontage.hpp similarity index 93% rename from src/complex/DataStructure/Montage/AbstractMontage.hpp rename to src/simplnx/DataStructure/Montage/AbstractMontage.hpp index f7fa73011f..6f52cbe5e8 100644 --- a/src/complex/DataStructure/Montage/AbstractMontage.hpp +++ b/src/simplnx/DataStructure/Montage/AbstractMontage.hpp @@ -1,12 +1,12 @@ #pragma once -#include "complex/Common/BoundingBox.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/LinkedPath.hpp" -#include "complex/Utilities/TooltipGenerator.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/BoundingBox.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/LinkedPath.hpp" +#include "simplnx/Utilities/TooltipGenerator.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { class AbstractTileIndex; class IGeometry; @@ -15,7 +15,7 @@ class IGeometry; * @class AbstractMontage * @brief */ -class COMPLEX_EXPORT AbstractMontage : public BaseGroup +class SIMPLNX_EXPORT AbstractMontage : public BaseGroup { public: using CollectionType = std::vector; @@ -179,4 +179,4 @@ class COMPLEX_EXPORT AbstractMontage : public BaseGroup private: CollectionType m_Collection; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Montage/AbstractTileIndex.cpp b/src/simplnx/DataStructure/Montage/AbstractTileIndex.cpp similarity index 95% rename from src/complex/DataStructure/Montage/AbstractTileIndex.cpp rename to src/simplnx/DataStructure/Montage/AbstractTileIndex.cpp index 2ac3bb9e96..f1b24e143e 100644 --- a/src/complex/DataStructure/Montage/AbstractTileIndex.cpp +++ b/src/simplnx/DataStructure/Montage/AbstractTileIndex.cpp @@ -1,6 +1,6 @@ #include "AbstractTileIndex.hpp" -using namespace complex; +using namespace nx::core; AbstractTileIndex::AbstractTileIndex() diff --git a/src/complex/DataStructure/Montage/AbstractTileIndex.hpp b/src/simplnx/DataStructure/Montage/AbstractTileIndex.hpp similarity index 90% rename from src/complex/DataStructure/Montage/AbstractTileIndex.hpp rename to src/simplnx/DataStructure/Montage/AbstractTileIndex.hpp index 6056e34a00..da277d5e17 100644 --- a/src/complex/DataStructure/Montage/AbstractTileIndex.hpp +++ b/src/simplnx/DataStructure/Montage/AbstractTileIndex.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Utilities/TooltipGenerator.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Utilities/TooltipGenerator.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { class IGeometry; class AbstractMontage; @@ -14,7 +14,7 @@ class AbstractMontage; * tile index classes. Each type of AbstractMontage should have its own derived * type of AbstractTileIndex as well. */ -class COMPLEX_EXPORT AbstractTileIndex +class SIMPLNX_EXPORT AbstractTileIndex { public: /** @@ -74,4 +74,4 @@ class COMPLEX_EXPORT AbstractTileIndex private: const AbstractMontage* m_Montage = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Montage/GridMontage.cpp b/src/simplnx/DataStructure/Montage/GridMontage.cpp similarity index 97% rename from src/complex/DataStructure/Montage/GridMontage.cpp rename to src/simplnx/DataStructure/Montage/GridMontage.cpp index 9a3e44fa04..b5ac7ceb8a 100644 --- a/src/complex/DataStructure/Montage/GridMontage.cpp +++ b/src/simplnx/DataStructure/Montage/GridMontage.cpp @@ -1,11 +1,11 @@ #include "GridMontage.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" #include -using namespace complex; +using namespace nx::core; GridMontage::GridMontage(DataStructure& dataStructure, std::string name) : AbstractMontage(dataStructure, std::move(name)) diff --git a/src/complex/DataStructure/Montage/GridMontage.hpp b/src/simplnx/DataStructure/Montage/GridMontage.hpp similarity index 96% rename from src/complex/DataStructure/Montage/GridMontage.hpp rename to src/simplnx/DataStructure/Montage/GridMontage.hpp index 5933b1af44..cfed6746db 100644 --- a/src/complex/DataStructure/Montage/GridMontage.hpp +++ b/src/simplnx/DataStructure/Montage/GridMontage.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Montage/AbstractMontage.hpp" -#include "complex/DataStructure/Montage/GridTileIndex.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Montage/AbstractMontage.hpp" +#include "simplnx/DataStructure/Montage/GridTileIndex.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { class GridTileIndex; @@ -14,7 +14,7 @@ class GridTileIndex; * @brief The GridMontage class is a type of montage where geometries are laid * out in a three dimensional grid. */ -class COMPLEX_EXPORT GridMontage : virtual public AbstractMontage +class SIMPLNX_EXPORT GridMontage : virtual public AbstractMontage { public: using Iterator = void; @@ -283,4 +283,4 @@ class COMPLEX_EXPORT GridMontage : virtual public AbstractMontage usize m_ColumnCount = 0; usize m_DepthCount = 0; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Montage/GridTileIndex.cpp b/src/simplnx/DataStructure/Montage/GridTileIndex.cpp similarity index 93% rename from src/complex/DataStructure/Montage/GridTileIndex.cpp rename to src/simplnx/DataStructure/Montage/GridTileIndex.cpp index d435c00f9a..2a60fbf62d 100644 --- a/src/complex/DataStructure/Montage/GridTileIndex.cpp +++ b/src/simplnx/DataStructure/Montage/GridTileIndex.cpp @@ -1,10 +1,10 @@ #include "GridTileIndex.hpp" -#include "complex/DataStructure/Montage/GridMontage.hpp" +#include "simplnx/DataStructure/Montage/GridMontage.hpp" #include -using namespace complex; +using namespace nx::core; GridTileIndex::GridTileIndex() : AbstractTileIndex() diff --git a/src/complex/DataStructure/Montage/GridTileIndex.hpp b/src/simplnx/DataStructure/Montage/GridTileIndex.hpp similarity index 88% rename from src/complex/DataStructure/Montage/GridTileIndex.hpp rename to src/simplnx/DataStructure/Montage/GridTileIndex.hpp index 37e2dc0553..4942c999a8 100644 --- a/src/complex/DataStructure/Montage/GridTileIndex.hpp +++ b/src/simplnx/DataStructure/Montage/GridTileIndex.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Montage/AbstractTileIndex.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Montage/AbstractTileIndex.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { class GridMontage; @@ -14,7 +14,7 @@ class GridMontage; * GridMontages. An index corresponds to a single 3D tile position in the * montage. */ -class COMPLEX_EXPORT GridTileIndex : public AbstractTileIndex +class SIMPLNX_EXPORT GridTileIndex : public AbstractTileIndex { public: friend class GridMontage; @@ -94,4 +94,4 @@ class COMPLEX_EXPORT GridTileIndex : public AbstractTileIndex private: SizeVec3 m_Pos; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/NeighborList.cpp b/src/simplnx/DataStructure/NeighborList.cpp similarity index 86% rename from src/complex/DataStructure/NeighborList.cpp rename to src/simplnx/DataStructure/NeighborList.cpp index da68f217d5..c7295ab369 100644 --- a/src/complex/DataStructure/NeighborList.cpp +++ b/src/simplnx/DataStructure/NeighborList.cpp @@ -1,10 +1,10 @@ #include "NeighborList.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" -namespace complex +namespace nx::core { template NeighborList::NeighborList(DataStructure& dataStructure, const std::string& name, usize numTuples) @@ -386,77 +386,77 @@ typename NeighborList::const_iterator NeighborList::cend() const } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::int8; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::int16; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::int32; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::int64; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::uint8; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::uint16; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::uint32; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::uint64; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::float32; } template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const +DataType SIMPLNX_EXPORT NeighborList::getDataType() const { return DataType::float64; } -template class COMPLEX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; -template class COMPLEX_TEMPLATE_EXPORT NeighborList; -} // namespace complex +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; +template class SIMPLNX_TEMPLATE_EXPORT NeighborList; +} // namespace nx::core diff --git a/src/complex/DataStructure/NeighborList.hpp b/src/simplnx/DataStructure/NeighborList.hpp similarity index 92% rename from src/complex/DataStructure/NeighborList.hpp rename to src/simplnx/DataStructure/NeighborList.hpp index 5471091288..16594cd124 100644 --- a/src/complex/DataStructure/NeighborList.hpp +++ b/src/simplnx/DataStructure/NeighborList.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/Common/TypeTraits.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/INeighborList.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" -namespace complex +namespace nx::core { namespace NeighborListConstants { @@ -360,34 +360,34 @@ class NeighborList : public INeighborList }; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; template <> -DataType COMPLEX_EXPORT NeighborList::getDataType() const; +DataType SIMPLNX_EXPORT NeighborList::getDataType() const; /** * Boolean NeighborLists are uncompilable @@ -424,4 +424,4 @@ using Float32NeighborList = NeighborList; using Float64NeighborList = NeighborList; using VectorOfFloat32NeighborList = std::vector>; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/Observers/AbstractDataStructureObserver.cpp b/src/simplnx/DataStructure/Observers/AbstractDataStructureObserver.cpp similarity index 87% rename from src/complex/DataStructure/Observers/AbstractDataStructureObserver.cpp rename to src/simplnx/DataStructure/Observers/AbstractDataStructureObserver.cpp index a8048a3edb..860ea14f53 100644 --- a/src/complex/DataStructure/Observers/AbstractDataStructureObserver.cpp +++ b/src/simplnx/DataStructure/Observers/AbstractDataStructureObserver.cpp @@ -1,7 +1,7 @@ -#include "complex/DataStructure/Observers/AbstractDataStructureObserver.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/Observers/AbstractDataStructureObserver.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" -using namespace complex; +using namespace nx::core; AbstractDataStructureObserver::AbstractDataStructureObserver() { diff --git a/src/complex/DataStructure/Observers/AbstractDataStructureObserver.hpp b/src/simplnx/DataStructure/Observers/AbstractDataStructureObserver.hpp similarity index 94% rename from src/complex/DataStructure/Observers/AbstractDataStructureObserver.hpp rename to src/simplnx/DataStructure/Observers/AbstractDataStructureObserver.hpp index de0e0bc366..0e04ab2947 100644 --- a/src/complex/DataStructure/Observers/AbstractDataStructureObserver.hpp +++ b/src/simplnx/DataStructure/Observers/AbstractDataStructureObserver.hpp @@ -1,12 +1,12 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { class AbstractDataStructureMessage; class DataStructure; @@ -18,7 +18,7 @@ class DataStructure; * DataStructure. Concrete instances of AbstractDataStructureObserver should * provide an implementation of the onNotify method. */ -class COMPLEX_EXPORT AbstractDataStructureObserver +class SIMPLNX_EXPORT AbstractDataStructureObserver { public: /** @@ -82,4 +82,4 @@ class COMPLEX_EXPORT AbstractDataStructureObserver DataStructure* m_ObservedStructure = nullptr; nod::connection m_Connection; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/ReadMe.md b/src/simplnx/DataStructure/ReadMe.md similarity index 78% rename from src/complex/DataStructure/ReadMe.md rename to src/simplnx/DataStructure/ReadMe.md index c1ccc8a512..ecf0ba7790 100644 --- a/src/complex/DataStructure/ReadMe.md +++ b/src/simplnx/DataStructure/ReadMe.md @@ -1,10 +1,11 @@ -# complex::DataStructure +# simplnx::DataStructure ## Adding DataObject types When adding DataObject types, additional IDataFactories need to be created for each IDataIOManager subclass. Complex provides the HDF5 version of IDataIOManager and IDataFactory, but plugins providing additional formats will need to be updated to enable reading and writing to the new types. ## Adding IO formats -complex comes with HDF5 readers and writers by default. To add additional IO formats, the plugin developer will require additional classes to tell complex how to read and write the DataObjects using the specified format. + +simplnx comes with HDF5 readers and writers by default. To add additional IO formats, the plugin developer will require additional classes to tell simplnx how to read and write the DataObjects using the specified format. Required subclasses: - IDataFactory for each concrete DataObject type @@ -13,4 +14,4 @@ Required subclasses: In addition, a DataStructure reader and writer should be provided for the new format for easy IO. -Once these classes are created, the DataIOManager needs to be added to the plugin so that complex has access to it and can find it using the format name. +Once these classes are created, the DataIOManager needs to be added to the plugin so that simplnx has access to it and can find it using the format name. diff --git a/src/complex/DataStructure/ScalarData.hpp b/src/simplnx/DataStructure/ScalarData.hpp similarity index 98% rename from src/complex/DataStructure/ScalarData.hpp rename to src/simplnx/DataStructure/ScalarData.hpp index 37ac68e367..d1fe1ee164 100644 --- a/src/complex/DataStructure/ScalarData.hpp +++ b/src/simplnx/DataStructure/ScalarData.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/DataObject.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/DataObject.hpp" -namespace complex +namespace nx::core { namespace ScalarDataConstants @@ -307,4 +307,4 @@ class ScalarData : public DataObject private: value_type m_Data; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/StringArray.cpp b/src/simplnx/DataStructure/StringArray.cpp similarity index 98% rename from src/complex/DataStructure/StringArray.cpp rename to src/simplnx/DataStructure/StringArray.cpp index 69d6328f7f..7ed978bc25 100644 --- a/src/complex/DataStructure/StringArray.cpp +++ b/src/simplnx/DataStructure/StringArray.cpp @@ -1,12 +1,12 @@ #include "StringArray.hpp" -#include "complex/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" #include "fmt/format.h" #include #include -namespace complex +namespace nx::core { StringArray* StringArray::Create(DataStructure& dataStructure, const std::string_view& name, const std::optional& parentId) { @@ -210,4 +210,4 @@ void StringArray::resizeTuples(const std::vector& tupleShape) m_Strings.resize(numTuples); } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/DataStructure/StringArray.hpp b/src/simplnx/DataStructure/StringArray.hpp similarity index 96% rename from src/complex/DataStructure/StringArray.hpp rename to src/simplnx/DataStructure/StringArray.hpp index 75d778312a..123dfcd09d 100644 --- a/src/complex/DataStructure/StringArray.hpp +++ b/src/simplnx/DataStructure/StringArray.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" +#include "simplnx/DataStructure/IArray.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT StringArray : public IArray +class SIMPLNX_EXPORT StringArray : public IArray { public: using value_type = std::string; @@ -120,4 +120,4 @@ class COMPLEX_EXPORT StringArray : public IArray private: collection_type m_Strings; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/AbstractParameter.cpp b/src/simplnx/Filter/AbstractParameter.cpp similarity index 92% rename from src/complex/Filter/AbstractParameter.cpp rename to src/simplnx/Filter/AbstractParameter.cpp index 504aa7d747..09f92a892d 100644 --- a/src/complex/Filter/AbstractParameter.cpp +++ b/src/simplnx/Filter/AbstractParameter.cpp @@ -1,6 +1,6 @@ #include "AbstractParameter.hpp" -namespace complex +namespace nx::core { AbstractParameter::AbstractParameter(const std::string& name, const std::string& humanName, const std::string& helpText) : m_Name(name) @@ -27,4 +27,4 @@ std::string AbstractParameter::helpText() const { return m_HelpText; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/AbstractParameter.hpp b/src/simplnx/Filter/AbstractParameter.hpp similarity index 85% rename from src/complex/Filter/AbstractParameter.hpp rename to src/simplnx/Filter/AbstractParameter.hpp index ba2e150898..2241d3ecdd 100644 --- a/src/complex/Filter/AbstractParameter.hpp +++ b/src/simplnx/Filter/AbstractParameter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/IParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/IParameter.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief AbstractParameter stores name, human name, and help text for classes that want to inherit from IParameter. */ -class COMPLEX_EXPORT AbstractParameter : public IParameter +class SIMPLNX_EXPORT AbstractParameter : public IParameter { public: ~AbstractParameter() noexcept override = default; @@ -47,4 +47,4 @@ class COMPLEX_EXPORT AbstractParameter : public IParameter std::string m_HumanName; std::string m_HelpText; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CopyArrayInstanceAction.cpp b/src/simplnx/Filter/Actions/CopyArrayInstanceAction.cpp similarity index 92% rename from src/complex/Filter/Actions/CopyArrayInstanceAction.cpp rename to src/simplnx/Filter/Actions/CopyArrayInstanceAction.cpp index 1e61ad41d4..22b08145b8 100644 --- a/src/complex/Filter/Actions/CopyArrayInstanceAction.cpp +++ b/src/simplnx/Filter/Actions/CopyArrayInstanceAction.cpp @@ -1,9 +1,9 @@ #include "CopyArrayInstanceAction.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/IDataStore.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/Utilities/TemplateHelpers.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Utilities/TemplateHelpers.hpp" #include @@ -12,9 +12,9 @@ namespace inline constexpr int32_t k_UnsupportedTypeError = -5001; } -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CopyArrayInstanceAction::CopyArrayInstanceAction(const DataPath& selectedDataPath, const DataPath& createdDataPath) : IDataCreationAction(createdDataPath) @@ -103,4 +103,4 @@ std::vector CopyArrayInstanceAction::getAllCreatedPaths() const return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CopyArrayInstanceAction.hpp b/src/simplnx/Filter/Actions/CopyArrayInstanceAction.hpp similarity index 89% rename from src/complex/Filter/Actions/CopyArrayInstanceAction.hpp rename to src/simplnx/Filter/Actions/CopyArrayInstanceAction.hpp index c37b45df1c..fe8e2a6974 100644 --- a/src/complex/Filter/Actions/CopyArrayInstanceAction.hpp +++ b/src/simplnx/Filter/Actions/CopyArrayInstanceAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action that will copy a Source DataArray to a Destination DataPath. */ -class COMPLEX_EXPORT CopyArrayInstanceAction : public IDataCreationAction +class SIMPLNX_EXPORT CopyArrayInstanceAction : public IDataCreationAction { public: CopyArrayInstanceAction() = delete; @@ -57,4 +57,4 @@ class COMPLEX_EXPORT CopyArrayInstanceAction : public IDataCreationAction private: DataPath m_SelectedDataPath; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CopyDataObjectAction.cpp b/src/simplnx/Filter/Actions/CopyDataObjectAction.cpp similarity index 91% rename from src/complex/Filter/Actions/CopyDataObjectAction.cpp rename to src/simplnx/Filter/Actions/CopyDataObjectAction.cpp index 46cfc97a12..798efa4a52 100644 --- a/src/complex/Filter/Actions/CopyDataObjectAction.cpp +++ b/src/simplnx/Filter/Actions/CopyDataObjectAction.cpp @@ -1,13 +1,13 @@ #include "CopyDataObjectAction.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/Utilities/DataGroupUtilities.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CopyDataObjectAction::CopyDataObjectAction(const DataPath& path, const DataPath& newPath, const std::vector allCreatedPaths) : IDataCreationAction(newPath) @@ -66,4 +66,4 @@ std::vector CopyDataObjectAction::getAllCreatedPaths() const { return m_AllCreatedPaths; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CopyDataObjectAction.hpp b/src/simplnx/Filter/Actions/CopyDataObjectAction.hpp similarity index 91% rename from src/complex/Filter/Actions/CopyDataObjectAction.hpp rename to src/simplnx/Filter/Actions/CopyDataObjectAction.hpp index f0da15679d..ac5d468c52 100644 --- a/src/complex/Filter/Actions/CopyDataObjectAction.hpp +++ b/src/simplnx/Filter/Actions/CopyDataObjectAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for copying a BaseGroup in a DataStructure */ -class COMPLEX_EXPORT CopyDataObjectAction : public IDataCreationAction +class SIMPLNX_EXPORT CopyDataObjectAction : public IDataCreationAction { public: CopyDataObjectAction() = delete; @@ -70,4 +70,4 @@ class COMPLEX_EXPORT CopyDataObjectAction : public IDataCreationAction DataPath m_NewPath; std::vector m_AllCreatedPaths; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateArrayAction.cpp b/src/simplnx/Filter/Actions/CreateArrayAction.cpp similarity index 92% rename from src/complex/Filter/Actions/CreateArrayAction.cpp rename to src/simplnx/Filter/Actions/CreateArrayAction.cpp index f3e630e9b4..73ec9c0410 100644 --- a/src/complex/Filter/Actions/CreateArrayAction.cpp +++ b/src/simplnx/Filter/Actions/CreateArrayAction.cpp @@ -1,14 +1,14 @@ #include "CreateArrayAction.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/EmptyDataStore.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CreateArrayAction::CreateArrayAction(DataType type, const std::vector& tDims, const std::vector& cDims, const DataPath& path, std::string dataFormat) : IDataCreationAction(path) @@ -99,4 +99,4 @@ std::string CreateArrayAction::dataFormat() const { return m_DataFormat; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateArrayAction.hpp b/src/simplnx/Filter/Actions/CreateArrayAction.hpp similarity index 89% rename from src/complex/Filter/Actions/CreateArrayAction.hpp rename to src/simplnx/Filter/Actions/CreateArrayAction.hpp index e647211fab..6fe244e1fa 100644 --- a/src/complex/Filter/Actions/CreateArrayAction.hpp +++ b/src/simplnx/Filter/Actions/CreateArrayAction.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief Action for creating DataArrays in a DataStructure */ -class COMPLEX_EXPORT CreateArrayAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateArrayAction : public IDataCreationAction { public: CreateArrayAction() = delete; @@ -85,4 +85,4 @@ class COMPLEX_EXPORT CreateArrayAction : public IDataCreationAction std::vector m_CDims; std::string m_DataFormat = ""; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateAttributeMatrixAction.cpp b/src/simplnx/Filter/Actions/CreateAttributeMatrixAction.cpp similarity index 94% rename from src/complex/Filter/Actions/CreateAttributeMatrixAction.cpp rename to src/simplnx/Filter/Actions/CreateAttributeMatrixAction.cpp index de6378b95c..a13d9229db 100644 --- a/src/complex/Filter/Actions/CreateAttributeMatrixAction.cpp +++ b/src/simplnx/Filter/Actions/CreateAttributeMatrixAction.cpp @@ -1,11 +1,11 @@ #include "CreateAttributeMatrixAction.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/LinkedPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/LinkedPath.hpp" #include -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ CreateAttributeMatrixAction::CreateAttributeMatrixAction(const DataPath& path, const AttributeMatrix::ShapeType& shape) @@ -64,4 +64,4 @@ std::vector CreateAttributeMatrixAction::getAllCreatedPaths() const { return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateAttributeMatrixAction.hpp b/src/simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp similarity index 84% rename from src/complex/Filter/Actions/CreateAttributeMatrixAction.hpp rename to src/simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp index bbafb3e425..2b5671426d 100644 --- a/src/complex/Filter/Actions/CreateAttributeMatrixAction.hpp +++ b/src/simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action to create a DataGroup with the DataStructure */ -class COMPLEX_EXPORT CreateAttributeMatrixAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateAttributeMatrixAction : public IDataCreationAction { public: CreateAttributeMatrixAction() = delete; @@ -47,4 +47,4 @@ class COMPLEX_EXPORT CreateAttributeMatrixAction : public IDataCreationAction private: AttributeMatrix::ShapeType m_TupleShape; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateDataGroupAction.cpp b/src/simplnx/Filter/Actions/CreateDataGroupAction.cpp similarity index 87% rename from src/complex/Filter/Actions/CreateDataGroupAction.cpp rename to src/simplnx/Filter/Actions/CreateDataGroupAction.cpp index 8e88672cf1..2c92adbc20 100644 --- a/src/complex/Filter/Actions/CreateDataGroupAction.cpp +++ b/src/simplnx/Filter/Actions/CreateDataGroupAction.cpp @@ -1,11 +1,11 @@ #include "CreateDataGroupAction.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/LinkedPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/LinkedPath.hpp" #include -namespace complex +namespace nx::core { //------------------------------------------------------------------------------ CreateDataGroupAction::CreateDataGroupAction(const DataPath& path) @@ -36,4 +36,4 @@ std::vector CreateDataGroupAction::getAllCreatedPaths() const { return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateDataGroupAction.hpp b/src/simplnx/Filter/Actions/CreateDataGroupAction.hpp similarity index 85% rename from src/complex/Filter/Actions/CreateDataGroupAction.hpp rename to src/simplnx/Filter/Actions/CreateDataGroupAction.hpp index 26ea256495..eb04d72e21 100644 --- a/src/complex/Filter/Actions/CreateDataGroupAction.hpp +++ b/src/simplnx/Filter/Actions/CreateDataGroupAction.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action to create a DataGroup with the DataStructure */ -class COMPLEX_EXPORT CreateDataGroupAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateDataGroupAction : public IDataCreationAction { public: CreateDataGroupAction() = delete; @@ -45,4 +45,4 @@ class COMPLEX_EXPORT CreateDataGroupAction : public IDataCreationAction private: }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateGeometry1DAction.hpp b/src/simplnx/Filter/Actions/CreateGeometry1DAction.hpp similarity index 93% rename from src/complex/Filter/Actions/CreateGeometry1DAction.hpp rename to src/simplnx/Filter/Actions/CreateGeometry1DAction.hpp index 218c328c9a..ead29938f3 100644 --- a/src/complex/Filter/Actions/CreateGeometry1DAction.hpp +++ b/src/simplnx/Filter/Actions/CreateGeometry1DAction.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/EdgeGeom.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/EdgeGeom.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief Action for creating an Edge Geometry in a DataStructure @@ -200,23 +200,23 @@ class CreateGeometry1DAction : public IDataCreationAction DataPath edgesPath = getCreatedPath().createChildPath(m_SharedEdgesName); // Create the default DataArray that will hold the EdgeList and Vertices. We // size these to 1 because the Csv parser will resize them to the appropriate number of tuples - complex::Result result = complex::CreateArray(dataStructure, edgeTupleShape, {2}, edgesPath, mode, m_CreatedDataStoreFormat); + nx::core::Result result = nx::core::CreateArray(dataStructure, edgeTupleShape, {2}, edgesPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return MakeErrorResult(-5409, fmt::format("{}CreateGeometry1DAction: Could not allocate SharedEdgeList '{}'", prefix, edgesPath.toString())); } - SharedEdgeList* createdEdges = complex::ArrayFromPath(dataStructure, edgesPath); + SharedEdgeList* createdEdges = nx::core::ArrayFromPath(dataStructure, edgesPath); geometry1d->setEdgeList(*createdEdges); // Create the Vertex Array with a component size of 3 DataPath vertexPath = getCreatedPath().createChildPath(m_SharedVerticesName); - result = complex::CreateArray(dataStructure, vertexTupleShape, {3}, vertexPath, mode, m_CreatedDataStoreFormat); + result = nx::core::CreateArray(dataStructure, vertexTupleShape, {3}, vertexPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return MakeErrorResult(-5410, fmt::format("{}CreateGeometry1DAction: Could not allocate SharedVertList '{}'", prefix, vertexPath.toString())); } - Float32Array* vertexArray = complex::ArrayFromPath(dataStructure, vertexPath); + Float32Array* vertexArray = nx::core::ArrayFromPath(dataStructure, vertexPath); geometry1d->setVertices(*vertexArray); } @@ -330,4 +330,4 @@ class CreateGeometry1DAction : public IDataCreationAction }; using CreateEdgeGeometryAction = CreateGeometry1DAction; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateGeometry2DAction.hpp b/src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp similarity index 93% rename from src/complex/Filter/Actions/CreateGeometry2DAction.hpp rename to src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp index 9fb181a4fa..85732ab95b 100644 --- a/src/complex/Filter/Actions/CreateGeometry2DAction.hpp +++ b/src/simplnx/Filter/Actions/CreateGeometry2DAction.hpp @@ -1,20 +1,20 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/QuadGeom.hpp" -#include "complex/DataStructure/Geometry/TriangleGeom.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/QuadGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief Action for creating a Triangle or QuadGeometry in a DataStructure @@ -200,23 +200,23 @@ class CreateGeometry2DAction : public IDataCreationAction DataPath trianglesPath = getCreatedPath().createChildPath(m_SharedFacesName); // Create the default DataArray that will hold the FaceList and Vertices. We // size these to 1 because the Csv parser will resize them to the appropriate number of tuples - complex::Result result = complex::CreateArray(dataStructure, faceTupleShape, {Geometry2DType::k_NumVerts}, trianglesPath, mode, m_CreatedDataStoreFormat); + nx::core::Result result = nx::core::CreateArray(dataStructure, faceTupleShape, {Geometry2DType::k_NumVerts}, trianglesPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return MakeErrorResult(-5509, fmt::format("{}CreateGeometry2DAction: Could not allocate SharedTriList '{}'", prefix, trianglesPath.toString())); } - SharedTriList* triangles = complex::ArrayFromPath(dataStructure, trianglesPath); + SharedTriList* triangles = nx::core::ArrayFromPath(dataStructure, trianglesPath); geometry2d->setFaceList(*triangles); // Create the Vertex Array with a component size of 3 DataPath vertexPath = getCreatedPath().createChildPath(m_SharedVerticesName); - result = complex::CreateArray(dataStructure, vertexTupleShape, {3}, vertexPath, mode, m_CreatedDataStoreFormat); + result = nx::core::CreateArray(dataStructure, vertexTupleShape, {3}, vertexPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return MakeErrorResult(-5510, fmt::format("{}CreateGeometry2DAction: Could not allocate SharedVertList '{}'", prefix, vertexPath.toString())); } - Float32Array* vertexArray = complex::ArrayFromPath(dataStructure, vertexPath); + Float32Array* vertexArray = nx::core::ArrayFromPath(dataStructure, vertexPath); geometry2d->setVertices(*vertexArray); } @@ -331,4 +331,4 @@ class CreateGeometry2DAction : public IDataCreationAction using CreateTriangleGeometryAction = CreateGeometry2DAction; using CreateQuadGeometryAction = CreateGeometry2DAction; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateGeometry3DAction.hpp b/src/simplnx/Filter/Actions/CreateGeometry3DAction.hpp similarity index 93% rename from src/complex/Filter/Actions/CreateGeometry3DAction.hpp rename to src/simplnx/Filter/Actions/CreateGeometry3DAction.hpp index d3c6efcf6f..5795832441 100644 --- a/src/complex/Filter/Actions/CreateGeometry3DAction.hpp +++ b/src/simplnx/Filter/Actions/CreateGeometry3DAction.hpp @@ -1,20 +1,20 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/HexahedralGeom.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/TetrahedralGeom.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/HexahedralGeom.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/TetrahedralGeom.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief Action for creating a Tetrahedral or Hexehedral Geometry in a DataStructure @@ -199,23 +199,23 @@ class CreateGeometry3DAction : public IDataCreationAction { const DataPath cellsPath = getCreatedPath().createChildPath(m_SharedCellsName); // Create the default DataArray that will hold the CellList and Vertices. - complex::Result result = complex::CreateArray(dataStructure, cellTupleShape, {Geometry3DType::k_NumVerts}, cellsPath, mode, m_CreatedDataStoreFormat); + nx::core::Result result = nx::core::CreateArray(dataStructure, cellTupleShape, {Geometry3DType::k_NumVerts}, cellsPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return MakeErrorResult(-5609, fmt::format("{}CreateGeometry3DAction: Could not allocate SharedCellList '{}'", prefix, cellsPath.toString())); } - SharedCellList* polyhedronList = complex::ArrayFromPath(dataStructure, cellsPath); + SharedCellList* polyhedronList = nx::core::ArrayFromPath(dataStructure, cellsPath); geometry3d->setPolyhedraList(*polyhedronList); // Create the Vertex Array with a component size of 3 const DataPath vertexPath = getCreatedPath().createChildPath(m_SharedVerticesName); - result = complex::CreateArray(dataStructure, vertexTupleShape, {3}, vertexPath, mode, m_CreatedDataStoreFormat); + result = nx::core::CreateArray(dataStructure, vertexTupleShape, {3}, vertexPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return MakeErrorResult(-5610, fmt::format("{}CreateGeometry3DAction: Could not allocate SharedVertList '{}'", prefix, vertexPath.toString())); } - Float32Array* vertexArray = complex::ArrayFromPath(dataStructure, vertexPath); + Float32Array* vertexArray = nx::core::ArrayFromPath(dataStructure, vertexPath); geometry3d->setVertices(*vertexArray); } @@ -330,4 +330,4 @@ class CreateGeometry3DAction : public IDataCreationAction using CreateTetrahedralGeometryAction = CreateGeometry3DAction; using CreateHexahedralGeometryAction = CreateGeometry3DAction; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateGridMontageAction.cpp b/src/simplnx/Filter/Actions/CreateGridMontageAction.cpp similarity index 93% rename from src/complex/Filter/Actions/CreateGridMontageAction.cpp rename to src/simplnx/Filter/Actions/CreateGridMontageAction.cpp index 8815d088e2..693ae5cd7b 100644 --- a/src/complex/Filter/Actions/CreateGridMontageAction.cpp +++ b/src/simplnx/Filter/Actions/CreateGridMontageAction.cpp @@ -1,7 +1,7 @@ -#include "complex/Filter/Actions/CreateGridMontageAction.hpp" -#include "complex/DataStructure/Montage/GridMontage.hpp" +#include "simplnx/Filter/Actions/CreateGridMontageAction.hpp" +#include "simplnx/DataStructure/Montage/GridMontage.hpp" -namespace complex +namespace nx::core { CreateGridMontageAction::CreateGridMontageAction(const DataPath& path, const DimensionType& dims, const OriginType& origin, const SpacingType& spacing) : IDataCreationAction(path) @@ -79,4 +79,4 @@ std::vector CreateGridMontageAction::getAllCreatedPaths() const { return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateGridMontageAction.hpp b/src/simplnx/Filter/Actions/CreateGridMontageAction.hpp similarity index 88% rename from src/complex/Filter/Actions/CreateGridMontageAction.hpp rename to src/simplnx/Filter/Actions/CreateGridMontageAction.hpp index 7bf7e43aa3..186cf3145b 100644 --- a/src/complex/Filter/Actions/CreateGridMontageAction.hpp +++ b/src/simplnx/Filter/Actions/CreateGridMontageAction.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for creating an ImageGeometry in a DataStructure */ -class COMPLEX_EXPORT CreateGridMontageAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateGridMontageAction : public IDataCreationAction { public: using DimensionType = std::vector; @@ -84,4 +84,4 @@ class COMPLEX_EXPORT CreateGridMontageAction : public IDataCreationAction OriginType m_Origin; SpacingType m_Spacing; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateImageGeometryAction.cpp b/src/simplnx/Filter/Actions/CreateImageGeometryAction.cpp similarity index 96% rename from src/complex/Filter/Actions/CreateImageGeometryAction.cpp rename to src/simplnx/Filter/Actions/CreateImageGeometryAction.cpp index a280340809..1d3562cf4e 100644 --- a/src/complex/Filter/Actions/CreateImageGeometryAction.cpp +++ b/src/simplnx/Filter/Actions/CreateImageGeometryAction.cpp @@ -1,11 +1,11 @@ #include "CreateImageGeometryAction.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CreateImageGeometryAction::CreateImageGeometryAction(const DataPath& path, const DimensionType& dims, const OriginType& origin, const SpacingType& spacing, const std::string& cellAttributeMatrixName, IGeometry::LengthUnit units) @@ -102,4 +102,4 @@ std::vector CreateImageGeometryAction::getAllCreatedPaths() const auto topLevelCreatedPath = getCreatedPath(); return {topLevelCreatedPath, topLevelCreatedPath.createChildPath(m_CellDataName)}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateImageGeometryAction.hpp b/src/simplnx/Filter/Actions/CreateImageGeometryAction.hpp similarity index 89% rename from src/complex/Filter/Actions/CreateImageGeometryAction.hpp rename to src/simplnx/Filter/Actions/CreateImageGeometryAction.hpp index 0ebb77d719..044f600f4a 100644 --- a/src/complex/Filter/Actions/CreateImageGeometryAction.hpp +++ b/src/simplnx/Filter/Actions/CreateImageGeometryAction.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for creating an ImageGeometry in a DataStructure */ -class COMPLEX_EXPORT CreateImageGeometryAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateImageGeometryAction : public IDataCreationAction { public: using DimensionType = std::vector; @@ -87,4 +87,4 @@ class COMPLEX_EXPORT CreateImageGeometryAction : public IDataCreationAction IGeometry::LengthUnit m_Units; std::string m_CellDataName; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateNeighborListAction.cpp b/src/simplnx/Filter/Actions/CreateNeighborListAction.cpp similarity index 93% rename from src/complex/Filter/Actions/CreateNeighborListAction.cpp rename to src/simplnx/Filter/Actions/CreateNeighborListAction.cpp index 7ba84d3bf0..120afcf1c5 100644 --- a/src/complex/Filter/Actions/CreateNeighborListAction.cpp +++ b/src/simplnx/Filter/Actions/CreateNeighborListAction.cpp @@ -1,13 +1,13 @@ #include "CreateNeighborListAction.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CreateNeighborListAction::CreateNeighborListAction(DataType type, usize tupleCount, const DataPath& path) : IDataCreationAction(path) @@ -82,4 +82,4 @@ std::vector CreateNeighborListAction::getAllCreatedPaths() const { return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateNeighborListAction.hpp b/src/simplnx/Filter/Actions/CreateNeighborListAction.hpp similarity index 90% rename from src/complex/Filter/Actions/CreateNeighborListAction.hpp rename to src/simplnx/Filter/Actions/CreateNeighborListAction.hpp index 4cd09bffd7..87a73c8c71 100644 --- a/src/complex/Filter/Actions/CreateNeighborListAction.hpp +++ b/src/simplnx/Filter/Actions/CreateNeighborListAction.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @class CreateNeighborListAction * @brief Action for creating NeighborList arrays in a DataStructure */ -class COMPLEX_EXPORT CreateNeighborListAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateNeighborListAction : public IDataCreationAction { public: CreateNeighborListAction() = delete; @@ -65,4 +65,4 @@ class COMPLEX_EXPORT CreateNeighborListAction : public IDataCreationAction DataType m_Type; usize m_TupleCount; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateRectGridGeometryAction.cpp b/src/simplnx/Filter/Actions/CreateRectGridGeometryAction.cpp similarity index 97% rename from src/complex/Filter/Actions/CreateRectGridGeometryAction.cpp rename to src/simplnx/Filter/Actions/CreateRectGridGeometryAction.cpp index 6e91eb89ee..653190efdf 100644 --- a/src/complex/Filter/Actions/CreateRectGridGeometryAction.cpp +++ b/src/simplnx/Filter/Actions/CreateRectGridGeometryAction.cpp @@ -1,15 +1,15 @@ #include "CreateRectGridGeometryAction.hpp" -#include "complex/DataStructure/Geometry/RectGridGeom.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CreateRectGridGeometryAction::CreateRectGridGeometryAction(const DataPath& path, usize xBoundTuples, usize yBoundTuples, usize zBoundTuples, const std::string& cellAttributeMatrixName, const std::string& xBoundsName, const std::string& yBoundsName, const std::string& zBoundsName, std::string createdDataFormat) @@ -192,7 +192,7 @@ Float32Array* CreateRectGridGeometryAction::createBoundArray(DataStructure& data errors.insert(errors.end(), result.errors().begin(), result.errors().end()); return nullptr; } - Float32Array* boundsArray = complex::ArrayFromPath(dataStructure, boundsPath); + Float32Array* boundsArray = nx::core::ArrayFromPath(dataStructure, boundsPath); return boundsArray; } @@ -229,4 +229,4 @@ std::vector CreateRectGridGeometryAction::getAllCreatedPaths() const } return createdPaths; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateRectGridGeometryAction.hpp b/src/simplnx/Filter/Actions/CreateRectGridGeometryAction.hpp similarity index 94% rename from src/complex/Filter/Actions/CreateRectGridGeometryAction.hpp rename to src/simplnx/Filter/Actions/CreateRectGridGeometryAction.hpp index 1dee7c7ba5..56cc266251 100644 --- a/src/complex/Filter/Actions/CreateRectGridGeometryAction.hpp +++ b/src/simplnx/Filter/Actions/CreateRectGridGeometryAction.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/Geometry/IGridGeometry.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for creating an RectGridGeometry in a DataStructure */ -class COMPLEX_EXPORT CreateRectGridGeometryAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateRectGridGeometryAction : public IDataCreationAction { public: using DimensionType = std::vector; @@ -113,4 +113,4 @@ class COMPLEX_EXPORT CreateRectGridGeometryAction : public IDataCreationAction Float32Array* createBoundArray(DataStructure& dataStructure, Mode mode, const std::string& arrayName, usize numTuples, std::vector& errors) const; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateStringArrayAction.cpp b/src/simplnx/Filter/Actions/CreateStringArrayAction.cpp similarity index 92% rename from src/complex/Filter/Actions/CreateStringArrayAction.cpp rename to src/simplnx/Filter/Actions/CreateStringArrayAction.cpp index be9a122ebd..07ef6978d9 100644 --- a/src/complex/Filter/Actions/CreateStringArrayAction.cpp +++ b/src/simplnx/Filter/Actions/CreateStringArrayAction.cpp @@ -1,14 +1,14 @@ #include "CreateStringArrayAction.hpp" -#include "complex/DataStructure/EmptyDataStore.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { CreateStringArrayAction::CreateStringArrayAction(const std::vector& tDims, const DataPath& path, const std::string& initializeValue) : IDataCreationAction(path) @@ -87,4 +87,4 @@ std::vector CreateStringArrayAction::getAllCreatedPaths() const { return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateStringArrayAction.hpp b/src/simplnx/Filter/Actions/CreateStringArrayAction.hpp similarity index 89% rename from src/complex/Filter/Actions/CreateStringArrayAction.hpp rename to src/simplnx/Filter/Actions/CreateStringArrayAction.hpp index dbbc332a96..c2940818c4 100644 --- a/src/complex/Filter/Actions/CreateStringArrayAction.hpp +++ b/src/simplnx/Filter/Actions/CreateStringArrayAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for creating DataArrays in a DataStructure */ -class COMPLEX_EXPORT CreateStringArrayAction : public IDataCreationAction +class SIMPLNX_EXPORT CreateStringArrayAction : public IDataCreationAction { public: CreateStringArrayAction() = delete; @@ -58,4 +58,4 @@ class COMPLEX_EXPORT CreateStringArrayAction : public IDataCreationAction std::vector m_Dims; std::string m_InitializeValue; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/CreateVertexGeometryAction.hpp b/src/simplnx/Filter/Actions/CreateVertexGeometryAction.hpp similarity index 93% rename from src/complex/Filter/Actions/CreateVertexGeometryAction.hpp rename to src/simplnx/Filter/Actions/CreateVertexGeometryAction.hpp index 1e99748986..2a9dea0af2 100644 --- a/src/complex/Filter/Actions/CreateVertexGeometryAction.hpp +++ b/src/simplnx/Filter/Actions/CreateVertexGeometryAction.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/DataStructure/Geometry/VertexGeom.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief Action for creating a Vertex Geometry in a DataStructure @@ -153,12 +153,12 @@ class CreateVertexGeometryAction : public IDataCreationAction const DataPath vertexPath = getCreatedPath().createChildPath(m_SharedVertexListName); const std::vector componentShape = {3}; - Result<> result = complex::CreateArray(dataStructure, tupleShape, componentShape, vertexPath, mode, m_CreatedDataStoreFormat); + Result<> result = nx::core::CreateArray(dataStructure, tupleShape, componentShape, vertexPath, mode, m_CreatedDataStoreFormat); if(result.invalid()) { return result; } - const Float32Array* vertexArray = complex::ArrayFromPath(dataStructure, vertexPath); + const Float32Array* vertexArray = nx::core::ArrayFromPath(dataStructure, vertexPath); vertexGeom->setVertices(*vertexArray); } @@ -248,4 +248,4 @@ class CreateVertexGeometryAction : public IDataCreationAction std::string m_CreatedDataStoreFormat; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/DeleteDataAction.cpp b/src/simplnx/Filter/Actions/DeleteDataAction.cpp similarity index 92% rename from src/complex/Filter/Actions/DeleteDataAction.cpp rename to src/simplnx/Filter/Actions/DeleteDataAction.cpp index aed7779eb2..6caad648e4 100644 --- a/src/complex/Filter/Actions/DeleteDataAction.cpp +++ b/src/simplnx/Filter/Actions/DeleteDataAction.cpp @@ -1,15 +1,15 @@ #include "DeleteDataAction.hpp" -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataObject.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/EmptyDataStore.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -100,7 +100,7 @@ Result<> TerminateNode(DataStructure& dataStructure, const DataPath& path, IData // } } // namespace -namespace complex +namespace nx::core { DeleteDataAction::DeleteDataAction(const DataPath& path, DeleteDataAction::DeleteType type) : m_Path(path) @@ -151,4 +151,4 @@ DeleteDataAction::DeleteType DeleteDataAction::type() const { return m_Type; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/DeleteDataAction.hpp b/src/simplnx/Filter/Actions/DeleteDataAction.hpp similarity index 88% rename from src/complex/Filter/Actions/DeleteDataAction.hpp rename to src/simplnx/Filter/Actions/DeleteDataAction.hpp index d6b7a8dc39..c8e63eb62c 100644 --- a/src/complex/Filter/Actions/DeleteDataAction.hpp +++ b/src/simplnx/Filter/Actions/DeleteDataAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for deleting DataObjects in a DataStructure */ -class COMPLEX_EXPORT DeleteDataAction : public IDataAction +class SIMPLNX_EXPORT DeleteDataAction : public IDataAction { public: enum class DeleteType : uint64 @@ -60,4 +60,4 @@ class COMPLEX_EXPORT DeleteDataAction : public IDataAction DataPath m_Path; DeleteType m_Type; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/EmptyAction.hpp b/src/simplnx/Filter/Actions/EmptyAction.hpp similarity index 83% rename from src/complex/Filter/Actions/EmptyAction.hpp rename to src/simplnx/Filter/Actions/EmptyAction.hpp index ef1adb947d..e6eb157385 100644 --- a/src/complex/Filter/Actions/EmptyAction.hpp +++ b/src/simplnx/Filter/Actions/EmptyAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for creating an ImageGeometry in a DataStructure */ -class COMPLEX_EXPORT EmptyAction : public IDataAction +class SIMPLNX_EXPORT EmptyAction : public IDataAction { public: EmptyAction() = default; @@ -40,4 +40,4 @@ class COMPLEX_EXPORT EmptyAction : public IDataAction return std::make_unique(); } }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/ImportH5ObjectPathsAction.cpp b/src/simplnx/Filter/Actions/ImportH5ObjectPathsAction.cpp similarity index 88% rename from src/complex/Filter/Actions/ImportH5ObjectPathsAction.cpp rename to src/simplnx/Filter/Actions/ImportH5ObjectPathsAction.cpp index a929690590..6f8e3f70cf 100644 --- a/src/complex/Filter/Actions/ImportH5ObjectPathsAction.cpp +++ b/src/simplnx/Filter/Actions/ImportH5ObjectPathsAction.cpp @@ -1,21 +1,21 @@ #include "ImportH5ObjectPathsAction.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" #include #include #include -using namespace complex; +using namespace nx::core; namespace { -constexpr complex::int32 k_InsertFailureError = -6202; +constexpr nx::core::int32 k_InsertFailureError = -6202; void sortImportPaths(std::vector& importPaths) { @@ -30,7 +30,7 @@ std::vector getImportPaths(const DataStructure& importStructure, const } } // namespace -namespace complex +namespace nx::core { ImportH5ObjectPathsAction::ImportH5ObjectPathsAction(const std::filesystem::path& importFile, const PathsType& paths) : IDataCreationAction(DataPath{}) @@ -50,7 +50,7 @@ Result<> ImportH5ObjectPathsAction::apply(DataStructure& dataStructure, Mode mod static constexpr StringLiteral prefix = "ImportH5ObjectPathsAction: "; bool preflighting = (mode == Mode::Preflight); - complex::HDF5::FileReader fileReader(m_H5FilePath); + nx::core::HDF5::FileReader fileReader(m_H5FilePath); Result dataStructureResult = DREAM3D::ImportDataStructureFromFile(fileReader, preflighting); if(dataStructureResult.invalid()) { @@ -114,4 +114,4 @@ std::vector ImportH5ObjectPathsAction::getAllCreatedPaths() const } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/ImportH5ObjectPathsAction.hpp b/src/simplnx/Filter/Actions/ImportH5ObjectPathsAction.hpp similarity index 90% rename from src/complex/Filter/Actions/ImportH5ObjectPathsAction.hpp rename to src/simplnx/Filter/Actions/ImportH5ObjectPathsAction.hpp index a6d1c7dacb..96385ee7ca 100644 --- a/src/complex/Filter/Actions/ImportH5ObjectPathsAction.hpp +++ b/src/simplnx/Filter/Actions/ImportH5ObjectPathsAction.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/Output.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/Output.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief Action for importing DataObjects from an HDF5 file. */ -class COMPLEX_EXPORT ImportH5ObjectPathsAction : public IDataCreationAction +class SIMPLNX_EXPORT ImportH5ObjectPathsAction : public IDataCreationAction { public: using PathsType = std::optional>; @@ -61,4 +61,4 @@ class COMPLEX_EXPORT ImportH5ObjectPathsAction : public IDataCreationAction std::filesystem::path m_H5FilePath; PathsType m_Paths; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/ImportObjectAction.cpp b/src/simplnx/Filter/Actions/ImportObjectAction.cpp similarity index 86% rename from src/complex/Filter/Actions/ImportObjectAction.cpp rename to src/simplnx/Filter/Actions/ImportObjectAction.cpp index e45c7acb89..bfbf3a4f81 100644 --- a/src/complex/Filter/Actions/ImportObjectAction.cpp +++ b/src/simplnx/Filter/Actions/ImportObjectAction.cpp @@ -1,18 +1,18 @@ #include "ImportObjectAction.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataArray.hpp" #include -using namespace complex; +using namespace nx::core; namespace { -constexpr complex::int32 k_InsertFailureError = -6301; +constexpr nx::core::int32 k_InsertFailureError = -6301; } // namespace -namespace complex +namespace nx::core { ImportObjectAction::ImportObjectAction(const std::shared_ptr& importObject, const DataPath& path) : IDataCreationAction(path) @@ -59,4 +59,4 @@ std::vector ImportObjectAction::getAllCreatedPaths() const { return {getCreatedPath()}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/ImportObjectAction.hpp b/src/simplnx/Filter/Actions/ImportObjectAction.hpp similarity index 91% rename from src/complex/Filter/Actions/ImportObjectAction.hpp rename to src/simplnx/Filter/Actions/ImportObjectAction.hpp index b72159080a..43bcb82af4 100644 --- a/src/complex/Filter/Actions/ImportObjectAction.hpp +++ b/src/simplnx/Filter/Actions/ImportObjectAction.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Filter/Output.hpp" +#include "simplnx/Filter/Output.hpp" -namespace complex +namespace nx::core { /** * @brief Action for importing DataObjects into a DataStructure. */ -class COMPLEX_EXPORT ImportObjectAction : public IDataCreationAction +class SIMPLNX_EXPORT ImportObjectAction : public IDataCreationAction { public: ImportObjectAction() = delete; @@ -57,4 +57,4 @@ class COMPLEX_EXPORT ImportObjectAction : public IDataCreationAction private: std::shared_ptr m_ImportData; }; -} // namespace complex \ No newline at end of file +} // namespace nx::core \ No newline at end of file diff --git a/src/complex/Filter/Actions/MoveDataAction.cpp b/src/simplnx/Filter/Actions/MoveDataAction.cpp similarity index 95% rename from src/complex/Filter/Actions/MoveDataAction.cpp rename to src/simplnx/Filter/Actions/MoveDataAction.cpp index 3adf8df866..9a8e75fdc9 100644 --- a/src/complex/Filter/Actions/MoveDataAction.cpp +++ b/src/simplnx/Filter/Actions/MoveDataAction.cpp @@ -1,11 +1,11 @@ #include "MoveDataAction.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -18,7 +18,7 @@ constexpr int32 k_FailedFindOldParentCode = -6406; constexpr int32 k_RecursiveParentCode = -6407; } // namespace -namespace complex +namespace nx::core { MoveDataAction::MoveDataAction(const DataPath& path, const DataPath& newParentPath) : m_NewParentPath(newParentPath) @@ -103,4 +103,4 @@ const DataPath& MoveDataAction::path() const { return m_Path; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/MoveDataAction.hpp b/src/simplnx/Filter/Actions/MoveDataAction.hpp similarity index 86% rename from src/complex/Filter/Actions/MoveDataAction.hpp rename to src/simplnx/Filter/Actions/MoveDataAction.hpp index 8789b43797..612bd24347 100644 --- a/src/complex/Filter/Actions/MoveDataAction.hpp +++ b/src/simplnx/Filter/Actions/MoveDataAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for renaming DataObjects in a DataStructure */ -class COMPLEX_EXPORT MoveDataAction : public IDataAction +class SIMPLNX_EXPORT MoveDataAction : public IDataAction { public: MoveDataAction() = delete; @@ -52,4 +52,4 @@ class COMPLEX_EXPORT MoveDataAction : public IDataAction DataPath m_NewParentPath; DataPath m_Path; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/RenameDataAction.cpp b/src/simplnx/Filter/Actions/RenameDataAction.cpp similarity index 87% rename from src/complex/Filter/Actions/RenameDataAction.cpp rename to src/simplnx/Filter/Actions/RenameDataAction.cpp index b165c20702..e63f35d50d 100644 --- a/src/complex/Filter/Actions/RenameDataAction.cpp +++ b/src/simplnx/Filter/Actions/RenameDataAction.cpp @@ -1,13 +1,13 @@ #include "RenameDataAction.hpp" -#include "complex/DataStructure/EmptyDataStore.hpp" -#include "complex/Utilities/DataArrayUtilities.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" +#include "simplnx/Utilities/DataArrayUtilities.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { RenameDataAction::RenameDataAction(const DataPath& path, const std::string& newName) : m_NewName(newName) @@ -51,4 +51,4 @@ const DataPath& RenameDataAction::path() const { return m_Path; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/RenameDataAction.hpp b/src/simplnx/Filter/Actions/RenameDataAction.hpp similarity index 86% rename from src/complex/Filter/Actions/RenameDataAction.hpp rename to src/simplnx/Filter/Actions/RenameDataAction.hpp index 0b988fd5ad..5bd8872e42 100644 --- a/src/complex/Filter/Actions/RenameDataAction.hpp +++ b/src/simplnx/Filter/Actions/RenameDataAction.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for renaming DataObjects in a DataStructure */ -class COMPLEX_EXPORT RenameDataAction : public IDataAction +class SIMPLNX_EXPORT RenameDataAction : public IDataAction { public: RenameDataAction() = delete; @@ -52,4 +52,4 @@ class COMPLEX_EXPORT RenameDataAction : public IDataAction std::string m_NewName; DataPath m_Path; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/UpdateImageGeomAction.cpp b/src/simplnx/Filter/Actions/UpdateImageGeomAction.cpp similarity index 92% rename from src/complex/Filter/Actions/UpdateImageGeomAction.cpp rename to src/simplnx/Filter/Actions/UpdateImageGeomAction.cpp index 40036a1a99..ce666b500f 100644 --- a/src/complex/Filter/Actions/UpdateImageGeomAction.cpp +++ b/src/simplnx/Filter/Actions/UpdateImageGeomAction.cpp @@ -1,12 +1,12 @@ #include "UpdateImageGeomAction.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" #include -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { UpdateImageGeomAction::UpdateImageGeomAction(const std::optional& origin, const std::optional& spacing, const DataPath& path) : m_Origin(origin) @@ -67,4 +67,4 @@ const DataPath& UpdateImageGeomAction::path() const { return m_Path; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Actions/UpdateImageGeomAction.hpp b/src/simplnx/Filter/Actions/UpdateImageGeomAction.hpp similarity index 89% rename from src/complex/Filter/Actions/UpdateImageGeomAction.hpp rename to src/simplnx/Filter/Actions/UpdateImageGeomAction.hpp index a8a016c52c..b0b8997b23 100644 --- a/src/complex/Filter/Actions/UpdateImageGeomAction.hpp +++ b/src/simplnx/Filter/Actions/UpdateImageGeomAction.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { /** * @brief Action for updating an ImageGeom's origin and spacing in a DataStructure */ -class COMPLEX_EXPORT UpdateImageGeomAction : public IDataAction +class SIMPLNX_EXPORT UpdateImageGeomAction : public IDataAction { public: UpdateImageGeomAction() = delete; @@ -72,4 +72,4 @@ class COMPLEX_EXPORT UpdateImageGeomAction : public IDataAction std::optional m_Spacing; DataPath m_Path; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/AnyCloneable.hpp b/src/simplnx/Filter/AnyCloneable.hpp similarity index 97% rename from src/complex/Filter/AnyCloneable.hpp rename to src/simplnx/Filter/AnyCloneable.hpp index 3332eab7e6..9342bc8569 100644 --- a/src/complex/Filter/AnyCloneable.hpp +++ b/src/simplnx/Filter/AnyCloneable.hpp @@ -4,7 +4,7 @@ #include #include -namespace complex +namespace nx::core { /** * @class AnyCloneable @@ -92,4 +92,4 @@ class AnyCloneable private: std::unique_ptr m_Value; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Arguments.cpp b/src/simplnx/Filter/Arguments.cpp similarity index 95% rename from src/complex/Filter/Arguments.cpp rename to src/simplnx/Filter/Arguments.cpp index 4683884428..d37a0317f5 100644 --- a/src/complex/Filter/Arguments.cpp +++ b/src/simplnx/Filter/Arguments.cpp @@ -4,7 +4,7 @@ #include -namespace complex +namespace nx::core { bool Arguments::insert(std::string key, std::any value) { @@ -46,4 +46,4 @@ bool Arguments::contains(std::string_view key) const { return m_Args.count(key) > 0; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Arguments.hpp b/src/simplnx/Filter/Arguments.hpp similarity index 94% rename from src/complex/Filter/Arguments.hpp rename to src/simplnx/Filter/Arguments.hpp index 070bb04c81..774bf87397 100644 --- a/src/complex/Filter/Arguments.hpp +++ b/src/simplnx/Filter/Arguments.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Common/Any.hpp" -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -11,12 +11,12 @@ #include #include -namespace complex +namespace nx::core { /** * @brief Arguments stores a map of strings to std::any. Meant for passing values to IFilter when executing. */ -class COMPLEX_EXPORT Arguments +class SIMPLNX_EXPORT Arguments { public: Arguments() = default; @@ -156,4 +156,4 @@ class COMPLEX_EXPORT Arguments private: std::map> m_Args; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/ConstDataParameter.cpp b/src/simplnx/Filter/ConstDataParameter.cpp similarity index 76% rename from src/complex/Filter/ConstDataParameter.cpp rename to src/simplnx/Filter/ConstDataParameter.cpp index a79526ea9c..0ab64330a2 100644 --- a/src/complex/Filter/ConstDataParameter.cpp +++ b/src/simplnx/Filter/ConstDataParameter.cpp @@ -1,9 +1,9 @@ #include "ConstDataParameter.hpp" -namespace complex +namespace nx::core { ConstDataParameter::Mutability ConstDataParameter::mutability() const { return Mutability::Const; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/ConstDataParameter.hpp b/src/simplnx/Filter/ConstDataParameter.hpp similarity index 87% rename from src/complex/Filter/ConstDataParameter.hpp rename to src/simplnx/Filter/ConstDataParameter.hpp index b68f664f64..d4831ddcbd 100644 --- a/src/complex/Filter/ConstDataParameter.hpp +++ b/src/simplnx/Filter/ConstDataParameter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Filter/DataParameter.hpp" +#include "simplnx/Filter/DataParameter.hpp" -namespace complex +namespace nx::core { /** * @brief ConstDataParameter provides const access to DataStructure for parameters. */ -class COMPLEX_EXPORT ConstDataParameter : public DataParameter +class SIMPLNX_EXPORT ConstDataParameter : public DataParameter { public: ~ConstDataParameter() noexcept override = default; @@ -37,4 +37,4 @@ class COMPLEX_EXPORT ConstDataParameter : public DataParameter ConstDataParameter() = delete; using DataParameter::DataParameter; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/DataParameter.cpp b/src/simplnx/Filter/DataParameter.cpp similarity index 90% rename from src/complex/Filter/DataParameter.cpp rename to src/simplnx/Filter/DataParameter.cpp index 1d8ef5f0d4..0c7f790416 100644 --- a/src/complex/Filter/DataParameter.cpp +++ b/src/simplnx/Filter/DataParameter.cpp @@ -1,6 +1,6 @@ #include "DataParameter.hpp" -namespace complex +namespace nx::core { DataParameter::DataParameter(const std::string& name, const std::string& humanName, const std::string& helpText, Category category) : AbstractParameter(name, humanName, helpText) @@ -17,4 +17,4 @@ DataParameter::Category DataParameter::category() const { return m_Category; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/DataParameter.hpp b/src/simplnx/Filter/DataParameter.hpp similarity index 86% rename from src/complex/Filter/DataParameter.hpp rename to src/simplnx/Filter/DataParameter.hpp index bbc58e07d2..2404f4721b 100644 --- a/src/complex/Filter/DataParameter.hpp +++ b/src/simplnx/Filter/DataParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/AbstractParameter.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/AbstractParameter.hpp" -namespace complex +namespace nx::core { /** * @brief DataParameter provides an interface for parameters that need access to DataStructure. */ -class COMPLEX_EXPORT DataParameter : public AbstractParameter +class SIMPLNX_EXPORT DataParameter : public AbstractParameter { public: enum class Category : uint8 @@ -65,4 +65,4 @@ class COMPLEX_EXPORT DataParameter : public AbstractParameter private: Category m_Category; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/FilterHandle.cpp b/src/simplnx/Filter/FilterHandle.cpp similarity index 92% rename from src/complex/Filter/FilterHandle.cpp rename to src/simplnx/Filter/FilterHandle.cpp index 0833d1b141..d8058aaa1e 100644 --- a/src/complex/Filter/FilterHandle.cpp +++ b/src/simplnx/Filter/FilterHandle.cpp @@ -1,7 +1,7 @@ -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Filter/IFilter.hpp" -namespace complex +namespace nx::core { FilterHandle::FilterHandle(const FilterIdType& filterId, const PluginIdType& pluginId) : m_FilterName("[Unknown Filter]") @@ -64,4 +64,4 @@ bool operator!=(const FilterHandle& lhs, const FilterHandle& rhs) noexcept { return !(lhs == rhs); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/FilterHandle.hpp b/src/simplnx/Filter/FilterHandle.hpp similarity index 88% rename from src/complex/Filter/FilterHandle.hpp rename to src/simplnx/Filter/FilterHandle.hpp index 9fa5e7700e..2cb3f4cf46 100644 --- a/src/complex/Filter/FilterHandle.hpp +++ b/src/simplnx/Filter/FilterHandle.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Common/Uuid.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Uuid.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { class AbstractPlugin; class FilterList; @@ -20,7 +20,7 @@ class FilterList; * belongs. This class serves no other purpose other than to identify a * specific filter in the FilterList. */ -class COMPLEX_EXPORT FilterHandle +class SIMPLNX_EXPORT FilterHandle { public: friend class AbstractPlugin; @@ -136,7 +136,7 @@ class COMPLEX_EXPORT FilterHandle * @param rhs * @return bool */ -bool COMPLEX_EXPORT operator==(const FilterHandle& lhs, const FilterHandle& rhs) noexcept; +bool SIMPLNX_EXPORT operator==(const FilterHandle& lhs, const FilterHandle& rhs) noexcept; /** * @brief The FilterHandle inequality operator checks that the filter name, @@ -145,22 +145,22 @@ bool COMPLEX_EXPORT operator==(const FilterHandle& lhs, const FilterHandle& rhs) * @param rhs * @return bool */ -bool COMPLEX_EXPORT operator!=(const FilterHandle& lhs, const FilterHandle& rhs) noexcept; -} // namespace complex +bool SIMPLNX_EXPORT operator!=(const FilterHandle& lhs, const FilterHandle& rhs) noexcept; +} // namespace nx::core namespace std { template <> -struct hash<::complex::FilterHandle> +struct hash<::nx::core::FilterHandle> { /** * @brief Hash operator for placing in a collection that requires hashing values. * @param value * @return std::size_t */ - std::size_t operator()(const ::complex::FilterHandle& value) const noexcept + std::size_t operator()(const ::nx::core::FilterHandle& value) const noexcept { - std::hash<::complex::FilterHandle::FilterIdType> hasher; + std::hash<::nx::core::FilterHandle::FilterIdType> hasher; std::size_t h1 = hasher(value.getPluginId()); std::size_t h2 = hasher(value.getFilterId()); return h1 ^ (h2 << 1); diff --git a/src/complex/Filter/FilterList.cpp b/src/simplnx/Filter/FilterList.cpp similarity index 98% rename from src/complex/Filter/FilterList.cpp rename to src/simplnx/Filter/FilterList.cpp index fcaee24875..0d57f404bd 100644 --- a/src/complex/Filter/FilterList.cpp +++ b/src/simplnx/Filter/FilterList.cpp @@ -1,13 +1,13 @@ #include "FilterList.hpp" -#include "complex/Core/Application.hpp" +#include "simplnx/Core/Application.hpp" #include #include #include -using namespace complex; +using namespace nx::core; FilterList::FilterList() = default; diff --git a/src/complex/Filter/FilterList.hpp b/src/simplnx/Filter/FilterList.hpp similarity index 92% rename from src/complex/Filter/FilterList.hpp rename to src/simplnx/Filter/FilterList.hpp index 5e2834290f..60b7659185 100644 --- a/src/complex/Filter/FilterList.hpp +++ b/src/simplnx/Filter/FilterList.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" -#include "complex/Plugin/PluginLoader.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" +#include "simplnx/Plugin/PluginLoader.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -12,7 +12,7 @@ #include #include -namespace complex +namespace nx::core { /** * @class FilterList @@ -21,7 +21,7 @@ namespace complex * FilterHandles for each plugin's available filters, and handles the creation * of those filters at a later time. */ -class COMPLEX_EXPORT FilterList +class SIMPLNX_EXPORT FilterList { public: using FilterContainerType = std::unordered_set; @@ -80,7 +80,7 @@ class COMPLEX_EXPORT FilterList * FilterHandle. Returns nullptr if the plugin could not be found. * * The plugin is owned by the FilterList and will be cleaned up when the - * complex::Application is destroyed. + * nx::core::Application is destroyed. * @param handle * @return AbstractPlugin* */ @@ -155,7 +155,7 @@ class COMPLEX_EXPORT FilterList * nullptr if no plugin with the given ID is found. * * This plugin is owned by the FilterList and will be cleaned up when the - * complex::Application closes. + * nx::core::Application closes. * @param identifier * @return AbstractPlugin* */ @@ -167,4 +167,4 @@ class COMPLEX_EXPORT FilterList FilterContainerType m_FilterHandles; std::unordered_map> m_PluginMap; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/FilterTraits.hpp b/src/simplnx/Filter/FilterTraits.hpp similarity index 56% rename from src/complex/Filter/FilterTraits.hpp rename to src/simplnx/Filter/FilterTraits.hpp index 9994730fb9..46b0bdc589 100644 --- a/src/complex/Filter/FilterTraits.hpp +++ b/src/simplnx/Filter/FilterTraits.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/IFilter.hpp" #include -namespace complex +namespace nx::core { /** * @brief Specializations of FilterTraits provide name and uuid for T @@ -15,21 +15,21 @@ template >> struct FilterTraits { }; -} // namespace complex +} // namespace nx::core -#define COMPLEX_DEF(ns_name) #ns_name +#define SIMPLNX_DEF(ns_name) #ns_name -#define COMPLEX_DEF_FILTER_TRAITS_NAMED(ns, filter_name, uuidString) \ +#define SIMPLNX_DEF_FILTER_TRAITS_NAMED(ns, filter_name, uuidString) \ template <> \ - struct complex::FilterTraits \ + struct nx::core::FilterTraits \ { \ - static inline constexpr complex::StringLiteral className = #filter_name; \ - static inline constexpr complex::StringLiteral name = COMPLEX_DEF(ns::filter_name); \ - static inline constexpr complex::Uuid uuid = *complex::Uuid::FromString(uuidString); \ + static inline constexpr nx::core::StringLiteral className = #filter_name; \ + static inline constexpr nx::core::StringLiteral name = SIMPLNX_DEF(ns::filter_name); \ + static inline constexpr nx::core::Uuid uuid = *nx::core::Uuid::FromString(uuidString); \ } -#define COMPLEX_DEF_FILTER_TRAITS(ns, name, uuidString) COMPLEX_DEF_FILTER_TRAITS_NAMED(ns, name, uuidString) +#define SIMPLNX_DEF_FILTER_TRAITS(ns, name, uuidString) SIMPLNX_DEF_FILTER_TRAITS_NAMED(ns, name, uuidString) -#define COMPLEX_NAMESPACE_CONCAT(nameSpace, type) nameSpace::type +#define SIMPLNX_NAMESPACE_CONCAT(nameSpace, type) nameSpace::type -#define COMPLEX_DEF_FILTER_TRAITS_NAMEDSPACED(type, nameSpace, uuidString) COMPLEX_DEF_FILTER_TRAITS_NAMED(COMPLEX_NAMESPACE_CONCAT(nameSpace, type), #type, uuidString) +#define SIMPLNX_DEF_FILTER_TRAITS_NAMEDSPACED(type, nameSpace, uuidString) SIMPLNX_DEF_FILTER_TRAITS_NAMED(SIMPLNX_NAMESPACE_CONCAT(nameSpace, type), #type, uuidString) diff --git a/src/complex/Filter/IFilter.cpp b/src/simplnx/Filter/IFilter.cpp similarity index 97% rename from src/complex/Filter/IFilter.cpp rename to src/simplnx/Filter/IFilter.cpp index a156362aa2..45d1fc6698 100644 --- a/src/complex/Filter/IFilter.cpp +++ b/src/simplnx/Filter/IFilter.cpp @@ -1,7 +1,7 @@ #include "IFilter.hpp" -#include "complex/Filter/DataParameter.hpp" -#include "complex/Filter/ValueParameter.hpp" +#include "simplnx/Filter/DataParameter.hpp" +#include "simplnx/Filter/ValueParameter.hpp" #include #include @@ -9,12 +9,12 @@ #include #include -using namespace complex; +using namespace nx::core; namespace { template -void moveResult(complex::Result& result, std::vector& errors, std::vector& warnings) +void moveResult(nx::core::Result& result, std::vector& errors, std::vector& warnings) { for(auto& warning : result.warnings()) { @@ -123,7 +123,7 @@ Result<> ValidateParameter(std::string_view name, const AnyParameter& parameter, } } // namespace -namespace complex +namespace nx::core { IFilter::~IFilter() noexcept = default; @@ -297,4 +297,4 @@ Arguments IFilter::getDefaultArguments() const return args; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/IFilter.hpp b/src/simplnx/Filter/IFilter.hpp similarity index 94% rename from src/complex/Filter/IFilter.hpp rename to src/simplnx/Filter/IFilter.hpp index e6e053b3d5..1aa95a328c 100644 --- a/src/complex/Filter/IFilter.hpp +++ b/src/simplnx/Filter/IFilter.hpp @@ -1,12 +1,12 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Common/Uuid.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Filter/Parameters.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Uuid.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Filter/Parameters.hpp" +#include "simplnx/simplnx_export.hpp" #include @@ -16,7 +16,7 @@ #include #include -namespace complex +namespace nx::core { class PipelineFilter; @@ -25,7 +25,7 @@ class PipelineFilter; * @brief IFilter is the interface for filters providing access to both metadata (e.g. name, uuid, etc.) * and the algorithm itself (i.e. preflight/execute). */ -class COMPLEX_EXPORT IFilter +class SIMPLNX_EXPORT IFilter { public: using UniquePointer = std::unique_ptr; @@ -222,4 +222,4 @@ class COMPLEX_EXPORT IFilter }; using FilterCreationFunc = std::function; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/IParameter.cpp b/src/simplnx/Filter/IParameter.cpp similarity index 73% rename from src/complex/Filter/IParameter.cpp rename to src/simplnx/Filter/IParameter.cpp index 9af1d34f10..f09a23e6d9 100644 --- a/src/complex/Filter/IParameter.cpp +++ b/src/simplnx/Filter/IParameter.cpp @@ -1,9 +1,9 @@ #include "IParameter.hpp" -namespace complex +namespace nx::core { std::any IParameter::construct(const Arguments& args) const { return args.at(name()); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/IParameter.hpp b/src/simplnx/Filter/IParameter.hpp similarity index 92% rename from src/complex/Filter/IParameter.hpp rename to src/simplnx/Filter/IParameter.hpp index c70806e199..4ff317ba9e 100644 --- a/src/complex/Filter/IParameter.hpp +++ b/src/simplnx/Filter/IParameter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Common/Uuid.hpp" -#include "complex/Filter/AnyCloneable.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Common/Uuid.hpp" +#include "simplnx/Filter/AnyCloneable.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/simplnx_export.hpp" #include @@ -17,7 +17,7 @@ #include #include -namespace complex +namespace nx::core { /** * @brief These constants can be used as standard error codes when parsing JSON @@ -48,7 +48,7 @@ inline constexpr int32 k_Validate_InvalidDataObjectName = -210; * @brief IParameter provides an interface for filter parameters including metadata (e.g. name, uuid, etc.) * and how it interacts with its inputs. May be either a ValueParameter or a DataParameter. */ -class COMPLEX_EXPORT IParameter +class SIMPLNX_EXPORT IParameter { public: using AcceptedTypes = std::vector; @@ -143,4 +143,4 @@ class COMPLEX_EXPORT IParameter }; using AnyParameter = AnyCloneable; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/MutableDataParameter.cpp b/src/simplnx/Filter/MutableDataParameter.cpp similarity index 77% rename from src/complex/Filter/MutableDataParameter.cpp rename to src/simplnx/Filter/MutableDataParameter.cpp index 46a2f413f7..1663882ed5 100644 --- a/src/complex/Filter/MutableDataParameter.cpp +++ b/src/simplnx/Filter/MutableDataParameter.cpp @@ -1,9 +1,9 @@ #include "MutableDataParameter.hpp" -namespace complex +namespace nx::core { MutableDataParameter::Mutability MutableDataParameter::mutability() const { return Mutability::Mutable; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/MutableDataParameter.hpp b/src/simplnx/Filter/MutableDataParameter.hpp similarity index 87% rename from src/complex/Filter/MutableDataParameter.hpp rename to src/simplnx/Filter/MutableDataParameter.hpp index fc4f3027d1..8d002c1e28 100644 --- a/src/complex/Filter/MutableDataParameter.hpp +++ b/src/simplnx/Filter/MutableDataParameter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Filter/DataParameter.hpp" +#include "simplnx/Filter/DataParameter.hpp" -namespace complex +namespace nx::core { /** * @brief MutableDataParameter provides mutable access to DataStructure for parameters. */ -class COMPLEX_EXPORT MutableDataParameter : public DataParameter +class SIMPLNX_EXPORT MutableDataParameter : public DataParameter { public: ~MutableDataParameter() noexcept override = default; @@ -37,4 +37,4 @@ class COMPLEX_EXPORT MutableDataParameter : public DataParameter MutableDataParameter() = delete; using DataParameter::DataParameter; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Output.cpp b/src/simplnx/Filter/Output.cpp similarity index 95% rename from src/complex/Filter/Output.cpp rename to src/simplnx/Filter/Output.cpp index e4916d8196..446d1f4418 100644 --- a/src/complex/Filter/Output.cpp +++ b/src/simplnx/Filter/Output.cpp @@ -1,8 +1,8 @@ #include "Output.hpp" -using namespace complex; +using namespace nx::core; -namespace complex +namespace nx::core { Result<> OutputActions::ApplyActions(nonstd::span actions, DataStructure& dataStructure, IDataAction::Mode mode) { @@ -41,4 +41,4 @@ Result<> OutputActions::applyAll(DataStructure& dataStructure, IDataAction::Mode Result<> deferredActionsResult = applyDeferred(dataStructure, mode); return MergeResults(std::move(regularActionsResult), std::move(deferredActionsResult)); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Output.hpp b/src/simplnx/Filter/Output.hpp similarity index 93% rename from src/complex/Filter/Output.hpp rename to src/simplnx/Filter/Output.hpp index 25e1df639f..61e56a6697 100644 --- a/src/complex/Filter/Output.hpp +++ b/src/simplnx/Filter/Output.hpp @@ -1,23 +1,23 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/AnyCloneable.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/AnyCloneable.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include -namespace complex +namespace nx::core { /** * @brief IDataAction is the interface for declaratively stating what changes to be made to a DataStructure. * Can then be applied in preflight or execute mode to actually make those changes. */ -class COMPLEX_EXPORT IDataAction +class SIMPLNX_EXPORT IDataAction { public: using UniquePointer = std::unique_ptr; @@ -59,7 +59,7 @@ using AnyDataAction = AnyCloneable; * @brief The IDataCreationAction class is a subclass of IDataAction used for * inserting a DataObject to a target DataStructure. */ -class COMPLEX_EXPORT IDataCreationAction : public IDataAction +class SIMPLNX_EXPORT IDataCreationAction : public IDataAction { public: enum class ArrayHandlingType : uint64 @@ -110,7 +110,7 @@ class COMPLEX_EXPORT IDataCreationAction : public IDataAction /** * @brief */ -struct COMPLEX_EXPORT DataObjectModification +struct SIMPLNX_EXPORT DataObjectModification { enum class ModifiedType : uint64 @@ -128,7 +128,7 @@ struct COMPLEX_EXPORT DataObjectModification /** * @brief Container for IDataActions */ -struct COMPLEX_EXPORT OutputActions +struct SIMPLNX_EXPORT OutputActions { std::vector actions = {}; std::vector deferredActions = {}; @@ -217,4 +217,4 @@ inline Result MergeOutputActionResults(Result firs result.value() = MergeOutputActions(first.value(), second.value()); return result; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/ParameterTraits.hpp b/src/simplnx/Filter/ParameterTraits.hpp similarity index 60% rename from src/complex/Filter/ParameterTraits.hpp rename to src/simplnx/Filter/ParameterTraits.hpp index dc08d6505d..1a2f5aad43 100644 --- a/src/complex/Filter/ParameterTraits.hpp +++ b/src/simplnx/Filter/ParameterTraits.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Common/StringLiteral.hpp" -#include "complex/Filter/IParameter.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Filter/IParameter.hpp" #include -namespace complex +namespace nx::core { /** * @brief Specializations of ParameterTraits provide name and uuid for T @@ -15,18 +15,18 @@ template >> struct ParameterTraits { }; -} // namespace complex +} // namespace nx::core -#define COMPLEX_DEF_PARAMETER_TRAITS_NAMED(type, nameString, uuidString) \ +#define SIMPLNX_DEF_PARAMETER_TRAITS_NAMED(type, nameString, uuidString) \ template <> \ - struct complex::ParameterTraits \ + struct nx::core::ParameterTraits \ { \ - static inline constexpr complex::StringLiteral name = nameString; \ - static inline constexpr complex::Uuid uuid = *complex::Uuid::FromString(uuidString); \ + static inline constexpr nx::core::StringLiteral name = nameString; \ + static inline constexpr nx::core::Uuid uuid = *nx::core::Uuid::FromString(uuidString); \ } -#define COMPLEX_DEF_PARAMETER_TRAITS(type, uuidString) COMPLEX_DEF_PARAMETER_TRAITS_NAMED(type, #type, uuidString) +#define SIMPLNX_DEF_PARAMETER_TRAITS(type, uuidString) SIMPLNX_DEF_PARAMETER_TRAITS_NAMED(type, #type, uuidString) -#define COMPLEX_NAMESPACE_CONCAT(nameSpace, type) nameSpace::type +#define SIMPLNX_NAMESPACE_CONCAT(nameSpace, type) nameSpace::type -#define COMPLEX_DEF_PARAMETER_TRAITS_NAMEDSPACED(type, nameSpace, uuidString) COMPLEX_DEF_PARAMETER_TRAITS_NAMED(COMPLEX_NAMESPACE_CONCAT(nameSpace, type), #type, uuidString) +#define SIMPLNX_DEF_PARAMETER_TRAITS_NAMEDSPACED(type, nameSpace, uuidString) SIMPLNX_DEF_PARAMETER_TRAITS_NAMED(SIMPLNX_NAMESPACE_CONCAT(nameSpace, type), #type, uuidString) diff --git a/src/complex/Filter/Parameters.cpp b/src/simplnx/Filter/Parameters.cpp similarity index 98% rename from src/complex/Filter/Parameters.cpp rename to src/simplnx/Filter/Parameters.cpp index 6af9d5da2b..952ffa1ff0 100644 --- a/src/complex/Filter/Parameters.cpp +++ b/src/simplnx/Filter/Parameters.cpp @@ -1,6 +1,6 @@ #include "Parameters.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -16,7 +16,7 @@ auto& MapAt(ContainerT& container, std::string_view key, const char* message) } } // namespace -namespace complex +namespace nx::core { bool Parameters::contains(std::string_view name) const { @@ -191,4 +191,4 @@ const Parameters::GroupList& Parameters::getLinkedGroups(std::string_view key) c { return MapAt(m_ParamGroups, key, "Parameters::getLinkedGroups(...): Key '{}' does not exist"); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/Parameters.hpp b/src/simplnx/Filter/Parameters.hpp similarity index 95% rename from src/complex/Filter/Parameters.hpp rename to src/simplnx/Filter/Parameters.hpp index 1b2b5d9afd..82d0d2a2c0 100644 --- a/src/complex/Filter/Parameters.hpp +++ b/src/simplnx/Filter/Parameters.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Filter/IParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Filter/IParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -10,7 +10,7 @@ #include #include -namespace complex +namespace nx::core { namespace detail { @@ -26,15 +26,15 @@ IsActiveFunc CreateIsActiveFunc() /** * @brief Parameters stores a map of strings to IParameter. Preserves insertion order. */ -class COMPLEX_EXPORT Parameters +class SIMPLNX_EXPORT Parameters { public: - struct COMPLEX_EXPORT Separator + struct SIMPLNX_EXPORT Separator { std::string name; }; - struct COMPLEX_EXPORT ParameterKey + struct SIMPLNX_EXPORT ParameterKey { std::string key; }; @@ -214,4 +214,4 @@ class COMPLEX_EXPORT Parameters std::map> m_ParamGroups; std::map> m_Groups; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/ValueParameter.cpp b/src/simplnx/Filter/ValueParameter.cpp similarity index 71% rename from src/complex/Filter/ValueParameter.cpp rename to src/simplnx/Filter/ValueParameter.cpp index 54bd5792e9..256a8c9225 100644 --- a/src/complex/Filter/ValueParameter.cpp +++ b/src/simplnx/Filter/ValueParameter.cpp @@ -1,9 +1,9 @@ #include "ValueParameter.hpp" -namespace complex +namespace nx::core { ValueParameter::Type ValueParameter::type() const { return Type::Value; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Filter/ValueParameter.hpp b/src/simplnx/Filter/ValueParameter.hpp similarity index 81% rename from src/complex/Filter/ValueParameter.hpp rename to src/simplnx/Filter/ValueParameter.hpp index 2667b44d26..5fc2845dff 100644 --- a/src/complex/Filter/ValueParameter.hpp +++ b/src/simplnx/Filter/ValueParameter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Filter/AbstractParameter.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Filter/AbstractParameter.hpp" -namespace complex +namespace nx::core { /** * @brief ValueParameter provides an interface for parameters that deal with value types (e.g. integer, string, etc.). */ -class COMPLEX_EXPORT ValueParameter : public AbstractParameter +class SIMPLNX_EXPORT ValueParameter : public AbstractParameter { public: ~ValueParameter() noexcept override = default; @@ -36,4 +36,4 @@ class COMPLEX_EXPORT ValueParameter : public AbstractParameter ValueParameter() = delete; using AbstractParameter::AbstractParameter; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ArrayCreationParameter.cpp b/src/simplnx/Parameters/ArrayCreationParameter.cpp similarity index 86% rename from src/complex/Parameters/ArrayCreationParameter.cpp rename to src/simplnx/Parameters/ArrayCreationParameter.cpp index 496cd8dc9c..a42e569636 100644 --- a/src/complex/Parameters/ArrayCreationParameter.cpp +++ b/src/simplnx/Parameters/ArrayCreationParameter.cpp @@ -1,11 +1,11 @@ #include "ArrayCreationParameter.hpp" -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" #include #include -namespace complex +namespace nx::core { ArrayCreationParameter::ArrayCreationParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : MutableDataParameter(name, humanName, helpText, Category::Created) @@ -75,12 +75,12 @@ Result<> ArrayCreationParameter::validatePath(const DataStructure& dataStructure if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* object = dataStructure.getData(value); if(object != nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_ExistingValue, fmt::format("{}Object exists at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_ExistingValue, fmt::format("{}Object exists at path '{}'", prefix, value.toString())); } return {}; @@ -92,4 +92,4 @@ Result ArrayCreationParameter::resolve(DataStructure& dataStructure, c DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ArrayCreationParameter.hpp b/src/simplnx/Parameters/ArrayCreationParameter.hpp similarity index 83% rename from src/complex/Parameters/ArrayCreationParameter.hpp rename to src/simplnx/Parameters/ArrayCreationParameter.hpp index 3cdc1eb3d1..bd15892835 100644 --- a/src/complex/Parameters/ArrayCreationParameter.hpp +++ b/src/simplnx/Parameters/ArrayCreationParameter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT ArrayCreationParameter : public MutableDataParameter +class SIMPLNX_EXPORT ArrayCreationParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -90,6 +90,6 @@ class COMPLEX_EXPORT ArrayCreationParameter : public MutableDataParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ArrayCreationParameter, "ab047a7d-f81b-4e6f-99b5-610e7b69fc5b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ArrayCreationParameter, "ab047a7d-f81b-4e6f-99b5-610e7b69fc5b"); diff --git a/src/complex/Parameters/ArraySelectionParameter.cpp b/src/simplnx/Parameters/ArraySelectionParameter.cpp similarity index 78% rename from src/complex/Parameters/ArraySelectionParameter.cpp rename to src/simplnx/Parameters/ArraySelectionParameter.cpp index ee9ceb8a1d..6de9a65cef 100644 --- a/src/complex/Parameters/ArraySelectionParameter.cpp +++ b/src/simplnx/Parameters/ArraySelectionParameter.cpp @@ -1,32 +1,32 @@ #include "ArraySelectionParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include #include -using namespace complex; +using namespace nx::core; template <> -struct fmt::formatter +struct fmt::formatter { constexpr format_parse_context::iterator parse(format_parse_context& ctx) { return ctx.begin(); } - format_context::iterator format(const complex::DataType& value, format_context& ctx) const + format_context::iterator format(const nx::core::DataType& value, format_context& ctx) const { - return fmt::format_to(ctx.out(), "{}", complex::DataTypeToString(value)); + return fmt::format_to(ctx.out(), "{}", nx::core::DataTypeToString(value)); } }; -namespace complex +namespace nx::core { ArraySelectionParameter::ArraySelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const AllowedTypes& allowedTypes, AllowedComponentShapes requiredComps, DataLocation location) @@ -133,18 +133,18 @@ Result<> ArraySelectionParameter::validatePath(const DataStructure& dataStructur if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* object = dataStructure.getData(value); if(object == nullptr) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_Does_Not_Exist, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_Does_Not_Exist, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); } const auto* iArrayPtr = dynamic_cast(object); if(iArrayPtr == nullptr) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_Type_Error, fmt::format("{}Object at path '{}' must be a DataArray.", prefix, value.toString())); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_Type_Error, fmt::format("{}Object at path '{}' must be a DataArray.", prefix, value.toString())); } // Only validate IDataArray? Ignore StringData Array because there is only a @@ -158,8 +158,8 @@ Result<> ArraySelectionParameter::validatePath(const DataStructure& dataStructur DataType dataType = dataArray->getDataType(); if(m_AllowedTypes.count(dataType) == 0) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_AllowedType_Error, - fmt::format("{}DataArray at path '{}' was of type '{}', but only {} are allowed", prefix, value.toString(), dataType, m_AllowedTypes)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_AllowedType_Error, + fmt::format("{}DataArray at path '{}' was of type '{}', but only {} are allowed", prefix, value.toString(), dataType, m_AllowedTypes)); } } @@ -183,8 +183,8 @@ Result<> ArraySelectionParameter::validatePath(const DataStructure& dataStructur } if(!foundMatch) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_TupleShapeValue, - fmt::format("{}Object at path '{}' must have a component shape of {}.", prefix, value.toString(), compStr)); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_TupleShapeValue, + fmt::format("{}Object at path '{}' must have a component shape of {}.", prefix, value.toString(), compStr)); } } @@ -214,4 +214,4 @@ Result ArraySelectionParameter::resolve(DataStructure& dataStructure, DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ArraySelectionParameter.hpp b/src/simplnx/Parameters/ArraySelectionParameter.hpp similarity index 91% rename from src/complex/Parameters/ArraySelectionParameter.hpp rename to src/simplnx/Parameters/ArraySelectionParameter.hpp index a9b55f4a39..22e3b828b3 100644 --- a/src/complex/Parameters/ArraySelectionParameter.hpp +++ b/src/simplnx/Parameters/ArraySelectionParameter.hpp @@ -1,20 +1,20 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief This Filter Parameter describes a specific DataPath where the last DataObject in * the path is a DataArray Object. */ -class COMPLEX_EXPORT ArraySelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT ArraySelectionParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -144,6 +144,6 @@ class COMPLEX_EXPORT ArraySelectionParameter : public MutableDataParameter AllowedComponentShapes m_RequiredComponentShapes = {}; DataLocation m_Location = DataLocation::Any; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ArraySelectionParameter, "ab047a7f-f9ab-4e6f-99b5-610e7b69fc5b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ArraySelectionParameter, "ab047a7f-f9ab-4e6f-99b5-610e7b69fc5b"); diff --git a/src/complex/Parameters/ArrayThresholdsParameter.cpp b/src/simplnx/Parameters/ArrayThresholdsParameter.cpp similarity index 79% rename from src/complex/Parameters/ArrayThresholdsParameter.cpp rename to src/simplnx/Parameters/ArrayThresholdsParameter.cpp index 331f7aef9a..e9225a58a5 100644 --- a/src/complex/Parameters/ArrayThresholdsParameter.cpp +++ b/src/simplnx/Parameters/ArrayThresholdsParameter.cpp @@ -1,13 +1,13 @@ #include "ArrayThresholdsParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include -namespace complex +namespace nx::core { ArrayThresholdsParameter::ArrayThresholdsParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, AllowedComponentShapes requiredComps) @@ -78,18 +78,18 @@ Result<> ArrayThresholdsParameter::validatePath(const DataStructure& dataStructu if(dataPath.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* object = dataStructure.getData(dataPath); if(object == nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_ExistingValue, fmt::format("{}Object does not exist at path '{}'", prefix, dataPath.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_ExistingValue, fmt::format("{}Object does not exist at path '{}'", prefix, dataPath.toString())); } const auto* dataArray = dynamic_cast(object); if(dataArray == nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Type_Error, fmt::format("{}Object at path '{}' must be a DataArray.", prefix, dataPath.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Type_Error, fmt::format("{}Object at path '{}' must be a DataArray.", prefix, dataPath.toString())); } if(!m_RequiredComponentShapes.empty()) @@ -112,8 +112,8 @@ Result<> ArrayThresholdsParameter::validatePath(const DataStructure& dataStructu } if(!foundMatch) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_TupleShapeValue, - fmt::format("{}Object at path '{}' must have a component shape of {}.", prefix, dataPath.toString(), compStr)); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_TupleShapeValue, + fmt::format("{}Object at path '{}' must have a component shape of {}.", prefix, dataPath.toString(), compStr)); } } @@ -139,4 +139,4 @@ Result ArrayThresholdsParameter::resolve(DataStructure& dataStructure, { return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ArrayThresholdsParameter.hpp b/src/simplnx/Parameters/ArrayThresholdsParameter.hpp similarity index 84% rename from src/complex/Parameters/ArrayThresholdsParameter.hpp rename to src/simplnx/Parameters/ArrayThresholdsParameter.hpp index cfe3374a9c..f8008ad20d 100644 --- a/src/complex/Parameters/ArrayThresholdsParameter.hpp +++ b/src/simplnx/Parameters/ArrayThresholdsParameter.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Utilities/ArrayThreshold.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Utilities/ArrayThreshold.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT ArrayThresholdsParameter : public MutableDataParameter +class SIMPLNX_EXPORT ArrayThresholdsParameter : public MutableDataParameter { public: using ValueType = ArrayThresholdSet; @@ -110,6 +110,6 @@ class COMPLEX_EXPORT ArrayThresholdsParameter : public MutableDataParameter ValueType m_DefaultValue = {}; AllowedComponentShapes m_RequiredComponentShapes = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ArrayThresholdsParameter, "e93251bc-cdad-44c2-9332-58fe26aedfbe"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ArrayThresholdsParameter, "e93251bc-cdad-44c2-9332-58fe26aedfbe"); diff --git a/src/complex/Parameters/AttributeMatrixSelectionParameter.cpp b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp similarity index 81% rename from src/complex/Parameters/AttributeMatrixSelectionParameter.cpp rename to src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp index 3af0beb71d..345f941fd0 100644 --- a/src/complex/Parameters/AttributeMatrixSelectionParameter.cpp +++ b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.cpp @@ -1,12 +1,12 @@ #include "AttributeMatrixSelectionParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" #include #include -namespace complex +namespace nx::core { AttributeMatrixSelectionParameter::AttributeMatrixSelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : MutableDataParameter(name, humanName, helpText, Category::Required) @@ -77,19 +77,19 @@ Result<> AttributeMatrixSelectionParameter::validatePath(const DataStructure& da if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* dataObject = dataStructure.getData(value); if(dataObject == nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_DuplicateValue, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_DuplicateValue, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); } const AttributeMatrix* attrMatrix = dynamic_cast(dataObject); if(attrMatrix == nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_DuplicateValue, fmt::format("{}Object at path '{}' is *not* an AttributeMatrix", prefix, value.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_DuplicateValue, fmt::format("{}Object at path '{}' is *not* an AttributeMatrix", prefix, value.toString())); } return {}; @@ -101,4 +101,4 @@ Result AttributeMatrixSelectionParameter::resolve(DataStructure& dataS DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/AttributeMatrixSelectionParameter.hpp b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp similarity index 87% rename from src/complex/Parameters/AttributeMatrixSelectionParameter.hpp rename to src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp index 339d05a697..88bcf05464 100644 --- a/src/complex/Parameters/AttributeMatrixSelectionParameter.hpp +++ b/src/simplnx/Parameters/AttributeMatrixSelectionParameter.hpp @@ -1,16 +1,16 @@ #pragma once -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT AttributeMatrixSelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT AttributeMatrixSelectionParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -99,5 +99,5 @@ class COMPLEX_EXPORT AttributeMatrixSelectionParameter : public MutableDataParam private: ValueType m_DefaultValue = {}; }; -} // namespace complex -COMPLEX_DEF_PARAMETER_TRAITS(complex::AttributeMatrixSelectionParameter, "a3619d74-a1d9-4bc2-9e03-ca001d65b119"); +} // namespace nx::core +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::AttributeMatrixSelectionParameter, "a3619d74-a1d9-4bc2-9e03-ca001d65b119"); diff --git a/src/complex/Parameters/BoolParameter.cpp b/src/simplnx/Parameters/BoolParameter.cpp similarity index 97% rename from src/complex/Parameters/BoolParameter.cpp rename to src/simplnx/Parameters/BoolParameter.cpp index 6197b4fc2e..777e428fc1 100644 --- a/src/complex/Parameters/BoolParameter.cpp +++ b/src/simplnx/Parameters/BoolParameter.cpp @@ -3,7 +3,7 @@ #include #include -namespace complex +namespace nx::core { BoolParameter::BoolParameter(const std::string& name, const std::string& humanName, const std::string& helpText, ValueType defaultValue) : ValueParameter(name, humanName, helpText) @@ -67,4 +67,4 @@ bool BoolParameter::checkActive(const std::any& parameterValue, const std::any& return value == storedValue; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/BoolParameter.hpp b/src/simplnx/Parameters/BoolParameter.hpp similarity index 83% rename from src/complex/Parameters/BoolParameter.hpp rename to src/simplnx/Parameters/BoolParameter.hpp index 2d79d41f6b..6d6ed08ce1 100644 --- a/src/complex/Parameters/BoolParameter.hpp +++ b/src/simplnx/Parameters/BoolParameter.hpp @@ -1,12 +1,12 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT BoolParameter : public ValueParameter +class SIMPLNX_EXPORT BoolParameter : public ValueParameter { public: using ValueType = bool; @@ -81,6 +81,6 @@ class COMPLEX_EXPORT BoolParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::BoolParameter, "b6936d18-7476-4855-9e13-e795d717c50f"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::BoolParameter, "b6936d18-7476-4855-9e13-e795d717c50f"); diff --git a/src/complex/Parameters/CalculatorParameter.cpp b/src/simplnx/Parameters/CalculatorParameter.cpp similarity index 91% rename from src/complex/Parameters/CalculatorParameter.cpp rename to src/simplnx/Parameters/CalculatorParameter.cpp index 34694084f7..767710d593 100644 --- a/src/complex/Parameters/CalculatorParameter.cpp +++ b/src/simplnx/Parameters/CalculatorParameter.cpp @@ -1,14 +1,14 @@ #include "CalculatorParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/TypeTraits.hpp" -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include -namespace complex +namespace nx::core { namespace @@ -112,8 +112,8 @@ Result<> CalculatorParameter::validate(const DataStructure& dataStructure, const const DataObject* dataObject = dataStructure.getData(structValue.m_SelectedGroup); if(dataObject == nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_DuplicateValue, - fmt::format("{}Object does not exist at path '{}'", prefix, structValue.m_SelectedGroup.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_DuplicateValue, + fmt::format("{}Object does not exist at path '{}'", prefix, structValue.m_SelectedGroup.toString())); } const auto baseGroupObj = dataStructure.getDataAs(structValue.m_SelectedGroup); if(baseGroupObj == nullptr) @@ -131,4 +131,4 @@ Result CalculatorParameter::resolve(DataStructure& dataStructure, cons DataObject* object = dataStructure.getData(structValue.m_SelectedGroup); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/CalculatorParameter.hpp b/src/simplnx/Parameters/CalculatorParameter.hpp similarity index 82% rename from src/complex/Parameters/CalculatorParameter.hpp rename to src/simplnx/Parameters/CalculatorParameter.hpp index 455b03af3c..53e8433391 100644 --- a/src/complex/Parameters/CalculatorParameter.hpp +++ b/src/simplnx/Parameters/CalculatorParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT CalculatorParameter : public MutableDataParameter +class SIMPLNX_EXPORT CalculatorParameter : public MutableDataParameter { public: enum AngleUnits : uint8 @@ -96,6 +96,6 @@ class COMPLEX_EXPORT CalculatorParameter : public MutableDataParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::CalculatorParameter, "ba2d4937-dbec-5536-8c5c-c0a406e80f77"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::CalculatorParameter, "ba2d4937-dbec-5536-8c5c-c0a406e80f77"); diff --git a/src/complex/Parameters/ChoicesParameter.cpp b/src/simplnx/Parameters/ChoicesParameter.cpp similarity index 87% rename from src/complex/Parameters/ChoicesParameter.cpp rename to src/simplnx/Parameters/ChoicesParameter.cpp index 8962fef0ad..4f62c9f1d7 100644 --- a/src/complex/Parameters/ChoicesParameter.cpp +++ b/src/simplnx/Parameters/ChoicesParameter.cpp @@ -5,20 +5,20 @@ #include template <> -struct fmt::formatter +struct fmt::formatter { constexpr format_parse_context::iterator parse(format_parse_context& ctx) { return ctx.begin(); } - format_context::iterator format(const complex::Error& error, format_context& ctx) const + format_context::iterator format(const nx::core::Error& error, format_context& ctx) const { return format_to(ctx.out(), "Error({}, {})", error.code, error.message); } }; -namespace complex +namespace nx::core { ChoicesParameter::ChoicesParameter(const std::string& name, const std::string& humanName, const std::string& helpText, ValueType defaultValue, const Choices& choices) : ValueParameter(name, humanName, helpText) @@ -82,7 +82,7 @@ Result<> ChoicesParameter::validateIndex(ValueType index) const if(index >= m_Choices.size()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_OutOfRange_Error, fmt::format("{}Value '{}' must be less than {}", prefix, index, m_Choices.size())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_OutOfRange_Error, fmt::format("{}Value '{}' must be less than {}", prefix, index, m_Choices.size())); } return {}; @@ -105,4 +105,4 @@ bool ChoicesParameter::checkActive(const std::any& parameterValue, const std::an auto index = std::any_cast(associatedValue); return value == index; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ChoicesParameter.hpp b/src/simplnx/Parameters/ChoicesParameter.hpp similarity index 85% rename from src/complex/Parameters/ChoicesParameter.hpp rename to src/simplnx/Parameters/ChoicesParameter.hpp index 1881a41314..943b717c80 100644 --- a/src/complex/Parameters/ChoicesParameter.hpp +++ b/src/simplnx/Parameters/ChoicesParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT ChoicesParameter : public ValueParameter +class SIMPLNX_EXPORT ChoicesParameter : public ValueParameter { public: using Choices = std::vector; @@ -99,6 +99,6 @@ class COMPLEX_EXPORT ChoicesParameter : public ValueParameter ValueType m_DefaultValue = {}; Choices m_Choices = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ChoicesParameter, "ee4d5ce2-9582-48fa-b182-8a766ce0feff"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ChoicesParameter, "ee4d5ce2-9582-48fa-b182-8a766ce0feff"); diff --git a/src/complex/Parameters/DataGroupCreationParameter.cpp b/src/simplnx/Parameters/DataGroupCreationParameter.cpp similarity index 87% rename from src/complex/Parameters/DataGroupCreationParameter.cpp rename to src/simplnx/Parameters/DataGroupCreationParameter.cpp index e3323ee0a5..ba2ca9bc41 100644 --- a/src/complex/Parameters/DataGroupCreationParameter.cpp +++ b/src/simplnx/Parameters/DataGroupCreationParameter.cpp @@ -1,11 +1,11 @@ #include "DataGroupCreationParameter.hpp" -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" #include #include -namespace complex +namespace nx::core { DataGroupCreationParameter::DataGroupCreationParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : MutableDataParameter(name, humanName, helpText, Category::Created) @@ -76,12 +76,12 @@ Result<> DataGroupCreationParameter::validatePath(const DataStructure& dataStruc if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* object = dataStructure.getData(value); if(object != nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_ExistingValue, fmt::format("{}Object exists at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_ExistingValue, fmt::format("{}Object exists at path '{}'", prefix, value.toString())); } return {}; @@ -93,4 +93,4 @@ Result DataGroupCreationParameter::resolve(DataStructure& dataStructur DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DataGroupCreationParameter.hpp b/src/simplnx/Parameters/DataGroupCreationParameter.hpp similarity index 87% rename from src/complex/Parameters/DataGroupCreationParameter.hpp rename to src/simplnx/Parameters/DataGroupCreationParameter.hpp index 7e207c98a2..9cb3c7a54d 100644 --- a/src/complex/Parameters/DataGroupCreationParameter.hpp +++ b/src/simplnx/Parameters/DataGroupCreationParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT DataGroupCreationParameter : public MutableDataParameter +class SIMPLNX_EXPORT DataGroupCreationParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -96,6 +96,6 @@ class COMPLEX_EXPORT DataGroupCreationParameter : public MutableDataParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::DataGroupCreationParameter, "bff2d4ac-04a6-5251-b188-4f83f7865074"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DataGroupCreationParameter, "bff2d4ac-04a6-5251-b188-4f83f7865074"); diff --git a/src/complex/Parameters/DataGroupSelectionParameter.cpp b/src/simplnx/Parameters/DataGroupSelectionParameter.cpp similarity index 97% rename from src/complex/Parameters/DataGroupSelectionParameter.cpp rename to src/simplnx/Parameters/DataGroupSelectionParameter.cpp index e442e8a8e9..c3f7851cef 100644 --- a/src/complex/Parameters/DataGroupSelectionParameter.cpp +++ b/src/simplnx/Parameters/DataGroupSelectionParameter.cpp @@ -1,13 +1,13 @@ #include "DataGroupSelectionParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/DataStructure/DataGroup.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" #include #include #include -namespace complex +namespace nx::core { DataGroupSelectionParameter::DataGroupSelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const AllowedTypes& allowedTypes) @@ -116,4 +116,4 @@ Result DataGroupSelectionParameter::resolve(DataStructure& dataStructu DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DataGroupSelectionParameter.hpp b/src/simplnx/Parameters/DataGroupSelectionParameter.hpp similarity index 86% rename from src/complex/Parameters/DataGroupSelectionParameter.hpp rename to src/simplnx/Parameters/DataGroupSelectionParameter.hpp index fec9fb8744..1e83cabb3a 100644 --- a/src/complex/Parameters/DataGroupSelectionParameter.hpp +++ b/src/simplnx/Parameters/DataGroupSelectionParameter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/DataStructure/BaseGroup.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT DataGroupSelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT DataGroupSelectionParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -107,5 +107,5 @@ class COMPLEX_EXPORT DataGroupSelectionParameter : public MutableDataParameter ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; }; -} // namespace complex -COMPLEX_DEF_PARAMETER_TRAITS(complex::DataGroupSelectionParameter, "bff3d4ac-04a6-5251-b178-4f83f7865074"); +} // namespace nx::core +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DataGroupSelectionParameter, "bff3d4ac-04a6-5251-b178-4f83f7865074"); diff --git a/src/complex/Parameters/DataObjectNameParameter.cpp b/src/simplnx/Parameters/DataObjectNameParameter.cpp similarity index 81% rename from src/complex/Parameters/DataObjectNameParameter.cpp rename to src/simplnx/Parameters/DataObjectNameParameter.cpp index cdefcac1f1..e4b3a7d019 100644 --- a/src/complex/Parameters/DataObjectNameParameter.cpp +++ b/src/simplnx/Parameters/DataObjectNameParameter.cpp @@ -1,12 +1,12 @@ #include "DataObjectNameParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/DataStructure/DataObject.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/DataStructure/DataObject.hpp" #include #include -namespace complex +namespace nx::core { DataObjectNameParameter::DataObjectNameParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : ValueParameter(name, humanName, helpText) @@ -69,13 +69,13 @@ Result<> DataObjectNameParameter::validateName(const std::string& value) const if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataObjectName cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataObjectName cannot be empty", prefix)); } if(!DataObject::IsValidName(value)) { - return MakeErrorResult(complex::FilterParameter::Constants::k_Validate_InvalidDataObjectName, fmt::format("{}'{}' is not a valid DataObject name", prefix, value)); + return MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_InvalidDataObjectName, fmt::format("{}'{}' is not a valid DataObject name", prefix, value)); } return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DataObjectNameParameter.hpp b/src/simplnx/Parameters/DataObjectNameParameter.hpp similarity index 81% rename from src/complex/Parameters/DataObjectNameParameter.hpp rename to src/simplnx/Parameters/DataObjectNameParameter.hpp index 52ae2658fe..1463b23361 100644 --- a/src/complex/Parameters/DataObjectNameParameter.hpp +++ b/src/simplnx/Parameters/DataObjectNameParameter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT DataObjectNameParameter : public ValueParameter +class SIMPLNX_EXPORT DataObjectNameParameter : public ValueParameter { public: using ValueType = std::string; @@ -82,6 +82,6 @@ class COMPLEX_EXPORT DataObjectNameParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::DataObjectNameParameter, "fbc89375-3ca4-4eb2-8257-aad9bf8e1c94"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DataObjectNameParameter, "fbc89375-3ca4-4eb2-8257-aad9bf8e1c94"); diff --git a/src/complex/Parameters/DataPathSelectionParameter.cpp b/src/simplnx/Parameters/DataPathSelectionParameter.cpp similarity index 86% rename from src/complex/Parameters/DataPathSelectionParameter.cpp rename to src/simplnx/Parameters/DataPathSelectionParameter.cpp index 6aab771fe3..b517ef1907 100644 --- a/src/complex/Parameters/DataPathSelectionParameter.cpp +++ b/src/simplnx/Parameters/DataPathSelectionParameter.cpp @@ -1,11 +1,11 @@ #include "DataPathSelectionParameter.hpp" -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" #include #include -namespace complex +namespace nx::core { DataPathSelectionParameter::DataPathSelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : MutableDataParameter(name, humanName, helpText, Category::Required) @@ -75,13 +75,13 @@ Result<> DataPathSelectionParameter::validatePath(const DataStructure& dataStruc if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* dataObject = dataStructure.getData(value); if(dataObject == nullptr) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_DuplicateValue, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_DuplicateValue, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); } return {}; @@ -93,4 +93,4 @@ Result DataPathSelectionParameter::resolve(DataStructure& dataStructur DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DataPathSelectionParameter.hpp b/src/simplnx/Parameters/DataPathSelectionParameter.hpp similarity index 87% rename from src/complex/Parameters/DataPathSelectionParameter.hpp rename to src/simplnx/Parameters/DataPathSelectionParameter.hpp index a5d2fd5097..6fca79c2b5 100644 --- a/src/complex/Parameters/DataPathSelectionParameter.hpp +++ b/src/simplnx/Parameters/DataPathSelectionParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT DataPathSelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT DataPathSelectionParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -96,6 +96,6 @@ class COMPLEX_EXPORT DataPathSelectionParameter : public MutableDataParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::DataPathSelectionParameter, "cd12d081-fbf0-46c4-8f4a-15e2e06e98b8"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DataPathSelectionParameter, "cd12d081-fbf0-46c4-8f4a-15e2e06e98b8"); diff --git a/src/complex/Parameters/DataStoreFormatParameter.cpp b/src/simplnx/Parameters/DataStoreFormatParameter.cpp similarity index 92% rename from src/complex/Parameters/DataStoreFormatParameter.cpp rename to src/simplnx/Parameters/DataStoreFormatParameter.cpp index 76a4a286f6..8c66d17244 100644 --- a/src/complex/Parameters/DataStoreFormatParameter.cpp +++ b/src/simplnx/Parameters/DataStoreFormatParameter.cpp @@ -1,17 +1,17 @@ #include "DataStoreFormatParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Core/Application.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Core/Application.hpp" #include #include namespace { -constexpr complex::int64 k_BadFormatCode = -780; +constexpr nx::core::int64 k_BadFormatCode = -780; } -namespace complex +namespace nx::core { DataStoreFormatParameter::DataStoreFormatParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : ValueParameter(name, humanName, helpText) @@ -74,4 +74,4 @@ Result<> DataStoreFormatParameter::validate(const std::any& value) const } return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DataStoreFormatParameter.hpp b/src/simplnx/Parameters/DataStoreFormatParameter.hpp similarity index 81% rename from src/complex/Parameters/DataStoreFormatParameter.hpp rename to src/simplnx/Parameters/DataStoreFormatParameter.hpp index 88ba1a7fc5..40b7d86bb2 100644 --- a/src/complex/Parameters/DataStoreFormatParameter.hpp +++ b/src/simplnx/Parameters/DataStoreFormatParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT DataStoreFormatParameter : public ValueParameter +class SIMPLNX_EXPORT DataStoreFormatParameter : public ValueParameter { public: using ValueType = std::string; @@ -83,6 +83,6 @@ class COMPLEX_EXPORT DataStoreFormatParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::DataStoreFormatParameter, "cfd5c150-2938-42a7-b023-4a9288fb6899"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DataStoreFormatParameter, "cfd5c150-2938-42a7-b023-4a9288fb6899"); diff --git a/src/complex/Parameters/DataTypeParameter.cpp b/src/simplnx/Parameters/DataTypeParameter.cpp similarity index 77% rename from src/complex/Parameters/DataTypeParameter.cpp rename to src/simplnx/Parameters/DataTypeParameter.cpp index 92e2297d3f..b21a7f491e 100644 --- a/src/complex/Parameters/DataTypeParameter.cpp +++ b/src/simplnx/Parameters/DataTypeParameter.cpp @@ -7,58 +7,58 @@ namespace { -constexpr std::optional DataTypefromString(std::string_view string) noexcept +constexpr std::optional DataTypefromString(std::string_view string) noexcept { if(string == "bool") { - return complex::DataType::boolean; + return nx::core::DataType::boolean; } if(string == "int8") { - return complex::DataType::int8; + return nx::core::DataType::int8; } if(string == "uint8") { - return complex::DataType::uint8; + return nx::core::DataType::uint8; } if(string == "int16") { - return complex::DataType::int16; + return nx::core::DataType::int16; } if(string == "uint16") { - return complex::DataType::uint16; + return nx::core::DataType::uint16; } if(string == "int32") { - return complex::DataType::int32; + return nx::core::DataType::int32; } if(string == "uint32") { - return complex::DataType::uint32; + return nx::core::DataType::uint32; } if(string == "int64") { - return complex::DataType::int64; + return nx::core::DataType::int64; } if(string == "uint64") { - return complex::DataType::uint64; + return nx::core::DataType::uint64; } if(string == "float32") { - return complex::DataType::float32; + return nx::core::DataType::float32; } if(string == "float64") { - return complex::DataType::float64; + return nx::core::DataType::float64; } return {}; } } // namespace -namespace complex +namespace nx::core { DataTypeParameter::DataTypeParameter(const std::string& name, const std::string& humanName, const std::string& helpText, ValueType defaultValue) : ValueParameter(name, humanName, helpText) @@ -114,4 +114,4 @@ Result<> DataTypeParameter::validate(const std::any& value) const [[maybe_unused]] auto castValue = std::any_cast(value); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DataTypeParameter.hpp b/src/simplnx/Parameters/DataTypeParameter.hpp similarity index 77% rename from src/complex/Parameters/DataTypeParameter.hpp rename to src/simplnx/Parameters/DataTypeParameter.hpp index daaab1d310..ecb511f772 100644 --- a/src/complex/Parameters/DataTypeParameter.hpp +++ b/src/simplnx/Parameters/DataTypeParameter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT DataTypeParameter : public ValueParameter +class SIMPLNX_EXPORT DataTypeParameter : public ValueParameter { public: using ValueType = DataType; @@ -74,6 +74,6 @@ class COMPLEX_EXPORT DataTypeParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::DataTypeParameter, "d31358d5-3253-4c69-aff0-eb98618f851b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DataTypeParameter, "d31358d5-3253-4c69-aff0-eb98618f851b"); diff --git a/src/complex/Parameters/Dream3dImportParameter.cpp b/src/simplnx/Parameters/Dream3dImportParameter.cpp similarity index 95% rename from src/complex/Parameters/Dream3dImportParameter.cpp rename to src/simplnx/Parameters/Dream3dImportParameter.cpp index 233d3e7f87..cf81018cdc 100644 --- a/src/complex/Parameters/Dream3dImportParameter.cpp +++ b/src/simplnx/Parameters/Dream3dImportParameter.cpp @@ -1,15 +1,15 @@ #include "Dream3dImportParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Utilities/Parsing/HDF5/Readers/FileReader.hpp" #include #include namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -17,7 +17,7 @@ constexpr StringLiteral k_FilePathKey = "file_path"; constexpr StringLiteral k_DataPathsKey = "data_paths"; } // namespace -namespace complex +namespace nx::core { //----------------------------------------------------------------------------- Dream3dImportParameter::Dream3dImportParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) @@ -160,11 +160,11 @@ Result<> Dream3dImportParameter::validatePath(const ValueType& importData) const return MakeErrorResult(-3, fmt::format("Path '{}' is not a file", path.string())); } - complex::HDF5::FileReader fileReader(path); + nx::core::HDF5::FileReader fileReader(path); if(!fileReader.isValid()) { return MakeErrorResult(-4, fmt::format("HDF5 file at path '{}' could not be read", path.string())); } return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/Dream3dImportParameter.hpp b/src/simplnx/Parameters/Dream3dImportParameter.hpp similarity index 82% rename from src/complex/Parameters/Dream3dImportParameter.hpp rename to src/simplnx/Parameters/Dream3dImportParameter.hpp index 621c728d1d..f617d31542 100644 --- a/src/complex/Parameters/Dream3dImportParameter.hpp +++ b/src/simplnx/Parameters/Dream3dImportParameter.hpp @@ -1,22 +1,22 @@ #pragma once -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include -namespace complex +namespace nx::core { /** * @brief This FilterParameter allows for the selection of both an HDF5 file * to import a DataStructure from and the DataPaths to import. */ -class COMPLEX_EXPORT Dream3dImportParameter : public ValueParameter +class SIMPLNX_EXPORT Dream3dImportParameter : public ValueParameter { public: struct ImportData @@ -31,7 +31,7 @@ class COMPLEX_EXPORT Dream3dImportParameter : public ValueParameter * value is missing, all available DataPaths will be imported. Otherwise, * only the paths provided will be imported. */ - std::optional> DataPaths = std::nullopt; + std::optional> DataPaths = std::nullopt; }; using ValueType = ImportData; @@ -99,6 +99,6 @@ class COMPLEX_EXPORT Dream3dImportParameter : public ValueParameter private: ValueType m_DefaultValue; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::Dream3dImportParameter, "170a257d-5952-4854-9a91-4281cd06f4f5"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Dream3dImportParameter, "170a257d-5952-4854-9a91-4281cd06f4f5"); diff --git a/src/complex/Parameters/DynamicTableParameter.cpp b/src/simplnx/Parameters/DynamicTableParameter.cpp similarity index 96% rename from src/complex/Parameters/DynamicTableParameter.cpp rename to src/simplnx/Parameters/DynamicTableParameter.cpp index 4b8a94948d..32f3c69538 100644 --- a/src/complex/Parameters/DynamicTableParameter.cpp +++ b/src/simplnx/Parameters/DynamicTableParameter.cpp @@ -1,13 +1,13 @@ #include "DynamicTableParameter.hpp" -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" #include #include #include -namespace complex +namespace nx::core { DynamicTableParameter::DynamicTableParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const DynamicTableInfo& tableInfo) : ValueParameter(name, humanName, helpText) @@ -71,4 +71,4 @@ Result<> DynamicTableParameter::validate(const std::any& value) const const auto& table = GetAnyRef(value); return m_TableInfo.validate(table); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/DynamicTableParameter.hpp b/src/simplnx/Parameters/DynamicTableParameter.hpp similarity index 85% rename from src/complex/Parameters/DynamicTableParameter.hpp rename to src/simplnx/Parameters/DynamicTableParameter.hpp index e71aa355c3..24a2e45621 100644 --- a/src/complex/Parameters/DynamicTableParameter.hpp +++ b/src/simplnx/Parameters/DynamicTableParameter.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Parameters/util/DynamicTableInfo.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Parameters/util/DynamicTableInfo.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { /** * @class DynamicTableParameter * @brief */ -class COMPLEX_EXPORT DynamicTableParameter : public ValueParameter +class SIMPLNX_EXPORT DynamicTableParameter : public ValueParameter { public: using ValueType = DynamicTableInfo::TableDataType; @@ -91,6 +91,6 @@ class COMPLEX_EXPORT DynamicTableParameter : public ValueParameter ValueType m_DefaultValue = {}; DynamicTableInfo m_TableInfo; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::DynamicTableParameter, "eea76f1a-fab9-4704-8da5-4c21057cf44e"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::DynamicTableParameter, "eea76f1a-fab9-4704-8da5-4c21057cf44e"); diff --git a/src/complex/Parameters/EnsembleInfoParameter.cpp b/src/simplnx/Parameters/EnsembleInfoParameter.cpp similarity index 97% rename from src/complex/Parameters/EnsembleInfoParameter.cpp rename to src/simplnx/Parameters/EnsembleInfoParameter.cpp index 41fba23196..7d31d8ec2a 100644 --- a/src/complex/Parameters/EnsembleInfoParameter.cpp +++ b/src/simplnx/Parameters/EnsembleInfoParameter.cpp @@ -1,7 +1,7 @@ #include "EnsembleInfoParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/StringLiteral.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/StringLiteral.hpp" #include #include @@ -10,7 +10,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace { @@ -143,4 +143,4 @@ Result<> EnsembleInfoParameter::validate(const std::any& valueRef) const return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/EnsembleInfoParameter.hpp b/src/simplnx/Parameters/EnsembleInfoParameter.hpp similarity index 84% rename from src/complex/Parameters/EnsembleInfoParameter.hpp rename to src/simplnx/Parameters/EnsembleInfoParameter.hpp index a5bca9cd48..5bfb0a0ea0 100644 --- a/src/complex/Parameters/EnsembleInfoParameter.hpp +++ b/src/simplnx/Parameters/EnsembleInfoParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Utilities/FilePathGenerator.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Utilities/FilePathGenerator.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT EnsembleInfoParameter : public ValueParameter +class SIMPLNX_EXPORT EnsembleInfoParameter : public ValueParameter { public: @@ -85,6 +85,6 @@ class COMPLEX_EXPORT EnsembleInfoParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::EnsembleInfoParameter, "10d3924f-b4c9-4e06-9225-ce11ec8dff89"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::EnsembleInfoParameter, "10d3924f-b4c9-4e06-9225-ce11ec8dff89"); diff --git a/src/complex/Parameters/FileSystemPathParameter.cpp b/src/simplnx/Parameters/FileSystemPathParameter.cpp similarity index 90% rename from src/complex/Parameters/FileSystemPathParameter.cpp rename to src/simplnx/Parameters/FileSystemPathParameter.cpp index 54005469d2..522c01e259 100644 --- a/src/complex/Parameters/FileSystemPathParameter.cpp +++ b/src/simplnx/Parameters/FileSystemPathParameter.cpp @@ -1,8 +1,8 @@ #include "FileSystemPathParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include @@ -23,7 +23,7 @@ namespace fs = std::filesystem; -using namespace complex; +using namespace nx::core; namespace { @@ -162,7 +162,7 @@ Result<> ValidateOutputDir(const FileSystemPathParameter::ValueType& path) } // namespace -namespace complex +namespace nx::core { //----------------------------------------------------------------------------- FileSystemPathParameter::FileSystemPathParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, @@ -182,11 +182,11 @@ FileSystemPathParameter::FileSystemPathParameter(const std::string& name, const } if(ext.at(0) != '.') { - validatedExtensions.insert('.' + complex::StringUtilities::toLower(ext)); + validatedExtensions.insert('.' + nx::core::StringUtilities::toLower(ext)); } else { - validatedExtensions.insert(complex::StringUtilities::toLower(ext)); + validatedExtensions.insert(nx::core::StringUtilities::toLower(ext)); } } m_AvailableExtensions = validatedExtensions; @@ -276,16 +276,16 @@ Result<> FileSystemPathParameter::validatePath(const ValueType& path) const if(path.empty()) { - return complex::MakeErrorResult(-3001, fmt::format("{} File System Path must not be empty", prefix)); + return nx::core::MakeErrorResult(-3001, fmt::format("{} File System Path must not be empty", prefix)); } - if(!m_acceptAllExtensions && (m_PathType == complex::FileSystemPathParameter::PathType::InputFile || m_PathType == complex::FileSystemPathParameter::PathType::OutputFile)) + if(!m_acceptAllExtensions && (m_PathType == nx::core::FileSystemPathParameter::PathType::InputFile || m_PathType == nx::core::FileSystemPathParameter::PathType::OutputFile)) { if(!path.has_extension()) { return {nonstd::make_unexpected(std::vector{{-3002, fmt::format("{} File System Path must include a file extension", prefix)}})}; } - std::string lowerExtension = complex::StringUtilities::toLower(path.extension().string()); + std::string lowerExtension = nx::core::StringUtilities::toLower(path.extension().string()); if(path.has_extension() && !m_AvailableExtensions.empty() && m_AvailableExtensions.find(lowerExtension) == m_AvailableExtensions.end()) { return {nonstd::make_unexpected(std::vector{{-3003, fmt::format("{} File extension '{}' is not a valid file extension", prefix, path.extension().string())}})}; @@ -294,16 +294,16 @@ Result<> FileSystemPathParameter::validatePath(const ValueType& path) const switch(m_PathType) { - case complex::FileSystemPathParameter::PathType::InputFile: + case nx::core::FileSystemPathParameter::PathType::InputFile: return ValidateInputFile(path); - case complex::FileSystemPathParameter::PathType::InputDir: + case nx::core::FileSystemPathParameter::PathType::InputDir: return ValidateInputDir(path); - case complex::FileSystemPathParameter::PathType::OutputFile: + case nx::core::FileSystemPathParameter::PathType::OutputFile: return ValidateOutputFile(path); - case complex::FileSystemPathParameter::PathType::OutputDir: + case nx::core::FileSystemPathParameter::PathType::OutputDir: return ValidateOutputDir(path); } return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/FileSystemPathParameter.hpp b/src/simplnx/Parameters/FileSystemPathParameter.hpp similarity index 89% rename from src/complex/Parameters/FileSystemPathParameter.hpp rename to src/simplnx/Parameters/FileSystemPathParameter.hpp index 19ab51324f..eb00b15571 100644 --- a/src/complex/Parameters/FileSystemPathParameter.hpp +++ b/src/simplnx/Parameters/FileSystemPathParameter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief This FilterParameter can represent an input or output file or folder on the @@ -15,7 +15,7 @@ namespace complex * path can be a file or folder, this is the FilterParameter to use. The data is * held in a std::filesystem::path. */ -class COMPLEX_EXPORT FileSystemPathParameter : public ValueParameter +class SIMPLNX_EXPORT FileSystemPathParameter : public ValueParameter { public: enum class PathType : uint32 @@ -132,6 +132,6 @@ class COMPLEX_EXPORT FileSystemPathParameter : public ValueParameter ExtensionsType m_AvailableExtensions; bool m_acceptAllExtensions = false; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::FileSystemPathParameter, "f9a93f3d-21ef-43a1-a958-e57cbf3b2909"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::FileSystemPathParameter, "f9a93f3d-21ef-43a1-a958-e57cbf3b2909"); diff --git a/src/complex/Parameters/GenerateColorTableParameter.cpp b/src/simplnx/Parameters/GenerateColorTableParameter.cpp similarity index 95% rename from src/complex/Parameters/GenerateColorTableParameter.cpp rename to src/simplnx/Parameters/GenerateColorTableParameter.cpp index e79c7241b2..55daaa3114 100644 --- a/src/complex/Parameters/GenerateColorTableParameter.cpp +++ b/src/simplnx/Parameters/GenerateColorTableParameter.cpp @@ -4,9 +4,9 @@ #include -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" -namespace complex +namespace nx::core { GenerateColorTableParameter::GenerateColorTableParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : ValueParameter(name, humanName, helpText) @@ -61,4 +61,4 @@ Result<> GenerateColorTableParameter::validate(const std::any& value) const [[maybe_unused]] const auto& json = GetAnyRef(value); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/GenerateColorTableParameter.hpp b/src/simplnx/Parameters/GenerateColorTableParameter.hpp similarity index 82% rename from src/complex/Parameters/GenerateColorTableParameter.hpp rename to src/simplnx/Parameters/GenerateColorTableParameter.hpp index aaa79d9324..cfd677a542 100644 --- a/src/complex/Parameters/GenerateColorTableParameter.hpp +++ b/src/simplnx/Parameters/GenerateColorTableParameter.hpp @@ -2,19 +2,19 @@ #include -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { /** * @brief This FilterParameter represents a color preset, and works specifically * with the GenerateColorTable filter. The data is held in an nlohmann::json object. */ -class COMPLEX_EXPORT GenerateColorTableParameter : public ValueParameter +class SIMPLNX_EXPORT GenerateColorTableParameter : public ValueParameter { public: using ValueType = nlohmann::json; @@ -81,6 +81,6 @@ class COMPLEX_EXPORT GenerateColorTableParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::GenerateColorTableParameter, "7b0e5b25-564e-4797-b154-4324ef276bf0"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::GenerateColorTableParameter, "7b0e5b25-564e-4797-b154-4324ef276bf0"); diff --git a/src/complex/Parameters/GeneratedFileListParameter.cpp b/src/simplnx/Parameters/GeneratedFileListParameter.cpp similarity index 93% rename from src/complex/Parameters/GeneratedFileListParameter.cpp rename to src/simplnx/Parameters/GeneratedFileListParameter.cpp index 8746ae8621..063ba78cdd 100644 --- a/src/complex/Parameters/GeneratedFileListParameter.cpp +++ b/src/simplnx/Parameters/GeneratedFileListParameter.cpp @@ -1,8 +1,8 @@ #include "GeneratedFileListParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/TypeTraits.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/TypeTraits.hpp" #include #include @@ -12,7 +12,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace { @@ -149,12 +149,12 @@ Result<> GeneratedFileListParameter::validate(const std::any& valueRef) const if(value.inputPath.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}Input Path cannot be empty.", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}Input Path cannot be empty.", prefix)); } if(value.startIndex > value.endIndex) { - return complex::MakeErrorResult(-4002, fmt::format("{}startIndex must be less than or equal to endIndex.", prefix)); + return nx::core::MakeErrorResult(-4002, fmt::format("{}startIndex must be less than or equal to endIndex.", prefix)); } // Generate the file list auto fileList = value.generate(); @@ -175,4 +175,4 @@ Result<> GeneratedFileListParameter::validate(const std::any& valueRef) const return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/GeneratedFileListParameter.hpp b/src/simplnx/Parameters/GeneratedFileListParameter.hpp similarity index 85% rename from src/complex/Parameters/GeneratedFileListParameter.hpp rename to src/simplnx/Parameters/GeneratedFileListParameter.hpp index 357dea4d5b..1fe6bdbd71 100644 --- a/src/complex/Parameters/GeneratedFileListParameter.hpp +++ b/src/simplnx/Parameters/GeneratedFileListParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Utilities/FilePathGenerator.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Utilities/FilePathGenerator.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT GeneratedFileListParameter : public ValueParameter +class SIMPLNX_EXPORT GeneratedFileListParameter : public ValueParameter { public: using Ordering = FilePathGenerator::Ordering; @@ -97,6 +97,6 @@ class COMPLEX_EXPORT GeneratedFileListParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::GeneratedFileListParameter, "aac15aa6-b367-508e-bf73-94ab6be0058b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::GeneratedFileListParameter, "aac15aa6-b367-508e-bf73-94ab6be0058b"); diff --git a/src/complex/Parameters/GeometrySelectionParameter.cpp b/src/simplnx/Parameters/GeometrySelectionParameter.cpp similarity index 84% rename from src/complex/Parameters/GeometrySelectionParameter.cpp rename to src/simplnx/Parameters/GeometrySelectionParameter.cpp index 45316484e1..24bce400aa 100644 --- a/src/complex/Parameters/GeometrySelectionParameter.cpp +++ b/src/simplnx/Parameters/GeometrySelectionParameter.cpp @@ -1,14 +1,14 @@ #include "GeometrySelectionParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/DataStructure/DataGroup.hpp" -#include "complex/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" #include #include #include -namespace complex +namespace nx::core { GeometrySelectionParameter::GeometrySelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const AllowedTypes& allowedTypes) @@ -84,13 +84,13 @@ Result<> GeometrySelectionParameter::validatePath(const DataStructure& dataStruc if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}Geometry Path cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}Geometry Path cannot be empty", prefix)); } const DataObject* object = dataStructure.getData(value); if(object == nullptr) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_Does_Not_Exist, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_Does_Not_Exist, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); } const IGeometry* geometry = dynamic_cast(object); @@ -105,8 +105,8 @@ Result<> GeometrySelectionParameter::validatePath(const DataStructure& dataStruc return {}; } - return complex::MakeErrorResult( - complex::FilterParameter::Constants::k_Validate_AllowedType_Error, + return nx::core::MakeErrorResult( + nx::core::FilterParameter::Constants::k_Validate_AllowedType_Error, fmt::format("{}Geometry at path '{}' was of type '{}', but only {} are allowed", prefix, value.toString(), geometry->getTypeName(), IGeometry::StringListFromGeometryType(m_AllowedTypes))); } @@ -116,4 +116,4 @@ Result GeometrySelectionParameter::resolve(DataStructure& dataStructur IGeometry* object = dataStructure.getDataAs(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/GeometrySelectionParameter.hpp b/src/simplnx/Parameters/GeometrySelectionParameter.hpp similarity index 88% rename from src/complex/Parameters/GeometrySelectionParameter.hpp rename to src/simplnx/Parameters/GeometrySelectionParameter.hpp index dfe6bd379f..ad1f22bdc0 100644 --- a/src/complex/Parameters/GeometrySelectionParameter.hpp +++ b/src/simplnx/Parameters/GeometrySelectionParameter.hpp @@ -1,20 +1,20 @@ #pragma once -#include "complex/DataStructure/Geometry/IGeometry.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** * @brief This Filter Parameter describes a specific DataPath where the last DataObject in * the path is a geometry of the specified type. */ -class COMPLEX_EXPORT GeometrySelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT GeometrySelectionParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -110,6 +110,6 @@ class COMPLEX_EXPORT GeometrySelectionParameter : public MutableDataParameter ValueType m_DefaultValue = {}; AllowedTypes m_AllowedTypes = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::GeometrySelectionParameter, "3804cd7f-4ee4-400f-80ad-c5af17735de2"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::GeometrySelectionParameter, "3804cd7f-4ee4-400f-80ad-c5af17735de2"); diff --git a/src/complex/Parameters/MultiArraySelectionParameter.cpp b/src/simplnx/Parameters/MultiArraySelectionParameter.cpp similarity index 94% rename from src/complex/Parameters/MultiArraySelectionParameter.cpp rename to src/simplnx/Parameters/MultiArraySelectionParameter.cpp index 87b729f408..816374f20c 100644 --- a/src/complex/Parameters/MultiArraySelectionParameter.cpp +++ b/src/simplnx/Parameters/MultiArraySelectionParameter.cpp @@ -1,13 +1,13 @@ #include "MultiArraySelectionParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/DataStructure/IArray.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include #include -namespace complex +namespace nx::core { MultiArraySelectionParameter::MultiArraySelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const AllowedTypes& allowedTypes, const AllowedDataTypes& allowedDataTypes, AllowedComponentShapes requiredComps) @@ -166,7 +166,7 @@ Result<> MultiArraySelectionParameter::validatePaths(const DataStructure& dataSt if(!foundMatch) { errors.push_back( - Error{complex::FilterParameter::Constants::k_Validate_TupleShapeValue, fmt::format("{}Object at path '{}' must have a component shape of {}.", prefix, path.toString(), compStr)}); + Error{nx::core::FilterParameter::Constants::k_Validate_TupleShapeValue, fmt::format("{}Object at path '{}' must have a component shape of {}.", prefix, path.toString(), compStr)}); } } } @@ -189,4 +189,4 @@ Result MultiArraySelectionParameter::resolve(DataStructure& dataStruct } return {{objects}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/MultiArraySelectionParameter.hpp b/src/simplnx/Parameters/MultiArraySelectionParameter.hpp similarity index 91% rename from src/complex/Parameters/MultiArraySelectionParameter.hpp rename to src/simplnx/Parameters/MultiArraySelectionParameter.hpp index 200dfb5027..c42502137c 100644 --- a/src/complex/Parameters/MultiArraySelectionParameter.hpp +++ b/src/simplnx/Parameters/MultiArraySelectionParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" -namespace complex +namespace nx::core { /** * @brief This Filter Parameter represents multiple DataArrays as input. */ -class COMPLEX_EXPORT MultiArraySelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT MultiArraySelectionParameter : public MutableDataParameter { public: using ValueType = std::vector; @@ -121,6 +121,6 @@ class COMPLEX_EXPORT MultiArraySelectionParameter : public MutableDataParameter AllowedDataTypes m_AllowedDataTypes = {}; AllowedComponentShapes m_RequiredComponentShapes = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::MultiArraySelectionParameter, "d11e0bd8-f227-4fd1-b618-b6f16b259fc8"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::MultiArraySelectionParameter, "d11e0bd8-f227-4fd1-b618-b6f16b259fc8"); diff --git a/src/complex/Parameters/MultiPathSelectionParameter.cpp b/src/simplnx/Parameters/MultiPathSelectionParameter.cpp similarity index 98% rename from src/complex/Parameters/MultiPathSelectionParameter.cpp rename to src/simplnx/Parameters/MultiPathSelectionParameter.cpp index 2729554c5c..e671f0cbe1 100644 --- a/src/complex/Parameters/MultiPathSelectionParameter.cpp +++ b/src/simplnx/Parameters/MultiPathSelectionParameter.cpp @@ -1,11 +1,11 @@ #include "MultiPathSelectionParameter.hpp" -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" #include #include -namespace complex +namespace nx::core { MultiPathSelectionParameter::MultiPathSelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : MutableDataParameter(name, humanName, helpText, Category::Required) @@ -132,4 +132,4 @@ Result MultiPathSelectionParameter::resolve(DataStructure& dataStructu } return {{objects}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/MultiPathSelectionParameter.hpp b/src/simplnx/Parameters/MultiPathSelectionParameter.hpp similarity index 88% rename from src/complex/Parameters/MultiPathSelectionParameter.hpp rename to src/simplnx/Parameters/MultiPathSelectionParameter.hpp index a89dfb0333..d7593357b8 100644 --- a/src/complex/Parameters/MultiPathSelectionParameter.hpp +++ b/src/simplnx/Parameters/MultiPathSelectionParameter.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" -namespace complex +namespace nx::core { /** * @brief This Filter Parameter represents multiple DataObjects as input. */ -class COMPLEX_EXPORT MultiPathSelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT MultiPathSelectionParameter : public MutableDataParameter { public: using ValueType = std::vector; @@ -96,6 +96,6 @@ class COMPLEX_EXPORT MultiPathSelectionParameter : public MutableDataParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::MultiPathSelectionParameter, "b5632f4f-fc13-4234-beb2-8fd8820eb6b6"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::MultiPathSelectionParameter, "b5632f4f-fc13-4234-beb2-8fd8820eb6b6"); diff --git a/src/complex/Parameters/NeighborListSelectionParameter.cpp b/src/simplnx/Parameters/NeighborListSelectionParameter.cpp similarity index 76% rename from src/complex/Parameters/NeighborListSelectionParameter.cpp rename to src/simplnx/Parameters/NeighborListSelectionParameter.cpp index f984c7b975..e9cb9483e5 100644 --- a/src/complex/Parameters/NeighborListSelectionParameter.cpp +++ b/src/simplnx/Parameters/NeighborListSelectionParameter.cpp @@ -1,26 +1,26 @@ #include "NeighborListSelectionParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/DataStructure/INeighborList.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" #include #include #include -using namespace complex; +using namespace nx::core; template <> -struct fmt::formatter +struct fmt::formatter { constexpr format_parse_context::iterator parse(format_parse_context& ctx) { return ctx.begin(); } - format_context::iterator format(const complex::DataType& value, format_context& ctx) const + format_context::iterator format(const nx::core::DataType& value, format_context& ctx) const { - return fmt::format_to(ctx.out(), "{}", complex::DataTypeToString(value)); + return fmt::format_to(ctx.out(), "{}", nx::core::DataTypeToString(value)); } }; @@ -29,7 +29,7 @@ namespace constexpr int32 k_Validate_AllowedType_Error = -206; } // namespace -namespace complex +namespace nx::core { NeighborListSelectionParameter::NeighborListSelectionParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const AllowedTypes& allowedTypes) @@ -113,18 +113,18 @@ Result<> NeighborListSelectionParameter::validatePath(const DataStructure& dataS if(value.empty()) { - return complex::MakeErrorResult(complex::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); + return nx::core::MakeErrorResult(nx::core::FilterParameter::Constants::k_Validate_Empty_Value, fmt::format("{}DataPath cannot be empty", prefix)); } const DataObject* object = dataStructure.getData(value); if(object == nullptr) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_Does_Not_Exist, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_Does_Not_Exist, fmt::format("{}Object does not exist at path '{}'", prefix, value.toString())); } const auto* neighborList = dynamic_cast(object); if(neighborList == nullptr) { - return complex::MakeErrorResult<>(complex::FilterParameter::Constants::k_Validate_Type_Error, fmt::format("{}Object at path '{}' is not a neighbor list.", prefix, value.toString())); + return nx::core::MakeErrorResult<>(nx::core::FilterParameter::Constants::k_Validate_Type_Error, fmt::format("{}Object at path '{}' is not a neighbor list.", prefix, value.toString())); } if(!m_AllowedTypes.empty()) @@ -132,8 +132,8 @@ Result<> NeighborListSelectionParameter::validatePath(const DataStructure& dataS DataType dataType = neighborList->getDataType(); if(m_AllowedTypes.count(dataType) == 0) { - return complex::MakeErrorResult(k_Validate_AllowedType_Error, - fmt::format("{}DataNeighborList at path '{}' was of type '{}', but only {} are allowed", prefix, value.toString(), dataType, m_AllowedTypes)); + return nx::core::MakeErrorResult(k_Validate_AllowedType_Error, + fmt::format("{}DataNeighborList at path '{}' was of type '{}', but only {} are allowed", prefix, value.toString(), dataType, m_AllowedTypes)); } } @@ -146,4 +146,4 @@ Result NeighborListSelectionParameter::resolve(DataStructure& dataStru DataObject* object = dataStructure.getData(path); return {{object}}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/NeighborListSelectionParameter.hpp b/src/simplnx/Parameters/NeighborListSelectionParameter.hpp similarity index 88% rename from src/complex/Parameters/NeighborListSelectionParameter.hpp rename to src/simplnx/Parameters/NeighborListSelectionParameter.hpp index 998d520342..d072d74aef 100644 --- a/src/complex/Parameters/NeighborListSelectionParameter.hpp +++ b/src/simplnx/Parameters/NeighborListSelectionParameter.hpp @@ -1,17 +1,17 @@ #pragma once -#include "complex/DataStructure/IArray.hpp" -#include "complex/Filter/MutableDataParameter.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/Filter/MutableDataParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT NeighborListSelectionParameter : public MutableDataParameter +class SIMPLNX_EXPORT NeighborListSelectionParameter : public MutableDataParameter { public: using ValueType = DataPath; @@ -107,6 +107,6 @@ class COMPLEX_EXPORT NeighborListSelectionParameter : public MutableDataParamete AllowedTypes m_AllowedTypes = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::NeighborListSelectionParameter, "ab0b7a7f-f9ab-4e6f-99b5-610e7b69fc5b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::NeighborListSelectionParameter, "ab0b7a7f-f9ab-4e6f-99b5-610e7b69fc5b"); diff --git a/src/complex/Parameters/NumberParameter.cpp b/src/simplnx/Parameters/NumberParameter.cpp similarity index 73% rename from src/complex/Parameters/NumberParameter.cpp rename to src/simplnx/Parameters/NumberParameter.cpp index 6faa6bb58f..12bc1286fa 100644 --- a/src/complex/Parameters/NumberParameter.cpp +++ b/src/simplnx/Parameters/NumberParameter.cpp @@ -3,7 +3,7 @@ #include #include -namespace complex +namespace nx::core { template NumberParameter::NumberParameter(const std::string& name, const std::string& humanName, const std::string& helpText, ValueType defaultValue) @@ -75,18 +75,18 @@ Result<> NumberParameter::validateNumber(ValueType value) const return {}; } -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; -template class COMPLEX_TEMPLATE_EXPORT NumberParameter; -} // namespace complex +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; +template class SIMPLNX_TEMPLATE_EXPORT NumberParameter; +} // namespace nx::core diff --git a/src/complex/Parameters/NumberParameter.hpp b/src/simplnx/Parameters/NumberParameter.hpp similarity index 68% rename from src/complex/Parameters/NumberParameter.hpp rename to src/simplnx/Parameters/NumberParameter.hpp index de93647725..bbafc61b3c 100644 --- a/src/complex/Parameters/NumberParameter.hpp +++ b/src/simplnx/Parameters/NumberParameter.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" -namespace complex +namespace nx::core { template class NumberParameter : public ValueParameter @@ -110,19 +110,19 @@ using UInt64Parameter = NumberParameter; using Float32Parameter = NumberParameter; using Float64Parameter = NumberParameter; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::Int8Parameter, "cae73834-68f8-4235-b010-8bea87d8ff7a"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::UInt8Parameter, "6c3efeff-ce8f-47c0-83d1-262f2b2dd6cc"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Int8Parameter, "cae73834-68f8-4235-b010-8bea87d8ff7a"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::UInt8Parameter, "6c3efeff-ce8f-47c0-83d1-262f2b2dd6cc"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::Int16Parameter, "44ae56e8-e6e7-4e4d-8128-dd3dc2c6696e"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::UInt16Parameter, "156a6f46-77e5-41d8-8f5a-65ba1da52f2a"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Int16Parameter, "44ae56e8-e6e7-4e4d-8128-dd3dc2c6696e"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::UInt16Parameter, "156a6f46-77e5-41d8-8f5a-65ba1da52f2a"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::Int32Parameter, "21acff45-a653-45db-a0d1-f43cd344b93a"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::UInt32Parameter, "e9521130-276c-40c7-95d7-0b4cb4f80649"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Int32Parameter, "21acff45-a653-45db-a0d1-f43cd344b93a"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::UInt32Parameter, "e9521130-276c-40c7-95d7-0b4cb4f80649"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::Int64Parameter, "b2039349-bd3a-4dbb-93d2-b4b5c633e697"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::UInt64Parameter, "36d91b23-5500-4ed4-bdf3-d680f54ee5d1"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Int64Parameter, "b2039349-bd3a-4dbb-93d2-b4b5c633e697"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::UInt64Parameter, "36d91b23-5500-4ed4-bdf3-d680f54ee5d1"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::Float32Parameter, "e4452dfe-2f70-4833-819e-0cbbec21289b"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::Float64Parameter, "f2a18fff-a095-47d7-b436-ede41b5ea21a"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Float32Parameter, "e4452dfe-2f70-4833-819e-0cbbec21289b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::Float64Parameter, "f2a18fff-a095-47d7-b436-ede41b5ea21a"); diff --git a/src/complex/Parameters/NumericTypeParameter.cpp b/src/simplnx/Parameters/NumericTypeParameter.cpp similarity index 78% rename from src/complex/Parameters/NumericTypeParameter.cpp rename to src/simplnx/Parameters/NumericTypeParameter.cpp index c962ba71c1..e3a34ebbcf 100644 --- a/src/complex/Parameters/NumericTypeParameter.cpp +++ b/src/simplnx/Parameters/NumericTypeParameter.cpp @@ -7,54 +7,54 @@ namespace { -constexpr std::optional NumericTypefromString(std::string_view string) noexcept +constexpr std::optional NumericTypefromString(std::string_view string) noexcept { if(string == "int8") { - return complex::NumericType::int8; + return nx::core::NumericType::int8; } if(string == "uint8") { - return complex::NumericType::uint8; + return nx::core::NumericType::uint8; } if(string == "int16") { - return complex::NumericType::int16; + return nx::core::NumericType::int16; } if(string == "uint16") { - return complex::NumericType::uint16; + return nx::core::NumericType::uint16; } if(string == "int32") { - return complex::NumericType::int32; + return nx::core::NumericType::int32; } if(string == "uint32") { - return complex::NumericType::uint32; + return nx::core::NumericType::uint32; } if(string == "int64") { - return complex::NumericType::int64; + return nx::core::NumericType::int64; } if(string == "uint64") { - return complex::NumericType::uint64; + return nx::core::NumericType::uint64; } if(string == "float32") { - return complex::NumericType::float32; + return nx::core::NumericType::float32; } if(string == "float64") { - return complex::NumericType::float64; + return nx::core::NumericType::float64; } return {}; } } // namespace -namespace complex +namespace nx::core { NumericTypeParameter::NumericTypeParameter(const std::string& name, const std::string& humanName, const std::string& helpText, ValueType defaultValue) : ValueParameter(name, humanName, helpText) @@ -110,4 +110,4 @@ Result<> NumericTypeParameter::validate(const std::any& value) const [[maybe_unused]] auto castValue = std::any_cast(value); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/NumericTypeParameter.hpp b/src/simplnx/Parameters/NumericTypeParameter.hpp similarity index 77% rename from src/complex/Parameters/NumericTypeParameter.hpp rename to src/simplnx/Parameters/NumericTypeParameter.hpp index be3d214da4..08e9d8674c 100644 --- a/src/complex/Parameters/NumericTypeParameter.hpp +++ b/src/simplnx/Parameters/NumericTypeParameter.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT NumericTypeParameter : public ValueParameter +class SIMPLNX_EXPORT NumericTypeParameter : public ValueParameter { public: using ValueType = NumericType; @@ -74,6 +74,6 @@ class COMPLEX_EXPORT NumericTypeParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::NumericTypeParameter, "a8ff9dbd-45e7-4ed6-8537-12dd53069bce"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::NumericTypeParameter, "a8ff9dbd-45e7-4ed6-8537-12dd53069bce"); diff --git a/src/complex/Parameters/ReadCSVFileParameter.cpp b/src/simplnx/Parameters/ReadCSVFileParameter.cpp similarity index 98% rename from src/complex/Parameters/ReadCSVFileParameter.cpp rename to src/simplnx/Parameters/ReadCSVFileParameter.cpp index 2373226b7e..b6a3f16c01 100644 --- a/src/complex/Parameters/ReadCSVFileParameter.cpp +++ b/src/simplnx/Parameters/ReadCSVFileParameter.cpp @@ -30,7 +30,7 @@ #include "ReadCSVFileParameter.hpp" -namespace complex +namespace nx::core { // ----------------------------------------------------------------------------- ReadCSVFileParameter::ReadCSVFileParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) @@ -83,4 +83,4 @@ Result<> ReadCSVFileParameter::validate(const std::any& value) const [[maybe_unused]] auto data = std::any_cast(value); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ReadCSVFileParameter.hpp b/src/simplnx/Parameters/ReadCSVFileParameter.hpp similarity index 89% rename from src/complex/Parameters/ReadCSVFileParameter.hpp rename to src/simplnx/Parameters/ReadCSVFileParameter.hpp index 6c98ece45d..7fb2f5f713 100644 --- a/src/complex/Parameters/ReadCSVFileParameter.hpp +++ b/src/simplnx/Parameters/ReadCSVFileParameter.hpp @@ -30,14 +30,14 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/Parameters/util/ReadCSVData.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/Parameters/util/ReadCSVData.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { -class COMPLEX_EXPORT ReadCSVFileParameter : public ValueParameter +class SIMPLNX_EXPORT ReadCSVFileParameter : public ValueParameter { public: using ValueType = ReadCSVData; @@ -101,6 +101,6 @@ class COMPLEX_EXPORT ReadCSVFileParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ReadCSVFileParameter, "4f6d6a33-48da-427a-8b17-61e07d1d5b45"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ReadCSVFileParameter, "4f6d6a33-48da-427a-8b17-61e07d1d5b45"); diff --git a/src/complex/Parameters/ReadHDF5DatasetParameter.cpp b/src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp similarity index 98% rename from src/complex/Parameters/ReadHDF5DatasetParameter.cpp rename to src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp index 726dcebee2..cfa7ddd4b2 100644 --- a/src/complex/Parameters/ReadHDF5DatasetParameter.cpp +++ b/src/simplnx/Parameters/ReadHDF5DatasetParameter.cpp @@ -30,7 +30,7 @@ #include "ReadHDF5DatasetParameter.hpp" -using namespace complex; +using namespace nx::core; namespace { constexpr StringLiteral k_DataPathsKey = "data_paths"; @@ -38,7 +38,7 @@ constexpr StringLiteral k_InputFileKey = "input_file"; constexpr StringLiteral k_ParentGroupKey = "parent_group"; } // namespace -namespace complex +namespace nx::core { // ----------------------------------------------------------------------------- ReadHDF5DatasetParameter::ReadHDF5DatasetParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) @@ -143,4 +143,4 @@ Result<> ReadHDF5DatasetParameter::validate(const std::any& value) const [[maybe_unused]] auto data = std::any_cast(value); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/ReadHDF5DatasetParameter.hpp b/src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp similarity index 93% rename from src/complex/Parameters/ReadHDF5DatasetParameter.hpp rename to src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp index 844c7e5dca..c52cf95009 100644 --- a/src/complex/Parameters/ReadHDF5DatasetParameter.hpp +++ b/src/simplnx/Parameters/ReadHDF5DatasetParameter.hpp @@ -30,20 +30,20 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT ReadHDF5DatasetParameter : public ValueParameter +class SIMPLNX_EXPORT ReadHDF5DatasetParameter : public ValueParameter { public: struct DatasetImportInfo @@ -172,6 +172,6 @@ class COMPLEX_EXPORT ReadHDF5DatasetParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::ReadHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::ReadHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a"); diff --git a/src/complex/Parameters/StringParameter.cpp b/src/simplnx/Parameters/StringParameter.cpp similarity index 95% rename from src/complex/Parameters/StringParameter.cpp rename to src/simplnx/Parameters/StringParameter.cpp index eba72ec176..26eeb75593 100644 --- a/src/complex/Parameters/StringParameter.cpp +++ b/src/simplnx/Parameters/StringParameter.cpp @@ -1,11 +1,11 @@ #include "StringParameter.hpp" -#include "complex/Common/Any.hpp" +#include "simplnx/Common/Any.hpp" #include #include -namespace complex +namespace nx::core { StringParameter::StringParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : ValueParameter(name, humanName, helpText) @@ -61,4 +61,4 @@ Result<> StringParameter::validate(const std::any& value) const [[maybe_unused]] const auto& stringValue = GetAnyRef(value); return {}; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/StringParameter.hpp b/src/simplnx/Parameters/StringParameter.hpp similarity index 79% rename from src/complex/Parameters/StringParameter.hpp rename to src/simplnx/Parameters/StringParameter.hpp index 8b65f62f11..bf4a60248c 100644 --- a/src/complex/Parameters/StringParameter.hpp +++ b/src/simplnx/Parameters/StringParameter.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT StringParameter : public ValueParameter +class SIMPLNX_EXPORT StringParameter : public ValueParameter { public: using ValueType = std::string; @@ -75,6 +75,6 @@ class COMPLEX_EXPORT StringParameter : public ValueParameter private: ValueType m_DefaultValue = {}; }; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::StringParameter, "5d6d1868-05f8-11ec-9a03-0242ac130003"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::StringParameter, "5d6d1868-05f8-11ec-9a03-0242ac130003"); diff --git a/src/complex/Parameters/VectorParameter.cpp b/src/simplnx/Parameters/VectorParameter.cpp similarity index 82% rename from src/complex/Parameters/VectorParameter.cpp rename to src/simplnx/Parameters/VectorParameter.cpp index a7a3e3bed1..7ece6d9e8f 100644 --- a/src/complex/Parameters/VectorParameter.cpp +++ b/src/simplnx/Parameters/VectorParameter.cpp @@ -1,12 +1,12 @@ #include "VectorParameter.hpp" -#include "complex/Common/Any.hpp" -#include "complex/Common/TypeTraits.hpp" +#include "simplnx/Common/Any.hpp" +#include "simplnx/Common/TypeTraits.hpp" #include #include -namespace complex +namespace nx::core { template VectorParameter::VectorParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue, const NamesType& names) @@ -137,18 +137,18 @@ Result<> VectorParameter::validateVector(const ValueType& value) const return {}; } -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; -template class COMPLEX_TEMPLATE_EXPORT VectorParameter; -} // namespace complex +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; +template class SIMPLNX_TEMPLATE_EXPORT VectorParameter; +} // namespace nx::core diff --git a/src/complex/Parameters/VectorParameter.hpp b/src/simplnx/Parameters/VectorParameter.hpp similarity index 73% rename from src/complex/Parameters/VectorParameter.hpp rename to src/simplnx/Parameters/VectorParameter.hpp index f9d5937af1..cbc3c71a7b 100644 --- a/src/complex/Parameters/VectorParameter.hpp +++ b/src/simplnx/Parameters/VectorParameter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/ParameterTraits.hpp" -#include "complex/Filter/ValueParameter.hpp" +#include "simplnx/Filter/ParameterTraits.hpp" +#include "simplnx/Filter/ValueParameter.hpp" #include -namespace complex +namespace nx::core { class VectorParameterBase : public ValueParameter { @@ -148,24 +148,24 @@ using VectorUInt64Parameter = VectorParameter; using VectorFloat32Parameter = VectorParameter; using VectorFloat64Parameter = VectorParameter; -} // namespace complex +} // namespace nx::core -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorInt8Parameter, "9f5f9683-e492-4a79-8378-79d727b2356a"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorInt8Parameter, "9f5f9683-e492-4a79-8378-79d727b2356a"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorUInt8Parameter, "bff78ff3-35ef-482a-b3b1-df8806e7f7ef"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorUInt8Parameter, "bff78ff3-35ef-482a-b3b1-df8806e7f7ef"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorInt16Parameter, "43810a29-1a5f-4472-bec6-41de9ffe27f7"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorInt16Parameter, "43810a29-1a5f-4472-bec6-41de9ffe27f7"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorUInt16Parameter, "2f1ba2f4-c5d5-403c-8b90-0bf60d2bde9b"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorUInt16Parameter, "2f1ba2f4-c5d5-403c-8b90-0bf60d2bde9b"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorInt32Parameter, "d3188e18-e383-4727-ab32-88b5fda56ae8"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorInt32Parameter, "d3188e18-e383-4727-ab32-88b5fda56ae8"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorUInt32Parameter, "37322aa6-1a2f-4ecb-9aa1-8922d7ac1e49"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorUInt32Parameter, "37322aa6-1a2f-4ecb-9aa1-8922d7ac1e49"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorInt64Parameter, "4ceaffc1-7326-4f65-a33a-eae263dc22d1"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorInt64Parameter, "4ceaffc1-7326-4f65-a33a-eae263dc22d1"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorUInt64Parameter, "17309744-c4e8-4d1e-807e-e7012387f1ec"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorUInt64Parameter, "17309744-c4e8-4d1e-807e-e7012387f1ec"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorFloat32Parameter, "88f231a1-7956-41f5-98b7-4471705d2805"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorFloat32Parameter, "88f231a1-7956-41f5-98b7-4471705d2805"); -COMPLEX_DEF_PARAMETER_TRAITS(complex::VectorFloat64Parameter, "57cbdfdf-9d1a-4de8-95d7-71d0c01c5c96"); +SIMPLNX_DEF_PARAMETER_TRAITS(nx::core::VectorFloat64Parameter, "57cbdfdf-9d1a-4de8-95d7-71d0c01c5c96"); diff --git a/src/complex/Parameters/util/DynamicTableInfo.cpp b/src/simplnx/Parameters/util/DynamicTableInfo.cpp similarity index 99% rename from src/complex/Parameters/util/DynamicTableInfo.cpp rename to src/simplnx/Parameters/util/DynamicTableInfo.cpp index ea94a89cc3..8fd5d74b14 100644 --- a/src/complex/Parameters/util/DynamicTableInfo.cpp +++ b/src/simplnx/Parameters/util/DynamicTableInfo.cpp @@ -2,7 +2,7 @@ #include -using namespace complex; +using namespace nx::core; DynamicTableInfo::DynamicVectorInfo::DynamicVectorInfo() = default; diff --git a/src/complex/Parameters/util/DynamicTableInfo.hpp b/src/simplnx/Parameters/util/DynamicTableInfo.hpp similarity index 95% rename from src/complex/Parameters/util/DynamicTableInfo.hpp rename to src/simplnx/Parameters/util/DynamicTableInfo.hpp index 2cfec3c685..13052a815e 100644 --- a/src/complex/Parameters/util/DynamicTableInfo.hpp +++ b/src/simplnx/Parameters/util/DynamicTableInfo.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include @@ -11,13 +11,13 @@ #include #include -namespace complex +namespace nx::core { /** * @brief DynamicTableInfo contains the description of a 2D table which may * have dynamic or static rows and columns. */ -class COMPLEX_EXPORT DynamicTableInfo +class SIMPLNX_EXPORT DynamicTableInfo { public: using HeadersListType = std::vector; @@ -29,7 +29,7 @@ class COMPLEX_EXPORT DynamicTableInfo * @brief TableDims is a simple struct to hold named * values for the number of rows and columns */ - struct COMPLEX_EXPORT TableDims + struct SIMPLNX_EXPORT TableDims { usize numRows = 0; usize numCols = 0; @@ -39,7 +39,7 @@ class COMPLEX_EXPORT DynamicTableInfo * @brief DynamicVectorInfo contains the description of * a dynamically sized row or column. */ - class COMPLEX_EXPORT DynamicVectorInfo + class SIMPLNX_EXPORT DynamicVectorInfo { public: /** @@ -97,7 +97,7 @@ class COMPLEX_EXPORT DynamicTableInfo * @brief StaticVectorInfo contains the description of * a statically sized row or column. */ - class COMPLEX_EXPORT StaticVectorInfo + class SIMPLNX_EXPORT StaticVectorInfo { public: /** @@ -158,7 +158,7 @@ class COMPLEX_EXPORT DynamicTableInfo * @brief VectorInfo contains the description of * a dynamic or static row or column. */ - class COMPLEX_EXPORT VectorInfo + class SIMPLNX_EXPORT VectorInfo { public: /** @@ -316,4 +316,4 @@ class COMPLEX_EXPORT DynamicTableInfo VectorInfo m_RowsInfo; VectorInfo m_ColsInfo; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Parameters/util/ReadCSVData.cpp b/src/simplnx/Parameters/util/ReadCSVData.cpp similarity index 99% rename from src/complex/Parameters/util/ReadCSVData.cpp rename to src/simplnx/Parameters/util/ReadCSVData.cpp index d0568adb22..08d78dcb3a 100644 --- a/src/complex/Parameters/util/ReadCSVData.cpp +++ b/src/simplnx/Parameters/util/ReadCSVData.cpp @@ -32,7 +32,7 @@ #include -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/complex/Parameters/util/ReadCSVData.hpp b/src/simplnx/Parameters/util/ReadCSVData.hpp similarity index 89% rename from src/complex/Parameters/util/ReadCSVData.hpp rename to src/simplnx/Parameters/util/ReadCSVData.hpp index e3e01bf855..6f3d2ca079 100644 --- a/src/complex/Parameters/util/ReadCSVData.hpp +++ b/src/simplnx/Parameters/util/ReadCSVData.hpp @@ -30,19 +30,19 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Common/StringLiteral.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Parameters/DynamicTableParameter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Parameters/DynamicTableParameter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -struct COMPLEX_EXPORT ReadCSVData +struct SIMPLNX_EXPORT ReadCSVData { public: enum class HeaderMode @@ -66,4 +66,4 @@ struct COMPLEX_EXPORT ReadCSVData std::vector delimiters = {}; bool consecutiveDelimiters = false; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/AbstractPipelineNode.cpp b/src/simplnx/Pipeline/AbstractPipelineNode.cpp similarity index 88% rename from src/complex/Pipeline/AbstractPipelineNode.cpp rename to src/simplnx/Pipeline/AbstractPipelineNode.cpp index 31b26fc2d5..85fcb25af2 100644 --- a/src/complex/Pipeline/AbstractPipelineNode.cpp +++ b/src/simplnx/Pipeline/AbstractPipelineNode.cpp @@ -1,15 +1,15 @@ #include "AbstractPipelineNode.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Core/Preferences.hpp" -#include "complex/Pipeline/Messaging/NodeStatusMessage.hpp" -#include "complex/Pipeline/Pipeline.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Core/Preferences.hpp" +#include "simplnx/Pipeline/Messaging/NodeStatusMessage.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -137,7 +137,7 @@ AbstractPipelineNode::PipelineRunStateSignalType& AbstractPipelineNode::getPipel return m_PipelineRunStateSignal; } -void AbstractPipelineNode::sendPipelineRunStateMessage(complex::RunState value) +void AbstractPipelineNode::sendPipelineRunStateMessage(nx::core::RunState value) { m_PipelineRunStateSignal(this, value); } @@ -150,7 +150,7 @@ AbstractPipelineNode::FilterRunStateSignalType& AbstractPipelineNode::getFilterR { return m_FilterRunStateSignal; } -void AbstractPipelineNode::sendFilterRunStateMessage(int32_t filterIndex, complex::RunState value) +void AbstractPipelineNode::sendFilterRunStateMessage(int32_t filterIndex, nx::core::RunState value) { m_FilterRunStateSignal(this, filterIndex, value); } @@ -189,7 +189,7 @@ AbstractPipelineNode::PipelineFaultSignalType& AbstractPipelineNode::getPipeline { return m_PipelineFaultSignal; } -void AbstractPipelineNode::sendPipelineFaultMessage(complex::FaultState state) +void AbstractPipelineNode::sendPipelineFaultMessage(nx::core::FaultState state) { m_PipelineFaultSignal(this, state); } @@ -202,7 +202,7 @@ AbstractPipelineNode::FilterFaultSignalType& AbstractPipelineNode::getFilterFaul { return m_FilterFaultSignal; } -void AbstractPipelineNode::sendFilterFaultMessage(int32_t filterIndex, complex::FaultState state) +void AbstractPipelineNode::sendFilterFaultMessage(int32_t filterIndex, nx::core::FaultState state) { m_FilterFaultSignal(this, filterIndex, state); } @@ -255,30 +255,30 @@ std::unique_ptr AbstractPipelineNode::getPrecedingPipelineSegment() co return std::move(parentPipeline->copySegment(parentPipeline->begin(), iter)); } -complex::FaultState AbstractPipelineNode::getFaultState() const +nx::core::FaultState AbstractPipelineNode::getFaultState() const { return m_FaultState; } bool AbstractPipelineNode::hasErrors() const { - return m_FaultState == complex::FaultState::Errors; + return m_FaultState == nx::core::FaultState::Errors; } bool AbstractPipelineNode::hasWarnings() const { - return m_FaultState == complex::FaultState::Warnings; + return m_FaultState == nx::core::FaultState::Warnings; } void AbstractPipelineNode::setHasWarnings(bool value) { if(value) { - m_FaultState = complex::FaultState::Warnings; + m_FaultState = nx::core::FaultState::Warnings; } - else if(!value && m_FaultState == complex::FaultState::Warnings) + else if(!value && m_FaultState == nx::core::FaultState::Warnings) { - m_FaultState = complex::FaultState::None; + m_FaultState = nx::core::FaultState::None; } } @@ -286,17 +286,17 @@ void AbstractPipelineNode::setHasErrors(bool value) { if(value) { - m_FaultState = complex::FaultState::Errors; + m_FaultState = nx::core::FaultState::Errors; } - else if(!value && m_FaultState == complex::FaultState::Errors) + else if(!value && m_FaultState == nx::core::FaultState::Errors) { - m_FaultState = complex::FaultState::None; + m_FaultState = nx::core::FaultState::None; } } void AbstractPipelineNode::clearFaultState() { - m_FaultState = complex::FaultState::None; + m_FaultState = nx::core::FaultState::None; } const AbstractPipelineNode::CancelledSignalType& AbstractPipelineNode::getCancelledSignal() const diff --git a/src/complex/Pipeline/AbstractPipelineNode.hpp b/src/simplnx/Pipeline/AbstractPipelineNode.hpp similarity index 98% rename from src/complex/Pipeline/AbstractPipelineNode.hpp rename to src/simplnx/Pipeline/AbstractPipelineNode.hpp index 9c9ac649e7..62261405eb 100644 --- a/src/complex/Pipeline/AbstractPipelineNode.hpp +++ b/src/simplnx/Pipeline/AbstractPipelineNode.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -11,7 +11,7 @@ #include #include -namespace complex +namespace nx::core { class AbstractPipelineMessage; class Pipeline; @@ -22,7 +22,7 @@ class Pipeline; * all items that can be contained within a pipeline. Shared API is declared * for implementation in derived classes. */ -class COMPLEX_EXPORT AbstractPipelineNode +class SIMPLNX_EXPORT AbstractPipelineNode { public: // Making Pipeline a friend class allows Pipelines to set flags of the nodes @@ -349,4 +349,4 @@ class COMPLEX_EXPORT AbstractPipelineNode CancelledSignalType m_CancelledSignal; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/AbstractPipelineMessage.cpp b/src/simplnx/Pipeline/Messaging/AbstractPipelineMessage.cpp similarity index 91% rename from src/complex/Pipeline/Messaging/AbstractPipelineMessage.cpp rename to src/simplnx/Pipeline/Messaging/AbstractPipelineMessage.cpp index e0b28d8cb5..e33562f72f 100644 --- a/src/complex/Pipeline/Messaging/AbstractPipelineMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/AbstractPipelineMessage.cpp @@ -1,6 +1,6 @@ #include "AbstractPipelineMessage.hpp" -using namespace complex; +using namespace nx::core; AbstractPipelineMessage::AbstractPipelineMessage(AbstractPipelineNode* node) : m_Node(node) diff --git a/src/complex/Pipeline/Messaging/AbstractPipelineMessage.hpp b/src/simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp similarity index 85% rename from src/complex/Pipeline/Messaging/AbstractPipelineMessage.hpp rename to src/simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp index 5e176c28cd..a4e1800b77 100644 --- a/src/complex/Pipeline/Messaging/AbstractPipelineMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" #include -namespace complex +namespace nx::core { class AbstractPipelineNode; @@ -12,7 +12,7 @@ class AbstractPipelineNode; * @class AbstractPipelineMessage * @brief The AbstractPipelineMessage class is the base class for all pipeline-related messages. */ -class COMPLEX_EXPORT AbstractPipelineMessage +class SIMPLNX_EXPORT AbstractPipelineMessage { public: /** @@ -38,4 +38,4 @@ class COMPLEX_EXPORT AbstractPipelineMessage private: AbstractPipelineNode* m_Node = nullptr; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/FilterPreflightMessage.cpp b/src/simplnx/Pipeline/Messaging/FilterPreflightMessage.cpp similarity index 63% rename from src/complex/Pipeline/Messaging/FilterPreflightMessage.cpp rename to src/simplnx/Pipeline/Messaging/FilterPreflightMessage.cpp index 3d460e6c4c..31d0a8d28d 100644 --- a/src/complex/Pipeline/Messaging/FilterPreflightMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/FilterPreflightMessage.cpp @@ -1,11 +1,11 @@ #include "FilterPreflightMessage.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Pipeline/PipelineFilter.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Pipeline/PipelineFilter.hpp" -using namespace complex; +using namespace nx::core; -FilterPreflightMessage::FilterPreflightMessage(PipelineFilter* filterNode, const std::vector& warnings, const std::vector& errors) +FilterPreflightMessage::FilterPreflightMessage(PipelineFilter* filterNode, const std::vector& warnings, const std::vector& errors) : AbstractPipelineMessage(filterNode) , m_Warnings(warnings) , m_Errors(errors) @@ -14,17 +14,17 @@ FilterPreflightMessage::FilterPreflightMessage(PipelineFilter* filterNode, const FilterPreflightMessage::~FilterPreflightMessage() = default; -complex::PipelineFilter* FilterPreflightMessage::getFilterNode() const +nx::core::PipelineFilter* FilterPreflightMessage::getFilterNode() const { return dynamic_cast(getNode()); } -std::vector FilterPreflightMessage::getWarnings() const +std::vector FilterPreflightMessage::getWarnings() const { return m_Warnings; } -std::vector FilterPreflightMessage::getErrors() const +std::vector FilterPreflightMessage::getErrors() const { return m_Errors; } diff --git a/src/complex/Pipeline/Messaging/FilterPreflightMessage.hpp b/src/simplnx/Pipeline/Messaging/FilterPreflightMessage.hpp similarity index 65% rename from src/complex/Pipeline/Messaging/FilterPreflightMessage.hpp rename to src/simplnx/Pipeline/Messaging/FilterPreflightMessage.hpp index 40860e86cd..f5b67dbd31 100644 --- a/src/complex/Pipeline/Messaging/FilterPreflightMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/FilterPreflightMessage.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" #include -namespace complex +namespace nx::core { class PipelineFilter; @@ -15,7 +15,7 @@ class PipelineFilter; * finishes preflighting. Its sole purpose is to pass along vectors of the * resulting errors and warnings. */ -class COMPLEX_EXPORT FilterPreflightMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT FilterPreflightMessage : public AbstractPipelineMessage { public: /** @@ -24,7 +24,7 @@ class COMPLEX_EXPORT FilterPreflightMessage : public AbstractPipelineMessage * @param warnings * @param errors */ - FilterPreflightMessage(PipelineFilter* filterNode, const std::vector& warnings, const std::vector& errors); + FilterPreflightMessage(PipelineFilter* filterNode, const std::vector& warnings, const std::vector& errors); ~FilterPreflightMessage() override; @@ -36,15 +36,15 @@ class COMPLEX_EXPORT FilterPreflightMessage : public AbstractPipelineMessage /** * @brief Returns a vector of warnings resulting from preflighting the PipelineFilter. - * @return std::vector + * @return std::vector */ - std::vector getWarnings() const; + std::vector getWarnings() const; /** * @brief Returns a vector of errors resulting from preflighting the PipelineFilter. - * @return std::vector + * @return std::vector */ - std::vector getErrors() const; + std::vector getErrors() const; /** * @brief Returns a string representation of the message. @@ -53,7 +53,7 @@ class COMPLEX_EXPORT FilterPreflightMessage : public AbstractPipelineMessage std::string toString() const override; private: - std::vector m_Warnings; - std::vector m_Errors; + std::vector m_Warnings; + std::vector m_Errors; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/NodeAddedMessage.cpp b/src/simplnx/Pipeline/Messaging/NodeAddedMessage.cpp similarity index 88% rename from src/complex/Pipeline/Messaging/NodeAddedMessage.cpp rename to src/simplnx/Pipeline/Messaging/NodeAddedMessage.cpp index c37664c794..1ffd94c975 100644 --- a/src/complex/Pipeline/Messaging/NodeAddedMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/NodeAddedMessage.cpp @@ -1,8 +1,8 @@ #include "NodeAddedMessage.hpp" -#include "complex/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" -using namespace complex; +using namespace nx::core; NodeAddedMessage::NodeAddedMessage(Pipeline* pipeline, AbstractPipelineNode* newNode, usize index) : AbstractPipelineMessage(pipeline) diff --git a/src/complex/Pipeline/Messaging/NodeAddedMessage.hpp b/src/simplnx/Pipeline/Messaging/NodeAddedMessage.hpp similarity index 83% rename from src/complex/Pipeline/Messaging/NodeAddedMessage.hpp rename to src/simplnx/Pipeline/Messaging/NodeAddedMessage.hpp index 94cbde30c0..93a0e12488 100644 --- a/src/complex/Pipeline/Messaging/NodeAddedMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/NodeAddedMessage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" -namespace complex +namespace nx::core { class AbstractPipelineNode; class Pipeline; @@ -13,7 +13,7 @@ class Pipeline; * @brief The NodeAddedMessage class exists to notify Pipeline observers that a * target AbstractPipelineNode was added at the specified index. */ -class COMPLEX_EXPORT NodeAddedMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT NodeAddedMessage : public AbstractPipelineMessage { public: /** @@ -49,4 +49,4 @@ class COMPLEX_EXPORT NodeAddedMessage : public AbstractPipelineMessage AbstractPipelineNode* m_Node; usize m_Index; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/NodeMovedMessage.cpp b/src/simplnx/Pipeline/Messaging/NodeMovedMessage.cpp similarity index 81% rename from src/complex/Pipeline/Messaging/NodeMovedMessage.cpp rename to src/simplnx/Pipeline/Messaging/NodeMovedMessage.cpp index f4ab6806fc..cfa0305b7e 100644 --- a/src/complex/Pipeline/Messaging/NodeMovedMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/NodeMovedMessage.cpp @@ -1,9 +1,9 @@ -#include "complex/Pipeline/Messaging/NodeMovedMessage.hpp" -#include "complex/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/Messaging/NodeMovedMessage.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" #include -using namespace complex; +using namespace nx::core; NodeMovedMessage::NodeMovedMessage(Pipeline* pipeline, usize fromIndex, usize toIndex) : AbstractPipelineMessage(pipeline) diff --git a/src/complex/Pipeline/Messaging/NodeMovedMessage.hpp b/src/simplnx/Pipeline/Messaging/NodeMovedMessage.hpp similarity index 82% rename from src/complex/Pipeline/Messaging/NodeMovedMessage.hpp rename to src/simplnx/Pipeline/Messaging/NodeMovedMessage.hpp index bb7d3c00d0..7cf3040abf 100644 --- a/src/complex/Pipeline/Messaging/NodeMovedMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/NodeMovedMessage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" -namespace complex +namespace nx::core { class AbstractPipelineNode; class Pipeline; @@ -13,7 +13,7 @@ class Pipeline; * @brief The NodeMovedMessage class exists to notify Pipeline observers that * the AbstractPipelineNode has been moved between two indices. */ -class COMPLEX_EXPORT NodeMovedMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT NodeMovedMessage : public AbstractPipelineMessage { public: /** @@ -49,4 +49,4 @@ class COMPLEX_EXPORT NodeMovedMessage : public AbstractPipelineMessage usize m_OldIndex; usize m_NewIndex; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/NodeRemovedMessage.cpp b/src/simplnx/Pipeline/Messaging/NodeRemovedMessage.cpp similarity index 86% rename from src/complex/Pipeline/Messaging/NodeRemovedMessage.cpp rename to src/simplnx/Pipeline/Messaging/NodeRemovedMessage.cpp index c411dd67b3..effaa1c470 100644 --- a/src/complex/Pipeline/Messaging/NodeRemovedMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/NodeRemovedMessage.cpp @@ -1,10 +1,10 @@ #include "NodeRemovedMessage.hpp" -#include "complex/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" #include -using namespace complex; +using namespace nx::core; NodeRemovedMessage::NodeRemovedMessage(Pipeline* pipeline, usize index) : AbstractPipelineMessage(pipeline) diff --git a/src/complex/Pipeline/Messaging/NodeRemovedMessage.hpp b/src/simplnx/Pipeline/Messaging/NodeRemovedMessage.hpp similarity index 79% rename from src/complex/Pipeline/Messaging/NodeRemovedMessage.hpp rename to src/simplnx/Pipeline/Messaging/NodeRemovedMessage.hpp index 2a2c581676..c68f394ab0 100644 --- a/src/complex/Pipeline/Messaging/NodeRemovedMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/NodeRemovedMessage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" -namespace complex +namespace nx::core { class Pipeline; @@ -13,7 +13,7 @@ class Pipeline; * that a target AbstractPipelineNode was removed from a pipeline at the * specified index. */ -class COMPLEX_EXPORT NodeRemovedMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT NodeRemovedMessage : public AbstractPipelineMessage { public: /** @@ -41,4 +41,4 @@ class COMPLEX_EXPORT NodeRemovedMessage : public AbstractPipelineMessage private: usize m_Index; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/NodeStatusMessage.cpp b/src/simplnx/Pipeline/Messaging/NodeStatusMessage.cpp similarity index 66% rename from src/complex/Pipeline/Messaging/NodeStatusMessage.cpp rename to src/simplnx/Pipeline/Messaging/NodeStatusMessage.cpp index aea543b3ff..f62a587c4e 100644 --- a/src/complex/Pipeline/Messaging/NodeStatusMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/NodeStatusMessage.cpp @@ -2,9 +2,9 @@ #include -using namespace complex; +using namespace nx::core; -NodeStatusMessage::NodeStatusMessage(AbstractPipelineNode* node, complex::FaultState faultState, complex::RunState runState) +NodeStatusMessage::NodeStatusMessage(AbstractPipelineNode* node, nx::core::FaultState faultState, nx::core::RunState runState) : AbstractPipelineMessage(node) , m_FaultState(faultState) , m_RunState(runState) @@ -13,12 +13,12 @@ NodeStatusMessage::NodeStatusMessage(AbstractPipelineNode* node, complex::FaultS NodeStatusMessage::~NodeStatusMessage() = default; -complex::FaultState NodeStatusMessage::getFaultState() const +nx::core::FaultState NodeStatusMessage::getFaultState() const { return m_FaultState; } -complex::RunState NodeStatusMessage::getRunState() const +nx::core::RunState NodeStatusMessage::getRunState() const { return m_RunState; } @@ -27,19 +27,19 @@ std::string NodeStatusMessage::toString() const { auto output = fmt::format("Node {}: ", getNode()->getName()); - if(m_RunState == complex::RunState::Idle) + if(m_RunState == nx::core::RunState::Idle) { output += " is Idle;"; } - if(m_RunState == complex::RunState::Queued) + if(m_RunState == nx::core::RunState::Queued) { output += " is Queued;"; } - if(m_RunState == complex::RunState::Preflighting) + if(m_RunState == nx::core::RunState::Preflighting) { output += " is Preflighting;"; } - if(m_RunState == complex::RunState::Executing) + if(m_RunState == nx::core::RunState::Executing) { output += " is Executing;"; } diff --git a/src/simplnx/Pipeline/Messaging/NodeStatusMessage.hpp b/src/simplnx/Pipeline/Messaging/NodeStatusMessage.hpp new file mode 100644 index 0000000000..7066a7b60b --- /dev/null +++ b/src/simplnx/Pipeline/Messaging/NodeStatusMessage.hpp @@ -0,0 +1,51 @@ +#pragma once + +#include "simplnx/Pipeline/AbstractPipelineNode.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" + +namespace nx::core +{ +class PipelineFilter; +class IFilter; + +/** + * @class NodeStatusMessage + * @brief The NodeStatusMessage class is used to notify observers that a + * AbstractPipelineNode's Status has been changed. + */ +class SIMPLNX_EXPORT NodeStatusMessage : public AbstractPipelineMessage +{ +public: + /** + * @brief Constructs a new NodeStatusMessage specifying the node and its Status. + * @param node + * @param faultState + * @param runState + */ + NodeStatusMessage(AbstractPipelineNode* node, nx::core::FaultState faultState, nx::core::RunState runState); + + ~NodeStatusMessage() override; + + /** + * @brief Returns the updated nx::core::FaultState. + * @return nx::core::FaultState + */ + nx::core::FaultState getFaultState() const; + + /** + * @brief Returns the updated nx::core::RunState. + * @return nx::core::RunState + */ + nx::core::RunState getRunState() const; + + /** + * @brief Returns a string representation of the message. + * @return std::string + */ + std::string toString() const override; + +private: + nx::core::FaultState m_FaultState; + nx::core::RunState m_RunState; +}; +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/OutputRenamedMessage.cpp b/src/simplnx/Pipeline/Messaging/OutputRenamedMessage.cpp similarity index 89% rename from src/complex/Pipeline/Messaging/OutputRenamedMessage.cpp rename to src/simplnx/Pipeline/Messaging/OutputRenamedMessage.cpp index 52e3e5df36..56ba2fd591 100644 --- a/src/complex/Pipeline/Messaging/OutputRenamedMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/OutputRenamedMessage.cpp @@ -1,6 +1,6 @@ -#include "complex/Pipeline/Messaging/OutputRenamedMessage.hpp" +#include "simplnx/Pipeline/Messaging/OutputRenamedMessage.hpp" -using namespace complex; +using namespace nx::core; OutputRenamedMessage::OutputRenamedMessage(AbstractPipelineNode* pipeline, const PipelineFilter::RenamedPath& renamedOutput) : AbstractPipelineMessage(pipeline) diff --git a/src/complex/Pipeline/Messaging/OutputRenamedMessage.hpp b/src/simplnx/Pipeline/Messaging/OutputRenamedMessage.hpp similarity index 83% rename from src/complex/Pipeline/Messaging/OutputRenamedMessage.hpp rename to src/simplnx/Pipeline/Messaging/OutputRenamedMessage.hpp index 8669ec810f..aff7f3029c 100644 --- a/src/complex/Pipeline/Messaging/OutputRenamedMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/OutputRenamedMessage.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" -#include "complex/Pipeline/PipelineFilter.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Pipeline/PipelineFilter.hpp" -namespace complex +namespace nx::core { class AbstractPipelineNode; class Pipeline; @@ -14,7 +14,7 @@ class Pipeline; * @brief The OutputRenamedMessage class exists to notify PipelineFilter observers that a * specified node's created DataPath was changed to the a new value. */ -class COMPLEX_EXPORT OutputRenamedMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT OutputRenamedMessage : public AbstractPipelineMessage { public: /** @@ -55,4 +55,4 @@ class COMPLEX_EXPORT OutputRenamedMessage : public AbstractPipelineMessage private: PipelineFilter::RenamedPath m_RenamedPath; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/PipelineFilterMessage.cpp b/src/simplnx/Pipeline/Messaging/PipelineFilterMessage.cpp similarity index 93% rename from src/complex/Pipeline/Messaging/PipelineFilterMessage.cpp rename to src/simplnx/Pipeline/Messaging/PipelineFilterMessage.cpp index cb16bc715b..6db2c76632 100644 --- a/src/complex/Pipeline/Messaging/PipelineFilterMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/PipelineFilterMessage.cpp @@ -1,10 +1,10 @@ #include "PipelineFilterMessage.hpp" -#include "complex/Pipeline/PipelineFilter.hpp" +#include "simplnx/Pipeline/PipelineFilter.hpp" #include -using namespace complex; +using namespace nx::core; PipelineFilterMessage::PipelineFilterMessage(PipelineFilter* filter, const IFilter::Message& filterMessage) : AbstractPipelineMessage(filter) diff --git a/src/complex/Pipeline/Messaging/PipelineFilterMessage.hpp b/src/simplnx/Pipeline/Messaging/PipelineFilterMessage.hpp similarity index 79% rename from src/complex/Pipeline/Messaging/PipelineFilterMessage.hpp rename to src/simplnx/Pipeline/Messaging/PipelineFilterMessage.hpp index dddf416d7e..f50599b391 100644 --- a/src/complex/Pipeline/Messaging/PipelineFilterMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/PipelineFilterMessage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Filter/IFilter.hpp" -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" -namespace complex +namespace nx::core { class PipelineFilter; @@ -12,7 +12,7 @@ class PipelineFilter; * @brief The PipelineFilterMessage class exists for alerting PipelineFilter * listeners to IFilter::Messages. */ -class COMPLEX_EXPORT PipelineFilterMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT PipelineFilterMessage : public AbstractPipelineMessage { public: /** @@ -39,4 +39,4 @@ class COMPLEX_EXPORT PipelineFilterMessage : public AbstractPipelineMessage private: IFilter::Message m_FilterMessage; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/PipelineNodeMessage.cpp b/src/simplnx/Pipeline/Messaging/PipelineNodeMessage.cpp similarity index 94% rename from src/complex/Pipeline/Messaging/PipelineNodeMessage.cpp rename to src/simplnx/Pipeline/Messaging/PipelineNodeMessage.cpp index 253eab2630..78d57390f6 100644 --- a/src/complex/Pipeline/Messaging/PipelineNodeMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/PipelineNodeMessage.cpp @@ -1,6 +1,6 @@ #include "PipelineNodeMessage.hpp" -using namespace complex; +using namespace nx::core; PipelineNodeMessage::PipelineNodeMessage(AbstractPipelineNode* node, const std::shared_ptr& message) : AbstractPipelineMessage(node) diff --git a/src/complex/Pipeline/Messaging/PipelineNodeMessage.hpp b/src/simplnx/Pipeline/Messaging/PipelineNodeMessage.hpp similarity index 84% rename from src/complex/Pipeline/Messaging/PipelineNodeMessage.hpp rename to src/simplnx/Pipeline/Messaging/PipelineNodeMessage.hpp index 50b32f9221..34de732533 100644 --- a/src/complex/Pipeline/Messaging/PipelineNodeMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/PipelineNodeMessage.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" #include #include -namespace complex +namespace nx::core { class Pipeline; @@ -14,7 +14,7 @@ class Pipeline; * @brief The PipelineNodeMessage class exists to pass node message from a * pipeline node to observers of the parent pipeline. */ -class COMPLEX_EXPORT PipelineNodeMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT PipelineNodeMessage : public AbstractPipelineMessage { public: /** @@ -42,4 +42,4 @@ class COMPLEX_EXPORT PipelineNodeMessage : public AbstractPipelineMessage private: std::shared_ptr m_Message; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/PipelineNodeObserver.cpp b/src/simplnx/Pipeline/Messaging/PipelineNodeObserver.cpp similarity index 91% rename from src/complex/Pipeline/Messaging/PipelineNodeObserver.cpp rename to src/simplnx/Pipeline/Messaging/PipelineNodeObserver.cpp index 2d50ddfc7e..3402e93249 100644 --- a/src/complex/Pipeline/Messaging/PipelineNodeObserver.cpp +++ b/src/simplnx/Pipeline/Messaging/PipelineNodeObserver.cpp @@ -1,8 +1,8 @@ #include "PipelineNodeObserver.hpp" -#include "complex/Pipeline/AbstractPipelineNode.hpp" +#include "simplnx/Pipeline/AbstractPipelineNode.hpp" -using namespace complex; +using namespace nx::core; PipelineNodeObserver::PipelineNodeObserver() { diff --git a/src/complex/Pipeline/Messaging/PipelineNodeObserver.hpp b/src/simplnx/Pipeline/Messaging/PipelineNodeObserver.hpp similarity index 93% rename from src/complex/Pipeline/Messaging/PipelineNodeObserver.hpp rename to src/simplnx/Pipeline/Messaging/PipelineNodeObserver.hpp index 8bb7f86e7f..a1c67bcc29 100644 --- a/src/complex/Pipeline/Messaging/PipelineNodeObserver.hpp +++ b/src/simplnx/Pipeline/Messaging/PipelineNodeObserver.hpp @@ -1,6 +1,6 @@ #pragma once -#include "complex/complex_export.hpp" +#include "simplnx/simplnx_export.hpp" #include @@ -8,7 +8,7 @@ #include #include -namespace complex +namespace nx::core { class AbstractPipelineMessage; class AbstractPipelineNode; @@ -19,7 +19,7 @@ class AbstractPipelineNode; * for derived classes to listen for messages emitted by target * AbstractPipelineNodes. */ -class COMPLEX_EXPORT PipelineNodeObserver +class SIMPLNX_EXPORT PipelineNodeObserver { public: /** @@ -80,4 +80,4 @@ class COMPLEX_EXPORT PipelineNodeObserver AbstractPipelineNode* m_ObservedNode = nullptr; nod::connection m_Connection; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Messaging/RenamedMessage.cpp b/src/simplnx/Pipeline/Messaging/RenamedMessage.cpp similarity index 89% rename from src/complex/Pipeline/Messaging/RenamedMessage.cpp rename to src/simplnx/Pipeline/Messaging/RenamedMessage.cpp index 412ef858d0..fad0f762bf 100644 --- a/src/complex/Pipeline/Messaging/RenamedMessage.cpp +++ b/src/simplnx/Pipeline/Messaging/RenamedMessage.cpp @@ -1,10 +1,10 @@ #include "RenamedMessage.hpp" -#include "complex/Pipeline/Pipeline.hpp" +#include "simplnx/Pipeline/Pipeline.hpp" #include -using namespace complex; +using namespace nx::core; RenamedMessage::RenamedMessage(Pipeline* pipeline, const std::string& newName, const std::string& oldName) : AbstractPipelineMessage(pipeline) diff --git a/src/complex/Pipeline/Messaging/RenamedMessage.hpp b/src/simplnx/Pipeline/Messaging/RenamedMessage.hpp similarity index 86% rename from src/complex/Pipeline/Messaging/RenamedMessage.hpp rename to src/simplnx/Pipeline/Messaging/RenamedMessage.hpp index 3aaa74e0f0..58cfcccc87 100644 --- a/src/complex/Pipeline/Messaging/RenamedMessage.hpp +++ b/src/simplnx/Pipeline/Messaging/RenamedMessage.hpp @@ -1,10 +1,10 @@ #pragma once -#include "complex/Pipeline/Messaging/AbstractPipelineMessage.hpp" +#include "simplnx/Pipeline/Messaging/AbstractPipelineMessage.hpp" #include -namespace complex +namespace nx::core { class Pipeline; @@ -14,7 +14,7 @@ class Pipeline; * target Pipeline has had its name changed, what it was changed from, and what * it was changed to. */ -class COMPLEX_EXPORT RenamedMessage : public AbstractPipelineMessage +class SIMPLNX_EXPORT RenamedMessage : public AbstractPipelineMessage { public: /** @@ -50,4 +50,4 @@ class COMPLEX_EXPORT RenamedMessage : public AbstractPipelineMessage std::string m_NewName; std::string m_OldName; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/Pipeline.cpp b/src/simplnx/Pipeline/Pipeline.cpp similarity index 97% rename from src/complex/Pipeline/Pipeline.cpp rename to src/simplnx/Pipeline/Pipeline.cpp index 3c4f75fe48..53049a2aa4 100644 --- a/src/complex/Pipeline/Pipeline.cpp +++ b/src/simplnx/Pipeline/Pipeline.cpp @@ -1,13 +1,13 @@ #include "Pipeline.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Filter/FilterList.hpp" -#include "complex/Pipeline/Messaging/NodeAddedMessage.hpp" -#include "complex/Pipeline/Messaging/NodeMovedMessage.hpp" -#include "complex/Pipeline/Messaging/NodeRemovedMessage.hpp" -#include "complex/Pipeline/Messaging/PipelineNodeMessage.hpp" -#include "complex/Pipeline/PipelineFilter.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Filter/FilterList.hpp" +#include "simplnx/Pipeline/Messaging/NodeAddedMessage.hpp" +#include "simplnx/Pipeline/Messaging/NodeMovedMessage.hpp" +#include "simplnx/Pipeline/Messaging/NodeRemovedMessage.hpp" +#include "simplnx/Pipeline/Messaging/PipelineNodeMessage.hpp" +#include "simplnx/Pipeline/PipelineFilter.hpp" #include @@ -15,7 +15,7 @@ #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -123,12 +123,12 @@ bool Pipeline::hasFilterList() const return m_FilterList != nullptr; } -complex::FilterList* Pipeline::getFilterList() const +nx::core::FilterList* Pipeline::getFilterList() const { return m_FilterList; } -void Pipeline::setFilterList(complex::FilterList* filterList) +void Pipeline::setFilterList(nx::core::FilterList* filterList) { m_FilterList = filterList; } @@ -763,7 +763,7 @@ Result Pipeline::FromJson(const nlohmann::json& json, FilterList* filt Pipeline pipeline(name, filterList); pipeline.setDisabled(ReadDisabledState(json)); - std::vector warnings; + std::vector warnings; for(const auto& item : json[k_PipelineItemsKey]) { diff --git a/src/complex/Pipeline/Pipeline.hpp b/src/simplnx/Pipeline/Pipeline.hpp similarity index 96% rename from src/complex/Pipeline/Pipeline.hpp rename to src/simplnx/Pipeline/Pipeline.hpp index 85032b4ed0..0b926b6fa1 100644 --- a/src/complex/Pipeline/Pipeline.hpp +++ b/src/simplnx/Pipeline/Pipeline.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Pipeline/AbstractPipelineNode.hpp" -#include "complex/Pipeline/Messaging/PipelineNodeObserver.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Pipeline/AbstractPipelineNode.hpp" +#include "simplnx/Pipeline/Messaging/PipelineNodeObserver.hpp" #include -namespace complex +namespace nx::core { class FilterHandle; class FilterList; @@ -22,7 +22,7 @@ class FilterList; * As a subclass of AbstractPipelineNode, Pipelines can be nested within other * Pipelines. */ -class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineNodeObserver +class SIMPLNX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineNodeObserver { using node_type = std::shared_ptr; using collection_type = std::vector; @@ -65,7 +65,7 @@ class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineN static Result FromFile(const std::filesystem::path& path, FilterList* filterList); /** - * @brief Attempts to read a SIMPL json pipeline and convert to a complex Pipeline. + * @brief Attempts to read a SIMPL json pipeline and convert to a simplnx Pipeline. * @param json * @param filterList * @return @@ -73,7 +73,7 @@ class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineN static Result FromSIMPLJson(const nlohmann::json& json, FilterList* filterList); /** - * @brief Attempts to read a SIMPL json pipeline and convert to a complex Pipeline. + * @brief Attempts to read a SIMPL json pipeline and convert to a simplnx Pipeline. * @param json * @return */ @@ -580,9 +580,9 @@ class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineN /** * @brief Returns a pointer to the assigned FilterList. Returns nullptr if * a FilterList has not been assigned. - * @return complex::FilterList* + * @return nx::core::FilterList* */ - complex::FilterList* getFilterList() const; + nx::core::FilterList* getFilterList() const; /** * @brief Assigns a new FilterList for use when adding filters by @@ -590,7 +590,7 @@ class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineN * the current Application instance's FilterList instead. * @param filterList */ - void setFilterList(complex::FilterList* filterList); + void setFilterList(nx::core::FilterList* filterList); /** * @brief Preflights the pipeline and checks the maximum amount of memory required to run the pipeline. @@ -618,9 +618,9 @@ class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineN * @brief Returns a pointer to the active FilterList that should be used for * creating IFilters. Returns the assigned FilterList pointer if one was * provided. Otherwise, this returns the current Application's FilterList. - * @return complex::FilterList* + * @return nx::core::FilterList* */ - complex::FilterList* getActiveFilterList() const; + nx::core::FilterList* getActiveFilterList() const; /** * @brief Resets all collection nodes' parent pipeline. @@ -650,4 +650,4 @@ class COMPLEX_EXPORT Pipeline : public AbstractPipelineNode, protected PipelineN FilterList* m_FilterList = nullptr; uint64 m_MemoryRequired = 0; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Pipeline/PipelineFilter.cpp b/src/simplnx/Pipeline/PipelineFilter.cpp similarity index 95% rename from src/complex/Pipeline/PipelineFilter.cpp rename to src/simplnx/Pipeline/PipelineFilter.cpp index 41c282b424..89657661b7 100644 --- a/src/complex/Pipeline/PipelineFilter.cpp +++ b/src/simplnx/Pipeline/PipelineFilter.cpp @@ -1,15 +1,15 @@ #include "PipelineFilter.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Filter/FilterList.hpp" -#include "complex/Pipeline/Messaging/FilterPreflightMessage.hpp" -#include "complex/Pipeline/Messaging/OutputRenamedMessage.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Filter/FilterList.hpp" +#include "simplnx/Pipeline/Messaging/FilterPreflightMessage.hpp" +#include "simplnx/Pipeline/Messaging/OutputRenamedMessage.hpp" #include #include -using namespace complex; +using namespace nx::core; namespace { @@ -47,7 +47,7 @@ std::optional FindComplexConversionFromSIMPL(const Uu auto plugins = filterList.getLoadedPlugins(); for(const auto* plugin : plugins) { - auto filterMap = plugin->getSimplToComplexMap(); + auto filterMap = plugin->getSimplToSimplnxMap(); if(filterMap.count(uuid) > 0) { return filterMap.at(uuid); @@ -246,7 +246,7 @@ bool PipelineFilter::preflight(DataStructure& data, RenamedPaths& renamedPaths, // ----------------------------------------------------------------------------- bool PipelineFilter::execute(DataStructure& data, const std::atomic_bool& shouldCancel) { - this->sendFilterRunStateMessage(m_Index, complex::RunState::Executing); + this->sendFilterRunStateMessage(m_Index, nx::core::RunState::Executing); this->sendFilterUpdateMessage(m_Index, "Begin"); m_Warnings.clear(); @@ -285,7 +285,7 @@ bool PipelineFilter::execute(DataStructure& data, const std::atomic_bool& should sendFilterFaultDetailMessage(m_Index, m_Warnings, m_Errors); } sendFilterFaultMessage(m_Index, getFaultState()); - this->sendFilterRunStateMessage(m_Index, complex::RunState::Idle); + this->sendFilterRunStateMessage(m_Index, nx::core::RunState::Idle); this->sendFilterUpdateMessage(m_Index, "End"); return result.result.valid() && m_Filter != nullptr; @@ -452,12 +452,12 @@ PipelineFilter::RenamedPaths PipelineFilter::checkForRenamedPaths(std::vector PipelineFilter::getWarnings() const +std::vector PipelineFilter::getWarnings() const { return m_Warnings; } -std::vector PipelineFilter::getErrors() const +std::vector PipelineFilter::getErrors() const { return m_Errors; } @@ -485,11 +485,11 @@ void PipelineFilter::notifyFilterMessage(const IFilter::Message& message) } else if(message.type == IFilter::Message::Type::Error) { - sendFilterFaultMessage(m_Index, complex::FaultState::Errors); + sendFilterFaultMessage(m_Index, nx::core::FaultState::Errors); } else if(message.type == IFilter::Message::Type::Warning) { - sendFilterFaultMessage(m_Index, complex::FaultState::Warnings); + sendFilterFaultMessage(m_Index, nx::core::FaultState::Warnings); } } @@ -628,7 +628,7 @@ void PipelineFilter::renamePathArgs(const RenamedPaths& renamedPaths) } } -complex::WarningCollection convertErrors(const complex::ErrorCollection& errors, const std::string& filterName) +nx::core::WarningCollection convertErrors(const nx::core::ErrorCollection& errors, const std::string& filterName) { if(errors.empty()) { @@ -644,7 +644,7 @@ complex::WarningCollection convertErrors(const complex::ErrorCollection& errors, return std::move(warnings); } -std::string PipelineFilter::CreateErrorComments(const complex::ErrorCollection& errors, const std::string& prefix) +std::string PipelineFilter::CreateErrorComments(const nx::core::ErrorCollection& errors, const std::string& prefix) { if(errors.empty()) { @@ -690,7 +690,7 @@ Result> PipelineFilter::FromSIMPLJson(const nloh return MakeErrorResult>(-3, fmt::format("Unable to find conversion data for filter '{}'", filterName)); } - IFilter::UniquePointer filter = filterList.createFilter(simplData->complexUuid); + IFilter::UniquePointer filter = filterList.createFilter(simplData->simplnxUuid); if(!simplData->convertJson) { diff --git a/src/complex/Pipeline/PipelineFilter.hpp b/src/simplnx/Pipeline/PipelineFilter.hpp similarity index 90% rename from src/complex/Pipeline/PipelineFilter.hpp rename to src/simplnx/Pipeline/PipelineFilter.hpp index 1afc51c7fb..742a368067 100644 --- a/src/complex/Pipeline/PipelineFilter.hpp +++ b/src/simplnx/Pipeline/PipelineFilter.hpp @@ -1,11 +1,11 @@ #pragma once -#include "complex/Filter/IFilter.hpp" -#include "complex/Pipeline/AbstractPipelineNode.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Pipeline/AbstractPipelineNode.hpp" #include -namespace complex +namespace nx::core { class FilterHandle; class FilterList; @@ -16,11 +16,11 @@ class FilterList; * IFilter object. The node keeps track of the resulting DataStructure as well * as error and warning messages. */ -class COMPLEX_EXPORT PipelineFilter : public AbstractPipelineNode +class SIMPLNX_EXPORT PipelineFilter : public AbstractPipelineNode { public: - using WarningsChangedSignal = nod::signal)>; - using ErrorsChangedSignal = nod::signal)>; + using WarningsChangedSignal = nod::signal)>; + using ErrorsChangedSignal = nod::signal)>; /** * @brief Attempts to construct a PipelineFilter based on the specified @@ -63,7 +63,7 @@ class COMPLEX_EXPORT PipelineFilter : public AbstractPipelineNode * @param prefix The comment string prefix for each of the errors * @return The converted comment string containing all of the errors */ - static std::string CreateErrorComments(const complex::ErrorCollection& errors, const std::string& prefix); + static std::string CreateErrorComments(const nx::core::ErrorCollection& errors, const std::string& prefix); /** * @brief Constructs a PipelineFilter with the provided filter and arguments. @@ -171,21 +171,21 @@ class COMPLEX_EXPORT PipelineFilter : public AbstractPipelineNode /** * @brief Returns a collection of warnings returned by the target filter. * This collection is cleared when the node is preflighted or executed. - * @return std::vector + * @return std::vector */ - std::vector getWarnings() const; + std::vector getWarnings() const; /** * @brief Returns a collection of errors emitted by the target filter. * This collection is cleared when the node is preflighted or executed. - * @return std::vector + * @return std::vector */ - std::vector getErrors() const; + std::vector getErrors() const; /** * @brief Returns a collection of preflight values emitted by the target filter. * This collection is cleared when the node is preflighted or executed. - * @return std::vector + * @return std::vector */ const std::vector& getPreflightValues() const; @@ -238,10 +238,10 @@ class COMPLEX_EXPORT PipelineFilter : public AbstractPipelineNode Arguments m_Arguments; int32 m_Index = 0; std::string m_Comments; - std::vector m_Warnings; - std::vector m_Errors; + std::vector m_Warnings; + std::vector m_Errors; std::vector m_PreflightValues; std::vector m_CreatedPaths; std::vector m_DataModifiedActions; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Plugin/AbstractPlugin.cpp b/src/simplnx/Plugin/AbstractPlugin.cpp similarity index 94% rename from src/complex/Plugin/AbstractPlugin.cpp rename to src/simplnx/Plugin/AbstractPlugin.cpp index 2e59bb6275..8c4d1a67dd 100644 --- a/src/complex/Plugin/AbstractPlugin.cpp +++ b/src/simplnx/Plugin/AbstractPlugin.cpp @@ -1,15 +1,15 @@ #include "AbstractPlugin.hpp" -#include "complex/Core/Application.hpp" -#include "complex/Core/Preferences.hpp" -#include "complex/Filter/IFilter.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/Core/Preferences.hpp" +#include "simplnx/Filter/IFilter.hpp" #include #include #include -using namespace complex; +using namespace nx::core; AbstractPlugin::AbstractPlugin(IdType identifier, const std::string& name, const std::string& description, const std::string& vendor) : m_Id(identifier) diff --git a/src/complex/Plugin/AbstractPlugin.hpp b/src/simplnx/Plugin/AbstractPlugin.hpp similarity index 84% rename from src/complex/Plugin/AbstractPlugin.hpp rename to src/simplnx/Plugin/AbstractPlugin.hpp index 7a90f64805..df3995a946 100644 --- a/src/complex/Plugin/AbstractPlugin.hpp +++ b/src/simplnx/Plugin/AbstractPlugin.hpp @@ -1,8 +1,8 @@ #pragma once -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -10,7 +10,7 @@ #include #include -namespace complex +namespace nx::core { namespace H5 { @@ -26,7 +26,7 @@ class IDataIOManager; * retrieving information about the plugin and creating filters within the * plugin. */ -class COMPLEX_EXPORT AbstractPlugin +class SIMPLNX_EXPORT AbstractPlugin { public: using IdType = Uuid; @@ -34,11 +34,11 @@ class COMPLEX_EXPORT AbstractPlugin using IOManagerPointer = std::shared_ptr; using IOManagersContainerType = std::vector; - struct COMPLEX_EXPORT SIMPLData + struct SIMPLNX_EXPORT SIMPLData { using ConversionFunction = std::function(const nlohmann::json&)>; - Uuid complexUuid; + Uuid simplnxUuid; ConversionFunction convertJson; }; @@ -84,7 +84,7 @@ class COMPLEX_EXPORT AbstractPlugin /** * @brief Returns a set of FilterHandles pointing to each of the filters * contained in the plugin. - * @return std::unordered_set + * @return std::unordered_set */ FilterContainerType getFilterHandles() const; @@ -110,10 +110,10 @@ class COMPLEX_EXPORT AbstractPlugin /** * @brief Returns a map of UUIDs as strings, where SIMPL UUIDs are keys to - * their complex counterpart + * their simplnx counterpart * @return SIMPLMapType */ - virtual SIMPLMapType getSimplToComplexMap() const = 0; + virtual SIMPLMapType getSimplToSimplnxMap() const = 0; protected: /** @@ -135,7 +135,7 @@ class COMPLEX_EXPORT AbstractPlugin void addFilter(FilterCreationFunc filterFunc); /** - * @brief Inserts an IOManager into the plugin for use throughout complex once the plugin has been loaded. + * @brief Inserts an IOManager into the plugin for use throughout simplnx once the plugin has been loaded. * @param ioManager */ void addDataIOManager(const IOManagerPointer& ioManager); @@ -159,31 +159,31 @@ class COMPLEX_EXPORT AbstractPlugin using CreatePluginFunc = AbstractPlugin* (*)(); using DestroyPluginFunc = bool (*)(AbstractPlugin*); -} // namespace complex +} // namespace nx::core -#define COMPLEX_CREATE_PLUGIN_FUNC COMPLEX_CreatePlugin -#define COMPLEX_DESTROY_PLUGIN_FUNC COMPLEX_DestroyPlugin +#define SIMPLNX_CREATE_PLUGIN_FUNC SIMPLNX_CreatePlugin +#define SIMPLNX_DESTROY_PLUGIN_FUNC SIMPLNX_DestroyPlugin -#define COMPLEX_STRINGIFY_IMPL(x) #x -#define COMPLEX_STRINGIFY(x) COMPLEX_STRINGIFY_IMPL(x) +#define SIMPLNX_STRINGIFY_IMPL(x) #x +#define SIMPLNX_STRINGIFY(x) SIMPLNX_STRINGIFY_IMPL(x) -#define COMPLEX_CREATE_PLUGIN_FUNC_NAME COMPLEX_STRINGIFY(COMPLEX_CREATE_PLUGIN_FUNC) -#define COMPLEX_DESTROY_PLUGIN_FUNC_NAME COMPLEX_STRINGIFY(COMPLEX_DESTROY_PLUGIN_FUNC) +#define SIMPLNX_CREATE_PLUGIN_FUNC_NAME SIMPLNX_STRINGIFY(SIMPLNX_CREATE_PLUGIN_FUNC) +#define SIMPLNX_DESTROY_PLUGIN_FUNC_NAME SIMPLNX_STRINGIFY(SIMPLNX_DESTROY_PLUGIN_FUNC) #if defined(_WIN32) -#define COMPLEX_PLUGIN_EXPORT __declspec(dllexport) +#define SIMPLNX_PLUGIN_EXPORT __declspec(dllexport) #else -#define COMPLEX_PLUGIN_EXPORT __attribute__((visibility("default"))) +#define SIMPLNX_PLUGIN_EXPORT __attribute__((visibility("default"))) #endif -#define COMPLEX_DEF_PLUGIN_IMPL(pluginType, createName, destroyName) \ +#define SIMPLNX_DEF_PLUGIN_IMPL(pluginType, createName, destroyName) \ extern "C" { \ - COMPLEX_PLUGIN_EXPORT complex::AbstractPlugin* createName() \ + SIMPLNX_PLUGIN_EXPORT nx::core::AbstractPlugin* createName() \ { \ return new pluginType(); \ } \ \ - COMPLEX_PLUGIN_EXPORT bool destroyName(complex::AbstractPlugin* plugin) \ + SIMPLNX_PLUGIN_EXPORT bool destroyName(nx::core::AbstractPlugin* plugin) \ { \ auto convertedPlugin = dynamic_cast(plugin); \ if(convertedPlugin == nullptr) \ @@ -195,4 +195,4 @@ using DestroyPluginFunc = bool (*)(AbstractPlugin*); } \ } -#define COMPLEX_DEF_PLUGIN(pluginType) COMPLEX_DEF_PLUGIN_IMPL(pluginType, COMPLEX_CREATE_PLUGIN_FUNC, COMPLEX_DESTROY_PLUGIN_FUNC) +#define SIMPLNX_DEF_PLUGIN(pluginType) SIMPLNX_DEF_PLUGIN_IMPL(pluginType, SIMPLNX_CREATE_PLUGIN_FUNC, SIMPLNX_DESTROY_PLUGIN_FUNC) diff --git a/src/complex/Plugin/PluginLoader.cpp b/src/simplnx/Plugin/PluginLoader.cpp similarity index 82% rename from src/complex/Plugin/PluginLoader.cpp rename to src/simplnx/Plugin/PluginLoader.cpp index bbd0946051..747a18cd91 100644 --- a/src/complex/Plugin/PluginLoader.cpp +++ b/src/simplnx/Plugin/PluginLoader.cpp @@ -1,4 +1,4 @@ -#include "complex/Plugin/PluginLoader.hpp" +#include "simplnx/Plugin/PluginLoader.hpp" #include @@ -12,20 +12,20 @@ #if defined(_WIN32) #include #include -#define COMPLEX_TEXT_IMPL(text) L##text +#define SIMPLNX_TEXT_IMPL(text) L##text #elif defined(__linux__) || defined(__APPLE__) #include -#define COMPLEX_TEXT_IMPL(text) text +#define SIMPLNX_TEXT_IMPL(text) text #else static_assert(false, "Plugin loading not implemented on this platform"); #endif -#define COMPLEX_TEXT(text) COMPLEX_TEXT_IMPL(text) +#define SIMPLNX_TEXT(text) SIMPLNX_TEXT_IMPL(text) -#include "complex/Filter/FilterHandle.hpp" -#include "complex/Plugin/AbstractPlugin.hpp" +#include "simplnx/Filter/FilterHandle.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" -using namespace complex; +using namespace nx::core; namespace { @@ -101,26 +101,26 @@ void PluginLoader::loadPlugin() m_Handle = LoadSharedLibrary(m_Path); if(m_Handle == nullptr) { - fmt::print(COMPLEX_TEXT("Could not load library '{}' with the following error:\n"), m_Path.c_str()); + fmt::print(SIMPLNX_TEXT("Could not load library '{}' with the following error:\n"), m_Path.c_str()); fmt::print(GetErrorMessage()); fmt::print("\n"); return; } - CreatePluginFunc createPluginFunc = ImportFunction(m_Handle, COMPLEX_CREATE_PLUGIN_FUNC_NAME); + CreatePluginFunc createPluginFunc = ImportFunction(m_Handle, SIMPLNX_CREATE_PLUGIN_FUNC_NAME); if(createPluginFunc == nullptr) { unloadPlugin(); - fmt::print(COMPLEX_TEXT("Could not retrieve function \"" COMPLEX_CREATE_PLUGIN_FUNC_NAME "\" from library '{}' with the following error:\n"), m_Path.c_str()); + fmt::print(SIMPLNX_TEXT("Could not retrieve function \"" SIMPLNX_CREATE_PLUGIN_FUNC_NAME "\" from library '{}' with the following error:\n"), m_Path.c_str()); fmt::print(GetErrorMessage()); return; } - DestroyPluginFunc destroyPluginFunc = ImportFunction(m_Handle, COMPLEX_DESTROY_PLUGIN_FUNC_NAME); + DestroyPluginFunc destroyPluginFunc = ImportFunction(m_Handle, SIMPLNX_DESTROY_PLUGIN_FUNC_NAME); if(destroyPluginFunc == nullptr) { unloadPlugin(); - fmt::print(COMPLEX_TEXT("Could not retrieve function \"" COMPLEX_DESTROY_PLUGIN_FUNC_NAME "\" from library '{}' with following error:\n"), m_Path.c_str()); + fmt::print(SIMPLNX_TEXT("Could not retrieve function \"" SIMPLNX_DESTROY_PLUGIN_FUNC_NAME "\" from library '{}' with following error:\n"), m_Path.c_str()); fmt::print(GetErrorMessage()); return; } @@ -137,7 +137,7 @@ void PluginLoader::unloadPlugin() m_Plugin = nullptr; if(!UnloadSharedLibrary(m_Handle)) { - fmt::print(COMPLEX_TEXT("The following error occurred while unloading library '{}':\n"), m_Path.c_str()); + fmt::print(SIMPLNX_TEXT("The following error occurred while unloading library '{}':\n"), m_Path.c_str()); fmt::print(GetErrorMessage()); } m_Handle = nullptr; diff --git a/src/complex/Plugin/PluginLoader.hpp b/src/simplnx/Plugin/PluginLoader.hpp similarity index 88% rename from src/complex/Plugin/PluginLoader.hpp rename to src/simplnx/Plugin/PluginLoader.hpp index b3760f6fc5..4e4470bd5a 100644 --- a/src/complex/Plugin/PluginLoader.hpp +++ b/src/simplnx/Plugin/PluginLoader.hpp @@ -1,14 +1,14 @@ #pragma once -#include "complex/Plugin/AbstractPlugin.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Plugin/AbstractPlugin.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { -class COMPLEX_EXPORT IPluginLoader +class SIMPLNX_EXPORT IPluginLoader { public: virtual ~IPluginLoader() noexcept = default; @@ -23,7 +23,7 @@ class COMPLEX_EXPORT IPluginLoader IPluginLoader() = default; }; -class COMPLEX_EXPORT InMemoryPluginLoader : public IPluginLoader +class SIMPLNX_EXPORT InMemoryPluginLoader : public IPluginLoader { public: InMemoryPluginLoader(std::shared_ptr plugin) @@ -59,7 +59,7 @@ class COMPLEX_EXPORT InMemoryPluginLoader : public IPluginLoader * unloading, and accessing plugins. The implementation of PluginLoader is * provided for each operating system, but the public API remains the same. */ -class COMPLEX_EXPORT PluginLoader : public IPluginLoader +class SIMPLNX_EXPORT PluginLoader : public IPluginLoader { public: /** @@ -107,4 +107,4 @@ class COMPLEX_EXPORT PluginLoader : public IPluginLoader void* m_Handle = nullptr; std::shared_ptr m_Plugin; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/AlignSections.cpp b/src/simplnx/Utilities/AlignSections.cpp similarity index 96% rename from src/complex/Utilities/AlignSections.cpp rename to src/simplnx/Utilities/AlignSections.cpp index ae1c852280..ee6bbabaa4 100644 --- a/src/complex/Utilities/AlignSections.cpp +++ b/src/simplnx/Utilities/AlignSections.cpp @@ -1,13 +1,13 @@ #include "AlignSections.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/ParallelDataAlgorithm.hpp" -#include "complex/Utilities/ParallelTaskAlgorithm.hpp" -#include "complex/Utilities/StringUtilities.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/ParallelDataAlgorithm.hpp" +#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp" +#include "simplnx/Utilities/StringUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -98,7 +98,7 @@ class AlignSectionsTransferDataImpl SizeVec3 m_Dims; std::vector m_Xshifts; std::vector m_Yshifts; - complex::DataArray& m_DataArray; + nx::core::DataArray& m_DataArray; }; } // namespace diff --git a/src/complex/Utilities/AlignSections.hpp b/src/simplnx/Utilities/AlignSections.hpp similarity index 86% rename from src/complex/Utilities/AlignSections.hpp rename to src/simplnx/Utilities/AlignSections.hpp index 52cd37f5a5..9c3bbe8fe8 100644 --- a/src/complex/Utilities/AlignSections.hpp +++ b/src/simplnx/Utilities/AlignSections.hpp @@ -1,19 +1,19 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/Filter/Arguments.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/Filter/Arguments.hpp" +#include "simplnx/Filter/IFilter.hpp" +#include "simplnx/simplnx_export.hpp" -namespace complex +namespace nx::core { class IGridGeometry; -class COMPLEX_EXPORT AlignSections +class SIMPLNX_EXPORT AlignSections { public: AlignSections(DataStructure& data, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler); @@ -72,4 +72,4 @@ class COMPLEX_EXPORT AlignSections const IFilter::MessageHandler& m_MessageHandler; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/ArrayThreshold.cpp b/src/simplnx/Utilities/ArrayThreshold.cpp similarity index 99% rename from src/complex/Utilities/ArrayThreshold.cpp rename to src/simplnx/Utilities/ArrayThreshold.cpp index 03459fb753..89adf721f0 100644 --- a/src/complex/Utilities/ArrayThreshold.cpp +++ b/src/simplnx/Utilities/ArrayThreshold.cpp @@ -1,8 +1,8 @@ #include "ArrayThreshold.hpp" -#include "complex/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataArray.hpp" -using namespace complex; +using namespace nx::core; namespace { diff --git a/src/complex/Utilities/ArrayThreshold.hpp b/src/simplnx/Utilities/ArrayThreshold.hpp similarity index 86% rename from src/complex/Utilities/ArrayThreshold.hpp rename to src/simplnx/Utilities/ArrayThreshold.hpp index ca7735ecbb..a8f65a36a3 100644 --- a/src/complex/Utilities/ArrayThreshold.hpp +++ b/src/simplnx/Utilities/ArrayThreshold.hpp @@ -1,9 +1,9 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/simplnx_export.hpp" #include @@ -11,13 +11,13 @@ #include #include -namespace complex +namespace nx::core { /** * @brief */ -class COMPLEX_EXPORT IArrayThreshold +class SIMPLNX_EXPORT IArrayThreshold { public: using MaskValue = bool; @@ -50,7 +50,7 @@ class COMPLEX_EXPORT IArrayThreshold /** * @brief */ -class COMPLEX_EXPORT ArrayThreshold : public IArrayThreshold +class SIMPLNX_EXPORT ArrayThreshold : public IArrayThreshold { public: using ComparisonValue = float64; @@ -93,7 +93,7 @@ class COMPLEX_EXPORT ArrayThreshold : public IArrayThreshold /** * @brief */ -class COMPLEX_EXPORT ArrayThresholdSet : public IArrayThreshold +class SIMPLNX_EXPORT ArrayThresholdSet : public IArrayThreshold { public: using CollectionType = std::vector>; @@ -117,4 +117,4 @@ class COMPLEX_EXPORT ArrayThresholdSet : public IArrayThreshold private: CollectionType m_Thresholds; }; -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/ColorPresetsUtilities.cpp b/src/simplnx/Utilities/ColorPresetsUtilities.cpp similarity index 96% rename from src/complex/Utilities/ColorPresetsUtilities.cpp rename to src/simplnx/Utilities/ColorPresetsUtilities.cpp index 1929ac3855..1c59961645 100644 --- a/src/complex/Utilities/ColorPresetsUtilities.cpp +++ b/src/simplnx/Utilities/ColorPresetsUtilities.cpp @@ -4,7 +4,7 @@ #include #include -namespace complex +namespace nx::core { // ----------------------------------------------------------------------------- Result ReadRGBPresets(const std::string& presetsJson) @@ -39,4 +39,4 @@ Result ReadRGBPresets(const fs::path& presetsFilePath) buffer << iStream.rdbuf(); return ReadRGBPresets(buffer.str()); } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/ColorPresetsUtilities.hpp b/src/simplnx/Utilities/ColorPresetsUtilities.hpp similarity index 67% rename from src/complex/Utilities/ColorPresetsUtilities.hpp rename to src/simplnx/Utilities/ColorPresetsUtilities.hpp index bbc87b81be..2b9aa1893d 100644 --- a/src/complex/Utilities/ColorPresetsUtilities.hpp +++ b/src/simplnx/Utilities/ColorPresetsUtilities.hpp @@ -1,26 +1,26 @@ #pragma once -#include "complex/Common/Result.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/simplnx_export.hpp" #include #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { /** * @brief ReadRGBPresets This method will read RGB presets from a given presets JSON string * @param presetsJson The presets JSON string * @return The json object result */ -COMPLEX_EXPORT Result ReadRGBPresets(const std::string& presetsJson); +SIMPLNX_EXPORT Result ReadRGBPresets(const std::string& presetsJson); /** * @brief ReadRGBPresets This method will read RGB presets from a given presets JSON file * @param presetsJson The presets JSON file path * @return The json object result */ -COMPLEX_EXPORT Result ReadRGBPresets(const fs::path& presetsFilePath); -} // namespace complex +SIMPLNX_EXPORT Result ReadRGBPresets(const fs::path& presetsFilePath); +} // namespace nx::core diff --git a/src/complex/Utilities/DataArrayUtilities.cpp b/src/simplnx/Utilities/DataArrayUtilities.cpp similarity index 97% rename from src/complex/Utilities/DataArrayUtilities.cpp rename to src/simplnx/Utilities/DataArrayUtilities.cpp index 21dc030150..a4ca8c8aef 100644 --- a/src/complex/Utilities/DataArrayUtilities.cpp +++ b/src/simplnx/Utilities/DataArrayUtilities.cpp @@ -1,12 +1,12 @@ #include "DataArrayUtilities.hpp" -#include "complex/Common/Types.hpp" -#include "complex/Common/TypesUtility.hpp" -#include "complex/Utilities/FilterUtilities.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Common/TypesUtility.hpp" +#include "simplnx/Utilities/FilterUtilities.hpp" #include -using namespace complex; +using namespace nx::core; namespace { @@ -30,7 +30,7 @@ struct InitializeNeighborListFunctor }; } // namespace -namespace complex +namespace nx::core { //----------------------------------------------------------------------------- Result<> CheckValueConverts(const std::string& value, NumericType numericType) @@ -121,7 +121,7 @@ Result<> CheckValueConvertsToArrayType(const std::string& value, const DataObjec //----------------------------------------------------------------------------- bool CheckArraysAreSameType(const DataStructure& dataStructure, const std::vector& dataArrayPaths) { - std::set types; + std::set types; for(const auto& dataPath : dataArrayPaths) { const auto* dataArray = dataStructure.getDataAs(dataPath); @@ -177,7 +177,7 @@ bool CheckMemoryRequirement(DataStructure& dataStructure, uint64 requiredMemory, Result<> ConditionalReplaceValueInArray(const std::string& valueAsStr, DataObject& inputDataObject, const IDataArray& conditionalDataArray, bool invertMask) { const IDataArray& iDataArray = dynamic_cast(inputDataObject); - const complex::DataType arrayType = iDataArray.getDataType(); + const nx::core::DataType arrayType = iDataArray.getDataType(); return ExecuteDataFunction(ConditionalReplaceValueInArrayFromString{}, arrayType, valueAsStr, inputDataObject, conditionalDataArray, invertMask); } @@ -327,4 +327,4 @@ bool ConvertIDataArray(const std::shared_ptr& dataArray, const std:: return false; } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/DataArrayUtilities.hpp b/src/simplnx/Utilities/DataArrayUtilities.hpp similarity index 94% rename from src/complex/Utilities/DataArrayUtilities.hpp rename to src/simplnx/Utilities/DataArrayUtilities.hpp index 8b356348cb..94ecc317e8 100644 --- a/src/complex/Utilities/DataArrayUtilities.hpp +++ b/src/simplnx/Utilities/DataArrayUtilities.hpp @@ -1,21 +1,21 @@ #pragma once -#include "complex/Common/Array.hpp" -#include "complex/Common/Result.hpp" -#include "complex/Core/Application.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataStore.hpp" -#include "complex/DataStructure/EmptyDataStore.hpp" -#include "complex/DataStructure/IDataStore.hpp" -#include "complex/DataStructure/IO/Generic/DataIOCollection.hpp" -#include "complex/DataStructure/NeighborList.hpp" -#include "complex/DataStructure/StringArray.hpp" -#include "complex/Filter/Output.hpp" -#include "complex/Utilities/MemoryUtilities.hpp" -#include "complex/Utilities/ParallelAlgorithmUtilities.hpp" -#include "complex/Utilities/TemplateHelpers.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Array.hpp" +#include "simplnx/Common/Result.hpp" +#include "simplnx/Core/Application.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataStore.hpp" +#include "simplnx/DataStructure/EmptyDataStore.hpp" +#include "simplnx/DataStructure/IDataStore.hpp" +#include "simplnx/DataStructure/IO/Generic/DataIOCollection.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/StringArray.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Utilities/MemoryUtilities.hpp" +#include "simplnx/Utilities/ParallelAlgorithmUtilities.hpp" +#include "simplnx/Utilities/TemplateHelpers.hpp" +#include "simplnx/simplnx_export.hpp" #include #include @@ -35,37 +35,37 @@ namespace #endif } // namespace -#define COMPLEX_DEF_STRING_CONVERTOR_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ +#define SIMPLNX_DEF_STRING_CONVERTOR_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ CONTAINER_TYPE value; \ try \ { \ value = FUNCTION(input); \ } catch(const std::invalid_argument& e) \ { \ - return complex::MakeErrorResult(-100, fmt::format("Error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ + return nx::core::MakeErrorResult(-100, fmt::format("Error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ } catch(const std::out_of_range& e) \ { \ - return complex::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ + return nx::core::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ } \ \ if(value > std::numeric_limits::max() || value < std::numeric_limits::min()) \ { \ - return complex::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ + return nx::core::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ } \ \ return {static_cast(value)}; -#define COMPLEX_DEF_STRING_CONVERTOR_SIGNED_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ +#define SIMPLNX_DEF_STRING_CONVERTOR_SIGNED_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ template <> \ struct ConvertTo \ { \ static Result convert(const std::string& input) \ { \ - COMPLEX_DEF_STRING_CONVERTOR_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ + SIMPLNX_DEF_STRING_CONVERTOR_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ } \ }; -#define COMPLEX_DEF_STRING_CONVERTOR_UNSIGNED_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ +#define SIMPLNX_DEF_STRING_CONVERTOR_UNSIGNED_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ template <> \ struct ConvertTo \ { \ @@ -73,14 +73,14 @@ namespace { \ if(!input.empty() && input.at(0) == '-') \ { \ - return complex::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ + return nx::core::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ } \ \ - COMPLEX_DEF_STRING_CONVERTOR_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ + SIMPLNX_DEF_STRING_CONVERTOR_INT(CONTAINER_TYPE, TYPE, FUNCTION) \ } \ }; -#define COMPLEX_DEF_STRING_CONVERTOR_FLOATING_POINT(TYPE, FUNCTION) \ +#define SIMPLNX_DEF_STRING_CONVERTOR_FLOATING_POINT(TYPE, FUNCTION) \ template <> \ struct ConvertTo \ { \ @@ -92,16 +92,16 @@ namespace value = static_cast(FUNCTION(input)); \ } catch(const std::invalid_argument& e) \ { \ - return complex::MakeErrorResult(-100, fmt::format("Error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ + return nx::core::MakeErrorResult(-100, fmt::format("Error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ } catch(const std::out_of_range& e) \ { \ - return complex::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ + return nx::core::MakeErrorResult(-101, fmt::format("Overflow error trying to convert '{}' to type '{}' using function '{}'", input, #TYPE, #FUNCTION)); \ } \ return {value}; \ } \ }; -namespace complex +namespace nx::core { template struct ConvertTo @@ -112,19 +112,19 @@ struct ConvertTo * These macros will create convertor objects that convert from a string to a numeric type */ -COMPLEX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint8, std::stoull) -COMPLEX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int8, std::stoll) -COMPLEX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint16, std::stoull) -COMPLEX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int16, std::stoll) -COMPLEX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint32, std::stoull) -COMPLEX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int32, std::stoll) -COMPLEX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint64, std::stoull) -COMPLEX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int64, std::stoll) +SIMPLNX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint8, std::stoull) +SIMPLNX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int8, std::stoll) +SIMPLNX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint16, std::stoull) +SIMPLNX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int16, std::stoll) +SIMPLNX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint32, std::stoull) +SIMPLNX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int32, std::stoll) +SIMPLNX_DEF_STRING_CONVERTOR_UNSIGNED_INT(uint64, uint64, std::stoull) +SIMPLNX_DEF_STRING_CONVERTOR_SIGNED_INT(int64, int64, std::stoll) #ifdef __APPLE__ -COMPLEX_DEF_STRING_CONVERTOR_UNSIGNED_INT(usize, usize, std::stoull) +SIMPLNX_DEF_STRING_CONVERTOR_UNSIGNED_INT(usize, usize, std::stoull) #endif -COMPLEX_DEF_STRING_CONVERTOR_FLOATING_POINT(float32, std::stof) -COMPLEX_DEF_STRING_CONVERTOR_FLOATING_POINT(float64, std::stod) +SIMPLNX_DEF_STRING_CONVERTOR_FLOATING_POINT(float32, std::stof) +SIMPLNX_DEF_STRING_CONVERTOR_FLOATING_POINT(float64, std::stod) template <> struct ConvertTo @@ -246,7 +246,7 @@ Result<> CheckValuesFloatDouble(const std::string& valueAsStr, const std::string * @param inputDataArray * @return */ -COMPLEX_EXPORT Result<> CheckValueConvertsToArrayType(const std::string& value, const DataObject& inputDataArray); +SIMPLNX_EXPORT Result<> CheckValueConvertsToArrayType(const std::string& value, const DataObject& inputDataArray); /** * @brief Replaces every value in an array based on a `mask` array. @@ -307,17 +307,17 @@ struct ConditionalReplaceValueInArrayFromString return MakeErrorResult<>(-4000, "Input String Value could not be converted to the appropriate numeric type."); } - const complex::DataType arrayType = conditionalDataArray.getDataType(); + const nx::core::DataType arrayType = conditionalDataArray.getDataType(); - if(complex::DataType::uint8 == arrayType) + if(nx::core::DataType::uint8 == arrayType) { ReplaceValue(inputDataArray, dynamic_cast(&conditionalDataArray), conversionResult.value(), invertMask); } - else if(complex::DataType::int8 == arrayType) + else if(nx::core::DataType::int8 == arrayType) { ReplaceValue(inputDataArray, dynamic_cast(&conditionalDataArray), conversionResult.value(), invertMask); } - else if(complex::DataType::boolean == arrayType) + else if(nx::core::DataType::boolean == arrayType) { ReplaceValue(inputDataArray, dynamic_cast(&conditionalDataArray), conversionResult.value(), invertMask); } @@ -336,7 +336,7 @@ struct ConditionalReplaceValueInArrayFromString * @param conditionalDataArray The mask array as a boolean array * @return */ -COMPLEX_EXPORT Result<> ConditionalReplaceValueInArray(const std::string& valueAsStr, DataObject& inputDataObject, const IDataArray& conditionalDataArray, bool invertmask = false); +SIMPLNX_EXPORT Result<> ConditionalReplaceValueInArray(const std::string& valueAsStr, DataObject& inputDataObject, const IDataArray& conditionalDataArray, bool invertmask = false); template uint64 CalculateDataSize(const IDataStore::ShapeType& tupleShape, const IDataStore::ShapeType& componentShape) @@ -380,7 +380,7 @@ std::shared_ptr> CreateDataStore(const typename IDataStore: } } -COMPLEX_EXPORT bool CheckMemoryRequirement(DataStructure& dataStructure, uint64 requiredMemory, std::string& format); +SIMPLNX_EXPORT bool CheckMemoryRequirement(DataStructure& dataStructure, uint64 requiredMemory, std::string& format); /** * @brief Creates a DataArray with the given properties @@ -725,7 +725,7 @@ Result<> DeepCopy(DataStructure& dataStructure, const DataPath& sourceDataPath, * @param mode The mode: Preflight or Execute * @return */ -COMPLEX_EXPORT Result<> ResizeAndReplaceDataArray(DataStructure& dataStructure, const DataPath& dataPath, std::vector& tupleShape, IDataAction::Mode mode); +SIMPLNX_EXPORT Result<> ResizeAndReplaceDataArray(DataStructure& dataStructure, const DataPath& dataPath, std::vector& tupleShape, IDataAction::Mode mode); /** * @brief This function will ensure that a user entered numeric value can correctly be parsed into the selected NumericType @@ -734,7 +734,7 @@ COMPLEX_EXPORT Result<> ResizeAndReplaceDataArray(DataStructure& dataStructure, * @param numericType The NumericType to parse the value into. * @return */ -COMPLEX_EXPORT Result<> CheckValueConverts(const std::string& value, NumericType numericType); +SIMPLNX_EXPORT Result<> CheckValueConverts(const std::string& value, NumericType numericType); /** * @brief This method will ensure that all the arrays are of the same type @@ -742,7 +742,7 @@ COMPLEX_EXPORT Result<> CheckValueConverts(const std::string& value, NumericType * @param dataArrayPaths The Paths to check * @return */ -COMPLEX_EXPORT bool CheckArraysAreSameType(const DataStructure& dataStructure, const std::vector& dataArrayPaths); +SIMPLNX_EXPORT bool CheckArraysAreSameType(const DataStructure& dataStructure, const std::vector& dataArrayPaths); /** * @brief This method will ensure that all the arrays have the same tuple count @@ -750,7 +750,7 @@ COMPLEX_EXPORT bool CheckArraysAreSameType(const DataStructure& dataStructure, c * @param dataArrayPaths The Paths to check * @return */ -COMPLEX_EXPORT bool CheckArraysHaveSameTupleCount(const DataStructure& dataStructure, const std::vector& dataArrayPaths); +SIMPLNX_EXPORT bool CheckArraysHaveSameTupleCount(const DataStructure& dataStructure, const std::vector& dataArrayPaths); /** * @brief Validates that the number of features in the array are equivalent @@ -759,7 +759,7 @@ COMPLEX_EXPORT bool CheckArraysHaveSameTupleCount(const DataStructure& dataStruc * @param featureIds the ids for the array * @return void */ -COMPLEX_EXPORT Result<> ValidateNumFeaturesInArray(const DataStructure& dataStructure, const DataPath& arrayPath, const Int32Array& featureIds); +SIMPLNX_EXPORT Result<> ValidateNumFeaturesInArray(const DataStructure& dataStructure, const DataPath& arrayPath, const Int32Array& featureIds); /** * @brief This function will ensure that a DataArray can be safely resized to the user entered numeric value @@ -800,7 +800,7 @@ Result<> ResizeDataArray(DataStructure& dataStructure, const DataPath& arrayPath * @param dataStructure * @param neighborListPath The path to the NeighborList to be initialized. */ -COMPLEX_EXPORT void InitializeNeighborList(DataStructure& dataStructure, const DataPath& neighborListPath); +SIMPLNX_EXPORT void InitializeNeighborList(DataStructure& dataStructure, const DataPath& neighborListPath); /** * @brief These structs and functions are meant to make using a "mask array" or "Good Voxels Array" easier @@ -949,14 +949,14 @@ struct UInt8MaskCompare : public MaskCompare * @param maskArrayPath The DataPath of the mask array. * @return */ -COMPLEX_EXPORT std::unique_ptr InstantiateMaskCompare(DataStructure& dataStructure, const DataPath& maskArrayPath); +SIMPLNX_EXPORT std::unique_ptr InstantiateMaskCompare(DataStructure& dataStructure, const DataPath& maskArrayPath); /** * @brief Convenience method to create an instance of the MaskCompare subclass * @param maskArrayPtr A Pointer to the mask array which can be of either `bool` or `uint8` type. * @return */ -COMPLEX_EXPORT std::unique_ptr InstantiateMaskCompare(IDataArray& maskArrayPtr); +SIMPLNX_EXPORT std::unique_ptr InstantiateMaskCompare(IDataArray& maskArrayPtr); template class CopyTupleUsingIndexList @@ -1552,4 +1552,4 @@ void RunParallelMapRectToImage(IArray& destArray, ParallelRunnerT&& runner, Args } // namespace CopyFromArray -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/DataGroupUtilities.cpp b/src/simplnx/Utilities/DataGroupUtilities.cpp similarity index 98% rename from src/complex/Utilities/DataGroupUtilities.cpp rename to src/simplnx/Utilities/DataGroupUtilities.cpp index a1a4bef254..b7a80abdf4 100644 --- a/src/complex/Utilities/DataGroupUtilities.cpp +++ b/src/simplnx/Utilities/DataGroupUtilities.cpp @@ -1,9 +1,9 @@ #include "DataGroupUtilities.hpp" -#include "complex/DataStructure/AttributeMatrix.hpp" -#include "complex/DataStructure/BaseGroup.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/BaseGroup.hpp" -namespace complex +namespace nx::core { bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& featureDataGroupPath, const std::vector& activeObjects, Int32Array& cellFeatureIds, size_t currentFeatureCount) { @@ -360,4 +360,4 @@ bool ContainsDataArrayName(const DataStructure& dataStructure, const DataPath& p return false; } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/DataGroupUtilities.hpp b/src/simplnx/Utilities/DataGroupUtilities.hpp similarity index 82% rename from src/complex/Utilities/DataGroupUtilities.hpp rename to src/simplnx/Utilities/DataGroupUtilities.hpp index 32d5062e3a..db713aa810 100644 --- a/src/complex/Utilities/DataGroupUtilities.hpp +++ b/src/simplnx/Utilities/DataGroupUtilities.hpp @@ -1,15 +1,15 @@ #pragma once -#include "complex/DataStructure/DataArray.hpp" -#include "complex/DataStructure/DataPath.hpp" -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/DataStructure/IDataArray.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/DataStructure/DataArray.hpp" +#include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/DataStructure.hpp" +#include "simplnx/DataStructure/IDataArray.hpp" +#include "simplnx/simplnx_export.hpp" #include #include -namespace complex +namespace nx::core { /** @@ -21,7 +21,7 @@ namespace complex * @param cellFeatureIds * @return */ -COMPLEX_EXPORT bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& featureDataGroupPath, const std::vector& activeObjects, Int32Array& cellFeatureIds, +SIMPLNX_EXPORT bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& featureDataGroupPath, const std::vector& activeObjects, Int32Array& cellFeatureIds, size_t currentFeatureCount); /** @@ -31,7 +31,7 @@ COMPLEX_EXPORT bool RemoveInactiveObjects(DataStructure& dataStructure, const Da * @param ignoredDataPaths Vector of DataPaths that should be remove from the final vector. * @return */ -COMPLEX_EXPORT std::vector> GenerateDataArrayList(const DataStructure& dataStructure, const DataPath& dataArrayPath, const std::vector& ignoredDataPaths); +SIMPLNX_EXPORT std::vector> GenerateDataArrayList(const DataStructure& dataStructure, const DataPath& dataArrayPath, const std::vector& ignoredDataPaths); /** * @brief This function will return all the DataPaths within a BaseGroup that are of a certain type @@ -41,7 +41,7 @@ COMPLEX_EXPORT std::vector> GenerateDataArrayList(co * @param ignoredDataPaths Vector of DataPaths that should be remove from the final vector. * @return std::optional> of child paths that meet the DataObjectType requirement if there no errors during the process. */ -COMPLEX_EXPORT std::optional> GetAllChildDataPaths(const DataStructure& dataStructure, const DataPath& parentGroup, DataObject::Type dataObjectType, +SIMPLNX_EXPORT std::optional> GetAllChildDataPaths(const DataStructure& dataStructure, const DataPath& parentGroup, DataObject::Type dataObjectType, const std::vector& ignoredDataPaths = {}); /** @@ -50,7 +50,7 @@ COMPLEX_EXPORT std::optional> GetAllChildDataPaths(const D * @param parentGroup The parent group whose children you want to get * @return std::optional> of child paths if there no errors during the process. */ -COMPLEX_EXPORT std::optional> GetAllChildDataPaths(const DataStructure& dataStructure, const DataPath& parent); +SIMPLNX_EXPORT std::optional> GetAllChildDataPaths(const DataStructure& dataStructure, const DataPath& parent); /** * @brief This function will return all the DataPaths within a BaseGroup that are of an IArray type @@ -59,9 +59,9 @@ COMPLEX_EXPORT std::optional> GetAllChildDataPaths(const D * @param ignoredDataPaths Vector of DataPaths that should be remove from the final vector. * @return std::optional> of child paths that are an IArray type if there no errors during the process. */ -COMPLEX_EXPORT std::optional> GetAllChildArrayDataPaths(const DataStructure& dataStructure, const DataPath& parentGroup, const std::vector& ignoredDataPaths = {}); +SIMPLNX_EXPORT std::optional> GetAllChildArrayDataPaths(const DataStructure& dataStructure, const DataPath& parentGroup, const std::vector& ignoredDataPaths = {}); -COMPLEX_EXPORT std::optional> GetAllChildDataPathsRecursive(const DataStructure& dataStructure, const DataPath& parentGroup, const std::vector& ignoredDataPaths = {}); +SIMPLNX_EXPORT std::optional> GetAllChildDataPathsRecursive(const DataStructure& dataStructure, const DataPath& parentGroup, const std::vector& ignoredDataPaths = {}); /** * @brief This function will return true if the arrayName is in the list of children of type IDataArray for the given parentGroup @@ -70,6 +70,6 @@ COMPLEX_EXPORT std::optional> GetAllChildDataPathsRecursiv * @param arrayName The target name of the array you want to check for in the parentGroup * @return bool Whether or not the arrayName exists as a child of the parentGroup */ -COMPLEX_EXPORT bool ContainsDataArrayName(const DataStructure& dataStructure, const DataPath& parentGroup, const std::string& arrayName); +SIMPLNX_EXPORT bool ContainsDataArrayName(const DataStructure& dataStructure, const DataPath& parentGroup, const std::string& arrayName); -} // namespace complex +} // namespace nx::core diff --git a/src/simplnx/Utilities/DataObjectUtilities.hpp b/src/simplnx/Utilities/DataObjectUtilities.hpp new file mode 100644 index 0000000000..c87b7fa23b --- /dev/null +++ b/src/simplnx/Utilities/DataObjectUtilities.hpp @@ -0,0 +1,280 @@ +#pragma once + +#include "simplnx/Common/StringLiteral.hpp" +#include "simplnx/Common/TypeTraits.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/DataStructure/AttributeMatrix.hpp" +#include "simplnx/DataStructure/DataGroup.hpp" +#include "simplnx/DataStructure/DataObject.hpp" +#include "simplnx/DataStructure/DynamicListArray.hpp" +#include "simplnx/DataStructure/Geometry/EdgeGeom.hpp" +#include "simplnx/DataStructure/Geometry/HexahedralGeom.hpp" +#include "simplnx/DataStructure/Geometry/IGeometry.hpp" +#include "simplnx/DataStructure/Geometry/IGridGeometry.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry0D.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry1D.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry2D.hpp" +#include "simplnx/DataStructure/Geometry/INodeGeometry3D.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" +#include "simplnx/DataStructure/Geometry/QuadGeom.hpp" +#include "simplnx/DataStructure/Geometry/RectGridGeom.hpp" +#include "simplnx/DataStructure/Geometry/TetrahedralGeom.hpp" +#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp" +#include "simplnx/DataStructure/Geometry/VertexGeom.hpp" +#include "simplnx/DataStructure/IArray.hpp" +#include "simplnx/DataStructure/INeighborList.hpp" +#include "simplnx/DataStructure/Montage/AbstractMontage.hpp" +#include "simplnx/DataStructure/Montage/GridMontage.hpp" +#include "simplnx/DataStructure/NeighborList.hpp" +#include "simplnx/DataStructure/ScalarData.hpp" +#include "simplnx/DataStructure/StringArray.hpp" + +#include +#include +#include + +namespace nx::core +{ +/** + * @brief Returns a string representation of the passed in IGeometry::Type + * @param dataType + * @return + */ +inline constexpr StringLiteral GeometryTypeToString(IGeometry::Type geomType) +{ + switch(geomType) + { + case IGeometry::Type::Image: { + return "Image"; + } + case IGeometry::Type::RectGrid: { + return "Rectilinear Grid"; + } + case IGeometry::Type::Vertex: { + return "Vertex"; + } + case IGeometry::Type::Edge: { + return "Edge"; + } + case IGeometry::Type::Triangle: { + return "Triangle"; + } + case IGeometry::Type::Quad: { + return "Quadrilateral"; + } + case IGeometry::Type::Tetrahedral: { + return "Tetrahedral"; + } + case IGeometry::Type::Hexahedral: { + return "Hexahedral"; + } + default: + throw std::runtime_error("nx::core::GeometryTypeToString: Unknown IGeometry::Type"); + } +} + +/** + * @brief Returns string representations for all DataTypes. + * @return + */ +inline const std::vector& GetAllGeometryTypesAsStrings() +{ + static const std::vector geomTypes = {GeometryTypeToString(IGeometry::Type::Image), GeometryTypeToString(IGeometry::Type::RectGrid), + GeometryTypeToString(IGeometry::Type::Vertex), GeometryTypeToString(IGeometry::Type::Edge), + GeometryTypeToString(IGeometry::Type::Triangle), GeometryTypeToString(IGeometry::Type::Quad), + GeometryTypeToString(IGeometry::Type::Tetrahedral), GeometryTypeToString(IGeometry::Type::Hexahedral)}; + return geomTypes; +} + +/** + * @brief Returns a IGeometry::Type for the passed in string representation + * @param geomTypeString + * @return + */ +inline constexpr IGeometry::Type StringToGeometryType(std::string_view geomTypeString) +{ + if(geomTypeString == GeometryTypeToString(IGeometry::Type::Image).view()) + { + return IGeometry::Type::Image; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::RectGrid).view()) + { + return IGeometry::Type::RectGrid; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Vertex).view()) + { + return IGeometry::Type::Vertex; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Edge).view()) + { + return IGeometry::Type::Edge; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Triangle).view()) + { + return IGeometry::Type::Triangle; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Quad).view()) + { + return IGeometry::Type::Quad; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Tetrahedral).view()) + { + return IGeometry::Type::Tetrahedral; + } + else if(geomTypeString == GeometryTypeToString(IGeometry::Type::Hexahedral).view()) + { + return IGeometry::Type::Hexahedral; + } + else + { + throw std::runtime_error("nx::core::StringToGeometryType: No known IGeometry::Type matches the given string value."); + } +} + +inline constexpr StringLiteral DataObjectTypeToString(DataObject::Type dataObjType) +{ + switch(dataObjType) + { + case nx::core::DataObject::Type::BaseGroup: { + return nx::core::BaseGroup::k_TypeName; + } + case nx::core::DataObject::Type::DataGroup: { + return nx::core::DataGroup::k_TypeName; + } + case nx::core::DataObject::Type::AttributeMatrix: { + return nx::core::AttributeMatrix::k_TypeName; + } + case nx::core::DataObject::Type::IGeometry: { + return nx::core::IGeometry::k_TypeName; + } + case nx::core::DataObject::Type::IGridGeometry: { + return nx::core::IGridGeometry::k_TypeName; + } + case nx::core::DataObject::Type::INodeGeometry0D: { + return nx::core::INodeGeometry0D::k_TypeName; + } + case nx::core::DataObject::Type::INodeGeometry1D: { + return nx::core::INodeGeometry1D::k_TypeName; + } + case nx::core::DataObject::Type::INodeGeometry2D: { + return nx::core::INodeGeometry2D::k_TypeName; + } + case nx::core::DataObject::Type::INodeGeometry3D: { + return nx::core::INodeGeometry3D::k_TypeName; + } + case nx::core::DataObject::Type::ImageGeom: { + return nx::core::ImageGeom::k_TypeName; + } + case nx::core::DataObject::Type::RectGridGeom: { + return nx::core::RectGridGeom::k_TypeName; + } + case nx::core::DataObject::Type::VertexGeom: { + return nx::core::VertexGeom::k_TypeName; + } + case nx::core::DataObject::Type::EdgeGeom: { + return nx::core::EdgeGeom::k_TypeName; + } + case nx::core::DataObject::Type::TriangleGeom: { + return nx::core::TriangleGeom::k_TypeName; + } + case nx::core::DataObject::Type::QuadGeom: { + return nx::core::QuadGeom::k_TypeName; + } + case nx::core::DataObject::Type::TetrahedralGeom: { + return nx::core::TetrahedralGeom::k_TypeName; + } + case nx::core::DataObject::Type::HexahedralGeom: { + return nx::core::HexahedralGeom::k_TypeName; + } + case nx::core::DataObject::Type::IDataArray: { + return nx::core::IDataArray::k_TypeName; + } + case nx::core::DataObject::Type::DataArray: { + return nx::core::DataArrayConstants::k_TypeName; + } + case nx::core::DataObject::Type::INeighborList: { + return nx::core::INeighborList::k_TypeName; + } + case nx::core::DataObject::Type::NeighborList: { + return nx::core::NeighborListConstants::k_TypeName; + } + case nx::core::DataObject::Type::ScalarData: { + return nx::core::ScalarDataConstants::k_TypeName; + } + case nx::core::DataObject::Type::StringArray: { + return nx::core::StringArray::k_TypeName; + } + case nx::core::DataObject::Type::DynamicListArray: { + return nx::core::DynamicListArrayConstants::k_TypeName; + } + case nx::core::DataObject::Type::AbstractMontage: { + return nx::core::AbstractMontage::k_TypeName; + } + case nx::core::DataObject::Type::GridMontage: { + return nx::core::GridMontage::k_TypeName; + } + case nx::core::DataObject::Type::Any: { + return {"Any"}; + } + default: { + throw std::runtime_error("nx::core::DataObjectTypeToString: Unknown DataObject::Type"); + } + } +} + +/** + * @brief Converts IArray::ArrayType to DataObject::Type. ArrayType is a subset of DataObject::Type so this function cannot fail. + * @param arrayType + * @return + */ +inline constexpr DataObject::Type ConvertArrayTypeToDataObjectType(IArray::ArrayType arrayType) +{ + switch(arrayType) + { + case IArray::ArrayType::DataArray: { + return DataObject::Type::DataArray; + } + case IArray::ArrayType::NeighborListArray: { + return DataObject::Type::NeighborList; + } + case IArray::ArrayType::StringArray: { + return DataObject::Type::StringArray; + } + case IArray::ArrayType::Any: { + return DataObject::Type::Any; + } + default: { + throw std::runtime_error("nx::core::ConvertArrayTypeToDataObjectType: Invalid ArrayType"); + } + } +} + +/** + * @brief Converts DataObject::Type to IArray::ArrayType. + * @param dataObjectType + * @return + */ +inline constexpr std::optional ConvertDataObjectTypeToArrayType(DataObject::Type dataObjectType) noexcept +{ + switch(dataObjectType) + { + case DataObject::Type::IDataArray: + case DataObject::Type::DataArray: { + return IArray::ArrayType::DataArray; + } + case DataObject::Type::INeighborList: + case DataObject::Type::NeighborList: { + return IArray::ArrayType::NeighborListArray; + } + case DataObject::Type::StringArray: { + return IArray::ArrayType::StringArray; + } + case DataObject::Type::Any: { + return IArray::ArrayType::Any; + } + default: { + return {}; + } + } +} +} // namespace nx::core diff --git a/src/complex/Utilities/FilePathGenerator.cpp b/src/simplnx/Utilities/FilePathGenerator.cpp similarity index 97% rename from src/complex/Utilities/FilePathGenerator.cpp rename to src/simplnx/Utilities/FilePathGenerator.cpp index 0b3a7193aa..d65abdbc3e 100644 --- a/src/complex/Utilities/FilePathGenerator.cpp +++ b/src/simplnx/Utilities/FilePathGenerator.cpp @@ -6,7 +6,7 @@ namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace FilePathGenerator { @@ -63,4 +63,4 @@ std::vector GenerateFileList(int32 start, int32 end, int32 incremen return fileList; } } // namespace FilePathGenerator -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/FilePathGenerator.hpp b/src/simplnx/Utilities/FilePathGenerator.hpp similarity index 90% rename from src/complex/Utilities/FilePathGenerator.hpp rename to src/simplnx/Utilities/FilePathGenerator.hpp index 02146db807..1637ae2275 100644 --- a/src/complex/Utilities/FilePathGenerator.hpp +++ b/src/simplnx/Utilities/FilePathGenerator.hpp @@ -1,13 +1,13 @@ #pragma once -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/simplnx_export.hpp" #include #include #include -namespace complex +namespace nx::core { namespace FilePathGenerator { @@ -31,7 +31,7 @@ enum class Ordering : uint8 * @param paddingDigits the number of padding digits to use when generating the integer index value * @return */ -COMPLEX_EXPORT std::pair, bool> GenerateAndValidateFileList(int32 start, int32 end, int32 increment, Ordering order, std::string_view inputPath, std::string_view filePrefix, +SIMPLNX_EXPORT std::pair, bool> GenerateAndValidateFileList(int32 start, int32 end, int32 increment, Ordering order, std::string_view inputPath, std::string_view filePrefix, std::string_view fileSuffix, std::string_view fileExtension, uint32 paddingDigits, bool failFast = true); /** @@ -48,7 +48,7 @@ COMPLEX_EXPORT std::pair, bool> GenerateAndValidateFile * @param paddingDigits the number of padding digits to use when generating the integer index value * @return */ -COMPLEX_EXPORT std::vector GenerateFileList(int32 start, int32 end, int32 increment, Ordering order, std::string_view inputPath, std::string_view filePrefix, std::string_view fileSuffix, +SIMPLNX_EXPORT std::vector GenerateFileList(int32 start, int32 end, int32 increment, Ordering order, std::string_view inputPath, std::string_view filePrefix, std::string_view fileSuffix, std::string_view fileExtension, uint32 paddingDigits); } // namespace FilePathGenerator -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/FileUtilities.hpp b/src/simplnx/Utilities/FileUtilities.hpp similarity index 98% rename from src/complex/Utilities/FileUtilities.hpp rename to src/simplnx/Utilities/FileUtilities.hpp index 41979a5c0f..f34d277fda 100644 --- a/src/complex/Utilities/FileUtilities.hpp +++ b/src/simplnx/Utilities/FileUtilities.hpp @@ -36,11 +36,11 @@ #include #include -#include "complex/Common/Result.hpp" +#include "simplnx/Common/Result.hpp" namespace fs = std::filesystem; -namespace complex +namespace nx::core { namespace FileUtilities { @@ -122,4 +122,4 @@ Result<> ValidateCSVFile(const std::string& filePath) return {}; } } // namespace FileUtilities -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/FilterUtilities.cpp b/src/simplnx/Utilities/FilterUtilities.cpp similarity index 88% rename from src/complex/Utilities/FilterUtilities.cpp rename to src/simplnx/Utilities/FilterUtilities.cpp index 5365fb2d21..f16f810c16 100644 --- a/src/complex/Utilities/FilterUtilities.cpp +++ b/src/simplnx/Utilities/FilterUtilities.cpp @@ -4,7 +4,7 @@ #include -namespace complex +namespace nx::core { // ----------------------------------------------------------------------------- @@ -27,7 +27,7 @@ Result<> CreateOutputDirectories(const fs::path& outputPath) // ----------------------------------------------------------------------------- void AppendDataObjectModifications(const DataStructure& dataStructure, std::vector& modifiedActions, const DataPath& parentPath, const std::vector& ignoredDataPaths) { - std::optional> result = complex::GetAllChildArrayDataPaths(dataStructure, parentPath, ignoredDataPaths); + std::optional> result = nx::core::GetAllChildArrayDataPaths(dataStructure, parentPath, ignoredDataPaths); if(!result) { return; @@ -39,4 +39,4 @@ void AppendDataObjectModifications(const DataStructure& dataStructure, std::vect } } -} // namespace complex +} // namespace nx::core diff --git a/src/complex/Utilities/FilterUtilities.hpp b/src/simplnx/Utilities/FilterUtilities.hpp similarity index 88% rename from src/complex/Utilities/FilterUtilities.hpp rename to src/simplnx/Utilities/FilterUtilities.hpp index a0b1bee341..13f016903c 100644 --- a/src/complex/Utilities/FilterUtilities.hpp +++ b/src/simplnx/Utilities/FilterUtilities.hpp @@ -1,18 +1,18 @@ #pragma once #include "ParallelAlgorithmUtilities.hpp" -#include "complex/Common/Result.hpp" -#include "complex/Common/Types.hpp" -#include "complex/complex_export.hpp" -#include -#include +#include "simplnx/Common/Result.hpp" +#include "simplnx/Common/Types.hpp" +#include "simplnx/Filter/Output.hpp" +#include "simplnx/Utilities/DataGroupUtilities.hpp" +#include "simplnx/simplnx_export.hpp" #include #include namespace fs = std::filesystem; -namespace complex +namespace nx::core { template
Michael Jackson
Michael Jackson
💻		Jared Duffey
Jared Duffey
💻		Joey Kleingers
Joey Kleingers
💻		Jessica Marquis
Jessica Marquis
💻		Matthew Marine
Matthew Marine
💻		Nathan Young
Nathan Young
💻		bpenniebq
bpenniebq
💻		Michael Jackson
Michael Jackson
💻		Jared Duffey
Jared Duffey
💻		Joey Kleingers
Joey Kleingers
💻		Jessica Marquis
Jessica Marquis
💻		Matthew Marine
Matthew Marine
💻		Nathan Young
Nathan Young
💻		bpenniebq
bpenniebq
💻
john-stone-ics
john-stone-ics
💻		VKUDRI
VKUDRI
💻		john-stone-ics
john-stone-ics
💻		VKUDRI
VKUDRI
💻		 Yang Liu
Yang Liu
🔬 🔣