Merge branch 'releases/snapshot-201105-preparation' into bug-7285-ensure…
9168c6df4b5c
Actions

Description

Merge branch 'releases/snapshot-201105-preparation' into bug-7285-ensure-correct-slice-positions

Details

Provenance

Authored on Apr 26 2011, 5:16 PM

Parents

rMITK7670c46bbf05: Merge branch 'bug-7700-integrate-bug-7802-planarfigure-shadow' into…
rMITK5bb20db03203: Merge branch 'bug-7210-DICOMlocaleReopened' into bug-7285-ensure-correct…

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK9168c6df4b5c: Merge branch 'releases/snapshot-201105-preparation' into bug-7285-ensure… (authored by maleike).Apr 26 2011, 5:16 PM

Merged Changes

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

7670c46bbf05 Merge branch 'bug-7700-integrate-bug-7802-planarfigure-shadow' into…
Author
maleike
Browse Repository
No Builds
No Audits
cecb93414aa9 renamed member and using given parameter instead of member for shadow-width
Author
engelm
Browse Repository
No Builds
No Audits
40876704f890 made width of planarfigure shadow configurable
Author
engelm
Browse Repository
No Builds
No Audits
94abd26a7b4e Merge branch 'bug-7700-integrate-bug-7802-planarfigure-shadow' into…
Author
maleike
Browse Repository
No Builds
No Audits
9c073cbac261 extended documentation on painting planar figures with a shadow
Author
engelm
Browse Repository
No Builds
No Audits
f61d2875d3bb adding possibility to draw shadow around planar figure
Author
engelm
Browse Repository
No Builds
No Audits
b1dadeece1f7 Merge branch 'bug-7700-integrate-bug-7807-planararrow-tip-size' into…
Author
maleike
Browse Repository
No Builds
No Audits
ccf095f74928 improved checking if Helperpolylines need to be recalculated
Author
engelm
Browse Repository
No Builds
No Audits
5942886caea7 always calculating the HelperLines
Author
engelm
Browse Repository
No Builds
No Audits
e81f343889b4 Merge remote branch 'remotes/origin/bug-7619-replace-world-to-index-calls' into…
Author
maleike
Browse Repository
No Builds
No Audits
1bf9e834f762 Merge remote branch 'remotes/origin/bug-7634-unittest-planarpolygon' into…
Author
maleike
Browse Repository
No Builds
No Audits
f1d013bd09fd Merge branch 'bug-7441-planarpolygon-editing-corrected' into releases/snapshot…
Author
engelm
Browse Repository
No Builds
No Audits
98204fd200b5 extending documentation on editing of PlanarPolygons
Author
engelm
Browse Repository
No Builds
No Audits
b6b33bfa1075 improving planarpolygon unittest to check new editing features
Author
engelm
Browse Repository
No Builds
No Audits
d43f49b9c563 Merge branch 'bug-7633-planarfigure-statemachine-add-control-point' into…
Author
engelm
Browse Repository
No Builds
No Audits
553c2d16f8a9 adding statemachine that has been lost in merging
Author
engelm
Browse Repository
No Builds
No Audits
0c8a79f3bb87 Merge branch 'bug-7441-planarpolygon-editing-corrected' into releases/snapshot…
Author
engelm
Browse Repository
No Builds
No Audits
35ec16f35a72 improving determining if inserting new points in ROI is possible
Author
engelm
Browse Repository
No Builds
No Audits
326b047ac66c Merge branch 'bug-7441-planarpolygon-editing-corrected' into releases/snapshot…
Author
engelm
Browse Repository
No Builds
No Audits
d30a780ad67b removing unnecessary line that causes recursion
Author
engelm
Browse Repository
No Builds
No Audits
50d5067ff8d3 Merge branch 'bug-7441-planarpolygon-editing-corrected' into releases/snapshot…
Author
engelm
Browse Repository
No Builds
No Audits
e9885b20568d fixing changes from review, removed old, commented or unncessary code
Author
engelm
Browse Repository
No Builds
No Audits
1910c6ff07d4 Merge branch 'bug-7441-planarpolygon-editing-corrected' into releases/snapshot…
Author
engelm
Browse Repository
No Builds
No Audits
b75ce2d1d015 correcting default property value for planarfigure interaction
Author
engelm
Browse Repository
No Builds
No Audits
a043951bdef2 Merge branch 'bug-7210-DICOMlocaleReopened' into releases/snapshot-201105…
Author
maleike
Browse Repository
No Builds
No Audits
c8295d222aef Merge branch 'bug-6517-mitk-superbuild'
Author
zelzer
Browse Repository
No Builds
No Audits
3a23e4fdc74e Make CMAKE_C*_FLAGS variable cache entries
Author
zelzer
Browse Repository
No Builds
No Audits
2d5aedf38c0a Merge branch 'bug-7103-include-thickslice-options-in-diffusion-imaging…
Author
fritzsck
Browse Repository
No Builds
No Audits
286570d63408 Merge branch 'bug-3672-ParRecFileReaderLocaleIndependent2'
Author
kislinsk
Browse Repository
No Builds
No Audits
ab8b827b4051 Made ParRecFileReader locale independent.
Author
kislinsk
Browse Repository
No Builds
No Audits
02edb9e439e7 Merge branch 'bug-6677-CalculateGrayValueStatisticsToolLocaleIndependent'
Author
kislinsk
Browse Repository
No Builds
No Audits
2ab0a12e48e9 Merge branch 'bug-7104-extend-thickslice-rendering-capabilities'
Author
fritzsck
Browse Repository
No Builds
No Audits
7494fdc49793 In the classes - Geometry3D - PlaneGeometry3D - AbstractTransformGeometry the…
Author
• fetzer
Browse Repository
No Builds
No Audits
8590bc3aa5b5 Merge branch 'bug-7151-incorrectCalcOfIntersectionPoint_PlaneGeometry_fix'
Author
reicht
Browse Repository
No Builds
No Audits
5ed02e026955 Merge branch 'bug-7441-planarpolygon-editing-corrected'
Author
engelm
Browse Repository
No Builds
No Audits
7a40985035f8 Made mitkCalculateGrayValueStatisticsTool locale independent.
Author
kislinsk
Browse Repository
No Builds
No Audits
8c47e2ba458e Fix of incorrect intersectionpoint calculation in mitkPlaneGeometry. Enhanced…
Author
reicht
Browse Repository
No Builds
No Audits
efbb5b1194d8 Merge branch 'bug-6517-mitk-superbuild'
Author
zelzer
Browse Repository
No Builds
No Audits
5def2f4d4dd7 COMP: Added ctest drop site and project parameters
Author
zelzer
Browse Repository
No Builds
No Audits
a1f69ede1d7a disabling adding and removing of control points if 'iseditable' is false
Author
engelm
Browse Repository
No Builds
No Audits
982e4f085a81 Merge branch 'bug-7633-planarfigure-statemachine-add-control-point' into bug…
Author
engelm
Browse Repository
No Builds
No Audits
95b1ff10f848 Merge branch 'bug-7553-bla'
Author
muellerm
Browse Repository
No Builds
No Audits
d1d1a2a8b276 COMP: test comp commit
Author
muellerm
Browse Repository
No Builds
No Audits
556a3894234f Merge branch 'bug-7441-planarpolygon-editing-corrected'
Author
engelm
Browse Repository
No Builds
No Audits
64b6c5598664 Merge branch 'bug-7633-planarfigure-statemachine-add-control-point'
Author
engelm
Browse Repository
No Builds
No Audits
789ec85d782e PlanarFigureMapper can draw a preview of the control point that is to be added
Author
engelm
Browse Repository
No Builds
No Audits
aa985d5179ac PlanarFigureInteractor now supports inserting and deleting controlpoints
Author
engelm
Browse Repository
No Builds
No Audits
9b4ea5d2dc1e extended StateMachine.xml to support editing of PlanarFigures / Polygons
Author
engelm
Browse Repository
No Builds
No Audits
2a2681213f01 Merge branch 'bug-7628-planarFigure-tests-fail'
Author
engelm
Browse Repository
No Builds
No Audits
062c65430dc8 correcting test
Author
engelm
Browse Repository
No Builds
No Audits

