Mercurial > hg > orthanc-stone

comparison Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp @ 1388:240531afdd2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dead code removal + removed untested Dicomweb + SingleFrameViewer wasm fixes
author Benjamin Golinvaux <bgo@osimis.io>
date Tue, 28 Apr 2020 08:57:39 +0200
parents 458ab069f313
children 15173a383a00
comparison
equal deleted inserted replaced
1387:4ebf246f3919 1388:240531afdd2d
42 42
43 43
44 44
45 namespace OrthancStone 45 namespace OrthancStone
46 { 46 {
47 class Observer : public IWebViewerLoadersObserver
48 {
49 public:
50 virtual void SignalSeriesUpdated(LoadedDicomResources& series)
51 {
52 LOG(INFO) << "=====================================";
53 LOG(INFO) << series.GetSize() << " series";
54
55 /*for (size_t i = 0; i < series.GetSize(); i++)
56 {
57 series.GetResource(i).Print(stdout);
58 printf("\n");
59 }*/
60 }
61
62 virtual void SignalThumbnailLoaded(const std::string& studyInstanceUid,
63 const std::string& seriesInstanceUid,
64 SeriesThumbnailType type)
65 {
66 LOG(INFO) << "*** Thumbnail loaded: " << studyInstanceUid << " / "
67 << seriesInstanceUid << " (type " << type << ")";
68 }
69 };
70 } 47 }
71
72
73 48
74 static std::auto_ptr<OrthancStone::WebAssemblyLoadersContext> context_; 49 static std::auto_ptr<OrthancStone::WebAssemblyLoadersContext> context_;
75 static boost::shared_ptr<OrthancStone::Application> application_; 50 static boost::shared_ptr<OrthancStone::Application> application_;
76
77 51
78 extern "C" 52 extern "C"
79 { 53 {
80 int main(int argc, char const *argv[]) 54 int main(int argc, char const *argv[])
81 { 55 {
93 LOG(INFO) << "Endianness: " << Orthanc::EnumerationToString(Orthanc::Toolbox::DetectEndianness()); 67 LOG(INFO) << "Endianness: " << Orthanc::EnumerationToString(Orthanc::Toolbox::DetectEndianness());
94 context_.reset(new OrthancStone::WebAssemblyLoadersContext(1, 4, 1)); 68 context_.reset(new OrthancStone::WebAssemblyLoadersContext(1, 4, 1));
95 context_->SetLocalOrthanc(".."); 69 context_->SetLocalOrthanc("..");
96 context_->SetDicomCacheSize(128 * 1024 * 1024); // 128MB 70 context_->SetDicomCacheSize(128 * 1024 * 1024); // 128MB
97 71
98 DISPATCH_JAVASCRIPT_EVENT("StoneInitialized"); 72 DISPATCH_JAVASCRIPT_EVENT("WasmModuleInitialized");
99 } 73 }
100 EXTERN_CATCH_EXCEPTIONS; 74 EXTERN_CATCH_EXCEPTIONS;
101 75
102 return 0; 76 return 0;
103 } 77 }
104
105 78
106 EMSCRIPTEN_KEEPALIVE 79 EMSCRIPTEN_KEEPALIVE
107 void InitializeViewport(const char* canvasId) 80 void InitializeViewport(const char* canvasId)
108 { 81 {
109 try 82 try
118 { 91 {
119 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls, 92 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
120 "Only one single viewport is available for this application"); 93 "Only one single viewport is available for this application");
121 } 94 }
122 95
123 {
124 std::auto_ptr<OrthancStone::Observer> observer(new OrthancStone::Observer);
125
126 #if 1
127 OrthancStone::DicomSource source1;
128 //source1.SetDicomWebSource("http://localhost:8042/dicom-web"); source1.SetDicomWebRendered(true);
129 source1.SetDicomWebThroughOrthancSource("self"); source1.SetDicomWebRendered(true);
130 //source1.SetDicomWebThroughOrthancSource("my-google"); source1.SetDicomWebRendered(false);
131 boost::shared_ptr<OrthancStone::WebViewerLoaders> app2(
132 OrthancStone::WebViewerLoaders::Create(*context_, source1, true, observer.release()));
133 #else
134 OrthancStone::DicomSource source1;
135 source1.SetOrthancSource();
136 boost::shared_ptr<OrthancStone::WebViewerLoaders> app2(
137 OrthancStone::WebViewerLoaders::Create(*context_, source1, true, observer.release()));
138 //app2->AddOrthancStudy("27f7126f-4f66fb14-03f4081b-f9341db2-53925988");
139 //app2->AddOrthancSeries("1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0");
140 #endif
141
142 // BRAINIX
143 //app2->AddDicomAllSeries();
144 //app2->AddDicomStudy("2.16.840.1.113669.632.20.1211.10000357775");
145 app2->AddDicomSeries("2.16.840.1.113669.632.20.1211.10000357775", "1.3.46.670589.11.0.0.11.4.2.0.8743.5.3800.2006120117110979000"); // Standard image: type 5
146
147 app2->AddDicomStudy("1.3.51.0.7.633920140505.6339234439.633987.633918098"); // "Video" type 4: video720p.dcm
148 app2->AddDicomStudy("1.2.276.0.7230010.3.1.2.2344313775.14992.1458058404.7528"); // "PDF" type 3: pdf.dcm
149 app2->AddDicomSeries("1.2.276.0.7230010.3.1.2.296485376.1.1568899779.944131", "1.2.276.0.7230010.3.1.3.296485376.1.1568899781.944588"); // RTSTRUCT, "Unsupported" type 2: DICOM/WebViewer2/TFE/IMAGES/IM452
150
151
152 //app2->AddDicomStudy("1.2.276.0.7230010.3.1.2.380371456.1.1544616291.954997"); // CSPO
153 }
154
155 boost::shared_ptr<OrthancStone::WebGLViewport> viewport(OrthancStone::GetWebGLViewportsRegistry().Add(canvasId)); 96 boost::shared_ptr<OrthancStone::WebGLViewport> viewport(OrthancStone::GetWebGLViewportsRegistry().Add(canvasId));
156 application_ = OrthancStone::Application::Create(*context_, viewport); 97 application_ = OrthancStone::Application::Create(*context_, viewport);
157 98
158 // Paint the viewport to black
159
160 { 99 {
161 OrthancStone::WebGLViewportsRegistry::Accessor accessor( 100 OrthancStone::WebGLViewportsRegistry::Accessor accessor(
162 OrthancStone::GetWebGLViewportsRegistry(), canvasId); 101 OrthancStone::GetWebGLViewportsRegistry(), canvasId);
163 102
164 if (accessor.IsValid()) 103 if (accessor.IsValid())
170 EXTERN_CATCH_EXCEPTIONS; 109 EXTERN_CATCH_EXCEPTIONS;
171 } 110 }
172 111
173 112
174 EMSCRIPTEN_KEEPALIVE 113 EMSCRIPTEN_KEEPALIVE
175 void LoadOrthanc(const char* instance, 114 void LoadFromOrthanc(const char* instance,
176 int frame) 115 int frame)
177 { 116 {
178 try 117 try
179 { 118 {
180 if (application_.get() != NULL) 119 if (application_.get() != NULL)
181 { 120 {
186 EXTERN_CATCH_EXCEPTIONS; 125 EXTERN_CATCH_EXCEPTIONS;
187 } 126 }
188 127
189 128
190 EMSCRIPTEN_KEEPALIVE 129 EMSCRIPTEN_KEEPALIVE
191 void LoadDicomWeb(const char* server, 130 void LoadFromDicomWeb(const char* server,
192 const char* studyInstanceUid, 131 const char* studyInstanceUid,
193 const char* seriesInstanceUid, 132 const char* seriesInstanceUid,
194 const char* sopInstanceUid, 133 const char* sopInstanceUid,
195 int frame) 134 int frame)
196 { 135 {
197 try 136 try
198 { 137 {
199 if (application_.get() != NULL) 138 if (application_.get() != NULL)
200 { 139 {