Diffusion MITK 69966e02c46b

Merge branch 'bug-15466-create-segmentationUI-module-us' into bug-15068…
69966e02c46b
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-15466-create-segmentationUI-module-us' into bug-15068-segmentation-UI-redesign

Conflicts:
Modules/MitkExt/Interactions/mitkTool.h
Modules/QmitkExt/CMakeLists.txt
Modules/Segmentation/Interactions/mitkAddContourTool.h
Modules/Segmentation/Interactions/mitkCorrectorTool2D.h
Modules/Segmentation/Interactions/mitkDrawPaintbrushTool.h
Modules/Segmentation/Interactions/mitkErasePaintbrushTool.cpp
Modules/Segmentation/Interactions/mitkErasePaintbrushTool.h
Modules/Segmentation/Interactions/mitkEraseRegionTool.cpp
Modules/Segmentation/Interactions/mitkEraseRegionTool.h
Modules/Segmentation/Interactions/mitkFastMarchingTool.cpp
Modules/Segmentation/Interactions/mitkFastMarchingTool.h
Modules/Segmentation/Interactions/mitkFillRegionTool.h
Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp
Modules/Segmentation/Interactions/mitkLiveWireTool2D.h
Modules/Segmentation/Interactions/mitkRegionGrowingTool.h
Modules/Segmentation/Interactions/mitkSubtractContourTool.h
Modules/Segmentation/resources/Segmentation.qrc
Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.cpp

Details

Provenance

Authored on Jul 7 2013, 2:39 PM

Parents

rMITKda774747d784: Minor code cleaning
rMITK974d01ec9152: Merge branch 'bug-15174-UpdateWatershedPlugin' into bug-15068-segmentation-UI…

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK69966e02c46b: Merge branch 'bug-15466-create-segmentationUI-module-us' into bug-15068… (authored by • fetzer).Jul 7 2013, 2:39 PM

Merged Changes

da774747d784 Minor code cleaning
Author
• fetzer
Browse Repository
No Builds
No Audits
b86efac42066 Adapted export macros for windows
Author
• fetzer
Browse Repository
No Builds
No Audits
7990e0452220 Removed Qt dependency from segmentation module. Replaced Qt resources with us…
Author
• fetzer
Browse Repository
No Builds
No Audits
beeb5e3333bf Removed Qt dependency from Segmentation module
Author
• fetzer
Browse Repository
No Builds
No Audits
ed77da130734 Created module SegmentationUI and move files accordingly
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (141)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

Modules/

MitkExt/

Interactions/

QmitkExt/

QmitkAdaptiveRegionGrowingToolGUI.cpp

QmitkAdaptiveRegionGrowingToolGUI.h

QmitkAdaptiveRegionGrowingToolGUIControls.ui

QmitkBinaryThresholdToolGUI.cpp

QmitkBinaryThresholdToolGUI.h

QmitkBinaryThresholdULToolGUI.cpp

QmitkBinaryThresholdULToolGUI.h

QmitkCalculateGrayValueStatisticsToolGUI.cpp

QmitkCalculateGrayValueStatisticsToolGUI.h

QmitkCopyToClipBoardDialog.cpp

QmitkCopyToClipBoardDialog.h

QmitkDrawPaintbrushToolGUI.cpp

QmitkDrawPaintbrushToolGUI.h

QmitkErasePaintbrushToolGUI.cpp

QmitkErasePaintbrushToolGUI.h

QmitkExtRegisterClasses.cpp

QmitkFastMarchingTool3DGUI.cpp

QmitkFastMarchingTool3DGUI.h

QmitkFastMarchingToolGUI.cpp

QmitkFastMarchingToolGUI.h

QmitkLiveWireTool2DGUI.cpp

QmitkLiveWireTool2DGUI.h

QmitkNewSegmentationDialog.cpp

QmitkNewSegmentationDialog.h

QmitkOtsuTool3DGUI.cpp

QmitkOtsuTool3DGUI.h

QmitkPaintbrushToolGUI.cpp

QmitkPaintbrushToolGUI.h

QmitkPixelManipulationToolGUI.cpp

