Diffusion MITK e91373d026d5

Merge branch 'bug-12703-LiveWire-Tool-Integration'
e91373d026d5
Actions

Description

Merge branch 'bug-12703-LiveWire-Tool-Integration'

Conflicts:
Modules/CMakeLists.txt
Modules/Segmentation/Interactions/mitkSegTool2D.cpp

Details

Provenance

• schroedt

Authored on Apr 5 2013, 10:34 AM

Parents

rMITK64aaf3a8fa72: documentation for LiveWire Tool.
rMITK48cc685f2633: Merge branch 'bug-13139-ExportFix'

Branches

Unknown

Tags

Unknown

Event Timeline

• schroedt committed rMITKe91373d026d5: Merge branch 'bug-12703-LiveWire-Tool-Integration' (authored by • schroedt).Apr 5 2013, 10:34 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

64aaf3a8fa72 documentation for LiveWire Tool.
Author
• schroedt
Browse Repository
No Builds
No Audits
b5e40b79970e Added images for documentation.
Author
• schroedt
Browse Repository
No Builds
No Audits
d2883392429d Changed Icon of LiveWire Tool.
Author
• schroedt
Browse Repository
No Builds
No Audits
212c8f4045c1 Fixed some typename issues for clang
Author
• fetzer
Browse Repository
No Builds
No Audits
7bc8636290aa Fix compiler errors on mac.
Author
• schroedt
Browse Repository
No Builds
No Audits
1e15d544554e Use right property names
Author
• schroedt
Browse Repository
No Builds
No Audits
9cbe781a83e1 Fix deleting and moving first controlpoint.
Author
• schroedt
Browse Repository
No Builds
No Audits
a03e249f3777 3x3 Region for initial point.
Author
• schroedt
Browse Repository
No Builds
No Audits
3372f9dc2679 Use right color for LiveWire Contour
Author
• schroedt
Browse Repository
No Builds
No Audits
0913cf6eb717 Fixed crash on finishing LiveWire Tool.
Author
• schroedt
Browse Repository
No Builds
No Audits
e80f3e23daf1 Add StateMachine of LiveWire Tool to legacy StateMachine.xml
Author
• schroedt
Browse Repository
No Builds
No Audits
f4963aebf802 Merge branch 'personal/schroedt/livewire-integration' into bug-12703-LiveWire…
Author
• schroedt
Browse Repository
No Builds
No Audits
2dfb12add6c4 compiler errors fixed
Author
• schroedt
Browse Repository
No Builds
No Audits
7fb2ea2dcfa3 fixed interaction on del and esc
Author
• schroedt
Browse Repository
No Builds
No Audits
91b81c76d2e5 remove last segment on esc
Author
• schroedt
Browse Repository
No Builds
No Audits
e692a748f6ed fixed compiler error
Author
• schroedt
Browse Repository
No Builds
No Audits
d3bec301caee Merge branch 'bug-12703-implement-a-2d-livewire-tool' into…
Author
• schroedt
Browse Repository
No Builds
No Audits
0d147c8d11cb merge branch bug-12704-implement-contourmodel
Author
• schroedt
Browse Repository
No Builds
No Audits
b133f3272809 fixed remove vertex after move
Author
• schroedt
Browse Repository
No Builds
No Audits
496dfa6f77b6 Merge branch 'bug-12703-implement-a-2d-livewire-tool' of mitk.org:MITK into bug…
Author
• schroedt
Browse Repository
No Builds
No Audits
c2f66a2a52d7 fixed some rendering stuff
Author
• schroedt
Browse Repository
No Builds
No Audits
ff1de48aafb9 fix bug after clicking in 3d window
Author
• schroedt
Browse Repository
No Builds
No Audits
2936e8996a48 renamed contourmodelelement to contourelement
Author
• schroedt
Browse Repository
No Builds
No Audits
44fdfb06b3c8 added statemachine and interactor to xml file. see bug 3701.
Author
• schroedt
Browse Repository
No Builds
No Audits
b5685ae42a58 inverted interaction
Author
• schroedt
Browse Repository
No Builds
No Audits
c64ba993d816 fix cost function
Author
• schroedt
Browse Repository
No Builds
No Audits
c1279e0afc82 removed performance test
Author
• schroedt
Browse Repository
No Builds
No Audits
907dd82b83af add with ctrl to avoid use of dynamic costs
Author
• schroedt
Browse Repository
No Builds
No Audits
f02428e5e567 fix list of contours
Author
• schroedt
Browse Repository
No Builds
No Audits
2722a1c46827 fix requested region
Author
• schroedt
Browse Repository
No Builds
No Audits
a6949f5bb7f0 do not use dynamic costs if ctrl+mousemove
Author
• schroedt
Browse Repository
No Builds
No Audits
2f369a357b1a *temporarly* check for duplicate points
Author
• schroedt
Browse Repository
No Builds
No Audits
98e132bcf8aa map initial click to highest gradient magn. in region 5x5
Author
• schroedt
Browse Repository
No Builds
No Audits
bd6bceb60509 fixed click in other slices
Author
• schroedt
Browse Repository
No Builds
No Audits
c9c2ac6fdca2 some documentation
Author
• schroedt
Browse Repository
No Builds
No Audits
4a0d85aa8bc9 put gaussian approximation in static member function
Author
• schroedt
Browse Repository
No Builds
No Audits
6e6befffdade *temporarly* always update dynamic cost map
Author
• schroedt
Browse Repository
No Builds
No Audits
dc077768287a fixed timestep support for livewire tool
Author
• schroedt
Browse Repository
No Builds
No Audits
d04e0f0ba7cd make segmentation after deactivating tool
Author
• schroedt
Browse Repository
No Builds
No Audits
daf7b0a2630d added function to get image as 2D slice by plane geometry plus timestep
Author
• schroedt
Browse Repository
No Builds
No Audits
e2782b0cc982 no boundingbox update for 2D geometries
Author
• schroedt
Browse Repository
No Builds
No Audits
a14795ac79a0 remove nodes on deactivation of tool
Author
• schroedt
Browse Repository
No Builds
No Audits
5ac459ac34e6 fixed requested region bug
Author
unknown <schroedt@.inet.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
f8c8d29215b7 fix cost map bug
Author
unknown <schroedt@.inet.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
5286af50381c finish tool on deactivation
Author
• schroedt
Browse Repository
No Builds
No Audits
b9ca2e31d3b2 scale bins by enum constant
Author
• schroedt
Browse Repository
No Builds
No Audits
1ea356c2a617 remove duplicate vertex
Author
• schroedt
Browse Repository
No Builds
No Audits
03d4431bdd2e take nearest active point in approximate nearest neighbour search
Author
• schroedt
Browse Repository
No Builds
No Audits
a9ade2b298f1 handle deactivating tool properly
Author
• schroedt
Browse Repository
No Builds
No Audits
2be804695e58 use dynamic cost map for livewire tool
Author
• schroedt
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

