Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into…
c0dc552e80b7
Actions

Description

Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into bug-16272-qt5-build-system

Conflicts:
Applications/mitkDiffusion/CMakeLists.txt
Applications/mitkWorkbench/CMakeLists.txt
CMake/mitkMacroCreateModule.cmake
CMake/mitkMacroCreateModuleTests.cmake
CMake/mitkMacroUseModule.cmake
Core/Code/DataManagement/mitkTimeSlicedGeometry.cpp
Examples/Overlays/CMakeLists.txt
Examples/Tutorial/CMakeLists.txt
Modules/CMakeLists.txt
Modules/DicomUI/CMakeLists.txt
Modules/IGT/IGTTutorial/CMakeLists.txt
Modules/OpenCVVideoSupport/UI/CMakeLists.txt
Modules/Overlays/CMakeLists.txt
Modules/Qmitk/CMakeLists.txt
Modules/QmitkExt/files.cmake
README.md

Details

Provenance

zelzer

Authored on Jan 8 2014, 3:12 AM

Parents

rMITK45aaac8201e4: Use the new mitk_create_executable() macro for the tutorial.
rMITK9577a2a7ad75: Added missing export macro.

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITKc0dc552e80b7: Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into… (authored by zelzer).Jan 8 2014, 3:12 AM

Merged Changes

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