QmitkPixelManipulationToolGUI.h

QmitkRegionGrow3DToolGUI.cpp

QmitkRegionGrow3DToolGUI.h

QmitkSlicesInterpolator.cpp

QmitkSlicesInterpolator.h

QmitkToolGUI.cpp

QmitkToolGUIArea.cpp

QmitkToolGUIArea.h

QmitkToolReferenceDataSelectionBox.cpp

QmitkToolReferenceDataSelectionBox.h

QmitkToolRoiDataSelectionBox.cpp

QmitkToolRoiDataSelectionBox.h

QmitkToolSelectionBox.cpp

QmitkToolSelectionBox.h

QmitkToolWorkingDataSelectionBox.cpp

QmitkToolWorkingDataSelectionBox.h

QmitkWatershedToolGUI.cpp

QmitkWatershedToolGUI.h

Segmentation/

O1: MITK Reviewer Group I

Interactions/

mitkAdaptiveRegionGrowingTool.cpp

O1: MITK Reviewer Group I

mitkAdaptiveRegionGrowingTool.h

O1: MITK Reviewer Group I

mitkAddContourTool.cpp

O1: MITK Reviewer Group I

mitkAddContourTool.h

O1: MITK Reviewer Group I

mitkBinaryThresholdTool.cpp

O1: MITK Reviewer Group I

mitkBinaryThresholdTool.h

O1: MITK Reviewer Group I

mitkBinaryThresholdULTool.cpp

O1: MITK Reviewer Group I

mitkBinaryThresholdULTool.h

O1: MITK Reviewer Group I

mitkCorrectorTool2D.cpp

O1: MITK Reviewer Group I

mitkCorrectorTool2D.h

O1: MITK Reviewer Group I

mitkDrawPaintbrushTool.cpp

O1: MITK Reviewer Group I

mitkDrawPaintbrushTool.h

O1: MITK Reviewer Group I

mitkErasePaintbrushTool.cpp

O1: MITK Reviewer Group I

mitkErasePaintbrushTool.h

O1: MITK Reviewer Group I

mitkEraseRegionTool.cpp

O1: MITK Reviewer Group I

mitkEraseRegionTool.h

O1: MITK Reviewer Group I

mitkFastMarchingTool.cpp

O1: MITK Reviewer Group I

mitkFastMarchingTool.h

O1: MITK Reviewer Group I

mitkFastMarchingTool3D.cpp

O1: MITK Reviewer Group I

mitkFastMarchingTool3D.h

O1: MITK Reviewer Group I

mitkFillRegionTool.cpp

O1: MITK Reviewer Group I

mitkFillRegionTool.h

O1: MITK Reviewer Group I

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

mitkLiveWireTool2D.h

O1: MITK Reviewer Group I

mitkOtsuTool3D.cpp

O1: MITK Reviewer Group I

mitkOtsuTool3D.h

O1: MITK Reviewer Group I

mitkRegionGrowingTool.cpp

O1: MITK Reviewer Group I

mitkRegionGrowingTool.h

O1: MITK Reviewer Group I

mitkSubtractContourTool.cpp

O1: MITK Reviewer Group I

mitkSubtractContourTool.h

O1: MITK Reviewer Group I

mitkWatershedTool.cpp

O1: MITK Reviewer Group I

mitkWatershedTool.h

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

resources/

Segmentation.qrc

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

	SegmentationUI/	Qmitk/
		QmitkExt/

QmitkAdaptiveRegionGrowingToolGUI.cpp

O1: MITK Reviewer Group I

QmitkAdaptiveRegionGrowingToolGUI.h

O1: MITK Reviewer Group I

QmitkAdaptiveRegionGrowingToolGUIControls.ui

O1: MITK Reviewer Group I

QmitkBinaryThresholdToolGUI.cpp

O1: MITK Reviewer Group I

QmitkBinaryThresholdToolGUI.h

O1: MITK Reviewer Group I

QmitkBinaryThresholdULToolGUI.cpp

O1: MITK Reviewer Group I

QmitkBinaryThresholdULToolGUI.h