Changes (51)

Path

Size

Packages

CMake/

MITKDashboardDriverScript.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Core/

Code/

Controllers/

mitkSlicesSwiveller.cpp

DataManagement/

mitkAbstractTransformGeometry.cpp

mitkAbstractTransformGeometry.h

mitkGeometry3D.cpp

mitkGeometry3D.h

mitkPlaneGeometry.cpp

mitkPlaneGeometry.h

mitkResliceMethodProperty.cpp

mitkSlicedGeometry3D.cpp

Interactions/

StateMachine.xml

mitkInteractionConst.h

Rendering/

mitkImageMapperGL2D.cpp

vtkMitkThickSlicesFilter.cpp

vtkMitkThickSlicesFilter.h

Testing/

mitkPlaneGeometryTest.cpp

CoreUI/

Bundles/

org.mitk.gui.qt.common/

resources/

StateMachine.xml

mitkEventAndActionConstants.xml

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

org.mitk.gui.qt.segmentation/

src/

internal/

QmitkSegmentationPostProcessing.cpp

MitkExt/

Algorithms/

mitkExtractDirectedPlaneImageFilter.cpp

mitkImageStatisticsCalculator.cpp

IO/

mitkParRecFileReader.cpp

Interactions/

mitkAffineInteractor3D.cpp

