Diffusion MITK 1e2828b5ecd3

Merge branch 'bug-11950-RedesignMeasurementToolBox'
1e2828b5ecd3
Actions

Description

Merge branch 'bug-11950-RedesignMeasurementToolBox'

Conflicts:
Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml

Details

Provenance

muellerm

Authored on Jun 13 2012, 12:58 PM

Parents

rMITK209a26865adf: deactivatin actions menu while a new planar figure is initialized
rMITK9ae1e9ddbeac: Merge branch 'bug-12088-documentation-for-3D-interpolation'

Branches

Unknown

Tags

Unknown

Event Timeline

muellerm committed rMITK1e2828b5ecd3: Merge branch 'bug-11950-RedesignMeasurementToolBox' (authored by muellerm).Jun 13 2012, 12:58 PM

Merged Changes

209a26865adf deactivatin actions menu while a new planar figure is initialized
Author
muellerm
Browse Repository
No Builds
No Audits
70d83bde5fa6 made planarfigureinteractor in both statemachine.xml files consistent…
Author
muellerm
Browse Repository
No Builds
No Audits
6dde0cf1c663 reworked measurement view still interactor issues: - all polyline planarfigure…
Author
muellerm
Browse Repository
No Builds
No Audits
4c4880631cda further reworking of measurement toolbox still todo: - add button…
Author
muellerm
Browse Repository
No Builds
No Audits
ffd53f04f302 conflict resolved for measurement view
Author
muellerm
Browse Repository
No Builds
No Audits
07eff2f50d2e added request update for renderwindows
Author
Diana Wald <d.wald@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
fcb76c33a8a4 start restructuring measurement view
Author
Diana Wald <d.wald@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

Packages

Modules/

PlanarFigure/

Interactions/

mitkPlanarFigureInteractor.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.application/

resources/

StateMachine.xml

O1: MITK Reviewer Group I

	StateMachine.xml.orig
	StateMachine.xml

O1: MITK Reviewer Group I

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkMeasurementView.cpp

O1: MITK Reviewer Group I

QmitkMeasurementView.h

O1: MITK Reviewer Group I

rMITK1e2828b5ecd3

View Options

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml

View Options

Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml.orig

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.h

Merge branch 'bug-11950-RedesignMeasurementToolBox'1e2828b5ecd3Actions

Description

Details

Event Timeline

Merged Changes

Changes (5)

rMITK1e2828b5ecd3

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml

Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml.orig

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.h

Merge branch 'bug-11950-RedesignMeasurementToolBox'
1e2828b5ecd3
Actions