diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SliceTriangleGeometry.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SliceTriangleGeometry.hpp index 46e27cbce7..9bfa3aaf80 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SliceTriangleGeometry.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/SliceTriangleGeometry.hpp @@ -16,9 +16,9 @@ namespace nx::core namespace slice_triangle_geometry::constants { - constexpr ChoicesParameter::ValueType k_FullRange = 0; - constexpr ChoicesParameter::ValueType k_UserDefinedRange = 1; -} +constexpr ChoicesParameter::ValueType k_FullRange = 0; +constexpr ChoicesParameter::ValueType k_UserDefinedRange = 1; +} // namespace slice_triangle_geometry::constants struct SIMPLNXCORE_EXPORT SliceTriangleGeometryInputValues { diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp index 060ba3953b..2df669d827 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp @@ -144,7 +144,8 @@ IFilter::PreflightResult RegularGridSampleSurfaceMeshFilter::preflightImpl(const float32 vol = (pDimensionsValue[0] * pSpacingValue[0]) * (pDimensionsValue[1] * pSpacingValue[1]) * (pDimensionsValue[2] * pSpacingValue[2]); - boxDimensions << "Volume: " << std::setprecision(8) << std::noshowpoint << vol << " " << lengthUnit << "s ^3" << "\n"; + boxDimensions << "Volume: " << std::setprecision(8) << std::noshowpoint << vol << " " << lengthUnit << "s ^3" + << "\n"; preflightUpdatedValues.push_back({"BoxDimensions", boxDimensions.str()}); diff --git a/src/Plugins/SimplnxCore/test/CMakeLists.txt b/src/Plugins/SimplnxCore/test/CMakeLists.txt index 3205426c19..287c7245d3 100644 --- a/src/Plugins/SimplnxCore/test/CMakeLists.txt +++ b/src/Plugins/SimplnxCore/test/CMakeLists.txt @@ -241,6 +241,9 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME volume_graphics_test.tar.gz SHA512 94d996fbf2b8b42cd715fb3adf33548f097970211e7a26eb9ccc5b073a78014eecbd10d40fc0451ff9cc7c92e23ed21582fc082d64e1f62b3714e4d9640c975f) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME vtk_rectilinear_grid_writer.tar.gz SHA512 9fef02b5269609503d03dd0126cc635cc1c1156894cff18b0184b334d705b850ca1a06ae0d1c66a352a32dd9ad9fb74f24255c7de1399b06bbec7d2e2b41941b) + download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME scan_path_test_data_v2.tar.gz SHA512 79eb796b16c23d5094b7f65b3069c84118cc557be7e9115c518724c7f1f3e40c0e17599a8bd858fff4d0a45a91ab70a242876fcc14bde86c34df7afa94e8f748) + + endif() # ----------------------------------------------------------------------------- diff --git a/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp b/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp index aa5b09b0a7..b45f261c18 100644 --- a/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp @@ -31,9 +31,9 @@ TEST_CASE("SimplnxCore::CreateAMScanPathsFilter: Valid Filter Execution", "[Simp { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "scan_path_test_data.tar.gz", "scan_path_test_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "scan_path_test_data_v2.tar.gz", "scan_path_test_data"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/scan_path_test_data/scan_path_test_data.dream3d", nx::core::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/scan_path_test_data_v2/scan_path_test_data.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object @@ -42,7 +42,7 @@ TEST_CASE("SimplnxCore::CreateAMScanPathsFilter: Valid Filter Execution", "[Simp Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(CreateAMScanPathsFilter::k_StripeWidth_Key, std::make_any(10.0f)); + args.insertOrAssign(CreateAMScanPathsFilter::k_StripeWidth_Key, std::make_any(7.0f)); args.insertOrAssign(CreateAMScanPathsFilter::k_HatchSpacing_Key, std::make_any(0.33f)); args.insertOrAssign(CreateAMScanPathsFilter::k_Power_Key, std::make_any(100.0f)); args.insertOrAssign(CreateAMScanPathsFilter::k_Speed_Key, std::make_any(1000.0f)); @@ -92,8 +92,3 @@ TEST_CASE("SimplnxCore::CreateAMScanPathsFilter: Valid Filter Execution", "[Simp UnitTest::CompareArrays(dataStructure, exemplarDataArray, computedDataArray); } } - -// TEST_CASE("SimplnxCore::ScanVectorsGeneratorFilter: InValid Filter Execution") -//{ -// -// } diff --git a/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp b/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp index ef6dea79d4..388b3e754a 100644 --- a/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp @@ -27,11 +27,15 @@ const DataObjectNameParameter::ValueType k_RegionIdsName("RegionIds"); TEST_CASE("SimplnxCore::SliceTriangleGeometryFilter: Valid Filter Execution", "[SimplnxCore][SliceTriangleGeometryFilter]") { - Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); - const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "scan_path_test_data.tar.gz", "scan_path_test_data"); + /// The test data set was reviewed manually by MAJ and found to be correct in output to the + /// the best of our abilities. This is needed because DREAM.3D did not have + /// this functionality and so we have nothing to compare against. + + Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "scan_path_test_data_v2.tar.gz", "scan_path_test_data_v2"); // Read the Small IN100 Data set - auto baseDataFilePath = fs::path(fmt::format("{}/scan_path_test_data/scan_path_test_data.dream3d", nx::core::unit_test::k_TestFilesDir)); + auto baseDataFilePath = fs::path(fmt::format("{}/scan_path_test_data_v2/scan_path_test_data.dream3d", nx::core::unit_test::k_TestFilesDir)); DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object @@ -41,7 +45,7 @@ TEST_CASE("SimplnxCore::SliceTriangleGeometryFilter: Valid Filter Execution", "[ // Create default Parameters for the filter. args.insertOrAssign(SliceTriangleGeometryFilter::k_Zstart_Key, std::make_any(0.0f)); args.insertOrAssign(SliceTriangleGeometryFilter::k_Zend_Key, std::make_any(0.0f)); - args.insertOrAssign(SliceTriangleGeometryFilter::k_SliceResolution_Key, std::make_any(3.0f)); + args.insertOrAssign(SliceTriangleGeometryFilter::k_SliceResolution_Key, std::make_any(0.075000003f)); args.insertOrAssign(SliceTriangleGeometryFilter::k_SliceRange_Key, std::make_any(0)); args.insertOrAssign(SliceTriangleGeometryFilter::k_HaveRegionIds_Key, std::make_any(true)); args.insertOrAssign(SliceTriangleGeometryFilter::k_TriangleGeometryDataPath_Key, std::make_any(k_InputTriangleGeometryPath));