O1: MITK Reviewer Group I

QmitkCalculateGrayValueStatisticsToolGUI.cpp

O1: MITK Reviewer Group I

QmitkCalculateGrayValueStatisticsToolGUI.h

O1: MITK Reviewer Group I

QmitkCopyToClipBoardDialog.cpp

O1: MITK Reviewer Group I

QmitkCopyToClipBoardDialog.h

O1: MITK Reviewer Group I

QmitkDrawPaintbrushToolGUI.cpp

O1: MITK Reviewer Group I

QmitkDrawPaintbrushToolGUI.h

O1: MITK Reviewer Group I

QmitkErasePaintbrushToolGUI.cpp

O1: MITK Reviewer Group I

QmitkErasePaintbrushToolGUI.h

O1: MITK Reviewer Group I

QmitkFastMarchingTool3DGUI.cpp

O1: MITK Reviewer Group I

QmitkFastMarchingTool3DGUI.h

O1: MITK Reviewer Group I

QmitkFastMarchingToolGUI.cpp

O1: MITK Reviewer Group I

QmitkFastMarchingToolGUI.h

O1: MITK Reviewer Group I

QmitkLiveWireTool2DGUI.cpp

O1: MITK Reviewer Group I

QmitkLiveWireTool2DGUI.h

O1: MITK Reviewer Group I

QmitkNewSegmentationDialog.cpp

O1: MITK Reviewer Group I

QmitkNewSegmentationDialog.h

O1: MITK Reviewer Group I

QmitkOtsuTool3DGUI.cpp

O1: MITK Reviewer Group I

QmitkOtsuTool3DGUI.h

O1: MITK Reviewer Group I

QmitkPaintbrushToolGUI.cpp

O1: MITK Reviewer Group I

QmitkPaintbrushToolGUI.h

O1: MITK Reviewer Group I

QmitkPixelManipulationToolGUI.cpp

O1: MITK Reviewer Group I

QmitkPixelManipulationToolGUI.h

O1: MITK Reviewer Group I

QmitkRegionGrow3DToolGUI.cpp

O1: MITK Reviewer Group I

QmitkRegionGrow3DToolGUI.h

O1: MITK Reviewer Group I

QmitkSlicesInterpolator.cpp

O1: MITK Reviewer Group I

QmitkSlicesInterpolator.h

O1: MITK Reviewer Group I

QmitkToolGUI.cpp

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

QmitkToolGUIArea.cpp

O1: MITK Reviewer Group I

QmitkToolGUIArea.h

O1: MITK Reviewer Group I

QmitkToolReferenceDataSelectionBox.cpp

O1: MITK Reviewer Group I

QmitkToolReferenceDataSelectionBox.h

O1: MITK Reviewer Group I

QmitkToolRoiDataSelectionBox.cpp

O1: MITK Reviewer Group I

QmitkToolRoiDataSelectionBox.h

O1: MITK Reviewer Group I

QmitkToolSelectionBox.cpp

O1: MITK Reviewer Group I

QmitkToolSelectionBox.h

O1: MITK Reviewer Group I

QmitkToolWorkingDataSelectionBox.cpp

O1: MITK Reviewer Group I

QmitkToolWorkingDataSelectionBox.h

O1: MITK Reviewer Group I

QmitkWatershedToolGUI.cpp

O1: MITK Reviewer Group I

QmitkWatershedToolGUI.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.examples/

org.mitk.gui.qt.segmentation/

O1: MITK Reviewer Group I

rMITK69966e02c46b

Modules/CMakeLists.txt

Modules/MitkExt/Interactions/mitkTool.cpp

Modules/MitkExt/Interactions/mitkTool.h

Modules/QmitkExt/CMakeLists.txt

Modules/QmitkExt/QmitkAdaptiveRegionGrowingToolGUI.cpp

Modules/QmitkExt/QmitkAdaptiveRegionGrowingToolGUI.h

Modules/QmitkExt/QmitkAdaptiveRegionGrowingToolGUIControls.ui

Modules/QmitkExt/QmitkBinaryThresholdToolGUI.cpp