Packages

Core/

Code/

Resources/

Interactions/

Legacy/

StateMachine.xml

Modules/

CMakeLists.txt

GraphAlgorithms/

files.cmake

itkShortestPathCostFunctionLiveWire.h

itkShortestPathCostFunctionLiveWire.txx

itkShortestPathImageFilter.h

itkShortestPathImageFilter.txx

Segmentation/

Algorithms/

mitkImageLiveWireContourModelFilter.cpp

O1: MITK Reviewer Group I

mitkImageLiveWireContourModelFilter.h

O1: MITK Reviewer Group I

mitkImageToContourModelFilter.cpp

O1: MITK Reviewer Group I

	mitkImageToContourModelFilter.h
	mitkContourModelToSurfaceFilter.h

O1: MITK Reviewer Group I

mitkImageToLiveWireContourFilter.cpp

O1: MITK Reviewer Group I

	mitkImageToLiveWireContourFilter.h
	mitkContourModelSubDivisionFilter.h

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

DataManagement/

mitkContourElement.cpp

O1: MITK Reviewer Group I

Interactions/

mitkContourModelLiveWireInteractor.cpp

O1: MITK Reviewer Group I

mitkContourModelLiveWireInteractor.h

O1: MITK Reviewer Group I

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

mitkLiveWireTool2D.h

