diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt index 04af24e273..9843ea9d59 100644 --- a/Modules/CMakeLists.txt +++ b/Modules/CMakeLists.txt @@ -1,78 +1,77 @@ # Modules must be listed according to their dependencies set(module_dirs DataTypesExt AlgorithmsExt MapperExt IOExt Qt4Qt5TestModule SceneSerializationBase PlanarFigure ImageDenoising ImageExtraction ImageStatistics LegacyAdaptors IpPicSupport Ext SceneSerialization GraphAlgorithms ContourModel SurfaceInterpolation Segmentation PlanarFigureSegmentation OpenViewCore QmlItems QtWidgets QtWidgetsExt SegmentationUI DiffusionImaging GPGPU IGTBase IGT CameraCalibration IGTUI RigidRegistration RigidRegistrationUI DeformableRegistration DeformableRegistrationUI OpenCL OpenCVVideoSupport Overlays InputDevices ToFHardware ToFProcessing ToFUI US - ClippingTools USUI DicomUI Simulation Remeshing Python Persistence VtkShaders ) if(MITK_ENABLE_PIC_READER) list(APPEND module_dirs IpPicSupportIO) endif() set(MITK_DEFAULT_SUBPROJECTS MITK-Modules) foreach(module_dir ${module_dirs}) add_subdirectory(${module_dir}) endforeach() if(MITK_PRIVATE_MODULES) file(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*) foreach(subdir ${all_subdirs}) string(FIND ${subdir} "." _result) if(_result EQUAL -1) if(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt) message(STATUS "Found private module ${subdir}") add_subdirectory(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir}) endif() endif() endforeach() endif(MITK_PRIVATE_MODULES) diff --git a/Modules/ClippingTools/CMakeLists.txt b/Modules/ClippingTools/CMakeLists.txt deleted file mode 100644 index 533c0d4627..0000000000 --- a/Modules/ClippingTools/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -MITK_CREATE_MODULE( - DEPENDS MitkSegmentation - WARNINGS_AS_ERRORS -) diff --git a/Modules/ClippingTools/files.cmake b/Modules/ClippingTools/files.cmake deleted file mode 100644 index 456348b3d6..0000000000 --- a/Modules/ClippingTools/files.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(CPP_FILES - mitkClippingPlaneTranslationTool.cpp - mitkClippingPlaneRotationTool.cpp - mitkClippingPlaneDeformationTool.cpp -) diff --git a/Modules/ClippingTools/mitkClippingPlaneDeformationTool.cpp b/Modules/ClippingTools/mitkClippingPlaneDeformationTool.cpp deleted file mode 100644 index f59db97b5d..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneDeformationTool.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -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 "mitkClippingPlaneDeformationTool.h" -#include "mitkClippingPlaneDeformationTool.xpm" - -#include "mitkBaseRenderer.h" -#include "usModule.h" -#include "usModuleContext.h" -#include "usGetModuleContext.h" -#include "usModuleRegistry.h" -#include "mitkGlobalInteraction.h" -#include "mitkRenderingManager.h" -#include "mitkToolManager.h" - -namespace mitk{ - MITK_TOOL_MACRO(MitkClippingTools_EXPORT, ClippingPlaneDeformationTool, "Clipping Tool Deformation"); -} - -mitk::ClippingPlaneDeformationTool::ClippingPlaneDeformationTool() -: Tool( "" ) -{ - m_SurfaceInteractor = mitk::SurfaceDeformationDataInteractor3D::New(); -} - -mitk::ClippingPlaneDeformationTool::~ClippingPlaneDeformationTool() -{ -} - -const char** mitk::ClippingPlaneDeformationTool::GetXPM() const -{ - return mitkClippingPlaneDeformationTool_xpm; -} - -const char* mitk::ClippingPlaneDeformationTool::GetName() const -{ - return "Deformation"; -} - -const char* mitk::ClippingPlaneDeformationTool::GetGroup() const -{ - return "ClippingTool"; -} - -void mitk::ClippingPlaneDeformationTool::Activated() -{ - Superclass::Activated(); - - //check if the Clipping plane is changed. - if(m_ClippingPlaneNode != m_ToolManager->GetWorkingData(0)) - { - m_ClippingPlaneNode = m_ToolManager->GetWorkingData(0); - m_ClippingPlaneNode->SetDataInteractor(NULL); - } - - m_SurfaceInteractor->LoadStateMachine("AffineInteraction3D.xml", us::ModuleRegistry::GetModule("MitkDataTypesExt")); - m_SurfaceInteractor->SetEventConfig("AffineDeformationConfig.xml", us::ModuleRegistry::GetModule("MitkDataTypesExt")); - m_SurfaceInteractor->SetDataNode(m_ClippingPlaneNode); - -} - -void mitk::ClippingPlaneDeformationTool::Deactivated() -{ - Superclass::Deactivated(); - - m_SurfaceInteractor->SetDataNode(NULL); -} diff --git a/Modules/ClippingTools/mitkClippingPlaneDeformationTool.h b/Modules/ClippingTools/mitkClippingPlaneDeformationTool.h deleted file mode 100644 index d6d8fbfd9f..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneDeformationTool.h +++ /dev/null @@ -1,61 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -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. - -===================================================================*/ - -#ifndef mitkClippingPlaneDeformationTool_h_Included -#define mitkClippingPlaneDeformationTool_h_Included - -#include - -#include "mitkCommon.h" -#include "mitkDataNode.h" -#include "mitkSurfaceDeformationDataInteractor3D.h" -#include "mitkTool.h" - -namespace mitk -{ - /** - \brief A tool with whom you can deform planes. - */ - class MitkClippingTools_EXPORT ClippingPlaneDeformationTool : public Tool - { - public: - - mitkClassMacro(ClippingPlaneDeformationTool, Tool); - itkFactorylessNewMacro(Self) - itkCloneMacro(Self) - - virtual const char** GetXPM() const; - virtual const char* GetName() const; - virtual const char* GetGroup() const; - - - protected: - - ClippingPlaneDeformationTool(); // purposely hidden - virtual ~ClippingPlaneDeformationTool(); - - virtual void Activated(); - virtual void Deactivated(); - - mitk::DataNode::Pointer m_ClippingPlaneNode; - mitk::SurfaceDeformationDataInteractor3D::Pointer m_SurfaceInteractor; - }; - -} //end namespace mitk - -#endif - - diff --git a/Modules/ClippingTools/mitkClippingPlaneDeformationTool.xpm b/Modules/ClippingTools/mitkClippingPlaneDeformationTool.xpm deleted file mode 100644 index e5a2804943..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneDeformationTool.xpm +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static const char * mitkClippingPlaneDeformationTool_xpm[] = { -"22 25 2 1", -" c None", -". c #000000", -" ", -" ", -" ", -" ", -" ........... ", -" ............. ", -" .............. ", -" ..... ...... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ...... ", -" .............. ", -" ............. ", -" ........... ", -" ", -" ", -" "}; diff --git a/Modules/ClippingTools/mitkClippingPlaneRotationTool.cpp b/Modules/ClippingTools/mitkClippingPlaneRotationTool.cpp deleted file mode 100644 index 41a6e8def6..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneRotationTool.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -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 "mitkClippingPlaneRotationTool.h" -#include "mitkClippingPlaneRotationTool.xpm" - -#include "mitkBaseRenderer.h" -#include "usModule.h" -#include "usModuleContext.h" -#include "usGetModuleContext.h" -#include "usModuleRegistry.h" -#include "mitkRenderingManager.h" -#include "mitkToolManager.h" - - -namespace mitk -{ - MITK_TOOL_MACRO(MitkClippingTools_EXPORT, ClippingPlaneRotationTool, "Clipping Tool Rotation"); -} - -mitk::ClippingPlaneRotationTool::ClippingPlaneRotationTool() -: Tool( "" ) -{ - m_AffineDataInteractor = mitk::AffineDataInteractor3D::New(); -} - -mitk::ClippingPlaneRotationTool::~ClippingPlaneRotationTool() -{ -} - -const char** mitk::ClippingPlaneRotationTool::GetXPM() const -{ - return mitkClippingPlaneRotationTool_xpm; -} - -const char* mitk::ClippingPlaneRotationTool::GetName() const -{ - return "Rotation"; -} - -const char* mitk::ClippingPlaneRotationTool::GetGroup() const -{ - return "ClippingTool"; -} - -void mitk::ClippingPlaneRotationTool::Activated() -{ - Superclass::Activated(); - - //check if the Clipping plane is changed. - if(m_ClippingPlaneNode != m_ToolManager->GetWorkingData(0)) - { - m_ClippingPlaneNode = m_ToolManager->GetWorkingData(0); - m_ClippingPlaneNode->SetDataInteractor(NULL); - } - - m_AffineDataInteractor->LoadStateMachine("AffineInteraction3D.xml", us::ModuleRegistry::GetModule("MitkDataTypesExt")); - m_AffineDataInteractor->SetEventConfig("AffineRotationConfig.xml", us::ModuleRegistry::GetModule("MitkDataTypesExt")); - m_AffineDataInteractor->SetDataNode(m_ClippingPlaneNode); -} - -void mitk::ClippingPlaneRotationTool::Deactivated() -{ - Superclass::Deactivated(); - m_AffineDataInteractor->SetDataNode(NULL); -} diff --git a/Modules/ClippingTools/mitkClippingPlaneRotationTool.h b/Modules/ClippingTools/mitkClippingPlaneRotationTool.h deleted file mode 100644 index af25154630..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneRotationTool.h +++ /dev/null @@ -1,66 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -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. - -===================================================================*/ - -#ifndef mitkClippingPlaneRotationTool_h_Included -#define mitkClippingPlaneRotationTool_h_Included - -#include - -#include "mitkAffineDataInteractor3D.h" -#include "mitkCommon.h" -#include "mitkDataNode.h" -#include "mitkTool.h" - -namespace mitk -{ - - /** - \brief A tool which allows you to rotate planes. - */ - class MitkClippingTools_EXPORT ClippingPlaneRotationTool : public Tool - { - public: - - mitkClassMacro(ClippingPlaneRotationTool, Tool); - itkFactorylessNewMacro(Self) - itkCloneMacro(Self) - - virtual const char** GetXPM() const; - virtual const char* GetName() const; - virtual const char* GetGroup() const; - - - protected: - - ClippingPlaneRotationTool(); // purposely hidden - virtual ~ClippingPlaneRotationTool(); - - virtual void Activated(); - virtual void Deactivated(); - - mitk::DataNode::Pointer m_ClippingPlaneNode; - mitk::AffineDataInteractor3D::Pointer m_AffineDataInteractor; - - private: - - void ClippingPlaneChanged(); - }; - -} //end namespace mitk - -#endif - - diff --git a/Modules/ClippingTools/mitkClippingPlaneRotationTool.xpm b/Modules/ClippingTools/mitkClippingPlaneRotationTool.xpm deleted file mode 100644 index b3a8a9a979..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneRotationTool.xpm +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static const char * mitkClippingPlaneRotationTool_xpm[] = { -"22 25 2 1", -" c None", -". c #000000", -" ", -" ", -" ", -" ", -" ............ ", -" .............. ", -" .............. ", -" ..... ...... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ..... ..... ", -" ............. ", -" ............ ", -" ............ ", -" ..... ...... ", -" ..... ...... ", -" ..... ...... ", -" ..... ...... ", -" ..... ...... ", -" ..... ...... ", -" ..... ....... ", -" ", -" ", -" "}; diff --git a/Modules/ClippingTools/mitkClippingPlaneTranslationTool.cpp b/Modules/ClippingTools/mitkClippingPlaneTranslationTool.cpp deleted file mode 100644 index 772ab5cfce..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneTranslationTool.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -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 "mitkClippingPlaneTranslationTool.h" -#include "mitkClippingPlaneTranslationTool.xpm" - -#include "mitkBaseRenderer.h" -#include "mitkRenderingManager.h" -#include "mitkToolManager.h" - -// us -#include "usModule.h" -#include "usModuleContext.h" -#include "usGetModuleContext.h" -#include "usModuleRegistry.h" - -namespace mitk -{ - MITK_TOOL_MACRO(MitkClippingTools_EXPORT, ClippingPlaneTranslationTool, "Clipping Tool Translation"); -} - -mitk::ClippingPlaneTranslationTool::ClippingPlaneTranslationTool() -: Tool( "" ) -{ - m_AffineDataInteractor = mitk::AffineDataInteractor3D::New(); -} - -mitk::ClippingPlaneTranslationTool::~ClippingPlaneTranslationTool() -{ -} - -const char** mitk::ClippingPlaneTranslationTool::GetXPM() const -{ - return mitkClippingPlaneTranslationTool_xpm; -} - -const char* mitk::ClippingPlaneTranslationTool::GetName() const -{ - return "Translation"; -} - -const char* mitk::ClippingPlaneTranslationTool::GetGroup() const -{ - return "ClippingTool"; -} - -void mitk::ClippingPlaneTranslationTool::Activated() -{ - Superclass::Activated(); - - //check if the Clipping plane is changed. - if(m_ClippingPlaneNode != m_ToolManager->GetWorkingData(0)) - { - m_ClippingPlaneNode = m_ToolManager->GetWorkingData(0); - m_ClippingPlaneNode->SetDataInteractor(NULL); - } - - m_AffineDataInteractor->LoadStateMachine("AffineInteraction3D.xml", us::ModuleRegistry::GetModule("MitkDataTypesExt")); - m_AffineDataInteractor->SetEventConfig("AffineTranslationConfig.xml", us::ModuleRegistry::GetModule("MitkDataTypesExt")); - m_AffineDataInteractor->SetDataNode(m_ClippingPlaneNode); -} - -void mitk::ClippingPlaneTranslationTool::Deactivated() -{ - Superclass::Deactivated(); - m_AffineDataInteractor->SetDataNode(NULL); -} diff --git a/Modules/ClippingTools/mitkClippingPlaneTranslationTool.h b/Modules/ClippingTools/mitkClippingPlaneTranslationTool.h deleted file mode 100644 index bbc5bb97ff..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneTranslationTool.h +++ /dev/null @@ -1,69 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -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. - -===================================================================*/ - -#ifndef mitkClippingPlaneTranslationTool_h_Included -#define mitkClippingPlaneTranslationTool_h_Included - -#include - -#include "mitkAffineDataInteractor3D.h" -#include "mitkCommon.h" -#include "mitkDataNode.h" -#include "mitkTool.h" - - -namespace us { - class Module; -} - - -namespace mitk -{ - - /** - \brief A tool which allows you to move planes. - */ - class MitkClippingTools_EXPORT ClippingPlaneTranslationTool : public Tool - { - public: - - mitkClassMacro(ClippingPlaneTranslationTool, Tool); - itkFactorylessNewMacro(Self) - itkCloneMacro(Self) - - virtual const char** GetXPM() const; - virtual const char* GetName() const; - virtual const char* GetGroup() const; - - - protected: - - ClippingPlaneTranslationTool(); // purposely hidden - virtual ~ClippingPlaneTranslationTool(); - - virtual void Activated(); - virtual void Deactivated(); - - mitk::DataNode::Pointer m_ClippingPlaneNode; - mitk::AffineDataInteractor3D::Pointer m_AffineDataInteractor; - - }; - -} //end namespace mitk - -#endif - - diff --git a/Modules/ClippingTools/mitkClippingPlaneTranslationTool.xpm b/Modules/ClippingTools/mitkClippingPlaneTranslationTool.xpm deleted file mode 100644 index 5f47707d35..0000000000 --- a/Modules/ClippingTools/mitkClippingPlaneTranslationTool.xpm +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static const char * mitkClippingPlaneTranslationTool_xpm[] = { -"22 25 2 1", -" c None", -". c #000000", -" ", -" ", -" ", -" ", -" ............... ", -" ............... ", -" ............... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ..... ", -" ", -" ", -" "}; diff --git a/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt b/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt index b136c3959b..93cb1256d8 100644 --- a/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt @@ -1,9 +1,9 @@ project(org_mitk_gui_qt_segmentation) include_directories(${CTK_INCLUDE_DIRS}) MACRO_CREATE_MITK_CTK_PLUGIN( EXPORT_DIRECTIVE MITK_QT_SEGMENTATION EXPORTED_INCLUDE_SUFFIXES src - MODULE_DEPENDS MitkQtWidgetsExt MitkClippingTools MitkSegmentationUI + MODULE_DEPENDS MitkQtWidgetsExt MitkSegmentationUI )