Diffusion MITK 346320914c20

Merge remote branch 'remotes/origin/bug-7802-planarfigure-shadow' into…
346320914c20
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote branch 'remotes/origin/bug-7802-planarfigure-shadow' into releases/snapshot-201105-preparation

Details

Provenance

Authored on May 13 2011, 7:24 PM

Parents

rMITK52c0fe9b485b: Merge branch 'bug-8048-snapshot-integration' into releases/snapshot-201105…
rMITK90df6626401f: renamed member and using given parameter instead of member for shadow-width

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK346320914c20: Merge remote branch 'remotes/origin/bug-7802-planarfigure-shadow' into… (authored by maleike).May 13 2011, 7:24 PM

Merged Changes

90df6626401f renamed member and using given parameter instead of member for shadow-width
Author
engelm
Browse Repository
No Builds
No Audits
dfd5052755af made width of planarfigure shadow configurable
Author
engelm
Browse Repository
No Builds
No Audits
de1478c6949f extended documentation on painting planar figures with a shadow
Author
engelm
Browse Repository
No Builds
No Audits
cb1fbfda8994 adding possibility to draw shadow around planar figure
Author
engelm
Browse Repository
No Builds
No Audits
9f36b292af3d Merge branch 'bug-7789-FailingTestsOnDashBoard'
Author
• mersmann
Browse Repository
No Builds
No Audits
2794ac4ce6ef COMP: changed failing tests, the cmake configuration did not set the processing…
Author
• mersmann
Browse Repository
No Builds
No Audits
35327fafbddc Merge branch 'bug-7788-mitkMovieGeneratorOpenCV_does_not_compile_on_OSX'
Author
reicht
Browse Repository
No Builds
No Audits
8005beaf2a23 COMP: fixed mitkGL.h path bug
Author
reicht
Browse Repository
No Builds
No Audits
664fe9ed47b2 Merge branch 'bug-7788-mitkMovieGeneratorOpenCV_does_not_compile_on_OSX'
Author
reicht
Browse Repository
No Builds
No Audits
2eafd71b8edf modified include path for gl.h cuz on OSX previous given path does not exist.
Author
reicht
Browse Repository
No Builds
No Audits
15189056390c Merge branch 'bug-7441-planarpolygon-editing-corrected'
Author
engelm
Browse Repository
No Builds
No Audits
17e85e4f7527 Merge branch 'bug-7441-planarpolygon-editing-corrected'
Author
engelm
Browse Repository
No Builds
No Audits
4966bc0ea6c1 Merge branch 'bug-7441-planarpolygon-editing-corrected'
Author
engelm
Browse Repository
No Builds
No Audits
1d9e8b5490b2 Merge branch 'bug-7741-fixLinuxErrors'
Author
franza
Browse Repository
No Builds
No Audits
3ff59421ad6a COMP (#7741): Fixed a bug in NavigationDataRecorder which caused the test to…
Author
franza
Browse Repository
No Builds
No Audits
761c12a379ea Merge branch 'bug-7741-fixLinuxErrors'
Author
franza
Browse Repository
No Builds
No Audits
dda42c63dad9 COMP (#7741): removed sleep command which was not necessary after flush
Author
franza
Browse Repository
No Builds
No Audits
1cec1b9bad2c Merge branch 'bug-7748-superbuild-does-not-work-with-mingw'
Author
zelzer
Browse Repository
No Builds
No Audits
2d69645e6569 Adapt CMake build options for MinGW builds of ITK and VTK.
Author
zelzer
Browse Repository
No Builds
No Audits
c09fd3d0c589 Link ssp (stack smash protection) lib on MinGW systems.
Author
zelzer
Browse Repository
No Builds
No Audits
98c4879aa9f6 Merge branch 'bug-6517-mitk-superbuild'
Author
zelzer
Browse Repository
No Builds
No Audits
c481cb5fee58 Create MITK_CMAKE_${type}_OUTPUT_DIRECTORY dirs and pass through superbuild
Author
zelzer
Browse Repository
No Builds
No Audits
4e81f78b925b Merge branch 'bug-7741-IGTTrackingToolboxNewFeatures'
Author
franza
Browse Repository
No Builds
No Audits
a95a1a8f4b16 added new features to tracking toolbox: updated rate / improved logging
Author
franza
Browse Repository
No Builds
No Audits
1046db998cc5 fixed a bug and added new features in NavigationDataRecorder
Author
franza
Browse Repository
No Builds
No Audits
dd95b63f1164 Merge branch 'bug-7441-planarpolygon-editing-corrected'
Author
engelm
Browse Repository
No Builds
No Audits
56aa44851bfe Merge branch 'bug-7733-cpack-macos'
Author
nolden
Browse Repository
No Builds
No Audits
a439a8a1801f Include globbed plugins in CPack installer fixup step
Author
nolden
Browse Repository
No Builds
No Audits
c6ce9b007045 Merge branch 'bug-6517-mitk-superbuild'
Author
zelzer
Browse Repository
No Builds
No Audits
d8ccc4f8c39c Tell ctest to use correct project names (sln files) for superbuild
Author
zelzer
Browse Repository
No Builds
No Audits
9f90efec37e1 Merge branch 'bug-7210-DICOMlocaleReopened'
Author
maleike
Browse Repository
No Builds
No Audits
3d2ac8754c78 Merge branch 'bug-7733-cpack-macos'
Author
nolden
Browse Repository
No Builds
No Audits
9fcac9113be2 Proper search path and initialization of variables for CPack
Author
nolden
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Packages

BlueBerry/

CMake/

MacroCreatePlugin.cmake

CMake/

MITKDashboardDriverScript.cmake

O1: MITK Reviewer Group I

mitkMacroCreateModule.cmake

O1: MITK Reviewer Group I

mitkMacroInstall.cmake

O1: MITK Reviewer Group I

mitkMacroInstallTargets.cmake

O1: MITK Reviewer Group I

CMakeExternals/

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

CTestConfig.cmake

O1: MITK Reviewer Group I

Modules/

Bundles/

org.mitk.gui.qt.igttrackingtoolbox/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

IGT/

IGTFilters/

mitkNavigationDataRecorder.cpp

mitkNavigationDataRecorder.h

OpenCVVideoSupport/

mitkMovieGeneratorOpenCV.cpp

ToFHardware/

Testing/

mitkToFCameraPMDPlayerControllerTest.cpp

mitkToFCameraPMDPlayerDeviceTest.cpp

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITK346320914c20

BlueBerry/CMake/MacroCreatePlugin.cmake

Loading...

CMake/MITKDashboardDriverScript.cmake

Loading...

CMake/mitkMacroCreateModule.cmake

Loading...

CMake/mitkMacroInstall.cmake

Loading...

CMake/mitkMacroInstallTargets.cmake

Loading...

CMakeExternals/ITK.cmake

Loading...

CMakeExternals/VTK.cmake

Loading...

CMakeLists.txt

Loading...

CTestConfig.cmake

Loading...

Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Loading...

Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxView.h

Loading...

Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Loading...

Modules/IGT/IGTFilters/mitkNavigationDataRecorder.cpp

Loading...

Modules/IGT/IGTFilters/mitkNavigationDataRecorder.h

Loading...

Modules/OpenCVVideoSupport/mitkMovieGeneratorOpenCV.cpp

Loading...

Modules/ToFHardware/Testing/mitkToFCameraPMDPlayerControllerTest.cpp

Loading...

Modules/ToFHardware/Testing/mitkToFCameraPMDPlayerDeviceTest.cpp

Loading...

SuperBuild.cmake

Loading...