orthanc-stone: Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp comparison

comparison Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 2144:9d77c935f2c3 dicom-sr

handling of pending referenced instances when loading DICOM-SR

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 16 Aug 2024 17:24:00 +0200
parents	1a02e758eaf4
children	743fa9c74443

comparison

equal deleted inserted replaced

-:83efb01991c5
+:9d77c935f2c3
 WebViewerAction_CreateRectangleProbe,  // New in 2.4
 WebViewerAction_CreateTextAnnotation   // New in 2.4
 };
+enum FramesCollectionType
+{
+FramesCollectionType_None,
+FramesCollectionType_DicomSR
+};
 static OrthancStone::MouseAction ConvertWebViewerAction(int action)
 {
 switch (action)
 {
 const std::string& seriesInstanceUid,
 const std::string& pdf) = 0;
 virtual void SignalVirtualSeriesThumbnailLoaded(const std::string& virtualSeriesId,
 const std::string& jpeg) = 0;
+virtual void SignalDicomSRLoaded(const std::string& studyInstanceUid,
+const std::string& seriesInstanceUid,
+const std::string& sopInstanceUid) = 0;
 };
 private:
 OrthancStone::ILoadersContext&                           context_;
 std::unique_ptr<IObserver>                               observer_;
 dicom.RemoveResource(seriesIdsToRemove[i]);
 }
 }
 else if (payload.GetValue() == Orthanc::ResourceType_Instance)
 {
-// This occurs if loading DICOM-SR
+// This occurs if loading DICOM-SR: Show the DICOM-SR once all its referenced instances are loaded
-// TODO - Hide/show DICOM-SR once they have been loaded
+for (size_t i = 0; i < dicom.GetSize(); i++)
+{
+std::string studyInstanceUid, seriesInstanceUid, sopInstanceUid;
+if (dicom.GetResource(i).LookupStringValue(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) &&
+dicom.GetResource(i).LookupStringValue(seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false) &&
+dicom.GetResource(i).LookupStringValue(sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
+{
+for (StructuredReports::const_iterator it = structuredReports_.begin(); it != structuredReports_.end(); ++it)
+{
+if (it->second->IsReferencedInstance(studyInstanceUid, seriesInstanceUid, sopInstanceUid))
+{
+bool complete = true;
+for (size_t j = 0; j < it->second->GetReferencedInstancesCount(); j++)
+{
+std::string referencedStudyInstanceUid, referencedSeriesInstanceUid, referencedInstanceInstanceUid, sopClassUid;
+it->second->GetReferencedInstance(referencedStudyInstanceUid, referencedSeriesInstanceUid, referencedInstanceInstanceUid, sopClassUid, j);
+if (!instances_->HasResource(referencedInstanceInstanceUid))
+{
+complete = false;
+break;
+}
+}
+if (complete)
+{
+LOG(INFO) << "Loaded all the instances referred by DICOM-SR instance: " << sopInstanceUid;
+if (observer_ != NULL)
+{
+observer_->SignalDicomSRLoaded(it->second->GetStudyInstanceUid(),
+it->second->GetSeriesInstanceUid(),
+it->second->GetSopInstanceUid());
+}
+}
+}
+}
+}
+}
 }
 if (payload.GetValue() == Orthanc::ResourceType_Study ||
 payload.GetValue() == Orthanc::ResourceType_Series)
 {
 {
 return false;
 }
 }
-IFramesCollection* GetSeriesFrames(const std::string& seriesInstanceUid) const
+IFramesCollection* GetSeriesFrames(FramesCollectionType& type,
-{
+const std::string& seriesInstanceUid) const
+{
+type = FramesCollectionType_None;
 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid);
 if (accessor.IsComplete())
 {
 StructuredReports::const_iterator sr = structuredReports_.find(seriesInstanceUid);
 if (sr != structuredReports_.end())
 {
 assert(sr->second != NULL);
+type = FramesCollectionType_DicomSR;
 try
 {
 return new DicomStructuredReportFrames(*sr->second, *instances_);
 }
 catch (Orthanc::OrthancException&)
 {
-// TODO
+LOG(INFO) << "All the instances referenced by the DICOM-SR series \""
-LOG(ERROR) << "Instances of the DICOM-SR are not available yet";
+<< seriesInstanceUid << "\" are not available yet";
 return NULL;
 }
 }
 std::unique_ptr<OrthancStone::SortedFrames> target(new OrthancStone::SortedFrames);
 // coordinates of the current texture, with (0,0) corresponding to
 // the center of the top-left pixel
 boost::shared_ptr<OrthancStone::AnnotationsSceneLayer>  stoneAnnotations_;
 bool linearInterpolation_;
+std::string pendingSeriesInstanceUid_;
 void ScheduleNextPrefetch()
 {
 while (!prefetchQueue_.empty())
 observer_->SignalSynchronizedBrowsing(
 *this, current.GetOrigin() + synchronizationOffset_, current.GetNormal());
 }
 }
+void SetPendingSeriesInstanceUid(const std::string& seriesInstanceUid)
+{
+pendingSeriesInstanceUid_ = seriesInstanceUid;
+}
+void ClearPendingSeriesInstanceUid()
+{
+pendingSeriesInstanceUid_.clear();
+}
+const std::string& GetPendingSeriesInstanceUid() const
+{
+return pendingSeriesInstanceUid_;
+}
 };
 pointedPosition.GetX(),
 pointedPosition.GetY(),
 labelPosition.GetX(),
 labelPosition.GetY() );
 }
+virtual void SignalDicomSRLoaded(const std::string& studyInstanceUid,
+const std::string& seriesInstanceUid,
+const std::string& sopInstanceUid) ORTHANC_OVERRIDE;
 };
 static OrthancStone::DicomSource source_;
 return viewport;
 }
 else
 {
 return found->second;
+}
+}
+void WebAssemblyObserver::SignalDicomSRLoaded(const std::string& studyInstanceUid,
+const std::string& seriesInstanceUid,
+const std::string& sopInstanceUid)
+{
+for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
+{
+if (it->second->GetPendingSeriesInstanceUid() == seriesInstanceUid)
+{
+it->second->ClearPendingSeriesInstanceUid();
+FramesCollectionType type;
+std::unique_ptr<IFramesCollection> frames(GetResourcesLoader().GetSeriesFrames(type, seriesInstanceUid));
+if (frames.get() != NULL)
+{
+it->second->SetFrames(frames.release());
+}
+}
 }
 }
 extern "C"
 int LoadSeriesInViewport(const char* canvas,
 const char* seriesInstanceUid)
 {
 try
 {
-std::unique_ptr<IFramesCollection> frames(GetResourcesLoader().GetSeriesFrames(seriesInstanceUid));
+FramesCollectionType type;
+std::unique_ptr<IFramesCollection> frames(GetResourcesLoader().GetSeriesFrames(type, seriesInstanceUid));
 if (frames.get() != NULL)
 {
+GetViewport(canvas)->ClearPendingSeriesInstanceUid();
 GetViewport(canvas)->SetFrames(frames.release());
 return 1;
 }
+else if (type == FramesCollectionType_DicomSR)
+{
+GetViewport(canvas)->SetPendingSeriesInstanceUid(seriesInstanceUid);
+return 0;
+}
 else
 {
+GetViewport(canvas)->ClearPendingSeriesInstanceUid();
 return 0;
 }
 }
 EXTERN_CATCH_EXCEPTIONS;
 return 0;

Mercurial > hg > orthanc-stone

comparison Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 2144:9d77c935f2c3 dicom-sr