diff --git a/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/QmitkDicomViewControls.ui b/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/QmitkDicomViewControls.ui
index 35cbbd7b02..5b7730f4cf 100644
--- a/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/QmitkDicomViewControls.ui
+++ b/Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/QmitkDicomViewControls.ui
@@ -1,39 +1,39 @@
QmitkDicomViewControls
0
0
635
300
Form
-
Import
-
QmitkDicomExternalDataWidget
QWidget
- Qmitk/QmitkDicomExternalDataWidget.h
+ QmitkDicomExternalDataWidget.h
1
diff --git a/Modules/DCMTesting/CMakeLists.txt b/Modules/DCMTesting/CMakeLists.txt
index a7a36dd3ea..f897c7831b 100644
--- a/Modules/DCMTesting/CMakeLists.txt
+++ b/Modules/DCMTesting/CMakeLists.txt
@@ -1,49 +1,49 @@
#
# IMPORTANT NOTE:
#
# This module is a testing module for the DicomSeriesReader class,
# which is meant to be replaced by the Module DCMReader.
# To have the "old" code tested before it is removed, we still
# keep this DCMTesting module.
#
# Note that the DICOMTesting module is practically a copy of
# this DCMTesting module, doing the same kind of testing, just
# for the new readers instead of DicomSeriesReader.
#
if(BUILD_TESTING)
if(GDCM_DIR)
# clear variables from prior files.cmake
# Else CMake would use the content of these variables and would try to create tests (which are not present in DCMTesting).
#set(MODULE_TESTS)
#set(MODULE_IMAGE_TESTS)
#set(MODULE_SURFACE_TESTS)
#set(MODULE_TESTIMAGES)
#set(MODULE_TESTSURFACES)
#set(MODULE_CUSTOM_TESTS)
#set(H_FILES)
#set(CPP_FILES)
# now create a new module only for testing purposes
MITK_CREATE_MODULE(
DEPENDS MitkCore # Mitk.so
)
if(TARGET ${MODULE_NAME})
# add helpful applications
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
# dumps out image information
- add_executable(DumpDCMMitkImage DumpDCMMitkImage.cpp)
+ add_executable(DumpDCMMitkImage src/DumpDCMMitkImage.cpp)
target_link_libraries(DumpDCMMitkImage ${MODULE_NAME})
# compares dumped out image information against reference dump
- add_executable(VerifyDCMMitkImageDump VerifyDCMMitkImageDump.cpp)
+ add_executable(VerifyDCMMitkImageDump src/VerifyDCMMitkImageDump.cpp)
target_link_libraries(VerifyDCMMitkImageDump ${MODULE_NAME})
- add_subdirectory(Testing)
+ add_subdirectory(test)
endif()
endif()
endif()
diff --git a/Modules/DCMTesting/files.cmake b/Modules/DCMTesting/files.cmake
index 7a17edf5d3..bdf6f2947c 100644
--- a/Modules/DCMTesting/files.cmake
+++ b/Modules/DCMTesting/files.cmake
@@ -1,4 +1,7 @@
+set(H_FILES
+ include/mitkTestDCMLoading.h
+)
set(CPP_FILES
mitkTestDCMLoading.cpp
)
diff --git a/Modules/DCMTesting/mitkTestDCMLoading.h b/Modules/DCMTesting/include/mitkTestDCMLoading.h
similarity index 100%
rename from Modules/DCMTesting/mitkTestDCMLoading.h
rename to Modules/DCMTesting/include/mitkTestDCMLoading.h
diff --git a/Modules/DCMTesting/DumpDCMMitkImage.cpp b/Modules/DCMTesting/src/DumpDCMMitkImage.cpp
similarity index 100%
rename from Modules/DCMTesting/DumpDCMMitkImage.cpp
rename to Modules/DCMTesting/src/DumpDCMMitkImage.cpp
diff --git a/Modules/DCMTesting/VerifyDCMMitkImageDump.cpp b/Modules/DCMTesting/src/VerifyDCMMitkImageDump.cpp
similarity index 100%
rename from Modules/DCMTesting/VerifyDCMMitkImageDump.cpp
rename to Modules/DCMTesting/src/VerifyDCMMitkImageDump.cpp
diff --git a/Modules/DCMTesting/mitkTestDCMLoading.cpp b/Modules/DCMTesting/src/mitkTestDCMLoading.cpp
similarity index 100%
rename from Modules/DCMTesting/mitkTestDCMLoading.cpp
rename to Modules/DCMTesting/src/mitkTestDCMLoading.cpp
diff --git a/Modules/DCMTesting/Testing/CMakeLists.txt b/Modules/DCMTesting/test/CMakeLists.txt
similarity index 100%
rename from Modules/DCMTesting/Testing/CMakeLists.txt
rename to Modules/DCMTesting/test/CMakeLists.txt
diff --git a/Modules/DCMTesting/Testing/files.cmake b/Modules/DCMTesting/test/files.cmake
similarity index 100%
rename from Modules/DCMTesting/Testing/files.cmake
rename to Modules/DCMTesting/test/files.cmake
diff --git a/Modules/DCMTesting/Testing/mitkDCMPreloadedVolumeTest.cpp b/Modules/DCMTesting/test/mitkDCMPreloadedVolumeTest.cpp
similarity index 100%
rename from Modules/DCMTesting/Testing/mitkDCMPreloadedVolumeTest.cpp
rename to Modules/DCMTesting/test/mitkDCMPreloadedVolumeTest.cpp
diff --git a/Modules/DCMTesting/Testing/mitkDCMTestingSanityTest.cpp b/Modules/DCMTesting/test/mitkDCMTestingSanityTest.cpp
similarity index 100%
rename from Modules/DCMTesting/Testing/mitkDCMTestingSanityTest.cpp
rename to Modules/DCMTesting/test/mitkDCMTestingSanityTest.cpp
diff --git a/Modules/DICOMReader/CMakeLists.txt b/Modules/DICOMReader/CMakeLists.txt
index 2621018374..cae933f814 100644
--- a/Modules/DICOMReader/CMakeLists.txt
+++ b/Modules/DICOMReader/CMakeLists.txt
@@ -1,8 +1,8 @@
MITK_CREATE_MODULE(
DEPENDS MitkCore
PACKAGE_DEPENDS
PUBLIC tinyxml
PRIVATE ITK|ITKIOGDCM
)
-add_subdirectory(Testing)
+add_subdirectory(test)
diff --git a/Modules/DICOMReader/Documentation/Doxygen/Modules.dox b/Modules/DICOMReader/doc/Doxygen/Modules.dox
similarity index 100%
rename from Modules/DICOMReader/Documentation/Doxygen/Modules.dox
rename to Modules/DICOMReader/doc/Doxygen/Modules.dox
diff --git a/Modules/DICOMReader/Documentation/Doxygen/tilt-correction.jpg b/Modules/DICOMReader/doc/Doxygen/tilt-correction.jpg
similarity index 100%
rename from Modules/DICOMReader/Documentation/Doxygen/tilt-correction.jpg
rename to Modules/DICOMReader/doc/Doxygen/tilt-correction.jpg
diff --git a/Modules/DICOMReader/Documentation/images/implementeditkseriesgdcmreader.jpg b/Modules/DICOMReader/doc/images/implementeditkseriesgdcmreader.jpg
similarity index 100%
rename from Modules/DICOMReader/Documentation/images/implementeditkseriesgdcmreader.jpg
rename to Modules/DICOMReader/doc/images/implementeditkseriesgdcmreader.jpg
diff --git a/Modules/DICOMReader/Documentation/images/tilt-correction.jpg b/Modules/DICOMReader/doc/images/tilt-correction.jpg
similarity index 100%
rename from Modules/DICOMReader/Documentation/images/tilt-correction.jpg
rename to Modules/DICOMReader/doc/images/tilt-correction.jpg
diff --git a/Modules/DICOMReader/files.cmake b/Modules/DICOMReader/files.cmake
index 3e530f565b..d1cf83b313 100644
--- a/Modules/DICOMReader/files.cmake
+++ b/Modules/DICOMReader/files.cmake
@@ -1,58 +1,37 @@
-set(H_FILES
- mitkDICOMFileReader.h
- mitkDICOMGDCMTagScanner.h
- mitkDICOMImageFrameInfo.h
- mitkDICOMImageBlockDescriptor.h
- mitkDICOMGDCMImageFrameInfo.h
- mitkDICOMITKSeriesGDCMReader.h
- mitkDICOMDatasetSorter.h
- mitkDICOMEnums.h
- mitkDICOMTagBasedSorter.h
- mitkDICOMSortCriterion.h
- mitkDICOMSortByTag.h
- mitkEquiDistantBlocksSorter.h
- mitkNormalDirectionConsistencySorter.h
- mitkSortByImagePositionPatient.h
- mitkClassicDICOMSeriesReader.h
- mitkThreeDnTDICOMSeriesReader.h
- mitkDICOMTag.h
- mitkDICOMTagCache.h
- mitkDICOMReaderConfigurator.h
- mitkDICOMFileReaderSelector.h
-)
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
set(CPP_FILES
mitkDICOMFileReader.cpp
mitkDICOMGDCMTagScanner.cpp
mitkDICOMImageBlockDescriptor.cpp
mitkDICOMITKSeriesGDCMReader.cpp
mitkDICOMDatasetSorter.cpp
mitkDICOMTagBasedSorter.cpp
mitkDICOMGDCMImageFrameInfo.cpp
mitkDICOMImageFrameInfo.cpp
mitkDICOMSortCriterion.cpp
mitkDICOMSortByTag.cpp
mitkITKDICOMSeriesReaderHelper.cpp
mitkEquiDistantBlocksSorter.cpp
mitkNormalDirectionConsistencySorter.cpp
mitkSortByImagePositionPatient.cpp
mitkGantryTiltInformation.cpp
mitkClassicDICOMSeriesReader.cpp
mitkThreeDnTDICOMSeriesReader.cpp
mitkDICOMTag.cpp
mitkDICOMTagCache.cpp
mitkDICOMEnums.cpp
mitkDICOMReaderConfigurator.cpp
mitkDICOMFileReaderSelector.cpp
)
set(RESOURCE_FILES
configurations/3D/classicreader.xml
configurations/3D/imageposition.xml
configurations/3D/imageposition_byacquisition.xml
configurations/3D/instancenumber.xml
configurations/3D/instancenumber_soft.xml
configurations/3D/slicelocation.xml
configurations/3DnT/classicreader.xml
)
diff --git a/Modules/DICOMReader/mitkClassicDICOMSeriesReader.h b/Modules/DICOMReader/include/mitkClassicDICOMSeriesReader.h
similarity index 100%
rename from Modules/DICOMReader/mitkClassicDICOMSeriesReader.h
rename to Modules/DICOMReader/include/mitkClassicDICOMSeriesReader.h
diff --git a/Modules/DICOMReader/mitkDICOMDatasetAccess.h b/Modules/DICOMReader/include/mitkDICOMDatasetAccess.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMDatasetAccess.h
rename to Modules/DICOMReader/include/mitkDICOMDatasetAccess.h
diff --git a/Modules/DICOMReader/mitkDICOMDatasetSorter.h b/Modules/DICOMReader/include/mitkDICOMDatasetSorter.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMDatasetSorter.h
rename to Modules/DICOMReader/include/mitkDICOMDatasetSorter.h
diff --git a/Modules/DICOMReader/mitkDICOMEnums.h b/Modules/DICOMReader/include/mitkDICOMEnums.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMEnums.h
rename to Modules/DICOMReader/include/mitkDICOMEnums.h
diff --git a/Modules/DICOMReader/mitkDICOMFileReader.h b/Modules/DICOMReader/include/mitkDICOMFileReader.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMFileReader.h
rename to Modules/DICOMReader/include/mitkDICOMFileReader.h
diff --git a/Modules/DICOMReader/mitkDICOMFileReaderSelector.h b/Modules/DICOMReader/include/mitkDICOMFileReaderSelector.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMFileReaderSelector.h
rename to Modules/DICOMReader/include/mitkDICOMFileReaderSelector.h
diff --git a/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h b/Modules/DICOMReader/include/mitkDICOMGDCMImageFrameInfo.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h
rename to Modules/DICOMReader/include/mitkDICOMGDCMImageFrameInfo.h
diff --git a/Modules/DICOMReader/mitkDICOMGDCMTagScanner.h b/Modules/DICOMReader/include/mitkDICOMGDCMTagScanner.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMGDCMTagScanner.h
rename to Modules/DICOMReader/include/mitkDICOMGDCMTagScanner.h
diff --git a/Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h b/Modules/DICOMReader/include/mitkDICOMITKSeriesGDCMReader.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h
rename to Modules/DICOMReader/include/mitkDICOMITKSeriesGDCMReader.h
diff --git a/Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h b/Modules/DICOMReader/include/mitkDICOMImageBlockDescriptor.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h
rename to Modules/DICOMReader/include/mitkDICOMImageBlockDescriptor.h
diff --git a/Modules/DICOMReader/mitkDICOMImageFrameInfo.h b/Modules/DICOMReader/include/mitkDICOMImageFrameInfo.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMImageFrameInfo.h
rename to Modules/DICOMReader/include/mitkDICOMImageFrameInfo.h
diff --git a/Modules/DICOMReader/mitkDICOMReaderConfigurator.h b/Modules/DICOMReader/include/mitkDICOMReaderConfigurator.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMReaderConfigurator.h
rename to Modules/DICOMReader/include/mitkDICOMReaderConfigurator.h
diff --git a/Modules/DICOMReader/mitkDICOMSortByTag.h b/Modules/DICOMReader/include/mitkDICOMSortByTag.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMSortByTag.h
rename to Modules/DICOMReader/include/mitkDICOMSortByTag.h
diff --git a/Modules/DICOMReader/mitkDICOMSortCriterion.h b/Modules/DICOMReader/include/mitkDICOMSortCriterion.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMSortCriterion.h
rename to Modules/DICOMReader/include/mitkDICOMSortCriterion.h
diff --git a/Modules/DICOMReader/mitkDICOMTag.h b/Modules/DICOMReader/include/mitkDICOMTag.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMTag.h
rename to Modules/DICOMReader/include/mitkDICOMTag.h
diff --git a/Modules/DICOMReader/mitkDICOMTagBasedSorter.h b/Modules/DICOMReader/include/mitkDICOMTagBasedSorter.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMTagBasedSorter.h
rename to Modules/DICOMReader/include/mitkDICOMTagBasedSorter.h
diff --git a/Modules/DICOMReader/mitkDICOMTagCache.h b/Modules/DICOMReader/include/mitkDICOMTagCache.h
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMTagCache.h
rename to Modules/DICOMReader/include/mitkDICOMTagCache.h
diff --git a/Modules/DICOMReader/mitkEquiDistantBlocksSorter.h b/Modules/DICOMReader/include/mitkEquiDistantBlocksSorter.h
similarity index 100%
rename from Modules/DICOMReader/mitkEquiDistantBlocksSorter.h
rename to Modules/DICOMReader/include/mitkEquiDistantBlocksSorter.h
diff --git a/Modules/DICOMReader/mitkGantryTiltInformation.h b/Modules/DICOMReader/include/mitkGantryTiltInformation.h
similarity index 100%
rename from Modules/DICOMReader/mitkGantryTiltInformation.h
rename to Modules/DICOMReader/include/mitkGantryTiltInformation.h
diff --git a/Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h b/Modules/DICOMReader/include/mitkITKDICOMSeriesReaderHelper.h
similarity index 100%
rename from Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h
rename to Modules/DICOMReader/include/mitkITKDICOMSeriesReaderHelper.h
diff --git a/Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx b/Modules/DICOMReader/include/mitkITKDICOMSeriesReaderHelper.txx
similarity index 100%
rename from Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx
rename to Modules/DICOMReader/include/mitkITKDICOMSeriesReaderHelper.txx
diff --git a/Modules/DICOMReader/mitkNormalDirectionConsistencySorter.h b/Modules/DICOMReader/include/mitkNormalDirectionConsistencySorter.h
similarity index 100%
rename from Modules/DICOMReader/mitkNormalDirectionConsistencySorter.h
rename to Modules/DICOMReader/include/mitkNormalDirectionConsistencySorter.h
diff --git a/Modules/DICOMReader/mitkSortByImagePositionPatient.h b/Modules/DICOMReader/include/mitkSortByImagePositionPatient.h
similarity index 100%
rename from Modules/DICOMReader/mitkSortByImagePositionPatient.h
rename to Modules/DICOMReader/include/mitkSortByImagePositionPatient.h
diff --git a/Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h b/Modules/DICOMReader/include/mitkThreeDnTDICOMSeriesReader.h
similarity index 100%
rename from Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h
rename to Modules/DICOMReader/include/mitkThreeDnTDICOMSeriesReader.h
diff --git a/Modules/DICOMReader/Resources/configurations/3D/classicreader.xml b/Modules/DICOMReader/resource/configurations/3D/classicreader.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/classicreader.xml
rename to Modules/DICOMReader/resource/configurations/3D/classicreader.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3D/imageposition.xml b/Modules/DICOMReader/resource/configurations/3D/imageposition.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/imageposition.xml
rename to Modules/DICOMReader/resource/configurations/3D/imageposition.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3D/imageposition_byacquisition.xml b/Modules/DICOMReader/resource/configurations/3D/imageposition_byacquisition.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/imageposition_byacquisition.xml
rename to Modules/DICOMReader/resource/configurations/3D/imageposition_byacquisition.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3D/imagetime.xml b/Modules/DICOMReader/resource/configurations/3D/imagetime.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/imagetime.xml
rename to Modules/DICOMReader/resource/configurations/3D/imagetime.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3D/instancenumber.xml b/Modules/DICOMReader/resource/configurations/3D/instancenumber.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/instancenumber.xml
rename to Modules/DICOMReader/resource/configurations/3D/instancenumber.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3D/instancenumber_soft.xml b/Modules/DICOMReader/resource/configurations/3D/instancenumber_soft.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/instancenumber_soft.xml
rename to Modules/DICOMReader/resource/configurations/3D/instancenumber_soft.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3D/slicelocation.xml b/Modules/DICOMReader/resource/configurations/3D/slicelocation.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3D/slicelocation.xml
rename to Modules/DICOMReader/resource/configurations/3D/slicelocation.xml
diff --git a/Modules/DICOMReader/Resources/configurations/3DnT/classicreader.xml b/Modules/DICOMReader/resource/configurations/3DnT/classicreader.xml
similarity index 100%
rename from Modules/DICOMReader/Resources/configurations/3DnT/classicreader.xml
rename to Modules/DICOMReader/resource/configurations/3DnT/classicreader.xml
diff --git a/Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp b/Modules/DICOMReader/src/mitkClassicDICOMSeriesReader.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp
rename to Modules/DICOMReader/src/mitkClassicDICOMSeriesReader.cpp
diff --git a/Modules/DICOMReader/mitkDICOMDatasetSorter.cpp b/Modules/DICOMReader/src/mitkDICOMDatasetSorter.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMDatasetSorter.cpp
rename to Modules/DICOMReader/src/mitkDICOMDatasetSorter.cpp
diff --git a/Modules/DICOMReader/mitkDICOMEnums.cpp b/Modules/DICOMReader/src/mitkDICOMEnums.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMEnums.cpp
rename to Modules/DICOMReader/src/mitkDICOMEnums.cpp
diff --git a/Modules/DICOMReader/mitkDICOMFileReader.cpp b/Modules/DICOMReader/src/mitkDICOMFileReader.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMFileReader.cpp
rename to Modules/DICOMReader/src/mitkDICOMFileReader.cpp
diff --git a/Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp b/Modules/DICOMReader/src/mitkDICOMFileReaderSelector.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp
rename to Modules/DICOMReader/src/mitkDICOMFileReaderSelector.cpp
diff --git a/Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp b/Modules/DICOMReader/src/mitkDICOMGDCMImageFrameInfo.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp
rename to Modules/DICOMReader/src/mitkDICOMGDCMImageFrameInfo.cpp
diff --git a/Modules/DICOMReader/mitkDICOMGDCMTagScanner.cpp b/Modules/DICOMReader/src/mitkDICOMGDCMTagScanner.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMGDCMTagScanner.cpp
rename to Modules/DICOMReader/src/mitkDICOMGDCMTagScanner.cpp
diff --git a/Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp b/Modules/DICOMReader/src/mitkDICOMITKSeriesGDCMReader.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp
rename to Modules/DICOMReader/src/mitkDICOMITKSeriesGDCMReader.cpp
diff --git a/Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp b/Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp
rename to Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp
diff --git a/Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp b/Modules/DICOMReader/src/mitkDICOMImageFrameInfo.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp
rename to Modules/DICOMReader/src/mitkDICOMImageFrameInfo.cpp
diff --git a/Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp b/Modules/DICOMReader/src/mitkDICOMReaderConfigurator.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp
rename to Modules/DICOMReader/src/mitkDICOMReaderConfigurator.cpp
diff --git a/Modules/DICOMReader/mitkDICOMSortByTag.cpp b/Modules/DICOMReader/src/mitkDICOMSortByTag.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMSortByTag.cpp
rename to Modules/DICOMReader/src/mitkDICOMSortByTag.cpp
diff --git a/Modules/DICOMReader/mitkDICOMSortCriterion.cpp b/Modules/DICOMReader/src/mitkDICOMSortCriterion.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMSortCriterion.cpp
rename to Modules/DICOMReader/src/mitkDICOMSortCriterion.cpp
diff --git a/Modules/DICOMReader/mitkDICOMTag.cpp b/Modules/DICOMReader/src/mitkDICOMTag.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMTag.cpp
rename to Modules/DICOMReader/src/mitkDICOMTag.cpp
diff --git a/Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp b/Modules/DICOMReader/src/mitkDICOMTagBasedSorter.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp
rename to Modules/DICOMReader/src/mitkDICOMTagBasedSorter.cpp
diff --git a/Modules/DICOMReader/mitkDICOMTagCache.cpp b/Modules/DICOMReader/src/mitkDICOMTagCache.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkDICOMTagCache.cpp
rename to Modules/DICOMReader/src/mitkDICOMTagCache.cpp
diff --git a/Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp b/Modules/DICOMReader/src/mitkEquiDistantBlocksSorter.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp
rename to Modules/DICOMReader/src/mitkEquiDistantBlocksSorter.cpp
diff --git a/Modules/DICOMReader/mitkGantryTiltInformation.cpp b/Modules/DICOMReader/src/mitkGantryTiltInformation.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkGantryTiltInformation.cpp
rename to Modules/DICOMReader/src/mitkGantryTiltInformation.cpp
diff --git a/Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp b/Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp
rename to Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp
diff --git a/Modules/DICOMReader/mitkNormalDirectionConsistencySorter.cpp b/Modules/DICOMReader/src/mitkNormalDirectionConsistencySorter.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkNormalDirectionConsistencySorter.cpp
rename to Modules/DICOMReader/src/mitkNormalDirectionConsistencySorter.cpp
diff --git a/Modules/DICOMReader/mitkSortByImagePositionPatient.cpp b/Modules/DICOMReader/src/mitkSortByImagePositionPatient.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkSortByImagePositionPatient.cpp
rename to Modules/DICOMReader/src/mitkSortByImagePositionPatient.cpp
diff --git a/Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.cpp b/Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp
similarity index 100%
rename from Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.cpp
rename to Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp
diff --git a/Modules/DICOMReader/Testing/CMakeLists.txt b/Modules/DICOMReader/test/CMakeLists.txt
similarity index 100%
rename from Modules/DICOMReader/Testing/CMakeLists.txt
rename to Modules/DICOMReader/test/CMakeLists.txt
diff --git a/Modules/DICOMReader/Testing/files.cmake b/Modules/DICOMReader/test/files.cmake
similarity index 100%
rename from Modules/DICOMReader/Testing/files.cmake
rename to Modules/DICOMReader/test/files.cmake
diff --git a/Modules/DICOMReader/Testing/mitkDICOMFileReaderTest.cpp b/Modules/DICOMReader/test/mitkDICOMFileReaderTest.cpp
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMFileReaderTest.cpp
rename to Modules/DICOMReader/test/mitkDICOMFileReaderTest.cpp
diff --git a/Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h b/Modules/DICOMReader/test/mitkDICOMFileReaderTestHelper.h
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h
rename to Modules/DICOMReader/test/mitkDICOMFileReaderTestHelper.h
diff --git a/Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.cpp b/Modules/DICOMReader/test/mitkDICOMFilenameSorter.cpp
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.cpp
rename to Modules/DICOMReader/test/mitkDICOMFilenameSorter.cpp
diff --git a/Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.h b/Modules/DICOMReader/test/mitkDICOMFilenameSorter.h
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.h
rename to Modules/DICOMReader/test/mitkDICOMFilenameSorter.h
diff --git a/Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp b/Modules/DICOMReader/test/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp
rename to Modules/DICOMReader/test/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp
diff --git a/Modules/DICOMReader/Testing/mitkDICOMNullFileReader.cpp b/Modules/DICOMReader/test/mitkDICOMNullFileReader.cpp
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMNullFileReader.cpp
rename to Modules/DICOMReader/test/mitkDICOMNullFileReader.cpp
diff --git a/Modules/DICOMReader/Testing/mitkDICOMNullFileReader.h b/Modules/DICOMReader/test/mitkDICOMNullFileReader.h
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMNullFileReader.h
rename to Modules/DICOMReader/test/mitkDICOMNullFileReader.h
diff --git a/Modules/DICOMReader/Testing/mitkDICOMReaderConfiguratorTest.cpp b/Modules/DICOMReader/test/mitkDICOMReaderConfiguratorTest.cpp
similarity index 100%
rename from Modules/DICOMReader/Testing/mitkDICOMReaderConfiguratorTest.cpp
rename to Modules/DICOMReader/test/mitkDICOMReaderConfiguratorTest.cpp
diff --git a/Modules/DICOMTesting/CMakeLists.txt b/Modules/DICOMTesting/CMakeLists.txt
index b94c99e5d4..b48d183998 100644
--- a/Modules/DICOMTesting/CMakeLists.txt
+++ b/Modules/DICOMTesting/CMakeLists.txt
@@ -1,38 +1,38 @@
if(BUILD_TESTING)
if(GDCM_DIR)
# clear variables from prior files.cmake
# Else CMake would use the content of these variables and would try to create tests (which are not present in DICOMTesting).
set(MODULE_TESTS)
set(MODULE_IMAGE_TESTS)
set(MODULE_SURFACE_TESTS)
set(MODULE_TESTIMAGES)
set(MODULE_TESTSURFACES)
set(MODULE_CUSTOM_TESTS)
set(H_FILES)
set(CPP_FILES)
# now create a new module only for testing purposes
MITK_CREATE_MODULE(
DEPENDS MitkDICOMReader
)
mitk_check_module_dependencies(MODULES MitkDICOMTesting MISSING_DEPENDENCIES_VAR _missing_deps)
if(_missing_deps)
message(STATUS "mitkDICOMTesting module helper applications won't be built. Missing: ${_missing_deps}")
else(_missing_deps)
# dumps out image information
- add_executable(DumpDICOMMitkImage DumpDICOMMitkImage.cpp)
+ add_executable(DumpDICOMMitkImage src/DumpDICOMMitkImage.cpp)
mitk_use_modules(TARGET DumpDICOMMitkImage MODULES MitkDICOMTesting)
# compares dumped out image information against reference dump
- add_executable(VerifyDICOMMitkImageDump VerifyDICOMMitkImageDump.cpp)
+ add_executable(VerifyDICOMMitkImageDump src/VerifyDICOMMitkImageDump.cpp)
mitk_use_modules(TARGET VerifyDICOMMitkImageDump MODULES MitkDICOMTesting)
- add_subdirectory(Testing)
+ add_subdirectory(test)
endif()
endif()
endif()
diff --git a/Modules/DICOMTesting/files.cmake b/Modules/DICOMTesting/files.cmake
index 1dfc52c4cc..560f35d49c 100644
--- a/Modules/DICOMTesting/files.cmake
+++ b/Modules/DICOMTesting/files.cmake
@@ -1,4 +1,7 @@
+set(H_FILES
+ include/mitkTestDICOMLoading.h
+)
set(CPP_FILES
mitkTestDICOMLoading.cpp
)
diff --git a/Modules/DICOMTesting/mitkTestDICOMLoading.h b/Modules/DICOMTesting/include/mitkTestDICOMLoading.h
similarity index 100%
rename from Modules/DICOMTesting/mitkTestDICOMLoading.h
rename to Modules/DICOMTesting/include/mitkTestDICOMLoading.h
diff --git a/Modules/DICOMTesting/DumpDICOMMitkImage.cpp b/Modules/DICOMTesting/src/DumpDICOMMitkImage.cpp
similarity index 100%
rename from Modules/DICOMTesting/DumpDICOMMitkImage.cpp
rename to Modules/DICOMTesting/src/DumpDICOMMitkImage.cpp
diff --git a/Modules/DICOMTesting/VerifyDICOMMitkImageDump.cpp b/Modules/DICOMTesting/src/VerifyDICOMMitkImageDump.cpp
similarity index 100%
rename from Modules/DICOMTesting/VerifyDICOMMitkImageDump.cpp
rename to Modules/DICOMTesting/src/VerifyDICOMMitkImageDump.cpp
diff --git a/Modules/DICOMTesting/mitkTestDICOMLoading.cpp b/Modules/DICOMTesting/src/mitkTestDICOMLoading.cpp
similarity index 100%
rename from Modules/DICOMTesting/mitkTestDICOMLoading.cpp
rename to Modules/DICOMTesting/src/mitkTestDICOMLoading.cpp
diff --git a/Modules/DICOMTesting/Testing/CMakeLists.txt b/Modules/DICOMTesting/test/CMakeLists.txt
similarity index 100%
rename from Modules/DICOMTesting/Testing/CMakeLists.txt
rename to Modules/DICOMTesting/test/CMakeLists.txt
diff --git a/Modules/DICOMTesting/Testing/files.cmake b/Modules/DICOMTesting/test/files.cmake
similarity index 100%
rename from Modules/DICOMTesting/Testing/files.cmake
rename to Modules/DICOMTesting/test/files.cmake
diff --git a/Modules/DICOMTesting/Testing/mitkDICOMLocaleTest.cpp b/Modules/DICOMTesting/test/mitkDICOMLocaleTest.cpp
similarity index 100%
rename from Modules/DICOMTesting/Testing/mitkDICOMLocaleTest.cpp
rename to Modules/DICOMTesting/test/mitkDICOMLocaleTest.cpp
diff --git a/Modules/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp b/Modules/DICOMTesting/test/mitkDICOMPreloadedVolumeTest.cpp
similarity index 100%
rename from Modules/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp
rename to Modules/DICOMTesting/test/mitkDICOMPreloadedVolumeTest.cpp
diff --git a/Modules/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp b/Modules/DICOMTesting/test/mitkDICOMTestingSanityTest.cpp
similarity index 100%
rename from Modules/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp
rename to Modules/DICOMTesting/test/mitkDICOMTestingSanityTest.cpp
diff --git a/Modules/DicomRT/CMakeLists.txt b/Modules/DicomRT/CMakeLists.txt
index e22de57759..d3e160052c 100644
--- a/Modules/DicomRT/CMakeLists.txt
+++ b/Modules/DicomRT/CMakeLists.txt
@@ -1,11 +1,9 @@
-# CREATE MODULE HERE
-IF (NOT DEFINED DCMTK_dcmrt_LIBRARY OR DCMTK_dcmrt_LIBRARY)
-MITK_CREATE_MODULE(
- INCLUDE_DIRS DataStructures
- DEPENDS MitkSegmentation MitkSceneSerializationBase
- PACKAGE_DEPENDS PUBLIC DCMTK
-)
-ADD_SUBDIRECTORY(Testing)
-ELSE()
-MESSAGE("MITK DicomRT Support disabled because the DCMTK dcmrt library not found")
-ENDIF()
+if(NOT DEFINED DCMTK_dcmrt_LIBRARY OR DCMTK_dcmrt_LIBRARY)
+ mitk_create_module(
+ DEPENDS MitkSegmentation MitkSceneSerializationBase
+ PACKAGE_DEPENDS PUBLIC DCMTK
+ )
+ add_subdirectory(test)
+else()
+ message("MITK DicomRT Support disabled because the DCMTK dcmrt library not found")
+endif()
diff --git a/Modules/DicomRT/files.cmake b/Modules/DicomRT/files.cmake
index f638320b1f..a6f3519f2f 100644
--- a/Modules/DicomRT/files.cmake
+++ b/Modules/DicomRT/files.cmake
@@ -1,26 +1,12 @@
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
+
SET(CPP_FILES
mitkRTDoseReader.cpp
mitkRTStructureSetReader.cpp
- DataStructures/mitkRTConstants.cpp
- DataStructures/mitkIsoDoseLevel.cpp
- DataStructures/mitkIsoDoseLevelCollections.cpp
- DataStructures/mitkIsoDoseLevelSetProperty.cpp
- DataStructures/mitkIsoDoseLevelVectorProperty.cpp
-)
-
-set(H_FILES
- mitkRTDoseReader.h
- mitkRTStructureSetReader.h
- DataStructures/mitkIsoDoseLevel.h
- DataStructures/mitkIsoDoseLevelCollections.h
- DataStructures/mitkIsoDoseLevelSetProperty.h
- DataStructures/mitkIsoDoseLevelVectorProperty.h
- DataStructures/mitkDoseValueType.h
- DataStructures/mitkRTConstants.h
+ mitkRTConstants.cpp
+ mitkIsoDoseLevel.cpp
+ mitkIsoDoseLevelCollections.cpp
+ mitkIsoDoseLevelSetProperty.cpp
+ mitkIsoDoseLevelVectorProperty.cpp
)
-set(TPP_FILES
-)
-
-set(MOC_H_FILES
-)
diff --git a/Modules/DicomRT/DataStructures/mitkDoseValueType.h b/Modules/DicomRT/include/mitkDoseValueType.h
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkDoseValueType.h
rename to Modules/DicomRT/include/mitkDoseValueType.h
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevel.h b/Modules/DicomRT/include/mitkIsoDoseLevel.h
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevel.h
rename to Modules/DicomRT/include/mitkIsoDoseLevel.h
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevelCollections.h b/Modules/DicomRT/include/mitkIsoDoseLevelCollections.h
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevelCollections.h
rename to Modules/DicomRT/include/mitkIsoDoseLevelCollections.h
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevelSetProperty.h b/Modules/DicomRT/include/mitkIsoDoseLevelSetProperty.h
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevelSetProperty.h
rename to Modules/DicomRT/include/mitkIsoDoseLevelSetProperty.h
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevelVectorProperty.h b/Modules/DicomRT/include/mitkIsoDoseLevelVectorProperty.h
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevelVectorProperty.h
rename to Modules/DicomRT/include/mitkIsoDoseLevelVectorProperty.h
diff --git a/Modules/DicomRT/DataStructures/mitkRTConstants.h b/Modules/DicomRT/include/mitkRTConstants.h
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkRTConstants.h
rename to Modules/DicomRT/include/mitkRTConstants.h
diff --git a/Modules/DicomRT/mitkRTDoseReader.h b/Modules/DicomRT/include/mitkRTDoseReader.h
similarity index 100%
rename from Modules/DicomRT/mitkRTDoseReader.h
rename to Modules/DicomRT/include/mitkRTDoseReader.h
diff --git a/Modules/DicomRT/mitkRTStructureSetReader.h b/Modules/DicomRT/include/mitkRTStructureSetReader.h
similarity index 100%
rename from Modules/DicomRT/mitkRTStructureSetReader.h
rename to Modules/DicomRT/include/mitkRTStructureSetReader.h
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevel.cpp b/Modules/DicomRT/src/mitkIsoDoseLevel.cpp
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevel.cpp
rename to Modules/DicomRT/src/mitkIsoDoseLevel.cpp
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevelCollections.cpp b/Modules/DicomRT/src/mitkIsoDoseLevelCollections.cpp
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevelCollections.cpp
rename to Modules/DicomRT/src/mitkIsoDoseLevelCollections.cpp
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevelSetProperty.cpp b/Modules/DicomRT/src/mitkIsoDoseLevelSetProperty.cpp
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevelSetProperty.cpp
rename to Modules/DicomRT/src/mitkIsoDoseLevelSetProperty.cpp
diff --git a/Modules/DicomRT/DataStructures/mitkIsoDoseLevelVectorProperty.cpp b/Modules/DicomRT/src/mitkIsoDoseLevelVectorProperty.cpp
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkIsoDoseLevelVectorProperty.cpp
rename to Modules/DicomRT/src/mitkIsoDoseLevelVectorProperty.cpp
diff --git a/Modules/DicomRT/DataStructures/mitkRTConstants.cpp b/Modules/DicomRT/src/mitkRTConstants.cpp
similarity index 100%
rename from Modules/DicomRT/DataStructures/mitkRTConstants.cpp
rename to Modules/DicomRT/src/mitkRTConstants.cpp
diff --git a/Modules/DicomRT/mitkRTDoseReader.cpp b/Modules/DicomRT/src/mitkRTDoseReader.cpp
similarity index 98%
rename from Modules/DicomRT/mitkRTDoseReader.cpp
rename to Modules/DicomRT/src/mitkRTDoseReader.cpp
index 96833dae43..716b20b459 100644
--- a/Modules/DicomRT/mitkRTDoseReader.cpp
+++ b/Modules/DicomRT/src/mitkRTDoseReader.cpp
@@ -1,145 +1,145 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include "mitkRTDoseReader.h"
#include
#include
#include
#include
#include
#include
-#include
+#include
namespace mitk
{
RTDoseReader::RTDoseReader(){}
RTDoseReader::~RTDoseReader(){}
mitk::DataNode::Pointer RTDoseReader::
LoadRTDose(const char* filename)
{
DcmFileFormat fileformat;
OFCondition outp = fileformat.loadFile(filename, EXS_Unknown);
if(outp.bad())
{
MITK_ERROR << "Cant read the file" << std::endl;
}
DcmDataset *dataset = fileformat.getDataset();
std::string name = filename;
itk::FilenamesContainer file;
file.push_back(name);
mitk::DicomSeriesReader* reader = new mitk::DicomSeriesReader;
mitk::DataNode::Pointer originalNode = reader->LoadDicomSeries(file,false);
if(originalNode.IsNull())
{
MITK_ERROR << "Error reading the dcm file" << std::endl;
return 0;
}
mitk::Image::Pointer originalImage
= dynamic_cast(originalNode->GetData());
DRTDoseIOD doseObject;
OFCondition result = doseObject.read(*dataset);
if(result.bad())
{
MITK_ERROR << "Error reading the Dataset" << std::endl;
return 0;
}
OFString gridScaling;
Float32 gridscale;
doseObject.getDoseGridScaling(gridScaling);
gridscale = OFStandard::atof(gridScaling.c_str());
AccessByItk_1(originalImage, MultiplayGridScaling, gridscale);
double prescripeDose = this->GetMaxDoseValue(dataset);
originalNode->SetName("RT Dose");
originalNode->SetFloatProperty(mitk::Constants::PRESCRIBED_DOSE_PROPERTY_NAME.c_str(),prescripeDose);
originalNode->SetFloatProperty(mitk::Constants::REFERENCE_DOSE_PROPERTY_NAME.c_str(), 40);
originalNode->SetBoolProperty(mitk::Constants::DOSE_PROPERTY_NAME.c_str(),true);
return originalNode;
}
template
void RTDoseReader::MultiplayGridScaling(itk::Image* image,
Float32 gridscale)
{
typedef itk::Image InputImageType;
itk::ImageRegionIterator it(image,
image->GetRequestedRegion());
for(it=it.Begin(); !it.IsAtEnd(); ++it)
{
it.Set(it.Get()*gridscale);
}
}
double RTDoseReader::GetMaxDoseValue(DcmDataset* dataSet)
{
DRTDoseIOD doseObject;
OFCondition result = doseObject.read(*dataSet);
if(result.bad())
{
MITK_ERROR << "Error reading the RT Dose dataset" << std::endl;
return 0;
}
Uint16 rows, columns, frames;
OFString nrframes, gridScaling;
const Uint16 *pixelData = NULL;
Float32 gridscale;
Uint16 &rows_ref = rows;
Uint16 &columns_ref = columns;
doseObject.getRows(rows_ref);
doseObject.getColumns(columns_ref);
doseObject.getNumberOfFrames(nrframes);
doseObject.getDoseGridScaling(gridScaling);
frames = atoi(nrframes.c_str());
gridscale = OFStandard::atof(gridScaling.c_str());
dataSet->findAndGetUint16Array(DCM_PixelData, pixelData, 0);
int size = columns*rows*frames;
double highest = 0;
for(int i=0; ihighest)
{
highest = pixelData[i] * gridscale;
}
}
return highest;
}
}
diff --git a/Modules/DicomRT/mitkRTStructureSetReader.cpp b/Modules/DicomRT/src/mitkRTStructureSetReader.cpp
similarity index 100%
rename from Modules/DicomRT/mitkRTStructureSetReader.cpp
rename to Modules/DicomRT/src/mitkRTStructureSetReader.cpp
diff --git a/Modules/DicomRT/Testing/CMakeLists.txt b/Modules/DicomRT/test/CMakeLists.txt
similarity index 100%
rename from Modules/DicomRT/Testing/CMakeLists.txt
rename to Modules/DicomRT/test/CMakeLists.txt
diff --git a/Modules/DicomRT/Testing/files.cmake b/Modules/DicomRT/test/files.cmake
similarity index 100%
rename from Modules/DicomRT/Testing/files.cmake
rename to Modules/DicomRT/test/files.cmake
diff --git a/Modules/DicomRT/Testing/mitkRTDoseReaderTest.cpp b/Modules/DicomRT/test/mitkRTDoseReaderTest.cpp
similarity index 100%
rename from Modules/DicomRT/Testing/mitkRTDoseReaderTest.cpp
rename to Modules/DicomRT/test/mitkRTDoseReaderTest.cpp
diff --git a/Modules/DicomRT/Testing/mitkRTStructureSetReaderTest.cpp b/Modules/DicomRT/test/mitkRTStructureSetReaderTest.cpp
similarity index 100%
rename from Modules/DicomRT/Testing/mitkRTStructureSetReaderTest.cpp
rename to Modules/DicomRT/test/mitkRTStructureSetReaderTest.cpp
diff --git a/Modules/DicomUI/files.cmake b/Modules/DicomUI/files.cmake
index 17d06312b7..692108939b 100644
--- a/Modules/DicomUI/files.cmake
+++ b/Modules/DicomUI/files.cmake
@@ -1,17 +1,21 @@
-SET(CPP_FILES ${CPP_FILES}
- Qmitk/QmitkDicomLocalStorageWidget.cpp
- Qmitk/QmitkDicomExternalDataWidget.cpp
+set(H_FILES
+ include/QmitkDicomExternalDataWidget.h
+ include/QmitkDicomLocalStorageWidget.h
)
-SET(UI_FILES ${UI_FILES}
- Qmitk/QmitkDicomLocalStorageWidgetControls.ui
- Qmitk/QmitkDicomExternalDataWidgetControls.ui
+set(CPP_FILES
+ QmitkDicomLocalStorageWidget.cpp
+ QmitkDicomExternalDataWidget.cpp
)
-SET(MOC_H_FILES ${MOC_H_FILES}
- Qmitk/QmitkDicomLocalStorageWidget.h
- Qmitk/QmitkDicomExternalDataWidget.h
+set(UI_FILES
+ src/QmitkDicomLocalStorageWidgetControls.ui
+ src/QmitkDicomExternalDataWidgetControls.ui
+)
+set(MOC_H_FILES
+ include/QmitkDicomLocalStorageWidget.h
+ include/QmitkDicomExternalDataWidget.h
)
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.h b/Modules/DicomUI/include/QmitkDicomExternalDataWidget.h
similarity index 100%
rename from Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.h
rename to Modules/DicomUI/include/QmitkDicomExternalDataWidget.h
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.h b/Modules/DicomUI/include/QmitkDicomLocalStorageWidget.h
similarity index 100%
rename from Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.h
rename to Modules/DicomUI/include/QmitkDicomLocalStorageWidget.h
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp b/Modules/DicomUI/src/QmitkDicomExternalDataWidget.cpp
similarity index 100%
rename from Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
rename to Modules/DicomUI/src/QmitkDicomExternalDataWidget.cpp
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidgetControls.ui b/Modules/DicomUI/src/QmitkDicomExternalDataWidgetControls.ui
similarity index 100%
rename from Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidgetControls.ui
rename to Modules/DicomUI/src/QmitkDicomExternalDataWidgetControls.ui
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp b/Modules/DicomUI/src/QmitkDicomLocalStorageWidget.cpp
similarity index 100%
rename from Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
rename to Modules/DicomUI/src/QmitkDicomLocalStorageWidget.cpp
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidgetControls.ui b/Modules/DicomUI/src/QmitkDicomLocalStorageWidgetControls.ui
similarity index 100%
rename from Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidgetControls.ui
rename to Modules/DicomUI/src/QmitkDicomLocalStorageWidgetControls.ui