Modules/QmitkExt/QmitkBinaryThresholdToolGUI.h

Modules/QmitkExt/QmitkBinaryThresholdULToolGUI.cpp

Modules/QmitkExt/QmitkBinaryThresholdULToolGUI.h

Modules/QmitkExt/QmitkCalculateGrayValueStatisticsToolGUI.cpp

Modules/QmitkExt/QmitkCalculateGrayValueStatisticsToolGUI.h

Modules/QmitkExt/QmitkCopyToClipBoardDialog.cpp

Modules/QmitkExt/QmitkCopyToClipBoardDialog.h

Modules/QmitkExt/QmitkDrawPaintbrushToolGUI.cpp

Modules/QmitkExt/QmitkDrawPaintbrushToolGUI.h

Modules/QmitkExt/QmitkErasePaintbrushToolGUI.cpp

Modules/QmitkExt/QmitkErasePaintbrushToolGUI.h

Modules/QmitkExt/QmitkExtRegisterClasses.cpp

Modules/QmitkExt/QmitkFastMarchingTool3DGUI.cpp

Modules/QmitkExt/QmitkFastMarchingTool3DGUI.h

Modules/QmitkExt/QmitkFastMarchingToolGUI.cpp

Modules/QmitkExt/QmitkFastMarchingToolGUI.h

Modules/QmitkExt/QmitkLiveWireTool2DGUI.cpp

Modules/QmitkExt/QmitkLiveWireTool2DGUI.h

Modules/QmitkExt/QmitkNewSegmentationDialog.cpp

Modules/QmitkExt/QmitkNewSegmentationDialog.h

Modules/QmitkExt/QmitkOtsuTool3DGUI.cpp

Modules/QmitkExt/QmitkOtsuTool3DGUI.h

Modules/QmitkExt/QmitkPaintbrushToolGUI.cpp

Modules/QmitkExt/QmitkPaintbrushToolGUI.h

Modules/QmitkExt/QmitkPixelManipulationToolGUI.cpp

Modules/QmitkExt/QmitkPixelManipulationToolGUI.h

Modules/QmitkExt/QmitkRegionGrow3DToolGUI.cpp

Modules/QmitkExt/QmitkRegionGrow3DToolGUI.h

Modules/QmitkExt/QmitkSlicesInterpolator.cpp

Modules/QmitkExt/QmitkSlicesInterpolator.h

Modules/QmitkExt/QmitkToolGUI.cpp

Modules/QmitkExt/QmitkToolGUI.h

Modules/QmitkExt/QmitkToolGUIArea.cpp

Modules/QmitkExt/QmitkToolGUIArea.h

Modules/QmitkExt/QmitkToolReferenceDataSelectionBox.cpp

Modules/QmitkExt/QmitkToolReferenceDataSelectionBox.h

Modules/QmitkExt/QmitkToolRoiDataSelectionBox.cpp

Modules/QmitkExt/QmitkToolRoiDataSelectionBox.h

Modules/QmitkExt/QmitkToolSelectionBox.cpp

Modules/QmitkExt/QmitkToolSelectionBox.h

Modules/QmitkExt/QmitkToolWorkingDataSelectionBox.cpp

Modules/QmitkExt/QmitkToolWorkingDataSelectionBox.h

Modules/QmitkExt/QmitkWatershedToolGUI.cpp

Modules/QmitkExt/QmitkWatershedToolGUI.h

Modules/QmitkExt/files.cmake

Modules/Segmentation/CMakeLists.txt

Modules/Segmentation/Interactions/mitkAdaptiveRegionGrowingTool.cpp

Modules/Segmentation/Interactions/mitkAdaptiveRegionGrowingTool.h

Modules/Segmentation/Interactions/mitkAddContourTool.cpp

Modules/Segmentation/Interactions/mitkAddContourTool.h

Modules/Segmentation/Interactions/mitkBinaryThresholdTool.cpp

Modules/Segmentation/Interactions/mitkBinaryThresholdTool.h

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.cpp

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.h

Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp

Modules/Segmentation/Interactions/mitkCorrectorTool2D.h

