diff --git a/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp b/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp index f8298ea79a..3e2e124eb3 100644 --- a/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp +++ b/Modules/DICOMReaderServices/src/mitkSimpleVolumeDICOMSeriesReaderService.cpp @@ -1,77 +1,67 @@ /*=================================================================== 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/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); } }