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

comparison Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 1603:595c0952ef7e

focusing on osirix annotations in Stone Web viewer

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 28 Oct 2020 18:49:01 +0100
parents	b253b79906fa
children	2df998314507

comparison

equal deleted inserted replaced

-:b2941196cabf
+:595c0952ef7e
 std::list<PrefetchItem>                      prefetchQueue_;
 bool         hasFocusOnInstance_;
 std::string  focusSopInstanceUid_;
+size_t       focusFrameNumber_;
 boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations>  annotations_;
 void ScheduleNextPrefetch()
 {
 case Annotation::Type_Text:
 {
 const TextAnnotation& text = dynamic_cast<const TextAnnotation&>(annotation);
 double x, y;
-OrthancStone::LinearAlgebra::Print(text.GetCenter());
 if (GetCurrentFrameGeometry().ProjectPoint(x, y, text.GetCenter()))
 {
 std::unique_ptr<OrthancStone::TextSceneLayer> layer2(new OrthancStone::TextSceneLayer());
 layer2->SetPosition(x, y);
 layer2->SetText(text.GetText());
 cache_(cache),
 fitNextContent_(true),
 isCtrlDown_(false),
 flipX_(false),
 flipY_(false),
-hasFocusOnInstance_(false)
+hasFocusOnInstance_(false),
+focusFrameNumber_(0)
 {
 if (!cache_)
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
 }
 void Handle(const OrthancStone::ParseDicomSuccessMessage& message)
 {
 dynamic_cast<const ICommand&>(message.GetOrigin().GetPayload()).Handle(message);
 }
-void ApplyScheduledFocus()
-{
-size_t instanceIndex;
-if (hasFocusOnInstance_ &&
-frames_.get() != NULL &&
-frames_->LookupSopInstanceUid(instanceIndex, focusSopInstanceUid_))
-{
-// TODO
-hasFocusOnInstance_ = false;
-}
-}
 public:
 static boost::shared_ptr<ViewerViewport> Create(OrthancStone::ILoadersContext::ILock& lock,
 const OrthancStone::DicomSource& source,
 const std::string& canvas,
 boost::shared_ptr<FramesCache> cache,
 loader_->ScheduleGetDicomWeb(
 boost::make_shared<OrthancStone::LoadedDicomResources>(Orthanc::DICOM_TAG_SOP_INSTANCE_UID),
 0, source_, uri, new SetDefaultWindowingCommand(GetSharedObserver()));
 }
 }
-}
+ApplyScheduledFocus();
+}
-void UpdateCurrentFrame()
+void Redraw()
 {
 if (cursor_.get() != NULL)
 {
 unsigned int quality;
 DisplayFrame(quality, cursor_->GetCurrentIndex());
 void SetAnnotations(boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations> annotations)
 {
 annotations_ = annotations;
 }
+void ScheduleFrameFocus(const std::string& sopInstanceUid,
+unsigned int frameNumber)
+{
+hasFocusOnInstance_ = true;
+focusSopInstanceUid_ = sopInstanceUid;
+focusFrameNumber_ = frameNumber;
+ApplyScheduledFocus();
+}
+void ApplyScheduledFocus()
+{
+size_t frameIndex;
+if (hasFocusOnInstance_ &&
+cursor_.get() != NULL &&
+frames_.get() != NULL &&
+frames_->LookupFrame(frameIndex, focusSopInstanceUid_, focusFrameNumber_))
+{
+size_t current = cursor_->GetCurrentIndex();
+if (current != frameIndex)
+{
+cursor_->SetCurrentIndex(frameIndex);
+DisplayCurrentFrame();
+}
+hasFocusOnInstance_ = false;
+}
+}
 };
 "seriesInstanceUid" : UTF8ToString($1) });
 window.dispatchEvent(customEvent);
 },
 studyInstanceUid.c_str(),
 seriesInstanceUid.c_str());
+for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
+{
+assert(it->second != NULL);
+it->second->ApplyScheduledFocus();
+}
 }
 virtual void SignalFrameUpdated(const ViewerViewport& viewport,
 size_t currentFrame,
 size_t countFrames,
 }
 EXTERN_CATCH_EXCEPTIONS;
 }
+// Side-effect: "GetStringBuffer()" is filled with the "Series
+// Instance UID" of the first loaded annotation
 EMSCRIPTEN_KEEPALIVE
 int LoadOsiriXAnnotations(const char* xml,
 int clearPreviousAnnotations)
 {
 try
 {
 annotations_->Clear();
 }
 annotations_->LoadXml(xml);
+// Force redraw, as the annotations might have changed
 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it)
 {
-// TODO - Check if the viewport contains one of the SOP
-// Instance UID from the loaded annotations => focus on this
-// instance
-// TODO - If no viewport contains the instance => monitor the
-// "ResourcesLoader" as new series get loaded
 assert(it->second != NULL);
-it->second->UpdateCurrentFrame();
+it->second->Redraw();
+}
+if (annotations_->GetSize() == 0)
+{
+stringBuffer_.clear();
+}
+else
+{
+stringBuffer_ = annotations_->GetAnnotation(0).GetSeriesInstanceUid();
 }
 LOG(WARNING) << "Loaded " << annotations_->GetSize() << " annotations from OsiriX";
 return 1;
 }
 EXTERN_CATCH_EXCEPTIONS;
 return 0;
 }
+EMSCRIPTEN_KEEPALIVE
+void FocusFirstOsiriXAnnotation(const char* canvas)
+{
+try
+{
+if (annotations_->GetSize() != 0)
+{
+const OrthancStone::OsiriX::Annotation& annotation = annotations_->GetAnnotation(0);
+boost::shared_ptr<ViewerViewport> viewport = GetViewport(canvas);
+viewport->ScheduleFrameFocus(annotation.GetSopInstanceUid(), 0 /* focus on first frame */);
+// Force redraw, as the annotations might already have changed
+viewport->Redraw();
+}
+}
+EXTERN_CATCH_EXCEPTIONS;
+}
 }

Mercurial > hg > orthanc-stone

comparison Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 1603:595c0952ef7e