mitkCalculateGrayValueStatisticsTool.cpp

mitkSurfaceDeformationInteractor3D.cpp

PlanarFigure/

DataManagement/

mitkPlanarAngle.cpp

O1: MITK Reviewer Group I

mitkPlanarArrow.cpp

O1: MITK Reviewer Group I

mitkPlanarCircle.cpp

O1: MITK Reviewer Group I

mitkPlanarCircle.h

O1: MITK Reviewer Group I

mitkPlanarCross.cpp

O1: MITK Reviewer Group I

mitkPlanarFigure.cpp

O1: MITK Reviewer Group I

mitkPlanarFigure.h

O1: MITK Reviewer Group I

mitkPlanarFourPointAngle.cpp

O1: MITK Reviewer Group I

mitkPlanarLine.cpp

O1: MITK Reviewer Group I

mitkPlanarPolygon.cpp

O1: MITK Reviewer Group I

mitkPlanarPolygon.h

O1: MITK Reviewer Group I

mitkPlanarRectangle.cpp

O1: MITK Reviewer Group I

IO/

mitkPlanarFigureWriter.cpp

O1: MITK Reviewer Group I

Interactions/

mitkPlanarFigureInteractor.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureInteractor.h

O1: MITK Reviewer Group I

Rendering/

mitkPlanarFigureMapper2D.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureMapper2D.h

O1: MITK Reviewer Group I

Testing/

mitkPlanarArrowTest.cpp

O1: MITK Reviewer Group I

mitkPlanarCrossTest.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureIOTest.cpp

O1: MITK Reviewer Group I

mitkPlanarPolygonTest.cpp

O1: MITK Reviewer Group I

QmitkExt/

QmitkVtkLineProfileWidget.cpp

rMITK9168c6df4b5c

View Options

CMake/MITKDashboardDriverScript.cmake

View Options

CMakeLists.txt

View Options

Core/Code/Controllers/mitkSlicesSwiveller.cpp

View Options

Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp

View Options

Core/Code/DataManagement/mitkAbstractTransformGeometry.h

View Options

Core/Code/DataManagement/mitkGeometry3D.cpp

View Options

Core/Code/DataManagement/mitkGeometry3D.h

View Options

Core/Code/DataManagement/mitkPlaneGeometry.cpp

View Options

Core/Code/DataManagement/mitkPlaneGeometry.h

View Options

Core/Code/DataManagement/mitkResliceMethodProperty.cpp

View Options

Core/Code/DataManagement/mitkSlicedGeometry3D.cpp

View Options

Core/Code/Interactions/StateMachine.xml

View Options

Core/Code/Interactions/mitkInteractionConst.h

View Options

Core/Code/Rendering/mitkImageMapperGL2D.cpp

View Options

Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp

View Options

Core/Code/Rendering/vtkMitkThickSlicesFilter.h

View Options

Core/Code/Testing/mitkPlaneGeometryTest.cpp

