diff --git a/Modules/DICOMReader/files.cmake b/Modules/DICOMReader/files.cmake index 38c58efbee..2e1ba191d8 100644 --- a/Modules/DICOMReader/files.cmake +++ b/Modules/DICOMReader/files.cmake @@ -1,52 +1,52 @@ file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") set(CPP_FILES mitkBaseDICOMReaderService.cpp mitkDICOMFileReader.cpp mitkDICOMTagScanner.cpp mitkDICOMGDCMTagScanner.cpp mitkDICOMDCMTKTagScanner.cpp mitkDICOMImageBlockDescriptor.cpp mitkDICOMITKSeriesGDCMReader.cpp mitkDICOMDatasetSorter.cpp mitkDICOMTagBasedSorter.cpp mitkDICOMGDCMImageFrameInfo.cpp mitkDICOMImageFrameInfo.cpp mitkDICOMGenericImageFrameInfo.cpp mitkDICOMDatasetAccessingImageFrameInfo.cpp mitkDICOMSortCriterion.cpp mitkDICOMSortByTag.cpp mitkITKDICOMSeriesReaderHelper.cpp mitkEquiDistantBlocksSorter.cpp mitkNormalDirectionConsistencySorter.cpp mitkSortByImagePositionPatient.cpp mitkGantryTiltInformation.cpp mitkClassicDICOMSeriesReader.cpp mitkThreeDnTDICOMSeriesReader.cpp mitkDICOMTag.cpp mitkDICOMTagsOfInterestHelper.cpp mitkDICOMTagCache.cpp mitkDICOMGDCMTagCache.cpp mitkDICOMGenericTagCache.cpp mitkDICOMEnums.cpp mitkDICOMReaderConfigurator.cpp mitkDICOMFileReaderSelector.cpp mitkIDICOMTagsOfInterest.cpp mitkDICOMTagPath.cpp mitkDICOMProperty.cpp mitkDICOMFilesHelper.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/3D/slicelocation_simple.xml + configurations/3D/simpleinstancenumber_soft.xml configurations/3DnT/classicreader.xml configurations/3DnT/imageposition_byacquisition.xml configurations/3DnT/imageposition_bytriggertime.xml ) diff --git a/Modules/DICOMReader/resource/configurations/3D/simpleinstancenumber_soft.xml b/Modules/DICOMReader/resource/configurations/3D/simpleinstancenumber_soft.xml new file mode 100644 index 0000000000..1ef0853e19 --- /dev/null +++ b/Modules/DICOMReader/resource/configurations/3D/simpleinstancenumber_soft.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Modules/DICOMReader/resource/configurations/3D/slicelocation_simple.xml b/Modules/DICOMReader/resource/configurations/3D/slicelocation_simple.xml deleted file mode 100644 index 9a25c0a911..0000000000 --- a/Modules/DICOMReader/resource/configurations/3D/slicelocation_simple.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp b/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp index 6da89034fd..f8298ea79a 100644 --- a/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp +++ b/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp @@ -1,77 +1,77 @@ /*=================================================================== 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 "mitkSimpleVolumeDICOMSeriesReaderService.h" #include "mitkDICOMReaderConfigurator.h" #include #include #include #include #include #include #include namespace mitk { SimpleVolumeDICOMSeriesReaderService::SimpleVolumeDICOMSeriesReaderService() : BaseDICOMReaderService("MITK Simple Volume Importer") { this->RegisterService(); } DICOMFileReader::Pointer SimpleVolumeDICOMSeriesReaderService::GetReader(const mitk::StringList& relevantFiles) const { std::string descr; us::ModuleResource resource = - us::ModuleRegistry::GetModule("MitkDICOMReader")->GetResource("configurations/3D/slicelocation_simple.xml"); + us::ModuleRegistry::GetModule("MitkDICOMReader")->GetResource("configurations/3D/simpleinstancenumber_soft.xml"); /*us::ModuleResource resource = us::GetModuleContext()->GetModule()->GetResource("E:/BS-280417/MITK/Modules/DICOMReader/resource/configurations/3D/slicelocation_simple.xml");*/ /*const std::vector configs = us::GetModuleContext()->GetModule()->FindResources( "configurations/3D/slicelocation_simple.xml", "*.xml", false ); for ( auto iter = configs.cbegin(); iter != configs.cend(); ++iter ) { us::ModuleResource resource = *iter;*/ if ( resource.IsValid() ) { us::ModuleResourceStream stream(resource); stream.seekg(0, std::ios::end); descr.reserve(stream.tellg()); stream.seekg(0, std::ios::beg); descr.assign((std::istreambuf_iterator(stream)), std::istreambuf_iterator()); } //} DICOMReaderConfigurator::Pointer configurator = DICOMReaderConfigurator::New(); DICOMFileReader::Pointer reader = configurator->CreateFromUTF8ConfigString(descr); return reader.GetPointer(); }; SimpleVolumeDICOMSeriesReaderService* SimpleVolumeDICOMSeriesReaderService::Clone() const { return new SimpleVolumeDICOMSeriesReaderService(*this); } }