Diffusion MITK f485c71dde0b

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
f485c71dde0b
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept

Details

Provenance

Authored on Feb 14 2013, 10:40 AM

Parents

rMITKc540c043062f: Merge branch 'bug-13037-MigrationAffineInteractor3DToNewConcept' into bug…
rMITKb6b4c0adb2b6: Merge branch 'bug-14355-embedding-resources-in-modules'

Branches

Unknown

Tags

Unknown

Event Timeline

• metzger committed rMITKf485c71dde0b: Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept (authored by • metzger).Feb 14 2013, 10:40 AM

Merged Changes

b6b4c0adb2b6 Merge branch 'bug-14355-embedding-resources-in-modules'
Author
zelzer
Browse Repository
No Builds
No Audits
9d6e8c3fe568 Include the CppMicroServices CMake config file to set-up all variables.
Author
zelzer
Browse Repository
No Builds
No Audits
b8f861d6ce1d Use an absolute path to the usResourceCompiler in the CMake macro.
Author
zelzer
Browse Repository
No Builds
No Audits
6cdbdeb8ef5d Merge branch 'bug-13664-RedesignInteraction-Integration-4'
Author
• webechr
Browse Repository
No Builds
No Audits
07a6dfe43a58 Changed Qt::MiddleButton to Qt::MidButton in order to retain compatibility with…
Author
• webechr
Browse Repository
No Builds
No Audits
b6990c576341 Merge branch 'bug-12730-NavigationToolStorageSerializerAndDeserializerStillRand…
Author
franza
Browse Repository
No Builds
No Audits
dbb8e01fc625 added additional information on test errors to maybe find the reason for the…
Author
franza
Browse Repository
No Builds
No Audits
51004f9d5bf2 Merge branch 'bug-8108-enable-dicom-tests-for-mac'
Author
• fetzer
Browse Repository
No Builds
No Audits
cfbd2bdcae96 Enabled DICOM Tests for Mac again
Author
• fetzer
Browse Repository
No Builds
No Audits
73d7b5ca5a33 Merge branch 'bug-13499-UnremovedObserverInLevelWindowManager'
Author
franza
Browse Repository
No Builds
No Audits
1199d7f24b34 minor change: removed parameter which is given by default anyway
Author
franza
Browse Repository
No Builds
No Audits
d0119f1222a7 DOC: Added doxygen commands for most methods
Author
franza
Browse Repository
No Builds
No Audits
2621d68c8f2a fixed a bug: Initialized the LevelWindowManager also in the AddNode method
Author
franza
Browse Repository
No Builds
No Audits
75a329fc396b added for loop (forgotten in last commit)
Author
franza
Browse Repository
No Builds
No Audits
a4d06a03111f fixed a bug with an iterator: replaced by for loop for the moment
Author
franza
Browse Repository
No Builds
No Audits
95cc44fe4d01 removed debug output
Author
franza
Browse Repository
No Builds
No Audits
83077bd9bce4 added a check if the removed node is relevant
Author
franza
Browse Repository
No Builds
No Audits
cdb09d7399ec removed absolute path from test data
Author
franza
Browse Repository
No Builds
No Audits
92bc74925403 added another internal method for better structure, added documentation
Author
franza
Browse Repository
No Builds
No Audits
040b5d6ab60e restructured code: (1) added internal help methods for better code structure…
Author
franza
Browse Repository
No Builds
No Audits
dea6397f4d58 finished restructuring of test, extended method for testing observers
Author
franza
Browse Repository
No Builds
No Audits
b566218e987e Merge branch 'bug-13889-FixMitkLevelWindowManagerTest' into bug-13499…
Author
franza
Browse Repository
No Builds
No Audits
fb80bd36c628 DOC: added documentation
Author
franza
Browse Repository
No Builds
No Audits
efa6ee21d022 further adaption of test code to mitk testing macros
Author
franza
Browse Repository
No Builds
No Audits
9c997cdd2737 temporary added output of number of observers
Author
franza
Browse Repository
No Builds
No Audits
7e4bcc555039 Merge branch 'bug-13889-FixMitkLevelWindowManagerTest' into bug-13499…
Author
franza
Browse Repository
No Builds
No Audits
151177c5bef7 integrated code from Felix C. Morency from github pull request (see bug 13499)
Author
franza
Browse Repository
No Builds
No Audits
49c3980166c6 added method GetNumberOfObservers
Author
franza
Browse Repository
No Builds
No Audits
1cb616cdd921 added a test for removing of observers
Author
franza
Browse Repository
No Builds
No Audits
4bbb96199867 restructured test
Author
franza
Browse Repository
No Builds
No Audits
58e2cc4086bb comment code in again
Author
franza
Browse Repository
No Builds
No Audits
d566ebfa0d03 converted exceptions to MITK exceptions, added documentation
Author
franza
Browse Repository
No Builds
No Audits
e1dfe73a8913 started conversion of old style test to MITK testing macros
Author
franza
Browse Repository
No Builds
No Audits
5b58809304e9 activated test again
Author
franza
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Packages

O1: MITK Reviewer Group I

Core/

Code/

CppMicroServices/

CMake/

usFunctionEmbedResources.cmake

CppMicroServicesConfig.cmake.in

DataManagement/

mitkLevelWindowManager.cpp

mitkLevelWindowManager.h

Testing/

DICOMTesting/

Testing/

mitkLevelWindowManagerTest.cpp

Documentation/

Doxygen/

Tutorial/

MITKConfig.cmake.in

O1: MITK Reviewer Group I

Modules/

IGT/

Testing/

mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

Qmitk/

QmitkRenderWindow.cpp

rMITKf485c71dde0b

CMakeLists.txt

Loading...

Core/Code/CppMicroServices/CMake/usFunctionEmbedResources.cmake

Loading...

Core/Code/CppMicroServices/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/CppMicroServicesConfig.cmake.in

Loading...

Core/Code/DataManagement/mitkLevelWindowManager.cpp

Loading...

Core/Code/DataManagement/mitkLevelWindowManager.h

Loading...

Core/Code/Testing/CMakeLists.txt

Loading...

Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt

Loading...

Core/Code/Testing/files.cmake

Loading...

Core/Code/Testing/mitkLevelWindowManagerTest.cpp

Loading...

Documentation/Doxygen/Tutorial/Step10.dox

Loading...

MITKConfig.cmake.in

Loading...

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

Loading...

Modules/Qmitk/QmitkRenderWindow.cpp

Loading...