O1: MITK Reviewer Group I

mitkLiveWireTool2D.xpm

O1: MITK Reviewer Group I

mitkSegTool2D.cpp

O1: MITK Reviewer Group I

mitkSegTool2D.h

O1: MITK Reviewer Group I

Rendering/

mitkContourModelGLMapper2D.cpp

O1: MITK Reviewer Group I

mitkContourModelMapper3D.cpp

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.segmentation/

documentation/

UserManual/

org_mitk_gui_qt_segmentation.dox

O1: MITK Reviewer Group I

org_mitk_gui_qt_segmentationIMGLiveWireUsage.PNG

O1: MITK Reviewer Group I

org_mitk_gui_qt_segmentationIMGiconLiveWire.png

O1: MITK Reviewer Group I

src/

internal/

QmitkSegmentationView.cpp

O1: MITK Reviewer Group I

rMITKe91373d026d5

View Options

Core/Code/Resources/Interactions/Legacy/StateMachine.xml

View Options

Modules/CMakeLists.txt

View Options

Modules/GraphAlgorithms/files.cmake

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunctionLiveWire.h

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunctionLiveWire.txx

View Options

Modules/GraphAlgorithms/itkShortestPathImageFilter.h

View Options

Modules/GraphAlgorithms/itkShortestPathImageFilter.txx

View Options

Modules/Segmentation/Algorithms/mitkImageLiveWireContourModelFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkImageLiveWireContourModelFilter.h

View Options

Modules/Segmentation/Algorithms/mitkImageToContourModelFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkImageToContourModelFilter.h

View Options

Modules/Segmentation/Algorithms/mitkImageToLiveWireContourFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkImageToLiveWireContourFilter.h

View Options

Modules/Segmentation/CMakeLists.txt

View Options

Modules/Segmentation/DataManagement/mitkContourElement.cpp

View Options

Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp

View Options

Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.h

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.xpm

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.h

View Options

Modules/Segmentation/Rendering/mitkContourModelGLMapper2D.cpp

View Options

Modules/Segmentation/Rendering/mitkContourModelMapper3D.cpp

View Options

Modules/Segmentation/files.cmake

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGLiveWireUsage.PNG

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconLiveWire.png

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

Merge branch 'bug-12703-LiveWire-Tool-Integration'e91373d026d5Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

rMITKe91373d026d5

Core/Code/Resources/Interactions/Legacy/StateMachine.xml

Modules/CMakeLists.txt

Modules/GraphAlgorithms/files.cmake

Modules/GraphAlgorithms/itkShortestPathCostFunctionLiveWire.h

Modules/GraphAlgorithms/itkShortestPathCostFunctionLiveWire.txx

Modules/GraphAlgorithms/itkShortestPathImageFilter.h

Modules/GraphAlgorithms/itkShortestPathImageFilter.txx

Modules/Segmentation/Algorithms/mitkImageLiveWireContourModelFilter.cpp

Modules/Segmentation/Algorithms/mitkImageLiveWireContourModelFilter.h

Modules/Segmentation/Algorithms/mitkImageToContourModelFilter.cpp

Modules/Segmentation/Algorithms/mitkImageToContourModelFilter.h

Modules/Segmentation/Algorithms/mitkImageToLiveWireContourFilter.cpp

Modules/Segmentation/Algorithms/mitkImageToLiveWireContourFilter.h

Modules/Segmentation/CMakeLists.txt

Modules/Segmentation/DataManagement/mitkContourElement.cpp

Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp

Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.h

Modules/Segmentation/Interactions/mitkLiveWireTool2D.xpm

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

Modules/Segmentation/Interactions/mitkSegTool2D.h

Modules/Segmentation/Rendering/mitkContourModelGLMapper2D.cpp

Modules/Segmentation/Rendering/mitkContourModelMapper3D.cpp

Modules/Segmentation/files.cmake

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGLiveWireUsage.PNG

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconLiveWire.png

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

Merge branch 'bug-12703-LiveWire-Tool-Integration'
e91373d026d5
Actions