orthanc-stone: OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp comparison

comparison OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2089:63d77859edee dicom-sr

cont

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 07 Nov 2023 19:30:44 +0100
parents	51c8b21b81e4
children	35de56fb6f89

comparison

equal deleted inserted replaced

-:b98d159c7545
+:63d77859edee
 }
 namespace OrthancStone
 {
+void DicomStructuredReport::ReferencedInstance::AddFrame(unsigned int frame)
+{
+if (frame == 0)
+{
+throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+}
+else
+{
+frames_.insert(frame);
+}
+}
 class DicomStructuredReport::Structure : public boost::noncopyable
 {
 private:
 std::string   sopInstanceUid_;
 bool          hasFrameNumber_;
 std::string sopClassUid = GetStringValue(*referencedInstances->getItem(k), DCM_ReferencedSOPClassUID);
 std::string sopInstanceUid = GetStringValue(*referencedInstances->getItem(k), DCM_ReferencedSOPInstanceUID);
 if (instancesInformation_.find(sopInstanceUid) == instancesInformation_.end())
 {
-instancesInformation_[sopInstanceUid] = ReferencedInstance(studyInstanceUid, seriesInstanceUid, sopClassUid);
+instancesInformation_[sopInstanceUid] = new ReferencedInstance(studyInstanceUid, seriesInstanceUid, sopClassUid);
 }
 else
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
 "Multiple occurrences of the same instance in DICOM-SR: " + sopInstanceUid);
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
 "Region cannot reference multiple instances in DICOM-SR");
 }
 std::string sopInstanceUid = GetStringValue(*instances.getItem(0), DCM_ReferencedSOPInstanceUID);
-if (instancesInformation_.find(sopInstanceUid) == instancesInformation_.end())
+std::map<std::string, ReferencedInstance*>::iterator instanceInformation = instancesInformation_.find(sopInstanceUid);
+if (instanceInformation == instancesInformation_.end())
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
 "Referencing unknown instance in DICOM-SR: " + sopInstanceUid);
 }
+assert(instanceInformation->second != NULL);
 if (instances.getItem(0)->tagExists(DCM_ReferencedFrameNumber))
 {
 std::string frames = GetStringValue(*instances.getItem(0), DCM_ReferencedFrameNumber);
 std::vector<std::string> tokens;
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
 }
 else
 {
 AddStructure(sopInstanceUid, group, true, frame, hasProbabilityOfCancer, probabilityOfCancer);
+instanceInformation->second->AddFrame(frame);
 }
 }
 }
 else
 {
 AddStructure(sopInstanceUid, group, false, 0, hasProbabilityOfCancer, probabilityOfCancer);
+instanceInformation->second->AddFrame(1);
 }
 }
 }
 }
 }
 for (std::list<Structure*>::iterator it = structures_.begin(); it != structures_.end(); ++it)
 {
 assert(*it != NULL);
 delete *it;
 }
-}
-}
+for (std::map<std::string, ReferencedInstance*>::iterator
+it = instancesInformation_.begin(); it != instancesInformation_.end(); ++it)
+{
+assert(it->second != NULL);
+delete it->second;
+}
+}
+void DicomStructuredReport::GetReferencedInstance(std::string& studyInstanceUid,
+std::string& seriesInstanceUid,
+std::string& sopInstanceUid,
+std::string& sopClassUid,
+size_t i) const
+{
+if (i >= orderedInstances_.size())
+{
+throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+}
+sopInstanceUid = orderedInstances_[i];
+std::map<std::string, ReferencedInstance*>::const_iterator found = instancesInformation_.find(sopInstanceUid);
+if (found == instancesInformation_.end())
+{
+throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
+}
+assert(found->second != NULL);
+studyInstanceUid = found->second->GetStudyInstanceUid();
+seriesInstanceUid = found->second->GetSeriesInstanceUid();
+sopClassUid = found->second->GetSopClassUid();
+}
+void DicomStructuredReport::ExportOrderedFrames(std::list<Frame>& frames) const
+{
+frames.clear();
+for (size_t i = 0; i < orderedInstances_.size(); i++)
+{
+std::map<std::string, ReferencedInstance*>::const_iterator found = instancesInformation_.find(orderedInstances_[i]);
+if (found == instancesInformation_.end())
+{
+throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
+}
+assert(found->second != NULL);
+for (std::set<unsigned int>::const_iterator frame = found->second->GetFrames().begin();
+frame != found->second->GetFrames().end(); ++frame)
+{
+frames.push_back(Frame(found->second->GetStudyInstanceUid(),
+found->second->GetSeriesInstanceUid(),
+orderedInstances_[i],
+found->second->GetSopClassUid(), *frame));
+}
+}
+}
+}

Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2089:63d77859edee dicom-sr