Mercurial > hg > orthanc-stone
annotate Applications/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h @ 2130:ed2c704b1119 StoneWebViewer-2.1
closing StoneWebViewer-2.1
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 30 May 2024 17:08:23 +0200 |
parents | 9ac2a65d4172 |
children | 3889ae96d2e9 |
rev | line source |
---|---|
1457 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
1739
9ac2a65d4172
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
1457 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
1596
4fb8fdf03314
removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
16 * |
1457 | 17 * You should have received a copy of the GNU Affero General Public License |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
22 #pragma once |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
23 |
1543 | 24 #include "../../../../OrthancStone/Sources/Loaders/DicomResourcesLoader.h" |
25 #include "../../../../OrthancStone/Sources/Loaders/ILoadersContext.h" | |
26 #include "../../../../OrthancStone/Sources/Loaders/SeriesFramesLoader.h" | |
27 #include "../../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h" | |
1560
b4ccd4963d37
fix sdl and wasm samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1543
diff
changeset
|
28 #include "../../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h" |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
29 |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
30 #include <Compatibility.h> // For std::unique_ptr<> |
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
31 |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
32 #include <boost/make_shared.hpp> |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
33 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
34 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
35 namespace OrthancStone |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
36 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
37 class Application : public ObserverBase<Application> |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
38 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
39 private: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
40 ILoadersContext& context_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
41 boost::shared_ptr<IViewport> viewport_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
42 boost::shared_ptr<DicomResourcesLoader> dicomLoader_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
43 boost::shared_ptr<SeriesFramesLoader> framesLoader_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
44 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
45 Application(ILoadersContext& context, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
46 boost::shared_ptr<IViewport> viewport) : |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
47 context_(context), |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
48 viewport_(viewport) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
49 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
50 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
51 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
52 void Handle(const SeriesFramesLoader::FrameLoadedMessage& message) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
53 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
54 LOG(INFO) << "Frame decoded! " |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
55 << message.GetImage().GetWidth() << "x" << message.GetImage().GetHeight() |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
56 << " " << Orthanc::EnumerationToString(message.GetImage().GetFormat()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
57 |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
58 std::unique_ptr<TextureBaseSceneLayer> layer( |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
59 message.GetInstanceParameters().CreateTexture(message.GetImage())); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
60 layer->SetLinearInterpolation(true); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
61 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
62 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
63 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
64 lock->GetController().GetScene().SetLayer(0, layer.release()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
65 lock->GetCompositor().FitContent(lock->GetController().GetScene()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
66 lock->Invalidate(); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
67 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
68 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
69 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
70 void Handle(const DicomResourcesLoader::SuccessMessage& message) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
71 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
72 if (message.GetResources()->GetSize() != 1) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
73 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
74 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
75 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
76 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
77 //message.GetResources()->GetResource(0).Print(stdout); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
78 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
79 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
80 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
81 SeriesFramesLoader::Factory f(*message.GetResources()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
82 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
83 framesLoader_ = boost::dynamic_pointer_cast<SeriesFramesLoader>(f.Create(*lock)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
84 Register<SeriesFramesLoader::FrameLoadedMessage>(*framesLoader_, &Application::Handle); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
85 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
86 assert(message.HasUserPayload()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
87 const Orthanc::SingleValueObject<unsigned int>& payload = |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
88 dynamic_cast<const Orthanc::SingleValueObject<unsigned int>&>(message.GetUserPayload()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
89 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
90 LOG(INFO) << "Loading pixel data of frame: " << payload.GetValue(); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
91 framesLoader_->ScheduleLoadFrame( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
92 0, message.GetDicomSource(), payload.GetValue(), |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
93 message.GetDicomSource().GetQualityCount() - 1 /* download best quality available */, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
94 NULL); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
95 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
96 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
97 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
98 public: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
99 static boost::shared_ptr<Application> Create(ILoadersContext& context, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
100 boost::shared_ptr<IViewport> viewport) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
101 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
102 boost::shared_ptr<Application> application(new Application(context, viewport)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
103 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
104 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
105 std::unique_ptr<ILoadersContext::ILock> lock(context.Lock()); |
1472
474360793956
DicomResourcesLoader::Create()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
106 application->dicomLoader_ = DicomResourcesLoader::Create(*lock); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
107 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
108 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
109 application->Register<DicomResourcesLoader::SuccessMessage>(*application->dicomLoader_, &Application::Handle); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
110 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
111 return application; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
112 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
113 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
114 void LoadOrthancFrame(const DicomSource& source, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
115 const std::string& instanceId, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
116 unsigned int frame) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
117 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
118 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
119 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
120 dicomLoader_->ScheduleLoadOrthancResource( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
121 boost::make_shared<LoadedDicomResources>(Orthanc::DICOM_TAG_SOP_INSTANCE_UID), |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
122 0, source, Orthanc::ResourceType_Instance, instanceId, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
123 new Orthanc::SingleValueObject<unsigned int>(frame)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
124 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
125 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
126 void LoadDicomWebFrame(const DicomSource& source, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
127 const std::string& studyInstanceUid, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
128 const std::string& seriesInstanceUid, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
129 const std::string& sopInstanceUid, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
130 unsigned int frame) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
131 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
132 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
133 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
134 // We first must load the "/metadata" to know the number of frames |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
135 dicomLoader_->ScheduleGetDicomWeb( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
136 boost::make_shared<LoadedDicomResources>(Orthanc::DICOM_TAG_SOP_INSTANCE_UID), 0, source, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
137 "/studies/" + studyInstanceUid + "/series/" + seriesInstanceUid + "/instances/" + sopInstanceUid + "/metadata", |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
138 new Orthanc::SingleValueObject<unsigned int>(frame)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
139 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
140 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
141 void FitContent() |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
142 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
143 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
144 lock->GetCompositor().FitContent(lock->GetController().GetScene()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
145 lock->Invalidate(); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
146 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
147 }; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
148 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
149 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
150 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
151 class IWebViewerLoadersObserver : public boost::noncopyable |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
152 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
153 public: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
154 virtual ~IWebViewerLoadersObserver() |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
155 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
156 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
157 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
158 virtual void SignalSeriesUpdated(LoadedDicomResources& series) = 0; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
159 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
160 virtual void SignalThumbnailLoaded(const std::string& studyInstanceUid, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
161 const std::string& seriesInstanceUid, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
162 SeriesThumbnailType type) = 0; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
163 }; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
164 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
165 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
166 class WebViewerLoaders : public ObserverBase<WebViewerLoaders> |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
167 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
168 private: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
169 static const int PRIORITY_ADD_RESOURCES = 0; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
170 static const int PRIORITY_THUMBNAILS = OracleScheduler::PRIORITY_LOW + 100; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
171 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
172 enum Type |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
173 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
174 Type_Orthanc = 1, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
175 Type_DicomWeb = 2 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
176 }; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
177 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
178 ILoadersContext& context_; |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
179 std::unique_ptr<IWebViewerLoadersObserver> observer_; |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
180 bool loadThumbnails_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
181 DicomSource source_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
182 std::set<std::string> scheduledSeries_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
183 std::set<std::string> scheduledThumbnails_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
184 std::set<std::string> scheduledStudies_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
185 boost::shared_ptr<LoadedDicomResources> loadedSeries_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
186 boost::shared_ptr<LoadedDicomResources> loadedStudies_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
187 boost::shared_ptr<DicomResourcesLoader> resourcesLoader_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
188 boost::shared_ptr<SeriesThumbnailsLoader> thumbnailsLoader_; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
189 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
190 WebViewerLoaders(ILoadersContext& context, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
191 IWebViewerLoadersObserver* observer) : |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
192 context_(context), |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
193 observer_(observer), |
1573 | 194 loadThumbnails_(false), |
195 loadedSeries_(boost::make_shared<LoadedDicomResources>(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID)), | |
196 loadedStudies_(boost::make_shared<LoadedDicomResources>(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID)) | |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
197 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
198 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
199 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
200 static Orthanc::IDynamicObject* CreatePayload(Type type) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
201 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
202 return new Orthanc::SingleValueObject<Type>(type); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
203 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
204 |
1474
d1dde1f86d4a
fix build of wasm samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1472
diff
changeset
|
205 void HandleThumbnail(const SeriesThumbnailsLoader::SuccessMessage& message) |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
206 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
207 if (observer_.get() != NULL) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
208 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
209 observer_->SignalThumbnailLoaded(message.GetStudyInstanceUid(), |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
210 message.GetSeriesInstanceUid(), |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
211 message.GetType()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
212 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
213 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
214 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
215 void HandleLoadedResources(const DicomResourcesLoader::SuccessMessage& message) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
216 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
217 LoadedDicomResources series(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
218 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
219 switch (dynamic_cast<const Orthanc::SingleValueObject<Type>&>(message.GetUserPayload()).GetValue()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
220 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
221 case Type_DicomWeb: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
222 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
223 for (size_t i = 0; i < loadedSeries_->GetSize(); i++) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
224 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
225 std::string study; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
226 if (loadedSeries_->GetResource(i).LookupStringValue( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
227 study, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) && |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
228 loadedStudies_->HasResource(study)) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
229 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
230 Orthanc::DicomMap m; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
231 m.Assign(loadedSeries_->GetResource(i)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
232 loadedStudies_->MergeResource(m, study); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
233 series.AddResource(m); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
234 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
235 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
236 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
237 break; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
238 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
239 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
240 case Type_Orthanc: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
241 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
242 for (size_t i = 0; i < message.GetResources()->GetSize(); i++) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
243 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
244 series.AddResource(message.GetResources()->GetResource(i)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
245 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
246 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
247 break; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
248 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
249 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
250 default: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
251 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
252 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
253 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
254 if (loadThumbnails_ && |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
255 (!source_.IsDicomWeb() || |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
256 source_.HasDicomWebRendered())) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
257 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
258 for (size_t i = 0; i < series.GetSize(); i++) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
259 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
260 std::string patientId, studyInstanceUid, seriesInstanceUid; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
261 if (series.GetResource(i).LookupStringValue(patientId, Orthanc::DICOM_TAG_PATIENT_ID, false) && |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
262 series.GetResource(i).LookupStringValue(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) && |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
263 series.GetResource(i).LookupStringValue(seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false) && |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
264 scheduledThumbnails_.find(seriesInstanceUid) == scheduledThumbnails_.end()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
265 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
266 scheduledThumbnails_.insert(seriesInstanceUid); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
267 thumbnailsLoader_->ScheduleLoadThumbnail(source_, patientId, studyInstanceUid, seriesInstanceUid); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
268 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
269 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
270 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
271 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
272 if (observer_.get() != NULL && |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
273 series.GetSize() > 0) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
274 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
275 observer_->SignalSeriesUpdated(series); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
276 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
277 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
278 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
279 void HandleOrthancRestApi(const OrthancRestApiCommand::SuccessMessage& message) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
280 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
281 Json::Value body; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
282 message.ParseJsonBody(body); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
283 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
284 if (body.type() != Json::arrayValue) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
285 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
286 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
287 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
288 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
289 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
290 for (Json::Value::ArrayIndex i = 0; i < body.size(); i++) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
291 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
292 if (body[i].type() == Json::stringValue) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
293 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
294 AddOrthancSeries(body[i].asString()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
295 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
296 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
297 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
298 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
299 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
300 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
301 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
302 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
303 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
304 public: |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
305 static boost::shared_ptr<WebViewerLoaders> Create(ILoadersContext& context, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
306 const DicomSource& source, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
307 bool loadThumbnails, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
308 IWebViewerLoadersObserver* observer) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
309 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
310 boost::shared_ptr<WebViewerLoaders> application(new WebViewerLoaders(context, observer)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
311 application->source_ = source; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
312 application->loadThumbnails_ = loadThumbnails; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
313 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
314 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
315 std::unique_ptr<ILoadersContext::ILock> lock(context.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
316 |
1472
474360793956
DicomResourcesLoader::Create()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
317 application->resourcesLoader_ = DicomResourcesLoader::Create(*lock); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
318 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
319 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
320 SeriesThumbnailsLoader::Factory f; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
321 f.SetPriority(PRIORITY_THUMBNAILS); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
322 application->thumbnailsLoader_ = boost::dynamic_pointer_cast<SeriesThumbnailsLoader>(f.Create(*lock)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
323 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
324 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
325 application->Register<OrthancRestApiCommand::SuccessMessage>( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
326 lock->GetOracleObservable(), &WebViewerLoaders::HandleOrthancRestApi); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
327 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
328 application->Register<DicomResourcesLoader::SuccessMessage>( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
329 *application->resourcesLoader_, &WebViewerLoaders::HandleLoadedResources); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
330 |
1474
d1dde1f86d4a
fix build of wasm samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1472
diff
changeset
|
331 application->Register<SeriesThumbnailsLoader::SuccessMessage>( |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
332 *application->thumbnailsLoader_, &WebViewerLoaders::HandleThumbnail); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
333 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
334 lock->AddLoader(application); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
335 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
336 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
337 return application; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
338 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
339 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
340 void AddDicomAllSeries() |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
341 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
342 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
343 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
344 if (source_.IsDicomWeb()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
345 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
346 resourcesLoader_->ScheduleGetDicomWeb(loadedSeries_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
347 "/series", CreatePayload(Type_DicomWeb)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
348 resourcesLoader_->ScheduleGetDicomWeb(loadedStudies_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
349 "/studies", CreatePayload(Type_DicomWeb)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
350 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
351 else if (source_.IsOrthanc()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
352 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
353 std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
354 command->SetMethod(Orthanc::HttpMethod_Get); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
355 command->SetUri("/series"); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
356 lock->Schedule(GetSharedObserver(), PRIORITY_ADD_RESOURCES, command.release()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
357 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
358 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
359 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
360 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
361 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
362 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
363 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
364 void AddDicomStudy(const std::string& studyInstanceUid) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
365 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
366 // Avoid adding twice the same study |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
367 if (scheduledStudies_.find(studyInstanceUid) == scheduledStudies_.end()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
368 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
369 scheduledStudies_.insert(studyInstanceUid); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
370 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
371 if (source_.IsDicomWeb()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
372 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
373 Orthanc::DicomMap filter; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
374 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
375 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
376 std::set<Orthanc::DicomTag> tags; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
377 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
378 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
379 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
380 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
381 resourcesLoader_->ScheduleQido(loadedStudies_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
382 Orthanc::ResourceType_Study, filter, tags, CreatePayload(Type_DicomWeb)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
383 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
384 resourcesLoader_->ScheduleQido(loadedSeries_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
385 Orthanc::ResourceType_Series, filter, tags, CreatePayload(Type_DicomWeb)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
386 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
387 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
388 else if (source_.IsOrthanc()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
389 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
390 std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
391 command->SetMethod(Orthanc::HttpMethod_Post); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
392 command->SetUri("/tools/find"); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
393 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
394 Json::Value body; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
395 body["Level"] = "Series"; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
396 body["Query"] = Json::objectValue; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
397 body["Query"]["StudyInstanceUID"] = studyInstanceUid; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
398 command->SetBody(body); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
399 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
400 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
401 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
402 lock->Schedule(GetSharedObserver(), PRIORITY_ADD_RESOURCES, command.release()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
403 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
404 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
405 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
406 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
407 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
408 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
409 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
410 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
411 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
412 void AddDicomSeries(const std::string& studyInstanceUid, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
413 const std::string& seriesInstanceUid) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
414 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
415 std::set<Orthanc::DicomTag> tags; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
416 |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
417 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
418 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
419 if (scheduledStudies_.find(studyInstanceUid) == scheduledStudies_.end()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
420 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
421 scheduledStudies_.insert(studyInstanceUid); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
422 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
423 if (source_.IsDicomWeb()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
424 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
425 Orthanc::DicomMap filter; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
426 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
427 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
428 resourcesLoader_->ScheduleQido(loadedStudies_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
429 Orthanc::ResourceType_Study, filter, tags, CreatePayload(Type_DicomWeb)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
430 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
431 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
432 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
433 if (scheduledSeries_.find(seriesInstanceUid) == scheduledSeries_.end()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
434 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
435 scheduledSeries_.insert(seriesInstanceUid); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
436 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
437 if (source_.IsDicomWeb()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
438 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
439 Orthanc::DicomMap filter; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
440 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
441 filter.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, seriesInstanceUid, false); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
442 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
443 resourcesLoader_->ScheduleQido(loadedSeries_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
444 Orthanc::ResourceType_Series, filter, tags, CreatePayload(Type_DicomWeb)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
445 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
446 else if (source_.IsOrthanc()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
447 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
448 std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
449 command->SetMethod(Orthanc::HttpMethod_Post); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
450 command->SetUri("/tools/find"); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
451 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
452 Json::Value body; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
453 body["Level"] = "Series"; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
454 body["Query"] = Json::objectValue; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
455 body["Query"]["StudyInstanceUID"] = studyInstanceUid; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
456 body["Query"]["SeriesInstanceUID"] = seriesInstanceUid; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
457 command->SetBody(body); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
458 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
459 lock->Schedule(GetSharedObserver(), PRIORITY_ADD_RESOURCES, command.release()); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
460 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
461 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
462 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
463 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
464 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
465 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
466 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
467 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
468 void AddOrthancStudy(const std::string& orthancId) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
469 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
470 if (source_.IsOrthanc()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
471 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
472 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
473 resourcesLoader_->ScheduleLoadOrthancResources( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
474 loadedSeries_, PRIORITY_ADD_RESOURCES, source_, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
475 Orthanc::ResourceType_Study, orthancId, Orthanc::ResourceType_Series, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
476 CreatePayload(Type_Orthanc)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
477 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
478 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
479 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
480 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadParameterType, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
481 "Only applicable to Orthanc DICOM sources"); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
482 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
483 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
484 |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
485 void AddOrthancSeries(const std::string& orthancId) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
486 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
487 if (source_.IsOrthanc()) |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
488 { |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1474
diff
changeset
|
489 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |
1354
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
490 resourcesLoader_->ScheduleLoadOrthancResource( |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
491 loadedSeries_, PRIORITY_ADD_RESOURCES, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
492 source_, Orthanc::ResourceType_Series, orthancId, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
493 CreatePayload(Type_Orthanc)); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
494 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
495 else |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
496 { |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
497 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadParameterType, |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
498 "Only applicable to Orthanc DICOM sources"); |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
499 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
500 } |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
501 }; |
c0e4eb14c912
SingleFrameViewer WASM working OK
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff
changeset
|
502 } |