9577a2a7ad75 Added missing export macro.
Author
zelzer
Browse Repository
No Builds
No Audits
e7b491c459c9 COMP: avoid unused private field warning.
Author
zelzer
Browse Repository
No Builds
No Audits
2e753f1737b3 COMP: Avoid uninitialized usage warnings.
Author
zelzer
Browse Repository
No Builds
No Audits
87b0ddf82a5b COMP: Use correct export macro.
Author
zelzer
Browse Repository
No Builds
No Audits
daab74fd35d3 COMP: Another Windows compiler fix.
Author
zelzer
Browse Repository
No Builds
No Audits
11e7202874cc COMP: Do not treat strict-overflow warnings as errors.
Author
zelzer
Browse Repository
No Builds
No Audits
c1f466aa445a COMP: Removed unneeded CppUnit dependency.
Author
zelzer
Browse Repository
No Builds
No Audits
a42f87ae4a1e COMP: Make the Windows parser happy
Author
zelzer
Browse Repository
No Builds
No Audits
ae4ccbf0f0fd Restored semantics prior to MitkExt removal.
Author
zelzer
Browse Repository
No Builds
No Audits
f663a8a40c1a Use MITK-Data for test data in ImageStatisticsCalculator test.
Author
zelzer
Browse Repository
No Builds
No Audits
f95f7ccb1b6b Extracted some more classes from the MitkExt module.
Author
zelzer
Browse Repository
No Builds
No Audits
ac6c8ec88d99 Fixed CMake variable expansion.
Author
zelzer
Browse Repository
No Builds
No Audits
095835f7eabe Reworked module deprecated warnings to remove duplicates.
Author
zelzer
Browse Repository
No Builds
No Audits
41b0b2bb5bf8 Fixed compiler warning about non-virtual destructor.
Author
zelzer
Browse Repository
No Builds
No Audits
33aa4b857dc1 Reverted to original download location.
Author
zelzer
Browse Repository
No Builds
No Audits
ecfede62c4cb Fixed possible dependency cycle with auto-loaded modules and their meta-targets.
Author
zelzer
Browse Repository
No Builds
No Audits
81a7d9a45469 Added an auto-loaded IpPicSupportIO module and marked IpPicSupport deprecated.
Author
zelzer
Browse Repository
No Builds
No Audits
92780d53a1d5 Fixed bug introduced during the VTK6 migration.
Author
zelzer
Browse Repository
No Builds
No Audits
9d27020d8f9c Added new modules based on MitkExt. MitkExt is now deprecated.
Author
zelzer
Browse Repository
No Builds
No Audits
ad5f77a1dee5 Merge remote-tracking branch 'origin/bug-14492…
Author
zelzer
Browse Repository
No Builds
No Audits
cace7ee7ddb4 Clean up the AffineDataInteractor3D and correcting spelling errors in the…
Author
• metzger
Browse Repository
No Builds
No Audits
22a752d9b23a Including the new DataInteractor in the ClippingPlaneDeformationTool.
Author
• metzger
Browse Repository
No Builds
No Audits
d3a62fb97899 Finished migration of the SurfaceDeformationInteractor to new concept. Fixed…
Author
• metzger
Browse Repository
No Builds
No Audits
ba84d0785c31 Add MouseWheelEvent to StateMachine of the AffineInteraction3D and in…
Author
• metzger
Browse Repository
No Builds
No Audits
6efb0efd0408 Integration changes: TimeSlicedGeometry is replaced by TimeGeometry ScalarType…
Author
• metzger
Browse Repository
No Builds
No Audits
f7af2929b6ab Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept-Integration…
Author
• metzger
Browse Repository
No Builds
No Audits
824f88e4f97c COMP: Merge branch 'bug-16640-cppmicroservices-service-hooks'
Author
nolden
Browse Repository
No Builds
No Audits
4fb7449a31aa Adapt new module registry interface
Author
nolden
Browse Repository
No Builds
No Audits
6f9dea9a8b39 Merge commit 'eb5cc551ee579093bcdd867307bc28c4d504309a' into bug-16640…
Author
zelzer
Browse Repository
No Builds
No Audits
eb5cc551ee57 Squashed 'Core/CppMicroServices/' changes from 3019383..98ceb17
Author
zelzer
Browse Repository
No Builds
No Audits
cf1874c94855 Merge branch 'bug-16640-cppmicroservices-service-hooks'
Author
zelzer
Browse Repository
No Builds
No Audits
b3b61912b8d8 Merge commit 'daa14309739e58005a0efaf69649d14e52982111' into bug-16640…
Author
zelzer
Browse Repository
No Builds
No Audits
daa14309739e Squashed 'Core/CppMicroServices/' changes from 15b6fc3..3019383
Author
zelzer
Browse Repository
No Builds
No Audits
cc7d4dcfe34b Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'
Author
zelzer
Browse Repository
No Builds
No Audits
86997fa79860 COMP: prevent commented test from being used for setting properties.
Author
zelzer
Browse Repository
No Builds
No Audits
8082015dd971 Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'
Author
zelzer
Browse Repository
No Builds
No Audits
d83ba2668080 COMP: Temporarily disabled four rendering tests
Author
zelzer
Browse Repository
No Builds
No Audits
ea4703a41f68 COMP: Avoid premature deletion of the vtkMarchingCubes instance.
Author
zelzer
Browse Repository
No Builds
No Audits
69acc0e39a6e COMP: Use a pipeline connection for the stencil.
Author
zelzer
Browse Repository
No Builds
No Audits
a58094c28890 Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'
Author
zelzer
Browse Repository
No Builds
No Audits
daccef65a4f3 COMP: Always add resources, even if NO_INIT is given.
Author
zelzer
Browse Repository
No Builds
No Audits
15ffd83ad043 Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'
Author
zelzer
Browse Repository
No Builds
No Audits
72dedc835e49 COMP: Fix static initialization order problem with VTK6.
Author
zelzer
Browse Repository
No Builds
No Audits
f993906b3bb0 Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'
Author
• kolbch
Browse Repository
No Builds
No Audits
f47f8a44ae99 COMP: change ACDV cmake version to 2.8.5
Author
• kolbch
Browse Repository
No Builds
No Audits
857661e3b18d Merge branch 'bug-16325-fix-mbi-cppunit'
Author
nolden
Browse Repository
No Builds
No Audits
0835af5212fd COMP: add CppUnit as Core dependency
Author
nolden
Browse Repository
No Builds
No Audits
c3c1a06ae26d Removed vtk 5.10 patch which is no longer neccessary for vtk 6.x
Author
• fetzer
Browse Repository
No Builds
No Audits
71415061b756 Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'
Author
• kolbch
Browse Repository
No Builds
No Audits
d8779ffb21d4 Merge branch 'bug-16628-missing-dicom-table-view-update'
Author
• fetzer
Browse Repository
No Builds
No Audits

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.

Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into…c0dc552e80b7Actions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into…
c0dc552e80b7
Actions