diff --git a/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.cpp b/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.cpp deleted file mode 100644 index f5b53f6c3a..0000000000 --- a/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#include "mitkCalculateVolumetryTool.h" - -#include "mitkCalculateVolumetryTool.xpm" - -#include "mitkProperties.h" -#include "mitkToolManager.h" -#include "mitkVolumeCalculator.h" - -namespace mitk -{ - MITK_TOOL_MACRO(MITKSEGMENTATION_EXPORT, CalculateVolumetryTool, "Volumetry tool"); -} - -mitk::CalculateVolumetryTool::CalculateVolumetryTool() -{ -} - -mitk::CalculateVolumetryTool::~CalculateVolumetryTool() -{ -} - -const char **mitk::CalculateVolumetryTool::GetXPM() const -{ - return mitkCalculateVolumetryTool_xpm; -} - -const char *mitk::CalculateVolumetryTool::GetName() const -{ - return "Volumetry"; -} - -std::string mitk::CalculateVolumetryTool::GetErrorMessage() -{ - return "Volume could not be calculated for these nodes:"; -} - -bool mitk::CalculateVolumetryTool::ProcessOneWorkingData(DataNode *node) -{ - if (node) - { - Image::Pointer image = dynamic_cast(node->GetData()); - if (image.IsNull()) - return false; - - if (image->GetDimension() == 4) - { - Tool::ErrorMessage("Volumetry only valid for timestep 0! Bug #1280"); - } - - VolumeCalculator::Pointer volumetryFilter = VolumeCalculator::New(); - volumetryFilter->SetImage(image); - volumetryFilter->SetThreshold(1); // comparison is >= - try - { - volumetryFilter->ComputeVolume(); - - float volumeInTimeStep0 = volumetryFilter->GetVolume(); - - node->SetProperty("volume", FloatProperty::New(volumeInTimeStep0)); - } - catch (...) - { - return false; - } - } - - return true; -} - -void mitk::CalculateVolumetryTool::FinishProcessingAllData() -{ - Superclass::FinishProcessingAllData(); - this->GetToolManager()->NodePropertiesChanged(); -} diff --git a/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.h b/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.h deleted file mode 100644 index 51d9253d2a..0000000000 --- a/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.h +++ /dev/null @@ -1,53 +0,0 @@ -/*============================================================================ - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center (DKFZ) -All rights reserved. - -Use of this source code is governed by a 3-clause BSD license that can be -found in the LICENSE file. - -============================================================================*/ - -#ifndef mitkCalculateVolumetryTool_h_Included -#define mitkCalculateVolumetryTool_h_Included - -#include "mitkCommon.h" -#include "mitkSegmentationsProcessingTool.h" -#include - -namespace mitk -{ - /** - \brief Calculates the segmented volumes for binary images. - - \ingroup ToolManagerEtAl - \sa mitk::Tool - \sa QmitkInteractiveSegmentation - - Last contributor: $Author$ - */ - class MITKSEGMENTATION_EXPORT CalculateVolumetryTool : public SegmentationsProcessingTool - { - public: - mitkClassMacro(CalculateVolumetryTool, SegmentationsProcessingTool); - itkFactorylessNewMacro(Self); - itkCloneMacro(Self); - - const char **GetXPM() const override; - const char *GetName() const override; - - protected: - bool ProcessOneWorkingData(DataNode *node) override; - std::string GetErrorMessage() override; - - void FinishProcessingAllData() override; - - CalculateVolumetryTool(); // purposely hidden - ~CalculateVolumetryTool() override; - }; - -} // namespace - -#endif diff --git a/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.xpm b/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.xpm deleted file mode 100644 index 54ffb9c3e5..0000000000 --- a/Modules/Segmentation/Interactions/mitkCalculateVolumetryTool.xpm +++ /dev/null @@ -1,37 +0,0 @@ -/* XPM */ -static const char * mitkCalculateVolumetryTool_xpm[] = { -"19 16 18 1", -" c None", -". c #2E3436", -"+ c #EEEEEC", -"@ c #555753", -"# c #595B57", -"$ c #70726E", -"% c #656763", -"& c #565854", -"* c #646662", -"= c #BEBEBC", -"- c #ADAEAB", -"; c #CDCECB", -"> c #ACADAA", -", c #CECFCC", -"' c #666864", -") c #E5E5E3", -"! c #EBEBE9", -"~ c #EDEDEB", -"...................", -".+++++++++++++++++.", -".+++++++++++++++++.", -".++++++++++++++@@+.", -".++++++++++++++@@+.", -".++++++++++++++@@+.", -".+@@@@#$%&*=+++@@+.", -".+@@-;@@>,@'+++@@+.", -".+@@)!@@)~@@+++@@+.", -".+@@++@@++@@+++@@+.", -".+@@++@@++@@+++@@+.", -".+@@++@@++@@+++@@+.", -".+@@++@@++@@+++@@+.", -".+++++++++++++++++.", -".+++++++++++++++++.", -"..................."}; diff --git a/Modules/Segmentation/files.cmake b/Modules/Segmentation/files.cmake index 9fc7ae7647..949590d808 100644 --- a/Modules/Segmentation/files.cmake +++ b/Modules/Segmentation/files.cmake @@ -1,110 +1,109 @@ set(CPP_FILES Algorithms/mitkCalculateSegmentationVolume.cpp Algorithms/mitkContourModelSetToImageFilter.cpp Algorithms/mitkContourSetToPointSetFilter.cpp Algorithms/mitkContourUtils.cpp Algorithms/mitkCorrectorAlgorithm.cpp Algorithms/mitkDiffImageApplier.cpp Algorithms/mitkDiffSliceOperation.cpp Algorithms/mitkDiffSliceOperationApplier.cpp Algorithms/mitkFeatureBasedEdgeDetectionFilter.cpp Algorithms/mitkImageLiveWireContourModelFilter.cpp Algorithms/mitkImageToContourFilter.cpp #Algorithms/mitkImageToContourModelFilter.cpp Algorithms/mitkImageToLiveWireContourFilter.cpp Algorithms/mitkManualSegmentationToSurfaceFilter.cpp Algorithms/mitkOtsuSegmentationFilter.cpp Algorithms/mitkSegmentationHelper.cpp Algorithms/mitkSegmentationObjectFactory.cpp Algorithms/mitkShapeBasedInterpolationAlgorithm.cpp Algorithms/mitkShowSegmentationAsSmoothedSurface.cpp Algorithms/mitkShowSegmentationAsSurface.cpp Algorithms/mitkVtkImageOverwrite.cpp Controllers/mitkSegmentationInterpolationController.cpp Controllers/mitkToolManager.cpp Controllers/mitkSegmentationModuleActivator.cpp Controllers/mitkToolManagerProvider.cpp DataManagement/mitkContour.cpp DataManagement/mitkContourSet.cpp DataManagement/mitkExtrudedContour.cpp Interactions/mitkAddContourTool.cpp Interactions/mitkAutoCropTool.cpp Interactions/mitkSegWithPreviewTool.cpp Interactions/mitkBinaryThresholdBaseTool.cpp Interactions/mitkBinaryThresholdTool.cpp Interactions/mitkBinaryThresholdULTool.cpp - Interactions/mitkCalculateVolumetryTool.cpp Interactions/mitkContourModelInteractor.cpp Interactions/mitkContourModelLiveWireInteractor.cpp Interactions/mitkEditableContourTool.cpp Interactions/mitkLiveWireTool2D.cpp Interactions/mitkLassoTool.cpp Interactions/mitkContourTool.cpp Interactions/mitkCreateSurfaceTool.cpp Interactions/mitkDrawPaintbrushTool.cpp Interactions/mitkErasePaintbrushTool.cpp Interactions/mitkEraseRegionTool.cpp Interactions/mitkFeedbackContourTool.cpp Interactions/mitkFillRegionTool.cpp Interactions/mitkOtsuTool3D.cpp Interactions/mitkPaintbrushTool.cpp Interactions/mitkRegionGrowingTool.cpp Interactions/mitkSegmentationsProcessingTool.cpp Interactions/mitkSetRegionTool.cpp Interactions/mitkSegTool2D.cpp Interactions/mitkSubtractContourTool.cpp Interactions/mitkTool.cpp Interactions/mitkToolCommand.cpp Interactions/mitkPickingTool.cpp Interactions/mitknnUnetTool.cpp Interactions/mitkSegmentationInteractor.cpp #SO Interactions/mitkProcessExecutor.cpp Rendering/mitkContourMapper2D.cpp Rendering/mitkContourSetMapper2D.cpp Rendering/mitkContourSetVtkMapper3D.cpp Rendering/mitkContourVtkMapper3D.cpp SegmentationUtilities/BooleanOperations/mitkBooleanOperation.cpp SegmentationUtilities/MorphologicalOperations/mitkMorphologicalOperations.cpp #Added from ML Controllers/mitkSliceBasedInterpolationController.cpp Algorithms/mitkSurfaceStampImageFilter.cpp ) set(RESOURCE_FILES Add_48x48.png Add_Cursor_32x32.png AI_48x48.png AI_Cursor_32x32.png Erase_48x48.png Erase_Cursor_32x32.png Fill_48x48.png Fill_Cursor_32x32.png LiveWire_48x48.png LiveWire_Cursor_32x32.png NewAdd_48x48.png NewAdd_Cursor_32x32.png Otsu_48x48.png Paint_48x48.png Paint_Cursor_32x32.png Pick_48x48.png RegionGrowing_48x48.png RegionGrowing_Cursor_32x32.png Subtract_48x48.png Subtract_Cursor_32x32.png Threshold_48x48.png TwoThresholds_48x48.png Wipe_48x48.png Wipe_Cursor_32x32.png Interactions/dummy.xml Interactions/EditableContourTool.xml Interactions/PickingTool.xml Interactions/PressMoveRelease.xml Interactions/PressMoveReleaseAndPointSetting.xml Interactions/PressMoveReleaseWithCTRLInversion.xml Interactions/PressMoveReleaseWithCTRLInversionAllMouseMoves.xml Interactions/SegmentationToolsConfig.xml Interactions/ContourModelModificationConfig.xml Interactions/ContourModelModificationInteractor.xml )