Mercurial > hg > orthanc-stone

comparison Framework/Loaders/SeriesMetadataLoader.cpp @ 1476:4db187d29731

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed SeriesMetadataLoader::SeriesLoadedMessage to SuccessMessage
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 17 Jun 2020 18:21:26 +0200
parents 474360793956
children
comparison
equal deleted inserted replaced
1475:615035c2f3ba 1476:4db187d29731
67 if (message.GetResources()->LookupTagValueConsensus(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID) && 67 if (message.GetResources()->LookupTagValueConsensus(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID) &&
68 message.GetResources()->LookupTagValueConsensus(seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID)) 68 message.GetResources()->LookupTagValueConsensus(seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID))
69 { 69 {
70 series_[seriesInstanceUid] = message.GetResources(); 70 series_[seriesInstanceUid] = message.GetResources();
71 71
72 SeriesLoadedMessage loadedMessage(*this, message.GetDicomSource(), studyInstanceUid, 72 SuccessMessage loadedMessage(*this, message.GetDicomSource(), studyInstanceUid,
73 seriesInstanceUid, *message.GetResources()); 73 seriesInstanceUid, *message.GetResources());
74 BroadcastMessage(loadedMessage); 74 BroadcastMessage(loadedMessage);
75 } 75 }
76 76
77 break; 77 break;
78 } 78 }
149 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); 149 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
150 } 150 }
151 else if (series->second->GetSize() == size->second) 151 else if (series->second->GetSize() == size->second)
152 { 152 {
153 // The series is complete 153 // The series is complete
154 SeriesLoadedMessage loadedMessage( 154 SuccessMessage loadedMessage(
155 *this, message.GetDicomSource(), 155 *this, message.GetDicomSource(),
156 studyInstanceUid, seriesInstanceUid, *series->second); 156 studyInstanceUid, seriesInstanceUid, *series->second);
157 loadedMessage.SetDicomDir(dicomDirPath_, dicomDir_); 157 loadedMessage.SetDicomDir(dicomDirPath_, dicomDir_);
158 BroadcastMessage(loadedMessage); 158 BroadcastMessage(loadedMessage);
159 } 159 }
168 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); 168 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
169 } 169 }
170 } 170 }
171 171
172 172
173 SeriesMetadataLoader::SeriesLoadedMessage::SeriesLoadedMessage( 173 SeriesMetadataLoader::SuccessMessage::SuccessMessage(
174 const SeriesMetadataLoader& loader, 174 const SeriesMetadataLoader& loader,
175 const DicomSource& source, 175 const DicomSource& source,
176 const std::string& studyInstanceUid, 176 const std::string& studyInstanceUid,
177 const std::string& seriesInstanceUid, 177 const std::string& seriesInstanceUid,
178 LoadedDicomResources& instances) : 178 LoadedDicomResources& instances) :
185 LOG(INFO) << "Loaded series " << seriesInstanceUid 185 LOG(INFO) << "Loaded series " << seriesInstanceUid
186 << ", number of instances: " << instances_.GetSize(); 186 << ", number of instances: " << instances_.GetSize();
187 } 187 }
188 188
189 189
190 boost::shared_ptr<IObserver> SeriesMetadataLoader::Factory::Create(ILoadersContext::ILock& context) 190 boost::shared_ptr<SeriesMetadataLoader> SeriesMetadataLoader::Create(ILoadersContext::ILock& context)
191 { 191 {
192 boost::shared_ptr<DicomResourcesLoader> loader(DicomResourcesLoader::Create(context)); 192 boost::shared_ptr<DicomResourcesLoader> loader(DicomResourcesLoader::Create(context));
193 193
194 boost::shared_ptr<SeriesMetadataLoader> obj(new SeriesMetadataLoader(loader)); 194 boost::shared_ptr<SeriesMetadataLoader> obj(new SeriesMetadataLoader(loader));
195 obj->Register<DicomResourcesLoader::SuccessMessage>(*loader, &SeriesMetadataLoader::Handle); 195 obj->Register<DicomResourcesLoader::SuccessMessage>(*loader, &SeriesMetadataLoader::Handle);