diff --git a/Modules/DICOMReaderServices/src/mitkManualSelectingDICOMReaderService.cpp b/Modules/DICOMReaderServices/src/mitkManualSelectingDICOMReaderService.cpp index 47db50fdaa..ffdd7bb056 100644 --- a/Modules/DICOMReaderServices/src/mitkManualSelectingDICOMReaderService.cpp +++ b/Modules/DICOMReaderServices/src/mitkManualSelectingDICOMReaderService.cpp @@ -1,64 +1,62 @@ /*============================================================================ The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center (DKFZ) All rights reserved. Use of this source code is governed by a 3-clause BSD license that can be found in the LICENSE file. ============================================================================*/ #include "mitkManualSelectingDICOMReaderService.h" namespace mitk { ManualSelectingDICOMReaderService::ManualSelectingDICOMReaderService() - : BaseDICOMReaderService("MITK DICOM Reader v2 (manual)") + : BaseDICOMReaderService("MITK DICOM Reader v2 (manual)"), m_Selector(mitk::DICOMFileReaderSelector::New()) { Options defaultOptions; - m_Selector = mitk::DICOMFileReaderSelector::New(); - m_Selector->LoadBuiltIn3DConfigs(); m_Selector->LoadBuiltIn3DnTConfigs(); auto readers = m_Selector->GetAllConfiguredReaders(); std::vector configs; for (const auto& reader : readers) { configs.push_back(reader->GetConfigurationLabel()); } defaultOptions["Configuration"] = configs; this->SetDefaultOptions(defaultOptions); this->RegisterService(); } DICOMFileReader::Pointer ManualSelectingDICOMReaderService::GetReader(const mitk::StringList& /*relevantFiles*/) const { const auto label = this->GetOption("Configuration").ToString(); - mitk::DICOMFileReader::Pointer selectedReader = nullptr; + mitk::DICOMFileReader::Pointer selectedReader; auto readers = m_Selector->GetAllConfiguredReaders(); for (const auto& reader : readers) { if (label == reader->GetConfigurationLabel()) { selectedReader = reader; } } return selectedReader; }; ManualSelectingDICOMReaderService* ManualSelectingDICOMReaderService::Clone() const { return new ManualSelectingDICOMReaderService(*this); } }