View Options

CoreUI/Bundles/org.mitk.gui.qt.common/resources/StateMachine.xml

View Options

CoreUI/Bundles/org.mitk.gui.qt.common/resources/mitkEventAndActionConstants.xml

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

View Options

Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.cpp

View Options

Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilter.cpp

View Options

Modules/MitkExt/Algorithms/mitkImageStatisticsCalculator.cpp

View Options

Modules/MitkExt/IO/mitkParRecFileReader.cpp

View Options

Modules/MitkExt/Interactions/mitkAffineInteractor3D.cpp

View Options

Modules/MitkExt/Interactions/mitkCalculateGrayValueStatisticsTool.cpp

View Options

Modules/MitkExt/Interactions/mitkSurfaceDeformationInteractor3D.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarArrow.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.h

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarCross.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.h

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarLine.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.h

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.cpp

View Options

Modules/PlanarFigure/IO/mitkPlanarFigureWriter.cpp

View Options

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.h

View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp

View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.h

View Options

Modules/PlanarFigure/Testing/mitkPlanarArrowTest.cpp

View Options

Modules/PlanarFigure/Testing/mitkPlanarCrossTest.cpp

View Options

Modules/PlanarFigure/Testing/mitkPlanarFigureIOTest.cpp

View Options

Modules/PlanarFigure/Testing/mitkPlanarPolygonTest.cpp

View Options

Modules/QmitkExt/QmitkVtkLineProfileWidget.cpp

Merge branch 'releases/snapshot-201105-preparation' into bug-7285-ensure…9168c6df4b5cActions

Description

Details

Event Timeline

Merged Changes

Changes (51)

rMITK9168c6df4b5c

CMake/MITKDashboardDriverScript.cmake

CMakeLists.txt

Core/Code/Controllers/mitkSlicesSwiveller.cpp

Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp

Core/Code/DataManagement/mitkAbstractTransformGeometry.h

Core/Code/DataManagement/mitkGeometry3D.cpp

Core/Code/DataManagement/mitkGeometry3D.h

Core/Code/DataManagement/mitkPlaneGeometry.cpp

Core/Code/DataManagement/mitkPlaneGeometry.h

Core/Code/DataManagement/mitkResliceMethodProperty.cpp

Core/Code/DataManagement/mitkSlicedGeometry3D.cpp

Core/Code/Interactions/StateMachine.xml

Core/Code/Interactions/mitkInteractionConst.h

Core/Code/Rendering/mitkImageMapperGL2D.cpp

Core/Code/Rendering/vtkMitkThickSlicesFilter.cpp

Core/Code/Rendering/vtkMitkThickSlicesFilter.h

Core/Code/Testing/mitkPlaneGeometryTest.cpp

CoreUI/Bundles/org.mitk.gui.qt.common/resources/StateMachine.xml

CoreUI/Bundles/org.mitk.gui.qt.common/resources/mitkEventAndActionConstants.xml

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.cpp

Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilter.cpp

Modules/MitkExt/Algorithms/mitkImageStatisticsCalculator.cpp

Modules/MitkExt/IO/mitkParRecFileReader.cpp

Modules/MitkExt/Interactions/mitkAffineInteractor3D.cpp

Modules/MitkExt/Interactions/mitkCalculateGrayValueStatisticsTool.cpp

Modules/MitkExt/Interactions/mitkSurfaceDeformationInteractor3D.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarArrow.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.h

Modules/PlanarFigure/DataManagement/mitkPlanarCross.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.h

Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarLine.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.h

Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.cpp

Modules/PlanarFigure/IO/mitkPlanarFigureWriter.cpp

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.h

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.h

Modules/PlanarFigure/Testing/mitkPlanarArrowTest.cpp

Modules/PlanarFigure/Testing/mitkPlanarCrossTest.cpp

Modules/PlanarFigure/Testing/mitkPlanarFigureIOTest.cpp

Modules/PlanarFigure/Testing/mitkPlanarPolygonTest.cpp

Modules/QmitkExt/QmitkVtkLineProfileWidget.cpp

Merge branch 'releases/snapshot-201105-preparation' into bug-7285-ensure…
9168c6df4b5c
Actions