diff --git a/Modules/DiffusionIO/CMakeLists.txt b/Modules/DiffusionIO/CMakeLists.txt index 9eb3000..68bc486 100644 --- a/Modules/DiffusionIO/CMakeLists.txt +++ b/Modules/DiffusionIO/CMakeLists.txt @@ -1,10 +1,10 @@ MITK_CREATE_MODULE( SUBPROJECTS MITK-Diffusion INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ReaderWriter ObjectFactories DEPENDS MitkConnectomics MitkDiffusionCore MitkSceneSerialization AUTOLOAD_WITH MitkCore PACKAGE_DEPENDS - PUBLIC DCMTK + PUBLIC DCMTK|dcmtract PRIVATE tinyxml2 ) diff --git a/Modules/FiberTracking/Testing/mitkFiberMapper3DTest.cpp b/Modules/FiberTracking/Testing/mitkFiberMapper3DTest.cpp index 722d724..ae5f528 100644 --- a/Modules/FiberTracking/Testing/mitkFiberMapper3DTest.cpp +++ b/Modules/FiberTracking/Testing/mitkFiberMapper3DTest.cpp @@ -1,166 +1,166 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include #include #include #include #include #include #include "mitkTestingMacros.h" #include #include #include #include #include #include #include #include class mitkFiberMapper3DTestSuite : public mitk::TestFixture { CPPUNIT_TEST_SUITE(mitkFiberMapper3DTestSuite); MITK_TEST(Default3D); MITK_TEST(Color3D); MITK_TEST(Ribbon3D); MITK_TEST(Tubes3D); // MITK_TEST(Line3D); // does not work. with is always 1. works fine in GUI // MITK_TEST(Default2D); // does not work. always black CPPUNIT_TEST_SUITE_END(); typedef itk::Image ItkFloatImgType; private: /** Members used inside the different (sub-)tests. All members are initialized via setUp().*/ mitk::FiberBundle::Pointer fib; mitk::DataNode::Pointer node; public: void setUp() override { fib = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/test_fibers.fib")); MITK_INFO << fib->GetNumFibers(); node = mitk::DataNode::New(); node->SetData(fib); } void tearDown() override { } void AddGeneratedDataToStorage(mitk::DataStorage *dataStorage) { auto node = mitk::DataNode::New(); node->SetData(fib); dataStorage->Add(node); } void Default2D() { mitk::RenderingTestHelper renderingHelper(640, 480); renderingHelper.AddNodeToStorage(node); - renderingHelper.SetViewDirection(mitk::SliceNavigationController::Frontal); + renderingHelper.SetViewDirection(mitk::SliceNavigationController::Axial); renderingHelper.SetMapperIDToRender2D(); std::this_thread::sleep_for(std::chrono::seconds(1)); renderingHelper.SaveReferenceScreenShot(mitk::IOUtil::GetTempPath()+"fib_2D.png"); mitk::Image::Pointer test_image = mitk::IOUtil::Load(mitk::IOUtil::GetTempPath()+"fib_2D.png"); mitk::Image::Pointer ref_image = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/fib_2D.png")); MITK_ASSERT_EQUAL(test_image, ref_image, "Check if images are equal."); } void Default3D() { mitk::RenderingTestHelper renderingHelper(640, 480); renderingHelper.AddNodeToStorage(node); renderingHelper.SetMapperIDToRender3D(); std::this_thread::sleep_for(std::chrono::seconds(1)); renderingHelper.SaveReferenceScreenShot(mitk::IOUtil::GetTempPath()+"fib_3D.png"); mitk::Image::Pointer test_image = mitk::IOUtil::Load(mitk::IOUtil::GetTempPath()+"fib_3D.png"); mitk::Image::Pointer ref_image = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/fib_3D.png")); MITK_ASSERT_EQUAL(test_image, ref_image, "Check if images are equal."); } void Tubes3D() { node->SetFloatProperty("shape.tuberadius", 1); mitk::RenderingTestHelper renderingHelper(640, 480); renderingHelper.AddNodeToStorage(node); renderingHelper.SetMapperIDToRender3D(); std::this_thread::sleep_for(std::chrono::seconds(1)); renderingHelper.SaveReferenceScreenShot(mitk::IOUtil::GetTempPath()+"fib_tubes_3D.png"); mitk::Image::Pointer test_image = mitk::IOUtil::Load(mitk::IOUtil::GetTempPath()+"fib_tubes_3D.png"); mitk::Image::Pointer ref_image = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/fib_tubes_3D.png")); MITK_ASSERT_EQUAL(test_image, ref_image, "Check if images are equal."); } void Ribbon3D() { node->SetFloatProperty("shape.ribbonwidth", 1); mitk::RenderingTestHelper renderingHelper(640, 480); renderingHelper.AddNodeToStorage(node); renderingHelper.SetMapperIDToRender3D(); std::this_thread::sleep_for(std::chrono::seconds(1)); renderingHelper.SaveReferenceScreenShot(mitk::IOUtil::GetTempPath()+"fib_ribbon_3D.png"); mitk::Image::Pointer test_image = mitk::IOUtil::Load(mitk::IOUtil::GetTempPath()+"fib_ribbon_3D.png"); mitk::Image::Pointer ref_image = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/fib_ribbon_3D.png")); MITK_ASSERT_EQUAL(test_image, ref_image, "Check if images are equal."); } void Line3D() { node->SetFloatProperty("shape.linewidth", 10); mitk::RenderingTestHelper renderingHelper(640, 480); renderingHelper.AddNodeToStorage(node); renderingHelper.SetMapperIDToRender3D(); std::this_thread::sleep_for(std::chrono::seconds(1)); renderingHelper.SaveReferenceScreenShot(mitk::IOUtil::GetTempPath()+"fib_line_3D.png"); mitk::Image::Pointer test_image = mitk::IOUtil::Load(mitk::IOUtil::GetTempPath()+"fib_line_3D.png"); mitk::Image::Pointer ref_image = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/fib_line_3D.png")); MITK_ASSERT_EQUAL(test_image, ref_image, "Check if images are equal."); } void Color3D() { mitk::FiberBundle::Pointer fib = dynamic_cast(node->GetData()); fib->SetFiberColors(255, 255, 255); mitk::RenderingTestHelper renderingHelper(640, 480); renderingHelper.AddNodeToStorage(node); renderingHelper.SetMapperIDToRender3D(); std::this_thread::sleep_for(std::chrono::seconds(1)); renderingHelper.SaveReferenceScreenShot(mitk::IOUtil::GetTempPath()+"fib_color_3D.png"); mitk::Image::Pointer test_image = mitk::IOUtil::Load(mitk::IOUtil::GetTempPath()+"fib_color_3D.png"); mitk::Image::Pointer ref_image = mitk::IOUtil::Load(GetTestDataFilePath("DiffusionImaging/Rendering/fib_color_3D.png")); MITK_ASSERT_EQUAL(test_image, ref_image, "Check if images are equal."); } }; MITK_TEST_SUITE_REGISTRATION(mitkFiberMapper3D)