Modules/Segmentation/Interactions/mitkDrawPaintbrushTool.cpp

Modules/Segmentation/Interactions/mitkDrawPaintbrushTool.h

Modules/Segmentation/Interactions/mitkErasePaintbrushTool.cpp

Modules/Segmentation/Interactions/mitkErasePaintbrushTool.h

Modules/Segmentation/Interactions/mitkEraseRegionTool.cpp

Modules/Segmentation/Interactions/mitkEraseRegionTool.h

Modules/Segmentation/Interactions/mitkFastMarchingTool.cpp

Modules/Segmentation/Interactions/mitkFastMarchingTool.h

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.cpp

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.h

Modules/Segmentation/Interactions/mitkFillRegionTool.cpp

Modules/Segmentation/Interactions/mitkFillRegionTool.h

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.h

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

Modules/Segmentation/Interactions/mitkOtsuTool3D.h

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

Modules/Segmentation/Interactions/mitkRegionGrowingTool.h

Modules/Segmentation/Interactions/mitkSubtractContourTool.cpp

Modules/Segmentation/Interactions/mitkSubtractContourTool.h

Modules/Segmentation/Interactions/mitkWatershedTool.cpp

Modules/Segmentation/Interactions/mitkWatershedTool.h

Modules/Segmentation/files.cmake

Modules/Segmentation/resources/Segmentation.qrc

Modules/SegmentationUI/CMakeLists.txt

Modules/SegmentationUI/Qmitk/QmitkAdaptiveRegionGrowingToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkAdaptiveRegionGrowingToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkAdaptiveRegionGrowingToolGUIControls.ui

Modules/SegmentationUI/Qmitk/QmitkBinaryThresholdToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkBinaryThresholdToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkBinaryThresholdULToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkBinaryThresholdULToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkCalculateGrayValueStatisticsToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkCalculateGrayValueStatisticsToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkCopyToClipBoardDialog.cpp

Modules/SegmentationUI/Qmitk/QmitkCopyToClipBoardDialog.h

Modules/SegmentationUI/Qmitk/QmitkDrawPaintbrushToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkDrawPaintbrushToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkErasePaintbrushToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkErasePaintbrushToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkFastMarchingTool3DGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkFastMarchingTool3DGUI.h

Modules/SegmentationUI/Qmitk/QmitkFastMarchingToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkFastMarchingToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkLiveWireTool2DGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkLiveWireTool2DGUI.h

Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.cpp

Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.h

Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkOtsuTool3DGUI.h

Modules/SegmentationUI/Qmitk/QmitkPaintbrushToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkPaintbrushToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkPixelManipulationToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkPixelManipulationToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkRegionGrow3DToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkRegionGrow3DToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.h

Modules/SegmentationUI/Qmitk/QmitkToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkToolGUI.h

Modules/SegmentationUI/Qmitk/QmitkToolGUIArea.cpp

Modules/SegmentationUI/Qmitk/QmitkToolGUIArea.h

Modules/SegmentationUI/Qmitk/QmitkToolReferenceDataSelectionBox.cpp

Modules/SegmentationUI/Qmitk/QmitkToolReferenceDataSelectionBox.h

Modules/SegmentationUI/Qmitk/QmitkToolRoiDataSelectionBox.cpp

Modules/SegmentationUI/Qmitk/QmitkToolRoiDataSelectionBox.h

Modules/SegmentationUI/Qmitk/QmitkToolSelectionBox.cpp

Modules/SegmentationUI/Qmitk/QmitkToolSelectionBox.h

Modules/SegmentationUI/Qmitk/QmitkToolWorkingDataSelectionBox.cpp

Modules/SegmentationUI/Qmitk/QmitkToolWorkingDataSelectionBox.h

Modules/SegmentationUI/Qmitk/QmitkWatershedToolGUI.cpp

Modules/SegmentationUI/Qmitk/QmitkWatershedToolGUI.h

Modules/SegmentationUI/files.cmake

Plugins/org.mitk.gui.qt.examples/CMakeLists.txt

Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt