Mercurial > hg > orthanc-stone
annotate Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 1982:ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 31 Oct 2022 08:55:14 +0100 |
| parents | 0aac8f552d89 |
| children | e8b9a2ba1df1 |
| rev | line source |
|---|---|
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Stone of Orthanc |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
1871
7053b8a0aaec
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1870
diff
changeset
|
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium |
|
7053b8a0aaec
upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1870
diff
changeset
|
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * This program is free software: you can redistribute it and/or |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * modify it under the terms of the GNU Affero General Public License |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * as published by the Free Software Foundation, either version 3 of |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * the License, or (at your option) any later version. |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * This program is distributed in the hope that it will be useful, but |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * WITHOUT ANY WARRANTY; without even the implied warranty of |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * Affero General Public License for more details. |
|
1596
4fb8fdf03314
removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1593
diff
changeset
|
17 * |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * You should have received a copy of the GNU Affero General Public License |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 **/ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
23 #include <EmbeddedResources.h> |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 #include <emscripten.h> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 #define DISPATCH_JAVASCRIPT_EVENT(name) \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 EM_ASM( \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 const customEvent = document.createEvent("CustomEvent"); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 customEvent.initCustomEvent(name, false, false, undefined); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 window.dispatchEvent(customEvent); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 ); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 #define EXTERN_CATCH_EXCEPTIONS \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 catch (Orthanc::OrthancException& e) \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 { \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
38 LOG(ERROR) << "OrthancException: " << e.What(); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 DISPATCH_JAVASCRIPT_EVENT("StoneException"); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 } \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 catch (OrthancStone::StoneException& e) \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 { \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 LOG(ERROR) << "StoneException: " << e.What(); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 DISPATCH_JAVASCRIPT_EVENT("StoneException"); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 } \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 catch (std::exception& e) \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 { \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 LOG(ERROR) << "Runtime error: " << e.what(); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 DISPATCH_JAVASCRIPT_EVENT("StoneException"); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 } \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 catch (...) \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 { \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 LOG(ERROR) << "Native exception"; \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 DISPATCH_JAVASCRIPT_EVENT("StoneException"); \ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
55 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
56 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 |
|
1549
a48ae10857b1
packaging of the WebAssembly module
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1544
diff
changeset
|
58 // Orthanc framework includes |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
59 #include <Cache/MemoryObjectCache.h> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
60 #include <DicomFormat/DicomArray.h> |
|
1549
a48ae10857b1
packaging of the WebAssembly module
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1544
diff
changeset
|
61 #include <DicomParsing/ParsedDicomFile.h> |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
62 #include <Images/Image.h> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
63 #include <Images/ImageProcessing.h> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
64 #include <Images/JpegReader.h> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 #include <Logging.h> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
66 |
|
1549
a48ae10857b1
packaging of the WebAssembly module
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1544
diff
changeset
|
67 // Stone includes |
| 1902 | 68 #include "../../../OrthancStone/Sources/Loaders/DicomResourcesLoader.h" |
| 69 #include "../../../OrthancStone/Sources/Loaders/SeriesMetadataLoader.h" | |
| 70 #include "../../../OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.h" | |
| 71 #include "../../../OrthancStone/Sources/Messages/ObserverBase.h" | |
| 72 #include "../../../OrthancStone/Sources/Oracle/ParseDicomFromWadoCommand.h" | |
| 73 #include "../../../OrthancStone/Sources/Oracle/ParseDicomSuccessMessage.h" | |
| 74 #include "../../../OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.h" | |
| 75 #include "../../../OrthancStone/Sources/Scene2D/ArrowSceneLayer.h" | |
| 76 #include "../../../OrthancStone/Sources/Scene2D/ColorTextureSceneLayer.h" | |
| 77 #include "../../../OrthancStone/Sources/Scene2D/FloatTextureSceneLayer.h" | |
| 78 #include "../../../OrthancStone/Sources/Scene2D/MacroSceneLayer.h" | |
| 79 #include "../../../OrthancStone/Sources/Scene2D/OsiriXLayerFactory.h" | |
| 80 #include "../../../OrthancStone/Sources/Scene2D/PolylineSceneLayer.h" | |
| 81 #include "../../../OrthancStone/Sources/Scene2D/TextSceneLayer.h" | |
| 82 #include "../../../OrthancStone/Sources/Scene2DViewport/ViewportController.h" | |
| 83 #include "../../../OrthancStone/Sources/StoneException.h" | |
| 84 #include "../../../OrthancStone/Sources/Toolbox/DicomInstanceParameters.h" | |
| 85 #include "../../../OrthancStone/Sources/Toolbox/GeometryToolbox.h" | |
| 86 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/AngleAnnotation.h" | |
| 87 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/CollectionOfAnnotations.h" | |
| 88 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/LineAnnotation.h" | |
| 89 #include "../../../OrthancStone/Sources/Toolbox/OsiriX/TextAnnotation.h" | |
| 90 #include "../../../OrthancStone/Sources/Toolbox/SortedFrames.h" | |
| 91 #include "../../../OrthancStone/Sources/Viewport/DefaultViewportInteractor.h" | |
|
1591
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1580
diff
changeset
|
92 |
|
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1580
diff
changeset
|
93 // WebAssembly includes |
| 1902 | 94 #include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyCairoViewport.h" |
| 95 #include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebAssemblyLoadersContext.h" | |
| 96 #include "../../../OrthancStone/Sources/Platforms/WebAssembly/WebGLViewport.h" | |
|
1591
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1580
diff
changeset
|
97 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
98 |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
99 #include <boost/math/special_functions/round.hpp> |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
100 #include <boost/make_shared.hpp> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
101 #include <stdio.h> |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
102 #include <algorithm> |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
103 |
|
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
104 #if !defined(STONE_WEB_VIEWER_EXPORT) |
|
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
105 // We are not running ParseWebAssemblyExports.py, but we're compiling the wasm |
|
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
106 # define STONE_WEB_VIEWER_EXPORT |
|
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
107 #endif |
|
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
108 |
|
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
109 |
|
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
110 #define FIX_LSD_479 1 |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
111 |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
112 |
|
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
113 enum STONE_WEB_VIEWER_EXPORT ThumbnailType |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
114 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
115 ThumbnailType_Image, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
116 ThumbnailType_NoPreview, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
117 ThumbnailType_Pdf, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
118 ThumbnailType_Video, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
119 ThumbnailType_Loading, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
120 ThumbnailType_Unknown |
| 1668 | 121 }; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
122 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
123 |
|
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
124 enum STONE_WEB_VIEWER_EXPORT DisplayedFrameQuality |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
125 { |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
126 DisplayedFrameQuality_None, |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
127 DisplayedFrameQuality_Low, |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
128 DisplayedFrameQuality_High |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
129 }; |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
130 |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
131 |
|
1632
9a4c09361f3e
removed annoying warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1630
diff
changeset
|
132 enum STONE_WEB_VIEWER_EXPORT WebViewerAction |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
133 { |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
134 WebViewerAction_None, |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
135 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
136 WebViewerAction_Windowing, |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
137 WebViewerAction_Zoom, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
138 WebViewerAction_Pan, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
139 WebViewerAction_Rotate, |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
140 WebViewerAction_Crosshair, |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
141 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
142 WebViewerAction_CreateAngle, |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
143 WebViewerAction_CreateCircle, |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
144 WebViewerAction_CreateSegment, |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
145 WebViewerAction_RemoveMeasure, |
|
1982
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
146 WebViewerAction_CreatePixelProbe, // New in 2.4 |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
147 WebViewerAction_CreateEllipseProbe, // New in 2.4 |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
148 WebViewerAction_CreateRectangleProbe, // New in 2.4 |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
149 WebViewerAction_CreateTextAnnotation // New in 2.4 |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
150 }; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
151 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
152 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
153 |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
154 static OrthancStone::MouseAction ConvertWebViewerAction(int action) |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
155 { |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
156 switch (action) |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
157 { |
|
1701
b5a8bf32d969
new configuration options: "CombinedToolEnabled", "CombinedToolBehaviour" and "DownloadAsJpegEnabled"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1695
diff
changeset
|
158 case WebViewerAction_Windowing: |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
159 return OrthancStone::MouseAction_GrayscaleWindowing; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
160 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
161 case WebViewerAction_Zoom: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
162 return OrthancStone::MouseAction_Zoom; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
163 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
164 case WebViewerAction_Pan: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
165 return OrthancStone::MouseAction_Pan; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
166 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
167 case WebViewerAction_Rotate: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
168 return OrthancStone::MouseAction_Rotate; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
169 |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
170 case WebViewerAction_None: |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
171 case WebViewerAction_Crosshair: |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
172 case WebViewerAction_CreateAngle: |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
173 case WebViewerAction_CreateCircle: |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
174 case WebViewerAction_CreateSegment: |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
175 case WebViewerAction_RemoveMeasure: |
|
1980
0aac8f552d89
added pixel probe to the Stone Web viewer toolbar
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1978
diff
changeset
|
176 case WebViewerAction_CreatePixelProbe: |
|
1982
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
177 case WebViewerAction_CreateEllipseProbe: |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
178 case WebViewerAction_CreateRectangleProbe: |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
179 case WebViewerAction_CreateTextAnnotation: |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
180 return OrthancStone::MouseAction_None; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
181 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
182 default: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
183 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
184 } |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
185 } |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
186 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
187 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
188 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
189 static const int PRIORITY_HIGH = -100; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
190 static const int PRIORITY_LOW = 100; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
191 static const int PRIORITY_NORMAL = 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
192 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
193 static const unsigned int QUALITY_JPEG = 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
194 static const unsigned int QUALITY_FULL = 1; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
195 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
196 static const unsigned int DEFAULT_CINE_RATE = 30; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
197 |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
198 |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
199 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
200 class VirtualSeries : public boost::noncopyable |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
201 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
202 private: |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
203 class Item : public boost::noncopyable |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
204 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
205 private: |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
206 std::string seriesInstanceUid_; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
207 std::list<std::string> sopInstanceUids_; |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
208 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
209 public: |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
210 Item(const std::string& seriesInstanceUid, |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
211 const std::list<std::string>& sopInstanceUids) : |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
212 seriesInstanceUid_(seriesInstanceUid), |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
213 sopInstanceUids_(sopInstanceUids) |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
214 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
215 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
216 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
217 const std::string& GetSeriesInstanceUid() const |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
218 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
219 return seriesInstanceUid_; |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
220 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
221 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
222 const std::list<std::string>& GetSopInstanceUids() const |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
223 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
224 return sopInstanceUids_; |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
225 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
226 }; |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
227 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
228 typedef std::map<std::string, Item*> Content; |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
229 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
230 Content content_; |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
231 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
232 const Item& GetItem(const std::string& id) const |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
233 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
234 Content::const_iterator found = content_.find(id); |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
235 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
236 if (found == content_.end()) |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
237 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
238 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
239 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
240 else |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
241 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
242 assert(found->second != NULL); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
243 return *found->second; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
244 } |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
245 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
246 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
247 public: |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
248 ~VirtualSeries() |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
249 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
250 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
251 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
252 assert(it->second != NULL); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
253 delete it->second; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
254 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
255 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
256 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
257 std::string AddSingleInstance(const std::string& seriesInstanceUid, |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
258 const std::string& sopInstanceUid) |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
259 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
260 std::list<std::string> sopInstanceUids; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
261 sopInstanceUids.push_back(sopInstanceUid); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
262 return AddMultipleInstances(seriesInstanceUid, sopInstanceUids); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
263 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
264 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
265 std::string AddMultipleInstances(const std::string& seriesInstanceUid, |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
266 const std::list<std::string>& sopInstanceUids) |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
267 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
268 // Generate a unique identifier for this virtual series |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
269 const std::string virtualSeriesId = "virtual-" + boost::lexical_cast<std::string>(content_.size()); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
270 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
271 if (content_.find(virtualSeriesId) != content_.end()) |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
272 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
273 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
274 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
275 else |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
276 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
277 content_.insert(std::make_pair(virtualSeriesId, new Item(seriesInstanceUid, sopInstanceUids))); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
278 return virtualSeriesId; |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
279 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
280 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
281 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
282 const std::string& GetSeriesInstanceUid(const std::string& id) const |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
283 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
284 return GetItem(id).GetSeriesInstanceUid(); |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
285 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
286 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
287 const std::list<std::string>& GetSopInstanceUids(const std::string& id) const |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
288 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
289 return GetItem(id).GetSopInstanceUids(); |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
290 } |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
291 }; |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
292 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
293 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
294 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
295 class ResourcesLoader : public OrthancStone::ObserverBase<ResourcesLoader> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
296 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
297 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
298 class IObserver : public boost::noncopyable |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
299 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
300 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
301 virtual ~IObserver() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
302 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
303 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
304 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
305 virtual void SignalResourcesLoaded() = 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
306 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
307 virtual void SignalSeriesThumbnailLoaded(const std::string& studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
308 const std::string& seriesInstanceUid) = 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
309 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
310 virtual void SignalSeriesMetadataLoaded(const std::string& studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
311 const std::string& seriesInstanceUid) = 0; |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
312 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
313 virtual void SignalSeriesPdfLoaded(const std::string& studyInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
314 const std::string& seriesInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
315 const std::string& pdf) = 0; |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
316 |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
317 virtual void SignalVirtualSeriesThumbnailLoaded(const std::string& virtualSeriesId, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
318 const std::string& jpeg) = 0; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
319 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
320 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
321 private: |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
322 OrthancStone::ILoadersContext& context_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
323 std::unique_ptr<IObserver> observer_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
324 OrthancStone::DicomSource source_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
325 size_t pending_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
326 boost::shared_ptr<OrthancStone::LoadedDicomResources> studies_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
327 boost::shared_ptr<OrthancStone::LoadedDicomResources> series_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
328 boost::shared_ptr<OrthancStone::DicomResourcesLoader> resourcesLoader_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
329 boost::shared_ptr<OrthancStone::SeriesThumbnailsLoader> thumbnailsLoader_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
330 boost::shared_ptr<OrthancStone::SeriesMetadataLoader> metadataLoader_; |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
331 std::set<std::string> scheduledVirtualSeriesThumbnails_; |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
332 VirtualSeries virtualSeries_; |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
333 std::vector<std::string> skipSeriesFromModalities_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
334 |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
335 explicit ResourcesLoader(OrthancStone::ILoadersContext& context, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
336 const OrthancStone::DicomSource& source) : |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
337 context_(context), |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
338 source_(source), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
339 pending_(0), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
340 studies_(new OrthancStone::LoadedDicomResources(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID)), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
341 series_(new OrthancStone::LoadedDicomResources(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID)) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
342 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
343 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
344 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
345 void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
346 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
347 const Orthanc::SingleValueObject<Orthanc::ResourceType>& payload = |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
348 dynamic_cast<const Orthanc::SingleValueObject<Orthanc::ResourceType>&>(message.GetUserPayload()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
349 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
350 OrthancStone::LoadedDicomResources& dicom = *message.GetResources(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
351 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
352 LOG(INFO) << "resources loaded: " << dicom.GetSize() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
353 << ", " << Orthanc::EnumerationToString(payload.GetValue()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
354 |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
355 std::vector<std::string> seriesIdsToRemove; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
356 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
357 if (payload.GetValue() == Orthanc::ResourceType_Series) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
358 { |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
359 // the 'dicom' var is actually equivalent to the 'series_' member in this case |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
360 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
361 for (size_t i = 0; i < dicom.GetSize(); i++) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
362 { |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
363 std::string studyInstanceUid, seriesInstanceUid, modality; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
364 if (dicom.GetResource(i).LookupStringValue( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
365 studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) && |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
366 dicom.GetResource(i).LookupStringValue( |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
367 seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false) && |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
368 dicom.GetResource(i).LookupStringValue( |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
369 modality, Orthanc::DICOM_TAG_MODALITY, false)) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
370 { |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
371 // skip series that should not be displayed |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
372 if (std::find(skipSeriesFromModalities_.begin(), skipSeriesFromModalities_.end(), modality) == skipSeriesFromModalities_.end()) |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
373 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
374 thumbnailsLoader_->ScheduleLoadThumbnail(source_, "", studyInstanceUid, seriesInstanceUid); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
375 metadataLoader_->ScheduleLoadSeries(PRIORITY_LOW + 1, source_, studyInstanceUid, seriesInstanceUid); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
376 } |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
377 |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
378 else |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
379 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
380 seriesIdsToRemove.push_back(seriesInstanceUid); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
381 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
382 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
383 } |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
384 |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
385 for (size_t i = 0; i < seriesIdsToRemove.size(); i++) |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
386 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
387 LOG(INFO) << "series to hide: " << seriesIdsToRemove[i]; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
388 dicom.RemoveResource(seriesIdsToRemove[i]); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
389 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
390 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
391 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
392 if (pending_ == 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
393 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
394 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
395 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
396 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
397 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
398 pending_ --; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
399 if (pending_ == 0 && |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
400 observer_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
401 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
402 observer_->SignalResourcesLoaded(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
403 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
404 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
405 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
406 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
407 void Handle(const OrthancStone::SeriesThumbnailsLoader::SuccessMessage& message) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
408 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
409 if (observer_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
410 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
411 observer_->SignalSeriesThumbnailLoaded( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
412 message.GetStudyInstanceUid(), message.GetSeriesInstanceUid()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
413 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
414 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
415 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
416 void Handle(const OrthancStone::SeriesMetadataLoader::SuccessMessage& message) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
417 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
418 if (observer_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
419 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
420 observer_->SignalSeriesMetadataLoaded( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
421 message.GetStudyInstanceUid(), message.GetSeriesInstanceUid()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
422 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
423 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
424 |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
425 void FetchInternal(const std::string& patientId, |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
426 const std::string& studyInstanceUid, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
427 const std::string& seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
428 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
429 // Firstly, load the study |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
430 Orthanc::DicomMap filter; |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
431 |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
432 if (!patientId.empty()) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
433 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
434 filter.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, patientId, false); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
435 } |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
436 |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
437 if (!studyInstanceUid.empty()) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
438 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
439 filter.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, studyInstanceUid, false); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
440 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
441 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
442 std::set<Orthanc::DicomTag> tags; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
443 tags.insert(Orthanc::DICOM_TAG_STUDY_DESCRIPTION); // Necessary for Orthanc DICOMweb plugin |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
444 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
445 resourcesLoader_->ScheduleQido( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
446 studies_, PRIORITY_HIGH, source_, Orthanc::ResourceType_Study, filter, tags, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
447 new Orthanc::SingleValueObject<Orthanc::ResourceType>(Orthanc::ResourceType_Study)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
448 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
449 // Secondly, load the series |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
450 if (!seriesInstanceUid.empty()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
451 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
452 filter.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, seriesInstanceUid, false); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
453 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
454 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
455 tags.insert(Orthanc::DICOM_TAG_SERIES_NUMBER); // Necessary for Google Cloud Platform |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
456 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
457 resourcesLoader_->ScheduleQido( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
458 series_, PRIORITY_HIGH, source_, Orthanc::ResourceType_Series, filter, tags, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
459 new Orthanc::SingleValueObject<Orthanc::ResourceType>(Orthanc::ResourceType_Series)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
460 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
461 pending_ += 2; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
462 } |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
463 |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
464 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
465 class PdfInfo : public Orthanc::IDynamicObject |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
466 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
467 private: |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
468 std::string studyInstanceUid_; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
469 std::string seriesInstanceUid_; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
470 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
471 public: |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
472 PdfInfo(const std::string& studyInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
473 const std::string& seriesInstanceUid) : |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
474 studyInstanceUid_(studyInstanceUid), |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
475 seriesInstanceUid_(seriesInstanceUid) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
476 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
477 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
478 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
479 const std::string& GetStudyInstanceUid() const |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
480 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
481 return studyInstanceUid_; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
482 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
483 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
484 const std::string& GetSeriesInstanceUid() const |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
485 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
486 return seriesInstanceUid_; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
487 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
488 }; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
489 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
490 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
491 void Handle(const OrthancStone::ParseDicomSuccessMessage& message) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
492 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
493 const PdfInfo& info = dynamic_cast<const PdfInfo&>(message.GetOrigin().GetPayload()); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
494 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
495 if (observer_.get() != NULL) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
496 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
497 std::string pdf; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
498 if (message.GetDicom().ExtractPdf(pdf)) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
499 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
500 observer_->SignalSeriesPdfLoaded(info.GetStudyInstanceUid(), info.GetSeriesInstanceUid(), pdf); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
501 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
502 else |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
503 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
504 LOG(ERROR) << "Unable to extract PDF from series: " << info.GetSeriesInstanceUid(); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
505 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
506 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
507 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
508 |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
509 void FetchVirtualSeriesThumbnail(const std::string& virtualSeriesId, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
510 const std::string& studyInstanceUid, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
511 const std::string& seriesInstanceUid, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
512 const std::string& sopInstanceUid) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
513 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
514 if (scheduledVirtualSeriesThumbnails_.find(virtualSeriesId) == scheduledVirtualSeriesThumbnails_.end()) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
515 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
516 scheduledVirtualSeriesThumbnails_.insert(virtualSeriesId); |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
517 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
518 std::map<std::string, std::string> arguments; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
519 std::map<std::string, std::string> headers; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
520 arguments["viewport"] = ( |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
521 boost::lexical_cast<std::string>(thumbnailsLoader_->GetThumbnailWidth()) + "," + |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
522 boost::lexical_cast<std::string>(thumbnailsLoader_->GetThumbnailHeight())); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
523 headers["Accept"] = Orthanc::MIME_JPEG; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
524 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
525 const std::string uri = ("studies/" + studyInstanceUid + "/series/" + seriesInstanceUid + |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
526 "/instances/" + sopInstanceUid + "/frames/1/rendered"); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
527 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
528 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
529 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock()); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
530 lock->Schedule( |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
531 GetSharedObserver(), PRIORITY_LOW + 2, source_.CreateDicomWebCommand( |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
532 uri, arguments, headers, new Orthanc::SingleValueObject<std::string>(virtualSeriesId))); |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
533 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
534 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
535 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
536 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
537 void HandleInstanceThumbnail(const OrthancStone::HttpCommand::SuccessMessage& message) |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
538 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
539 if (observer_.get() != NULL) |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
540 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
541 const std::string& virtualSeriesId = |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
542 dynamic_cast<const Orthanc::SingleValueObject<std::string>&>( |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
543 message.GetOrigin().GetPayload()).GetValue(); |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
544 observer_->SignalVirtualSeriesThumbnailLoaded(virtualSeriesId, message.GetAnswer()); |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
545 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
546 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
547 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
548 public: |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
549 void SetSkipSeriesFromModalities(const std::vector<std::string>& skipSeriesFromModalities) |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
550 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
551 skipSeriesFromModalities_ = skipSeriesFromModalities; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
552 } |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
553 |
| 1916 | 554 static boost::shared_ptr<ResourcesLoader> Create(const OrthancStone::ILoadersContext::ILock& lock, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
555 const OrthancStone::DicomSource& source) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
556 { |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
557 boost::shared_ptr<ResourcesLoader> loader(new ResourcesLoader(lock.GetContext(), source)); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
558 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
559 loader->resourcesLoader_ = OrthancStone::DicomResourcesLoader::Create(lock); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
560 loader->thumbnailsLoader_ = OrthancStone::SeriesThumbnailsLoader::Create(lock, PRIORITY_LOW); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
561 loader->metadataLoader_ = OrthancStone::SeriesMetadataLoader::Create(lock); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
562 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
563 loader->Register<OrthancStone::DicomResourcesLoader::SuccessMessage>( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
564 *loader->resourcesLoader_, &ResourcesLoader::Handle); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
565 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
566 loader->Register<OrthancStone::SeriesThumbnailsLoader::SuccessMessage>( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
567 *loader->thumbnailsLoader_, &ResourcesLoader::Handle); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
568 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
569 loader->Register<OrthancStone::SeriesMetadataLoader::SuccessMessage>( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
570 *loader->metadataLoader_, &ResourcesLoader::Handle); |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
571 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
572 loader->Register<OrthancStone::ParseDicomSuccessMessage>( |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
573 lock.GetOracleObservable(), &ResourcesLoader::Handle); |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
574 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
575 loader->Register<OrthancStone::HttpCommand::SuccessMessage>( |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
576 lock.GetOracleObservable(), &ResourcesLoader::HandleInstanceThumbnail); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
577 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
578 return loader; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
579 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
580 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
581 void FetchAllStudies() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
582 { |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
583 FetchInternal("", "", ""); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
584 } |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
585 |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
586 void FetchPatient(const std::string& patientId) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
587 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
588 if (!patientId.empty()) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
589 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
590 FetchInternal(patientId, "", ""); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
591 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
592 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
593 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
594 void FetchStudy(const std::string& studyInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
595 { |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
596 if (!studyInstanceUid.empty()) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
597 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
598 FetchInternal("", studyInstanceUid, ""); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
599 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
600 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
601 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
602 void FetchSeries(const std::string& studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
603 const std::string& seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
604 { |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
605 if (!studyInstanceUid.empty() && |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
606 !seriesInstanceUid.empty()) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
607 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
608 FetchInternal("", studyInstanceUid, seriesInstanceUid); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
609 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
610 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
611 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
612 size_t GetStudiesCount() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
613 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
614 return studies_->GetSize(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
615 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
616 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
617 size_t GetSeriesCount() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
618 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
619 return series_->GetSize(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
620 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
621 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
622 void GetStudy(Orthanc::DicomMap& target, |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
623 size_t i) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
624 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
625 target.Assign(studies_->GetResource(i)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
626 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
627 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
628 void GetSeries(Orthanc::DicomMap& target, |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
629 size_t i) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
630 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
631 target.Assign(series_->GetResource(i)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
632 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
633 // Complement with the study-level tags |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
634 std::string studyInstanceUid; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
635 if (target.LookupStringValue(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) && |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
636 studies_->HasResource(studyInstanceUid)) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
637 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
638 studies_->MergeResource(target, studyInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
639 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
640 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
641 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
642 OrthancStone::SeriesThumbnailType GetSeriesThumbnail(std::string& image, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
643 std::string& mime, |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
644 const std::string& seriesInstanceUid) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
645 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
646 return thumbnailsLoader_->GetSeriesThumbnail(image, mime, seriesInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
647 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
648 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
649 void FetchSeriesMetadata(int priority, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
650 const std::string& studyInstanceUid, |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
651 const std::string& seriesInstanceUid) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
652 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
653 metadataLoader_->ScheduleLoadSeries(priority, source_, studyInstanceUid, seriesInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
654 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
655 |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
656 bool IsSeriesComplete(const std::string& seriesInstanceUid) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
657 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
658 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
659 return accessor.IsComplete(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
660 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
661 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
662 bool LookupVirtualSeries(std::map<std::string, unsigned int>& virtualSeries /* out */, |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
663 const std::string& seriesInstanceUid) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
664 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
665 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
666 if (accessor.IsComplete() && |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
667 accessor.GetInstancesCount() >= 2) |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
668 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
669 bool hasMultiframe = false; |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
670 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
671 for (size_t i = 0; i < accessor.GetInstancesCount(); i++) |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
672 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
673 OrthancStone::DicomInstanceParameters p(accessor.GetInstance(i)); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
674 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
675 if (p.GetNumberOfFrames() > 1) |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
676 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
677 hasMultiframe = true; |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
678 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
679 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
680 |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
681 if (hasMultiframe) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
682 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
683 std::string studyInstanceUid; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
684 std::list<std::string> instancesWithoutFrameNumber; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
685 |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
686 for (size_t i = 0; i < accessor.GetInstancesCount(); i++) |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
687 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
688 OrthancStone::DicomInstanceParameters p(accessor.GetInstance(i)); |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
689 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
690 if (p.HasNumberOfFrames()) |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
691 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
692 const std::string virtualSeriesId = virtualSeries_.AddSingleInstance(seriesInstanceUid, p.GetSopInstanceUid()); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
693 if (virtualSeries.find(virtualSeriesId) != virtualSeries.end()) |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
694 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
695 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
696 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
697 else |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
698 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
699 virtualSeries[virtualSeriesId] = p.GetNumberOfFrames(); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
700 FetchVirtualSeriesThumbnail(virtualSeriesId, p.GetStudyInstanceUid(), seriesInstanceUid, p.GetSopInstanceUid()); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
701 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
702 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
703 else |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
704 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
705 studyInstanceUid = p.GetStudyInstanceUid(); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
706 instancesWithoutFrameNumber.push_back(p.GetSopInstanceUid()); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
707 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
708 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
709 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
710 if (!instancesWithoutFrameNumber.empty()) |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
711 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
712 /** |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
713 * Group together in a single "virtual series" all the DICOM |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
714 * instances that have no value for the tag "NumberOfFrames" |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
715 * (0028,0008). This can happen in US CINE series. New in |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
716 * Stone Web viewer 2.1. |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
717 * https://groups.google.com/g/orthanc-users/c/V-vOnlwj06A/m/2sPNwteYAAAJ |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
718 **/ |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
719 const std::string virtualSeriesId = virtualSeries_.AddMultipleInstances(seriesInstanceUid, instancesWithoutFrameNumber); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
720 virtualSeries[virtualSeriesId] = instancesWithoutFrameNumber.size(); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
721 FetchVirtualSeriesThumbnail(virtualSeriesId, studyInstanceUid, seriesInstanceUid, instancesWithoutFrameNumber.front()); |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
722 } |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
723 |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
724 return true; |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
725 } |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
726 else |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
727 { |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
728 return false; |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
729 } |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
730 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
731 else |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
732 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
733 return false; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
734 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
735 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
736 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
737 bool SortSeriesFrames(OrthancStone::SortedFrames& target, |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
738 const std::string& seriesInstanceUid) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
739 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
740 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
741 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
742 if (accessor.IsComplete()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
743 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
744 target.Clear(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
745 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
746 for (size_t i = 0; i < accessor.GetInstancesCount(); i++) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
747 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
748 target.AddInstance(accessor.GetInstance(i)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
749 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
750 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
751 target.Sort(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
752 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
753 return true; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
754 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
755 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
756 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
757 return false; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
758 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
759 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
760 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
761 bool SortVirtualSeriesFrames(OrthancStone::SortedFrames& target, |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
762 const std::string& virtualSeriesId) const |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
763 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
764 const std::string& seriesInstanceUid = virtualSeries_.GetSeriesInstanceUid(virtualSeriesId); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
765 |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
766 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
767 |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
768 if (accessor.IsComplete()) |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
769 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
770 const std::list<std::string>& sopInstanceUids = virtualSeries_.GetSopInstanceUids(virtualSeriesId); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
771 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
772 target.Clear(); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
773 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
774 for (std::list<std::string>::const_iterator |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
775 it = sopInstanceUids.begin(); it != sopInstanceUids.end(); ++it) |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
776 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
777 Orthanc::DicomMap instance; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
778 if (accessor.LookupInstance(instance, *it)) |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
779 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
780 target.AddInstance(instance); |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
781 } |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
782 else |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
783 { |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
784 LOG(ERROR) << "Missing instance: " << *it; |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
785 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
786 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
787 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
788 target.Sort(); |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
789 return true; |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
790 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
791 else |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
792 { |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
793 return false; |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
794 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
795 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
796 |
|
1674
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
797 size_t GetSeriesNumberOfFrames(const std::string& seriesInstanceUid) const |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
798 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
799 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
800 |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
801 if (accessor.IsComplete()) |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
802 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
803 size_t count = 0; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
804 |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
805 for (size_t i = 0; i < accessor.GetInstancesCount(); i++) |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
806 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
807 uint32_t f; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
808 if (accessor.GetInstance(i).ParseUnsignedInteger32(f, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES)) |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
809 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
810 count += f; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
811 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
812 else |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
813 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
814 count++; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
815 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
816 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
817 |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
818 return count; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
819 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
820 else |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
821 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
822 return 0; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
823 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
824 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
825 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
826 void AcquireObserver(IObserver* observer) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
827 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
828 observer_.reset(observer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
829 } |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
830 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
831 void FetchPdf(const std::string& studyInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
832 const std::string& seriesInstanceUid) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
833 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
834 OrthancStone::SeriesMetadataLoader::Accessor accessor(*metadataLoader_, seriesInstanceUid); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
835 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
836 if (accessor.IsComplete()) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
837 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
838 if (accessor.GetInstancesCount() > 1) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
839 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
840 LOG(INFO) << "Series with more than one instance, will show the first PDF: " |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
841 << seriesInstanceUid; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
842 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
843 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
844 for (size_t i = 0; i < accessor.GetInstancesCount(); i++) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
845 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
846 std::string sopClassUid, sopInstanceUid; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
847 if (accessor.GetInstance(i).LookupStringValue(sopClassUid, Orthanc::DICOM_TAG_SOP_CLASS_UID, false) && |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
848 accessor.GetInstance(i).LookupStringValue(sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false) && |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
849 sopClassUid == "1.2.840.10008.5.1.4.1.1.104.1") |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
850 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
851 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock()); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
852 lock->Schedule( |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
853 GetSharedObserver(), PRIORITY_NORMAL, OrthancStone::ParseDicomFromWadoCommand::Create( |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
854 source_, studyInstanceUid, seriesInstanceUid, sopInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
855 false /* no transcoding */, Orthanc::DicomTransferSyntax_LittleEndianExplicit /* dummy value */, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
856 new PdfInfo(studyInstanceUid, seriesInstanceUid))); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
857 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
858 return; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
859 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
860 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
861 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
862 LOG(WARNING) << "Series without a PDF: " << seriesInstanceUid; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
863 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
864 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
865 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
866 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
867 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
868 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
869 class FramesCache : public boost::noncopyable |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
870 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
871 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
872 class CachedImage : public Orthanc::ICacheable |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
873 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
874 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
875 std::unique_ptr<Orthanc::ImageAccessor> image_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
876 unsigned int quality_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
877 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
878 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
879 CachedImage(Orthanc::ImageAccessor* image, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
880 unsigned int quality) : |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
881 image_(image), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
882 quality_(quality) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
883 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
884 assert(image != NULL); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
885 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
886 |
| 1573 | 887 virtual size_t GetMemoryUsage() const ORTHANC_OVERRIDE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
888 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
889 assert(image_.get() != NULL); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
890 return (image_->GetBytesPerPixel() * image_->GetPitch() * image_->GetHeight()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
891 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
892 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
893 const Orthanc::ImageAccessor& GetImage() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
894 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
895 assert(image_.get() != NULL); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
896 return *image_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
897 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
898 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
899 unsigned int GetQuality() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
900 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
901 return quality_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
902 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
903 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
904 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
905 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
906 static std::string GetKey(const std::string& sopInstanceUid, |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
907 size_t frameNumber) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
908 { |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
909 return sopInstanceUid + "|" + boost::lexical_cast<std::string>(frameNumber); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
910 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
911 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
912 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
913 Orthanc::MemoryObjectCache cache_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
914 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
915 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
916 FramesCache() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
917 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
918 SetMaximumSize(100 * 1024 * 1024); // 100 MB |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
919 //SetMaximumSize(1); // DISABLE CACHE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
920 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
921 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
922 size_t GetMaximumSize() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
923 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
924 return cache_.GetMaximumSize(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
925 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
926 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
927 void SetMaximumSize(size_t size) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
928 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
929 cache_.SetMaximumSize(size); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
930 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
931 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
932 /** |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
933 * Returns "true" iff the provided image has better quality than the |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
934 * previously cached one, or if no cache was previously available. |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
935 **/ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
936 bool Acquire(const std::string& sopInstanceUid, |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
937 size_t frameNumber, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
938 Orthanc::ImageAccessor* image /* transfer ownership */, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
939 unsigned int quality) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
940 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
941 std::unique_ptr<Orthanc::ImageAccessor> protection(image); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
942 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
943 if (image == NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
944 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
945 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
946 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
947 else if (image->GetFormat() != Orthanc::PixelFormat_Float32 && |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
948 image->GetFormat() != Orthanc::PixelFormat_RGB24) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
949 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
950 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
951 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
952 |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
953 const std::string& key = GetKey(sopInstanceUid, frameNumber); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
954 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
955 bool invalidate = false; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
956 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
957 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
958 /** |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
959 * Access the previous cached entry, with side effect of tagging |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
960 * it as the most recently accessed frame (update of LRU recycling) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
961 **/ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
962 Orthanc::MemoryObjectCache::Accessor accessor(cache_, key, false /* unique lock */); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
963 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
964 if (accessor.IsValid()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
965 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
966 const CachedImage& previous = dynamic_cast<const CachedImage&>(accessor.GetValue()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
967 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
968 // There is already a cached image for this frame |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
969 if (previous.GetQuality() < quality) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
970 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
971 // The previously stored image has poorer quality |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
972 invalidate = true; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
973 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
974 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
975 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
976 // No update in the quality, don't change the cache |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
977 return false; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
978 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
979 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
980 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
981 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
982 invalidate = false; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
983 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
984 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
985 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
986 if (invalidate) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
987 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
988 cache_.Invalidate(key); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
989 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
990 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
991 cache_.Acquire(key, new CachedImage(protection.release(), quality)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
992 return true; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
993 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
994 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
995 class Accessor : public boost::noncopyable |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
996 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
997 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
998 Orthanc::MemoryObjectCache::Accessor accessor_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
999 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1000 const CachedImage& GetCachedImage() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1001 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1002 if (IsValid()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1003 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1004 return dynamic_cast<CachedImage&>(accessor_.GetValue()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1005 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1006 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1007 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1008 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1009 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1010 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1011 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1012 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1013 Accessor(FramesCache& that, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1014 const std::string& sopInstanceUid, |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1015 size_t frameNumber) : |
|
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1016 accessor_(that.cache_, GetKey(sopInstanceUid, frameNumber), false /* shared lock */) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1017 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1018 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1019 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1020 bool IsValid() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1021 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1022 return accessor_.IsValid(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1023 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1024 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1025 const Orthanc::ImageAccessor& GetImage() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1026 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1027 return GetCachedImage().GetImage(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1028 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1029 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1030 unsigned int GetQuality() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1031 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1032 return GetCachedImage().GetQuality(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1033 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1034 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1035 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1036 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1037 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1038 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1039 class SeriesCursor : public boost::noncopyable |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1040 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1041 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1042 enum Action |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1043 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1044 Action_FastPlus, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1045 Action_Plus, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1046 Action_None, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1047 Action_Minus, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1048 Action_FastMinus |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1049 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1050 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1051 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1052 std::vector<size_t> prefetch_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1053 int framesCount_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1054 int currentFrame_; |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1055 bool isCircularPrefetch_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1056 int fastDelta_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1057 Action lastAction_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1058 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1059 int ComputeNextFrame(int currentFrame, |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1060 Action action, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1061 bool isCircular) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1062 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1063 if (framesCount_ == 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1064 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1065 assert(currentFrame == 0); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1066 return 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1067 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1068 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1069 int nextFrame = currentFrame; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1070 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1071 switch (action) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1072 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1073 case Action_FastPlus: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1074 nextFrame += fastDelta_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1075 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1076 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1077 case Action_Plus: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1078 nextFrame += 1; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1079 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1080 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1081 case Action_None: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1082 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1083 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1084 case Action_Minus: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1085 nextFrame -= 1; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1086 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1087 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1088 case Action_FastMinus: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1089 nextFrame -= fastDelta_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1090 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1091 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1092 default: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1093 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1094 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1095 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1096 if (isCircular) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1097 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1098 while (nextFrame < 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1099 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1100 nextFrame += framesCount_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1101 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1102 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1103 while (nextFrame >= framesCount_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1104 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1105 nextFrame -= framesCount_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1106 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1107 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1108 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1109 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1110 if (nextFrame < 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1111 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1112 nextFrame = 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1113 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1114 else if (nextFrame >= framesCount_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1115 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1116 nextFrame = framesCount_ - 1; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1117 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1118 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1119 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1120 return nextFrame; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1121 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1122 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1123 void UpdatePrefetch() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1124 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1125 /** |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1126 * This method will order the frames of the series according to |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1127 * the number of "actions" (i.e. mouse wheels) that are necessary |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1128 * to reach them, starting from the current frame. It is assumed |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1129 * that once one action is done, it is more likely that the user |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1130 * will do the same action just afterwards. |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1131 **/ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1132 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1133 prefetch_.clear(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1134 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1135 if (framesCount_ == 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1136 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1137 return; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1138 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1139 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1140 prefetch_.reserve(framesCount_); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1141 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1142 // Breadth-first search using a FIFO. The queue associates a frame |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1143 // and the action that is the most likely in this frame |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1144 typedef std::list< std::pair<int, Action> > Queue; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1145 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1146 Queue queue; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1147 std::set<int> visited; // Frames that have already been visited |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1148 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1149 queue.push_back(std::make_pair(currentFrame_, lastAction_)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1150 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1151 while (!queue.empty()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1152 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1153 int frame = queue.front().first; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1154 Action previousAction = queue.front().second; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1155 queue.pop_front(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1156 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1157 if (visited.find(frame) == visited.end()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1158 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1159 visited.insert(frame); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1160 prefetch_.push_back(frame); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1161 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1162 switch (previousAction) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1163 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1164 case Action_None: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1165 case Action_Plus: |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1166 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Plus, isCircularPrefetch_), Action_Plus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1167 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Minus, isCircularPrefetch_), Action_Minus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1168 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastPlus, isCircularPrefetch_), Action_FastPlus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1169 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastMinus, isCircularPrefetch_), Action_FastMinus)); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1170 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1171 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1172 case Action_Minus: |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1173 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Minus, isCircularPrefetch_), Action_Minus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1174 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Plus, isCircularPrefetch_), Action_Plus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1175 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastMinus, isCircularPrefetch_), Action_FastMinus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1176 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastPlus, isCircularPrefetch_), Action_FastPlus)); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1177 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1178 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1179 case Action_FastPlus: |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1180 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastPlus, isCircularPrefetch_), Action_FastPlus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1181 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastMinus, isCircularPrefetch_), Action_FastMinus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1182 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Plus, isCircularPrefetch_), Action_Plus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1183 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Minus, isCircularPrefetch_), Action_Minus)); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1184 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1185 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1186 case Action_FastMinus: |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1187 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastMinus, isCircularPrefetch_), Action_FastMinus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1188 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_FastPlus, isCircularPrefetch_), Action_FastPlus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1189 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Minus, isCircularPrefetch_), Action_Minus)); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1190 queue.push_back(std::make_pair(ComputeNextFrame(frame, Action_Plus, isCircularPrefetch_), Action_Plus)); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1191 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1192 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1193 default: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1194 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1195 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1196 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1197 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1198 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1199 assert(prefetch_.size() == framesCount_); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1200 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1201 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1202 bool CheckFrameIndex(int frame) const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1203 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1204 return ((framesCount_ == 0 && frame == 0) || |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1205 (framesCount_ > 0 && frame >= 0 && frame < framesCount_)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1206 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1207 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1208 public: |
|
1970
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
1209 explicit SeriesCursor(size_t framesCount, |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
1210 bool startAtMiddle /* Whether to start at the middle frame */) : |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1211 framesCount_(framesCount), |
|
1970
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
1212 currentFrame_(startAtMiddle ? framesCount / 2 : 0), |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1213 isCircularPrefetch_(false), |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1214 lastAction_(Action_None) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1215 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1216 SetFastDelta(framesCount / 20); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1217 UpdatePrefetch(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1218 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1219 |
|
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1220 size_t GetFramesCount() const |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1221 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1222 return framesCount_; |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1223 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
1224 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1225 void SetCircularPrefetch(bool isCircularPrefetch) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1226 { |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1227 isCircularPrefetch_ = isCircularPrefetch; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1228 UpdatePrefetch(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1229 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1230 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1231 void SetFastDelta(int delta) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1232 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1233 fastDelta_ = (delta < 0 ? -delta : delta); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1234 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1235 if (fastDelta_ <= 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1236 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1237 fastDelta_ = 1; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1238 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1239 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1240 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1241 void SetCurrentIndex(size_t frame) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1242 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1243 if (frame >= framesCount_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1244 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1245 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1246 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1247 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1248 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1249 currentFrame_ = frame; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1250 lastAction_ = Action_None; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1251 UpdatePrefetch(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1252 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1253 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1254 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1255 size_t GetCurrentIndex() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1256 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1257 assert(CheckFrameIndex(currentFrame_)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1258 return static_cast<size_t>(currentFrame_); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1259 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1260 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1261 void Apply(Action action, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1262 bool isCircular) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1263 { |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1264 currentFrame_ = ComputeNextFrame(currentFrame_, action, isCircular); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1265 lastAction_ = action; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1266 UpdatePrefetch(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1267 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1268 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1269 size_t GetPrefetchSize() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1270 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1271 assert(prefetch_.size() == framesCount_); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1272 return prefetch_.size(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1273 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1274 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1275 size_t GetPrefetchIndex(size_t i) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1276 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1277 if (i >= prefetch_.size()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1278 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1279 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1280 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1281 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1282 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1283 assert(CheckFrameIndex(prefetch_[i])); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1284 return static_cast<size_t>(prefetch_[i]); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1285 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1286 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1287 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1288 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1289 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1290 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1291 |
|
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1292 /** |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1293 * Returns a clipped line (out: x1, y1, x2, y2), in the coordinate |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1294 * system of "instance1". Note that the frame of reference UID is not |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1295 * checked by this function. |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
1296 **/ |
|
1646
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1297 static bool GetReferenceLineCoordinates(double& x1, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1298 double& y1, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1299 double& x2, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1300 double& y2, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1301 const OrthancStone::DicomInstanceParameters& instance1, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1302 unsigned int frame1, |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
1303 const OrthancStone::CoordinateSystem3D& plane2) |
|
1646
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1304 { |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1305 if (instance1.GetWidth() == 0 && |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1306 instance1.GetHeight() == 0) |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1307 { |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1308 return false; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1309 } |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1310 else |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1311 { |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1312 /** |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1313 * Compute the 2D extent of the "instance1", expressed in |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1314 * centimeters, in the 2D plane defined by this DICOM instance. |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1315 * |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1316 * In a multiframe image (cf. "ExtractFrameOffsets()"), the plane of |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1317 * each frame is a translation of the plane of the first frame along |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1318 * its normal. As a consequence, the extent is the same for each |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1319 * frame, so we can ignore the frame number. |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1320 **/ |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1321 OrthancStone::Extent2D extent; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1322 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1323 double ox = -instance1.GetPixelSpacingX() / 2.0; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1324 double oy = -instance1.GetPixelSpacingY() / 2.0; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1325 extent.AddPoint(ox, oy); |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1326 extent.AddPoint(ox + instance1.GetPixelSpacingX() * static_cast<double>(instance1.GetWidth()), |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1327 oy + instance1.GetPixelSpacingY() * static_cast<double>(instance1.GetHeight())); |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1328 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1329 const OrthancStone::CoordinateSystem3D c1 = instance1.GetFrameGeometry(frame1); |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1330 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1331 OrthancStone::Vector direction, origin; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1332 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1333 if (!extent.IsEmpty() && |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1334 OrthancStone::GeometryToolbox::IntersectTwoPlanes(origin, direction, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1335 c1.GetOrigin(), c1.GetNormal(), |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
1336 plane2.GetOrigin(), plane2.GetNormal())) |
|
1646
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1337 { |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1338 double ax, ay, bx, by; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1339 c1.ProjectPoint(ax, ay, origin); |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1340 c1.ProjectPoint(bx, by, origin + 100.0 * direction); |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1341 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1342 return OrthancStone::GeometryToolbox::ClipLineToRectangle( |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1343 x1, y1, x2, y2, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1344 ax, ay, bx, by, |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1345 extent.GetX1(), extent.GetY1(), extent.GetX2(), extent.GetY2()); |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1346 } |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1347 else |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1348 { |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1349 return false; |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1350 } |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1351 } |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1352 } |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1353 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1354 |
|
4e14735e98f8
preparing to remove FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1644
diff
changeset
|
1355 |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1356 class StoneAnnotationsRegistry : public boost::noncopyable |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1357 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1358 private: |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1359 class Index |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1360 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1361 private: |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1362 std::string sopInstanceUid_; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1363 size_t frame_; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1364 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1365 public: |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1366 Index(const std::string& sopInstanceUid, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1367 size_t frame) : |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1368 sopInstanceUid_(sopInstanceUid), |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1369 frame_(frame) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1370 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1371 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1372 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1373 const std::string& GetSopInstanceUid() const |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1374 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1375 return sopInstanceUid_; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1376 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1377 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1378 size_t GetFrame() const |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1379 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1380 return frame_; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1381 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1382 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1383 bool operator< (const Index& other) const |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1384 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1385 if (sopInstanceUid_ < other.sopInstanceUid_) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1386 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1387 return true; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1388 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1389 else if (sopInstanceUid_ > other.sopInstanceUid_) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1390 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1391 return false; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1392 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1393 else |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1394 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1395 return frame_ < other.frame_; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1396 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1397 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1398 }; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1399 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1400 typedef std::map<Index, Json::Value*> Content; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1401 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1402 Content content_; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1403 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1404 void Clear() |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1405 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1406 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1407 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1408 assert(it->second != NULL); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1409 delete it->second; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1410 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1411 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1412 content_.clear(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1413 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1414 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1415 StoneAnnotationsRegistry() |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1416 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1417 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1418 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1419 public: |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1420 ~StoneAnnotationsRegistry() |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1421 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1422 Clear(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1423 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1424 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1425 static StoneAnnotationsRegistry& GetInstance() |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1426 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1427 static StoneAnnotationsRegistry singleton; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1428 return singleton; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1429 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1430 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1431 void Save(const std::string& sopInstanceUid, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1432 size_t frame, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1433 const OrthancStone::AnnotationsSceneLayer& layer) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1434 { |
| 1814 | 1435 std::unique_ptr<Json::Value> serialized(new Json::Value); |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1436 layer.Serialize(*serialized); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1437 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1438 const Index index(sopInstanceUid, frame); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1439 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1440 Content::iterator found = content_.find(index); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1441 if (found == content_.end()) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1442 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1443 content_[index] = serialized.release(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1444 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1445 else |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1446 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1447 assert(found->second != NULL); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1448 delete found->second; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1449 found->second = serialized.release(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1450 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1451 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1452 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1453 void Load(OrthancStone::AnnotationsSceneLayer& layer, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1454 const std::string& sopInstanceUid, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1455 size_t frame) const |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1456 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1457 const Index index(sopInstanceUid, frame); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1458 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1459 Content::const_iterator found = content_.find(index); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1460 if (found == content_.end()) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1461 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1462 layer.Clear(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1463 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1464 else |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1465 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1466 assert(found->second != NULL); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1467 layer.Unserialize(*found->second); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1468 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1469 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1470 }; |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1471 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1472 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1473 |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1474 class OverlaysRegistry : public boost::noncopyable |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1475 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1476 private: |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1477 typedef std::map<std::string, OrthancStone::LookupTableTextureSceneLayer*> Content; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1478 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1479 Content content_; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1480 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1481 public: |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1482 ~OverlaysRegistry() |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1483 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1484 for (Content::iterator it = content_.begin(); it != content_.end(); ++it) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1485 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1486 assert(it->second != NULL); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1487 delete it->second; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1488 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1489 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1490 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1491 static OverlaysRegistry& GetInstance() |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1492 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1493 static OverlaysRegistry singleton; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1494 return singleton; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1495 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1496 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1497 void Register(const std::string& sopInstanceUid, |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1498 const OrthancStone::DicomInstanceParameters& parameters, |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1499 int overlayX, |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1500 int overlayY, |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1501 const Orthanc::ImageAccessor& overlay) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1502 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1503 // Don't register twice the same overlay |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1504 Content::iterator found = content_.find(sopInstanceUid); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1505 if (found == content_.end()) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1506 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1507 content_[sopInstanceUid] = parameters.CreateOverlayTexture(overlayX, overlayY, overlay); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1508 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1509 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1510 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1511 class Accessor : public boost::noncopyable |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1512 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1513 private: |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1514 const OrthancStone::LookupTableTextureSceneLayer* texture_; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1515 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1516 public: |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1517 Accessor(const OverlaysRegistry& registry, |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1518 const std::string& sopInstanceUid) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1519 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1520 Content::const_iterator found = registry.content_.find(sopInstanceUid); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1521 if (found == registry.content_.end()) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1522 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1523 texture_ = NULL; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1524 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1525 else |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1526 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1527 assert(found->second != NULL); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1528 texture_ = found->second; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1529 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1530 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1531 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1532 bool IsValid() const |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1533 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1534 return texture_ != NULL; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1535 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1536 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1537 OrthancStone::LookupTableTextureSceneLayer* CreateTexture() const |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1538 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1539 if (texture_ == NULL) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1540 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1541 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1542 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1543 else |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1544 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1545 return dynamic_cast<OrthancStone::LookupTableTextureSceneLayer*>(texture_->Clone()); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1546 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1547 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1548 }; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1549 }; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1550 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1551 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1552 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1553 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1554 class ViewerViewport : public OrthancStone::ObserverBase<ViewerViewport> |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1555 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1556 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1557 class IObserver : public boost::noncopyable |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1558 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1559 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1560 virtual ~IObserver() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1561 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1562 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1563 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1564 virtual void SignalSeriesDetailsReady(const ViewerViewport& viewport) = 0; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1565 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1566 virtual void SignalFrameUpdated(const ViewerViewport& viewport, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1567 size_t currentFrame, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1568 size_t countFrames, |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
1569 DisplayedFrameQuality quality, |
|
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
1570 unsigned int instanceNumber, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
1571 const std::string& contentDate, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
1572 const std::string& contentTime) = 0; |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
1573 |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
1574 // "click" is a 3D vector in world coordinates |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
1575 virtual void SignalCrosshair(const ViewerViewport& viewport, |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
1576 const OrthancStone::Vector& click) = 0; |
| 1694 | 1577 |
| 1578 virtual void SignalSynchronizedBrowsing(const ViewerViewport& viewport, | |
| 1579 const OrthancStone::Vector& click, | |
| 1580 const OrthancStone::Vector& normal) = 0; | |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
1581 |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
1582 virtual void SignalWindowingUpdated(const ViewerViewport& viewport, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
1583 double windowingCenter, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
1584 double windowingWidth) = 0; |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1585 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1586 virtual void SignalStoneAnnotationsChanged(const ViewerViewport& viewport, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1587 const std::string& sopInstanceUid, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
1588 size_t frame) = 0; |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
1589 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
1590 virtual void SignalStoneAnnotationAdded(const ViewerViewport& viewport) = 0; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
1591 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
1592 virtual void SignalStoneAnnotationRemoved(const ViewerViewport& viewport) = 0; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1593 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1594 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1595 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1596 static const int LAYER_TEXTURE = 0; |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1597 static const int LAYER_OVERLAY = 1; |
| 1963 | 1598 static const int LAYER_ORIENTATION_MARKERS = 2; |
| 1599 static const int LAYER_REFERENCE_LINES = 3; | |
| 1600 static const int LAYER_ANNOTATIONS_OSIRIX = 4; | |
| 1601 static const int LAYER_ANNOTATIONS_STONE = 5; | |
|
1611
787db80a5a1b
new class MacroLayerRenderer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1607
diff
changeset
|
1602 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1603 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1604 class ICommand : public Orthanc::IDynamicObject |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1605 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1606 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1607 boost::shared_ptr<ViewerViewport> viewport_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1608 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1609 public: |
| 1573 | 1610 explicit ICommand(boost::shared_ptr<ViewerViewport> viewport) : |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1611 viewport_(viewport) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1612 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1613 if (viewport == NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1614 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1615 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1616 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1617 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1618 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1619 virtual ~ICommand() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1620 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1621 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1622 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1623 ViewerViewport& GetViewport() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1624 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1625 assert(viewport_ != NULL); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1626 return *viewport_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1627 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1628 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1629 virtual void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message) const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1630 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1631 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1632 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1633 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1634 virtual void Handle(const OrthancStone::HttpCommand::SuccessMessage& message) const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1635 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1636 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1637 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1638 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1639 virtual void Handle(const OrthancStone::ParseDicomSuccessMessage& message) const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1640 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1641 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1642 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1643 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1644 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1645 class LoadSeriesDetailsFromInstance : public ICommand |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1646 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1647 public: |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1648 explicit LoadSeriesDetailsFromInstance(boost::shared_ptr<ViewerViewport> viewport) : |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1649 ICommand(viewport) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1650 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1651 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1652 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1653 virtual void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message) const ORTHANC_OVERRIDE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1654 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1655 if (message.GetResources()->GetSize() != 1) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1656 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1657 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1658 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1659 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1660 const Orthanc::DicomMap& dicom = message.GetResources()->GetResource(0); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1661 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1662 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1663 OrthancStone::DicomInstanceParameters params(dicom); |
|
1822
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1664 |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1665 params.EnrichUsingDicomWeb(message.GetResources()->GetSourceJson(0)); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1666 GetViewport().centralPixelSpacingX_ = params.GetPixelSpacingX(); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1667 GetViewport().centralPixelSpacingY_ = params.GetPixelSpacingY(); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1668 |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1669 if (params.HasPixelSpacing()) |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1670 { |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1671 GetViewport().stoneAnnotations_->SetUnits(OrthancStone::Units_Millimeters); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1672 } |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1673 else |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1674 { |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1675 GetViewport().stoneAnnotations_->SetUnits(OrthancStone::Units_Pixels); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1676 } |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1677 |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1678 if (params.GetPixelSpacingX() != 0 && |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1679 params.GetPixelSpacingY() != 0 && |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1680 params.GetWidth() != 0 && |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1681 params.GetHeight()) |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1682 { |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1683 GetViewport().centralPhysicalWidth_ = (params.GetPixelSpacingX() * |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1684 static_cast<double>(params.GetWidth())); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1685 GetViewport().centralPhysicalHeight_ = (params.GetPixelSpacingY() * |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1686 static_cast<double>(params.GetHeight())); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
1687 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1688 |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1689 GetViewport().windowingPresetCenters_.resize(params.GetWindowingPresetsCount()); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1690 GetViewport().windowingPresetWidths_.resize(params.GetWindowingPresetsCount()); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1691 |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1692 for (size_t i = 0; i < params.GetWindowingPresetsCount(); i++) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1693 { |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1694 LOG(INFO) << "Preset windowing " << (i + 1) << "/" << params.GetWindowingPresetsCount() |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1695 << ": " << params.GetWindowingPresetCenter(i) |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1696 << "," << params.GetWindowingPresetWidth(i); |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1697 |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1698 GetViewport().windowingPresetCenters_[i] = params.GetWindowingPresetCenter(i); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1699 GetViewport().windowingPresetWidths_[i] = params.GetWindowingPresetWidth(i); |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1700 } |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
1701 |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1702 if (params.GetWindowingPresetsCount() == 0) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1703 { |
|
1677
51bab5188a13
start multiple preset windowings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1676
diff
changeset
|
1704 LOG(INFO) << "No preset windowing"; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1705 } |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1706 |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1707 GetViewport().SetWindowingPreset(); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1708 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1709 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1710 uint32_t cineRate; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1711 if (dicom.ParseUnsignedInteger32(cineRate, Orthanc::DICOM_TAG_CINE_RATE) && |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1712 cineRate > 0) |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1713 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1714 /** |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1715 * If we detect a cine sequence, start on the first frame |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1716 * instead of on the middle frame. |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1717 **/ |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1718 GetViewport().cursor_->SetCurrentIndex(0); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1719 GetViewport().cineRate_ = cineRate; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1720 } |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1721 else |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1722 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1723 GetViewport().cineRate_ = DEFAULT_CINE_RATE; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1724 } |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1725 |
| 1668 | 1726 GetViewport().Redraw(); |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1727 |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1728 if (GetViewport().observer_.get() != NULL) |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1729 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1730 GetViewport().observer_->SignalSeriesDetailsReady(GetViewport()); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1731 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1732 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1733 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1734 |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
1735 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1736 class SetLowQualityFrame : public ICommand |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1737 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1738 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1739 std::string sopInstanceUid_; |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1740 unsigned int frameNumber_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1741 float windowCenter_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1742 float windowWidth_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1743 bool isMonochrome1_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1744 bool isPrefetch_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1745 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1746 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1747 SetLowQualityFrame(boost::shared_ptr<ViewerViewport> viewport, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1748 const std::string& sopInstanceUid, |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1749 unsigned int frameNumber, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1750 float windowCenter, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1751 float windowWidth, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1752 bool isMonochrome1, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1753 bool isPrefetch) : |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1754 ICommand(viewport), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1755 sopInstanceUid_(sopInstanceUid), |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1756 frameNumber_(frameNumber), |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1757 windowCenter_(windowCenter), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1758 windowWidth_(windowWidth), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1759 isMonochrome1_(isMonochrome1), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1760 isPrefetch_(isPrefetch) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1761 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1762 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1763 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1764 virtual void Handle(const OrthancStone::HttpCommand::SuccessMessage& message) const ORTHANC_OVERRIDE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1765 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1766 std::unique_ptr<Orthanc::JpegReader> jpeg(new Orthanc::JpegReader); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1767 jpeg->ReadFromMemory(message.GetAnswer()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1768 |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1769 std::unique_ptr<Orthanc::ImageAccessor> converted; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1770 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1771 switch (jpeg->GetFormat()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1772 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1773 case Orthanc::PixelFormat_RGB24: |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1774 converted.reset(jpeg.release()); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1775 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1776 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1777 case Orthanc::PixelFormat_Grayscale8: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1778 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1779 if (isMonochrome1_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1780 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1781 Orthanc::ImageProcessing::Invert(*jpeg); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1782 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1783 |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1784 converted.reset(new Orthanc::Image(Orthanc::PixelFormat_Float32, jpeg->GetWidth(), |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1785 jpeg->GetHeight(), false)); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1786 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1787 Orthanc::ImageProcessing::Convert(*converted, *jpeg); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1788 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1789 /** |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1790 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1791 Orthanc::ImageProcessing::ShiftScale() computes "(x + offset) * scaling". |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1792 The system to solve is thus: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1793 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1794 (0 + offset) * scaling = windowingCenter - windowingWidth / 2 [a] |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1795 (255 + offset) * scaling = windowingCenter + windowingWidth / 2 [b] |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1796 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1797 Resolution: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1798 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1799 [b - a] => 255 * scaling = windowingWidth |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1800 [a] => offset = (windowingCenter - windowingWidth / 2) / scaling |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1801 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1802 **/ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1803 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1804 const float scaling = windowWidth_ / 255.0f; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1805 const float offset = (OrthancStone::LinearAlgebra::IsCloseToZero(scaling) ? 0 : |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1806 (windowCenter_ - windowWidth_ / 2.0f) / scaling); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1807 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1808 Orthanc::ImageProcessing::ShiftScale(*converted, offset, scaling, false); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1809 break; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1810 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1811 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1812 default: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1813 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1814 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1815 |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1816 assert(converted.get() != NULL); |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1817 GetViewport().RenderCurrentSceneFromCommand(*converted, sopInstanceUid_, frameNumber_, DisplayedFrameQuality_Low); |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
1818 GetViewport().framesCache_->Acquire(sopInstanceUid_, frameNumber_, converted.release(), QUALITY_JPEG); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1819 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1820 if (isPrefetch_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1821 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1822 GetViewport().ScheduleNextPrefetch(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1823 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1824 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1825 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1826 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1827 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1828 class SetFullDicomFrame : public ICommand |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1829 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1830 private: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1831 std::string sopInstanceUid_; |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1832 unsigned int frameNumber_; |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1833 int priority_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1834 bool isPrefetch_; |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1835 bool serverSideTranscoding_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1836 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1837 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1838 SetFullDicomFrame(boost::shared_ptr<ViewerViewport> viewport, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1839 const std::string& sopInstanceUid, |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1840 unsigned int frameNumber, |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1841 int priority, |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1842 bool isPrefetch, |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1843 bool serverSideTranscoding) : |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1844 ICommand(viewport), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1845 sopInstanceUid_(sopInstanceUid), |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1846 frameNumber_(frameNumber), |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1847 priority_(priority), |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1848 isPrefetch_(isPrefetch), |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1849 serverSideTranscoding_(serverSideTranscoding) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1850 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1851 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1852 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1853 virtual void Handle(const OrthancStone::ParseDicomSuccessMessage& message) const ORTHANC_OVERRIDE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1854 { |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1855 std::unique_ptr<Orthanc::ImageAccessor> frame; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1856 |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1857 try |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1858 { |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1859 frame.reset(message.GetDicom().DecodeFrame(frameNumber_)); |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1860 } |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1861 catch (Orthanc::OrthancException& e) |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1862 { |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1863 if (e.GetErrorCode() == Orthanc::ErrorCode_NotImplemented) |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1864 { |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1865 if (!serverSideTranscoding_) |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1866 { |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1867 // If we haven't tried server-side rendering yet, give it a try |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1868 LOG(INFO) << "Switching to server-side transcoding"; |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1869 GetViewport().serverSideTranscoding_ = true; |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1870 GetViewport().ScheduleLoadFullDicomFrame(sopInstanceUid_, frameNumber_, priority_, isPrefetch_); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1871 } |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1872 return; |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1873 } |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1874 else |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1875 { |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1876 throw; |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1877 } |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
1878 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1879 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1880 if (frame.get() == NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1881 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1882 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1883 } |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1884 else |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1885 { |
|
1855
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1886 if (GetViewport().windowingPresetCenters_.empty()) |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1887 { |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1888 // New in Stone Web viewer 2.2: Deal with Philips multiframe |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1889 // (cf. mail from Tomas Kenda on 2021-08-17) |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1890 double windowingCenter, windowingWidth; |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1891 message.GetDicom().GetDefaultWindowing(windowingCenter, windowingWidth, frameNumber_); |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1892 GetViewport().windowingPresetCenters_.push_back(windowingCenter); |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1893 GetViewport().windowingPresetWidths_.push_back(windowingWidth); |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1894 GetViewport().SetWindowingPreset(); |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1895 } |
|
73a4bee08bb6
Support detection of windowing and rescale in Philips multiframe images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1850
diff
changeset
|
1896 |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1897 Apply(GetViewport(), message.GetDicom(), frame.release(), sopInstanceUid_, frameNumber_); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1898 |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1899 if (isPrefetch_) |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1900 { |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1901 GetViewport().ScheduleNextPrefetch(); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1902 } |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1903 } |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1904 } |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1905 |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1906 static void Apply(ViewerViewport& viewport, |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1907 const Orthanc::ParsedDicomFile& dicom, |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1908 Orthanc::ImageAccessor* f, |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1909 const std::string& sopInstanceUid, |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1910 unsigned int frameNumber) |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1911 { |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1912 std::unique_ptr<Orthanc::ImageAccessor> frameProtection(f); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1913 |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1914 Orthanc::DicomMap tags; |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1915 dicom.ExtractDicomSummary(tags, ORTHANC_STONE_MAX_TAG_LENGTH); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1916 |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1917 OrthancStone::DicomInstanceParameters parameters(tags); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1918 |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1919 std::unique_ptr<Orthanc::ImageAccessor> converted; |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1920 |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1921 if (frameProtection->GetFormat() == Orthanc::PixelFormat_RGB24) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1922 { |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1923 converted.reset(frameProtection.release()); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1924 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1925 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1926 { |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1927 converted.reset(new Orthanc::Image(Orthanc::PixelFormat_Float32, frameProtection->GetWidth(), frameProtection->GetHeight(), false)); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
1928 Orthanc::ImageProcessing::Convert(*converted, *frameProtection); |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1929 parameters.ApplyRescaleAndDoseScaling(*converted, false /* don't use double */); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1930 } |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1931 |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1932 try |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1933 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1934 int x, y; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1935 std::unique_ptr<Orthanc::ImageAccessor> overlay(dicom.DecodeAllOverlays(x, y)); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1936 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1937 if (overlay.get() != NULL && |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1938 overlay->GetWidth() > 0 && |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1939 overlay->GetHeight() > 0) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1940 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1941 OverlaysRegistry::GetInstance().Register(sopInstanceUid, parameters, x, y, *overlay); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1942 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1943 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1944 catch (Orthanc::OrthancException& e) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1945 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1946 LOG(ERROR) << "Cannot decode overlays from instance " << sopInstanceUid; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1947 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
1948 |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
1949 assert(converted.get() != NULL); |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
1950 viewport.RenderCurrentSceneFromCommand(*converted, sopInstanceUid, frameNumber, DisplayedFrameQuality_High); |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
1951 viewport.framesCache_->Acquire(sopInstanceUid, frameNumber, converted.release(), QUALITY_FULL); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1952 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1953 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1954 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1955 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1956 class PrefetchItem |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1957 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1958 private: |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1959 size_t cursorIndex_; |
| 1670 | 1960 bool isFullQuality_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1961 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1962 public: |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1963 PrefetchItem(size_t cursorIndex, |
| 1670 | 1964 bool isFullQuality) : |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1965 cursorIndex_(cursorIndex), |
| 1670 | 1966 isFullQuality_(isFullQuality) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1967 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1968 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1969 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1970 size_t GetCursorIndex() const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1971 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
1972 return cursorIndex_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1973 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1974 |
| 1670 | 1975 bool IsFullQuality() const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1976 { |
| 1670 | 1977 return isFullQuality_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1978 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1979 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1980 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1981 |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
1982 std::unique_ptr<IObserver> observer_; |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
1983 OrthancStone::WebAssemblyLoadersContext& context_; |
|
1551
c54bc5bffd01
software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1549
diff
changeset
|
1984 boost::shared_ptr<OrthancStone::WebAssemblyViewport> viewport_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1985 boost::shared_ptr<OrthancStone::DicomResourcesLoader> loader_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1986 OrthancStone::DicomSource source_; |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
1987 boost::shared_ptr<FramesCache> framesCache_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1988 std::unique_ptr<OrthancStone::SortedFrames> frames_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1989 std::unique_ptr<SeriesCursor> cursor_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1990 float windowingCenter_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1991 float windowingWidth_; |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1992 std::vector<float> windowingPresetCenters_; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
1993 std::vector<float> windowingPresetWidths_; |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
1994 unsigned int cineRate_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1995 bool inverted_; |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
1996 bool flipX_; |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
1997 bool flipY_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1998 bool fitNextContent_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1999 std::list<PrefetchItem> prefetchQueue_; |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2000 bool serverSideTranscoding_; |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2001 OrthancStone::Vector synchronizationOffset_; |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2002 bool synchronizationEnabled_; |
|
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2003 double centralPhysicalWidth_; // LSD-479 |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2004 double centralPhysicalHeight_; |
|
1822
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2005 double centralPixelSpacingX_; |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2006 double centralPixelSpacingY_; |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2007 |
|
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2008 bool hasFocusOnInstance_; |
|
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2009 std::string focusSopInstanceUid_; |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2010 size_t focusFrameNumber_; |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2011 |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2012 // The coordinates of OsiriX annotations are expressed in 3D world coordinates |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2013 boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations> osiriXAnnotations_; |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2014 |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2015 // The coordinates of Stone annotations are expressed in 2D |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2016 // coordinates of the current texture, with (0,0) corresponding to |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
2017 // the center of the top-left pixel |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2018 boost::shared_ptr<OrthancStone::AnnotationsSceneLayer> stoneAnnotations_; |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2019 |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2020 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2021 void ScheduleNextPrefetch() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2022 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2023 while (!prefetchQueue_.empty()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2024 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2025 size_t cursorIndex = prefetchQueue_.front().GetCursorIndex(); |
| 1670 | 2026 bool isFullQuality = prefetchQueue_.front().IsFullQuality(); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2027 prefetchQueue_.pop_front(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2028 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2029 const std::string sopInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSopInstanceUid(); |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2030 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2031 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2032 { |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2033 FramesCache::Accessor accessor(*framesCache_, sopInstanceUid, frameNumber); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2034 if (!accessor.IsValid() || |
| 1670 | 2035 (isFullQuality && accessor.GetQuality() == 0)) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2036 { |
| 1670 | 2037 if (isFullQuality) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2038 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2039 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_NORMAL, true); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2040 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2041 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2042 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2043 ScheduleLoadRenderedFrame(cursorIndex, PRIORITY_NORMAL, true); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2044 } |
| 1670 | 2045 |
| 2046 return; // We have found a new frame to cache, stop the lookup loop | |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2047 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2048 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2049 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2050 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2051 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2052 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2053 void ClearViewport() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2054 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2055 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2056 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2057 lock->GetController().GetScene().DeleteLayer(LAYER_TEXTURE); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2058 //lock->GetCompositor().Refresh(lock->GetController().GetScene()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2059 lock->Invalidate(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2060 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2061 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2062 |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
2063 |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2064 /** |
|
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2065 * NB: "frame" is only used to estimate the memory size to store 1 |
|
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2066 * frame, in order to avoid prefetching too much data. |
|
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2067 **/ |
|
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2068 void SetupPrefetchAfterRendering(const Orthanc::ImageAccessor& frame, |
|
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2069 DisplayedFrameQuality quality) |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2070 { |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2071 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2072 |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2073 // Prepare prefetching |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2074 prefetchQueue_.clear(); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2075 |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2076 if (1) // DISABLE PREFETCHING |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2077 { |
|
1680
03afa09cfcf1
running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
2078 const size_t frameSize = frame.GetPitch() * frame.GetHeight(); |
|
03afa09cfcf1
running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
2079 size_t prefetchedSize = 0; |
|
03afa09cfcf1
running the tests of the Orthanc Framework in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1679
diff
changeset
|
2080 |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2081 for (size_t i = 0; i < cursor_->GetPrefetchSize() && i < 16 && |
|
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2082 prefetchedSize <= framesCache_->GetMaximumSize() / 2; i++) |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2083 { |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2084 size_t a = cursor_->GetPrefetchIndex(i); |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2085 if (a != cursorIndex) |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2086 { |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2087 prefetchQueue_.push_back(PrefetchItem(a, i < 2)); |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2088 prefetchedSize += frameSize; |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2089 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2090 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2091 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2092 |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2093 ScheduleNextPrefetch(); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2094 |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2095 if (frames_.get() != NULL && |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2096 cursor_.get() != NULL && |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2097 observer_.get() != NULL) |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2098 { |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2099 const Orthanc::DicomMap& instance = frames_->GetInstanceOfFrame(cursor_->GetCurrentIndex()).GetTags(); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
2100 |
|
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2101 uint32_t instanceNumber = 0; |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2102 std::string contentDate; |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2103 std::string contentTime; |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2104 |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2105 instance.ParseUnsignedInteger32(instanceNumber, Orthanc::DICOM_TAG_INSTANCE_NUMBER); |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2106 instance.LookupStringValue(contentDate, Orthanc::DicomTag(0x0008, 0x0023), false); |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2107 instance.LookupStringValue(contentTime, Orthanc::DicomTag(0x0008, 0x0033), false); |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2108 |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2109 observer_->SignalFrameUpdated(*this, cursorIndex, frames_->GetFramesCount(), quality, instanceNumber, contentDate, contentTime); |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2110 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2111 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2112 |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2113 |
| 1668 | 2114 void RenderCurrentScene(const Orthanc::ImageAccessor& frame, |
| 2115 const OrthancStone::DicomInstanceParameters& instance, | |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2116 size_t frameIndex, |
| 1668 | 2117 const OrthancStone::CoordinateSystem3D& plane) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2118 { |
|
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2119 /** |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2120 * IMPORTANT - DO NOT use "instance.GetWidth()" and |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2121 * "instance.GetHeight()" in this method. Use the information from |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2122 * "frame" instead. Indeed, the "instance" information is taken |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2123 * from DICOMweb "/studies/.../series/.../metadata". But, |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2124 * "SeriesMetadataExtrapolatedTags" includes the "Columns" and |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2125 * "Rows" DICOM tags for performance, which make this information |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2126 * unreliable if the series includes instances with varying sizes |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2127 * (cf. LSD-479). |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2128 **/ |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2129 |
| 1668 | 2130 bool isMonochrome1 = (instance.GetImageInformation().GetPhotometricInterpretation() == |
| 2131 Orthanc::PhotometricInterpretation_Monochrome1); | |
| 2132 | |
| 2133 std::unique_ptr<OrthancStone::TextureBaseSceneLayer> layer; | |
| 2134 | |
| 2135 switch (frame.GetFormat()) | |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2136 { |
| 1668 | 2137 case Orthanc::PixelFormat_RGB24: |
| 2138 layer.reset(new OrthancStone::ColorTextureSceneLayer(frame)); | |
| 2139 break; | |
| 2140 | |
| 2141 case Orthanc::PixelFormat_Float32: | |
| 2142 { | |
| 2143 std::unique_ptr<OrthancStone::FloatTextureSceneLayer> tmp( | |
| 2144 new OrthancStone::FloatTextureSceneLayer(frame)); | |
| 2145 tmp->SetCustomWindowing(windowingCenter_, windowingWidth_); | |
| 2146 tmp->SetInverted(inverted_ ^ isMonochrome1); | |
| 2147 layer.reset(tmp.release()); | |
| 2148 break; | |
| 2149 } | |
| 2150 | |
| 2151 default: | |
| 2152 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); | |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2153 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2154 |
| 1668 | 2155 assert(layer.get() != NULL); |
| 2156 | |
| 2157 layer->SetLinearInterpolation(true); | |
| 2158 layer->SetFlipX(flipX_); | |
| 2159 layer->SetFlipY(flipY_); | |
| 2160 | |
| 2161 double pixelSpacingX, pixelSpacingY; | |
|
1822
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2162 |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2163 if (instance.HasPixelSpacing()) |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2164 { |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2165 pixelSpacingX = instance.GetPixelSpacingX(); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2166 pixelSpacingY = instance.GetPixelSpacingY(); |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2167 } |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2168 else |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2169 { |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2170 pixelSpacingX = centralPixelSpacingX_; |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2171 pixelSpacingY = centralPixelSpacingY_; |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2172 } |
|
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2173 |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2174 if (FIX_LSD_479) |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2175 { |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2176 /** |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2177 * Some series contain a first instance (secondary capture) that |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2178 * is completely different from others wrt. to resolution and |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2179 * pixel spacing. We make sure to rescale each frame to fit in a |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2180 * square that corresponds to the extent of the frame in the |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2181 * middle of the series. |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2182 **/ |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2183 double physicalWidth = pixelSpacingX * static_cast<double>(frame.GetWidth()); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2184 double physicalHeight = pixelSpacingY * static_cast<double>(frame.GetHeight()); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2185 |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2186 if (OrthancStone::LinearAlgebra::IsCloseToZero(physicalWidth) || |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2187 OrthancStone::LinearAlgebra::IsCloseToZero(physicalHeight)) |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2188 { |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2189 // Numerical instability, don't try further processing |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2190 layer->SetPixelSpacing(pixelSpacingX, pixelSpacingY); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2191 } |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2192 else |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2193 { |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2194 double scale = std::max(centralPhysicalWidth_ / physicalWidth, |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2195 centralPhysicalHeight_ / physicalHeight); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2196 layer->SetPixelSpacing(pixelSpacingX * scale, pixelSpacingY * scale); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2197 layer->SetOrigin((centralPhysicalWidth_ - physicalWidth * scale) / 2.0, |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2198 (centralPhysicalHeight_ - physicalHeight * scale) / 2.0); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2199 } |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2200 } |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2201 else |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2202 { |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2203 layer->SetPixelSpacing(pixelSpacingX, pixelSpacingY); |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2204 } |
| 1668 | 2205 |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2206 std::unique_ptr<OrthancStone::LookupTableTextureSceneLayer> overlay; |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2207 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2208 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2209 OverlaysRegistry::Accessor accessor(OverlaysRegistry::GetInstance(), instance.GetSopInstanceUid()); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2210 if (accessor.IsValid()) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2211 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2212 overlay.reset(accessor.CreateTexture()); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2213 overlay->SetFlipX(flipX_); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2214 overlay->SetFlipY(flipY_); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2215 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2216 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2217 |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2218 std::unique_ptr<OrthancStone::MacroSceneLayer> annotationsOsiriX; |
| 1668 | 2219 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2220 if (osiriXAnnotations_) |
| 1668 | 2221 { |
| 2222 std::set<size_t> a; | |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2223 osiriXAnnotations_->LookupSopInstanceUid(a, instance.GetSopInstanceUid()); |
| 1668 | 2224 if (plane.IsValid() && |
| 2225 !a.empty()) | |
| 2226 { | |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2227 annotationsOsiriX.reset(new OrthancStone::MacroSceneLayer); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2228 // annotationsOsiriX->Reserve(a.size()); |
| 1668 | 2229 |
| 2230 OrthancStone::OsiriXLayerFactory factory; | |
| 2231 factory.SetColor(0, 255, 0); | |
| 2232 | |
| 2233 for (std::set<size_t>::const_iterator it = a.begin(); it != a.end(); ++it) | |
| 2234 { | |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2235 const OrthancStone::OsiriX::Annotation& annotation = osiriXAnnotations_->GetAnnotation(*it); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2236 annotationsOsiriX->AddLayer(factory.Create(annotation, plane)); |
| 1668 | 2237 } |
| 2238 } | |
| 2239 } | |
| 2240 | |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2241 StoneAnnotationsRegistry::GetInstance().Load(*stoneAnnotations_, instance.GetSopInstanceUid(), frameIndex); |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2242 |
|
1962
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2243 // Orientation markers, new in Stone Web viewer 2.4 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2244 std::unique_ptr<OrthancStone::MacroSceneLayer> orientationMarkers; |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2245 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2246 if (instance.GetGeometry().IsValid()) |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2247 { |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2248 orientationMarkers.reset(new OrthancStone::MacroSceneLayer); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2249 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2250 std::string top, bottom, left, right; |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2251 instance.GetGeometry().GetOrientationMarkers(top, bottom, left, right); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2252 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2253 std::unique_ptr<OrthancStone::TextSceneLayer> text; |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2254 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2255 text.reset(new OrthancStone::TextSceneLayer); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2256 text->SetText(top); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2257 text->SetPosition(pixelSpacingX * static_cast<double>(frame.GetWidth()) / 2.0, 0); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2258 text->SetAnchor(OrthancStone::BitmapAnchor_TopCenter); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2259 orientationMarkers->AddLayer(text.release()); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2260 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2261 text.reset(new OrthancStone::TextSceneLayer); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2262 text->SetText(bottom); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2263 text->SetPosition(pixelSpacingX * static_cast<double>(frame.GetWidth()) / 2.0, |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2264 pixelSpacingY * static_cast<double>(frame.GetHeight())); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2265 text->SetAnchor(OrthancStone::BitmapAnchor_BottomCenter); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2266 orientationMarkers->AddLayer(text.release()); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2267 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2268 text.reset(new OrthancStone::TextSceneLayer); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2269 text->SetText(left); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2270 text->SetPosition(0, pixelSpacingY * static_cast<double>(frame.GetHeight()) / 2.0); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2271 text->SetAnchor(OrthancStone::BitmapAnchor_CenterLeft); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2272 orientationMarkers->AddLayer(text.release()); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2273 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2274 text.reset(new OrthancStone::TextSceneLayer); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2275 text->SetText(right); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2276 text->SetPosition(pixelSpacingX * static_cast<double>(frame.GetWidth()), |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2277 pixelSpacingY * static_cast<double>(frame.GetHeight()) / 2.0); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2278 text->SetAnchor(OrthancStone::BitmapAnchor_CenterRight); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2279 orientationMarkers->AddLayer(text.release()); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2280 } |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2281 |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2282 |
| 1668 | 2283 { |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2284 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2285 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2286 OrthancStone::Scene2D& scene = lock->GetController().GetScene(); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2287 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2288 scene.SetLayer(LAYER_TEXTURE, layer.release()); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2289 |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2290 if (overlay.get() != NULL) |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2291 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2292 scene.SetLayer(LAYER_OVERLAY, overlay.release()); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2293 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2294 else |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2295 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2296 scene.DeleteLayer(LAYER_OVERLAY); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2297 } |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2298 |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2299 if (annotationsOsiriX.get() != NULL) |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2300 { |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2301 scene.SetLayer(LAYER_ANNOTATIONS_OSIRIX, annotationsOsiriX.release()); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2302 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2303 else |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2304 { |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2305 scene.DeleteLayer(LAYER_ANNOTATIONS_OSIRIX); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2306 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2307 |
|
1962
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2308 if (orientationMarkers.get() != NULL) |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2309 { |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2310 scene.SetLayer(LAYER_ORIENTATION_MARKERS, orientationMarkers.release()); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2311 } |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2312 else |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2313 { |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2314 scene.DeleteLayer(LAYER_ORIENTATION_MARKERS); |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2315 } |
|
c6272d7bb6d9
display of orientation markers in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1948
diff
changeset
|
2316 |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2317 stoneAnnotations_->Render(scene); // Necessary for "FitContent()" to work |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2318 |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2319 if (fitNextContent_) |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2320 { |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2321 lock->RefreshCanvasSize(); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2322 lock->GetCompositor().FitContent(scene); |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2323 stoneAnnotations_->Render(scene); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2324 fitNextContent_ = false; |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2325 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2326 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2327 //lock->GetCompositor().Refresh(scene); |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2328 lock->Invalidate(); |
| 1668 | 2329 } |
| 2330 } | |
| 2331 | |
| 2332 | |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2333 void RenderCurrentSceneFromCommand(const Orthanc::ImageAccessor& frame, |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2334 const std::string& loadedSopInstanceUid, |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2335 unsigned int loadedFrameNumber, |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2336 DisplayedFrameQuality quality) |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2337 { |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2338 if (cursor_.get() != NULL && |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2339 frames_.get() != NULL) |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2340 { |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2341 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2342 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2343 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2344 |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2345 // Only change the scene if the loaded frame still corresponds to the current cursor |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2346 if (instance.GetSopInstanceUid() == loadedSopInstanceUid && |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2347 frameNumber == loadedFrameNumber) |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2348 { |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2349 const OrthancStone::CoordinateSystem3D plane = frames_->GetFrameGeometry(cursorIndex); |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2350 |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2351 if (quality == DisplayedFrameQuality_Low) |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2352 { |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2353 FramesCache::Accessor accessor(*framesCache_, instance.GetSopInstanceUid(), frameNumber); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2354 if (accessor.IsValid() && |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2355 accessor.GetQuality() == QUALITY_FULL) |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2356 { |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2357 // A high-res image was downloaded in between: Use this cached image instead of the low-res |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2358 RenderCurrentScene(accessor.GetImage(), instance, frameNumber, plane); |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2359 SetupPrefetchAfterRendering(frame, DisplayedFrameQuality_High); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2360 } |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2361 else |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2362 { |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2363 // This frame is only available in low-res: Download the full DICOM |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2364 RenderCurrentScene(frame, instance, frameNumber, plane); |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2365 SetupPrefetchAfterRendering(frame, quality); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2366 |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2367 /** |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2368 * The command "SetupPrefetchAfterRendering()" must be |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2369 * after "SetupPrefetchAfterRendering(quality)", as the |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2370 * DICOM instance might already be cached by the oracle, |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2371 * which makes a call to "observer_->SignalFrameUpdated()" |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2372 * with a low quality, whereas the high quality is |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2373 * available. |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2374 **/ |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2375 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2376 } |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2377 } |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2378 else |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2379 { |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2380 assert(quality == DisplayedFrameQuality_High); |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2381 SetupPrefetchAfterRendering(frame, quality); |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2382 RenderCurrentScene(frame, instance, frameNumber, plane); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2383 } |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2384 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2385 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2386 } |
|
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2387 |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2388 void ScheduleLoadFullDicomFrame(const std::string& sopInstanceUid, |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2389 unsigned int frameNumber, |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2390 int priority, |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2391 bool isPrefetch) |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2392 { |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2393 if (frames_.get() != NULL) |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2394 { |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2395 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock()); |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2396 lock->Schedule( |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2397 GetSharedObserver(), priority, OrthancStone::ParseDicomFromWadoCommand::Create( |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2398 source_, frames_->GetStudyInstanceUid(), frames_->GetSeriesInstanceUid(), |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2399 sopInstanceUid, serverSideTranscoding_, |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2400 Orthanc::DicomTransferSyntax_LittleEndianExplicit, |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2401 new SetFullDicomFrame(GetSharedObserver(), sopInstanceUid, frameNumber, priority, isPrefetch, serverSideTranscoding_))); |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2402 } |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2403 } |
|
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2404 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2405 void ScheduleLoadFullDicomFrame(size_t cursorIndex, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2406 int priority, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2407 bool isPrefetch) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2408 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2409 if (frames_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2410 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2411 std::string sopInstanceUid = frames_->GetInstanceOfFrame(cursorIndex).GetSopInstanceUid(); |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2412 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2413 ScheduleLoadFullDicomFrame(sopInstanceUid, frameNumber, priority, isPrefetch); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2414 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2415 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2416 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2417 void ScheduleLoadRenderedFrame(size_t cursorIndex, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2418 int priority, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2419 bool isPrefetch) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2420 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2421 if (!source_.HasDicomWebRendered()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2422 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2423 ScheduleLoadFullDicomFrame(cursorIndex, priority, isPrefetch); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2424 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2425 else if (frames_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2426 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2427 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2428 unsigned int frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2429 |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2430 /** |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2431 * If the full-resolution DICOM file is already available in the |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2432 * cache of the oracle, bypass the loading of the "rendered" and |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2433 * use the cached DICOM file. |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2434 **/ |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2435 std::unique_ptr<OrthancStone::WebAssemblyOracle::CachedInstanceAccessor> accessor( |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2436 context_.AccessCachedInstance(instance.GetSopInstanceUid())); |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2437 |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2438 if (accessor.get() != NULL && |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2439 accessor->IsValid()) |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2440 { |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2441 try |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2442 { |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2443 std::unique_ptr<Orthanc::ImageAccessor> frame(accessor->GetDicom().DecodeFrame(frameNumber)); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2444 SetFullDicomFrame::Apply(*this, accessor->GetDicom(), frame.release(), instance.GetSopInstanceUid(), frameNumber); |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2445 return; // Success |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2446 } |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2447 catch (Orthanc::OrthancException&) |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2448 { |
|
1722
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2449 /** |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2450 * This happens if the cached DICOM file uses a transfer |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2451 * syntax that is not supported by DCMTK (such as |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2452 * JPEG2k). Fallback to "/rendered" in order to re-download |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2453 * the DICOM file using server-side transcoding. This |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2454 * happens on WRIX dataset. |
|
802cb1272f3a
fix for the WRIX dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1721
diff
changeset
|
2455 **/ |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2456 } |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2457 } |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2458 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2459 bool isMonochrome1 = (instance.GetImageInformation().GetPhotometricInterpretation() == |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2460 Orthanc::PhotometricInterpretation_Monochrome1); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2461 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2462 const std::string uri = ("studies/" + frames_->GetStudyInstanceUid() + |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2463 "/series/" + frames_->GetSeriesInstanceUid() + |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2464 "/instances/" + instance.GetSopInstanceUid() + |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2465 "/frames/" + boost::lexical_cast<std::string>(frameNumber + 1) + "/rendered"); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2466 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2467 std::map<std::string, std::string> headers, arguments; |
|
1717
391c798e4dae
fix for KNIX sample dataset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1714
diff
changeset
|
2468 // arguments["quality"] = "10"; // Low-level quality for test purpose |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2469 arguments["window"] = ( |
| 1536 | 2470 boost::lexical_cast<std::string>(windowingCenter_) + "," + |
| 2471 boost::lexical_cast<std::string>(windowingWidth_) + ",linear"); | |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2472 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2473 std::unique_ptr<OrthancStone::IOracleCommand> command( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2474 source_.CreateDicomWebCommand( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2475 uri, arguments, headers, new SetLowQualityFrame( |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
2476 GetSharedObserver(), instance.GetSopInstanceUid(), frameNumber, |
| 1536 | 2477 windowingCenter_, windowingWidth_, isMonochrome1, isPrefetch))); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2478 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2479 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2480 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_.Lock()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2481 lock->Schedule(GetSharedObserver(), priority, command.release()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2482 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2483 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2484 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2485 |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2486 void UpdateCurrentTextureParameters() |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2487 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2488 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2489 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2490 if (lock->GetController().GetScene().HasLayer(LAYER_TEXTURE)) |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2491 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2492 if (lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() == |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2493 OrthancStone::ISceneLayer::Type_FloatTexture) |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2494 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2495 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>( |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2496 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)). |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2497 SetCustomWindowing(windowingCenter_, windowingWidth_); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2498 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2499 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2500 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2501 OrthancStone::TextureBaseSceneLayer& layer = |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2502 dynamic_cast<OrthancStone::TextureBaseSceneLayer&>( |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2503 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2504 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2505 layer.SetFlipX(flipX_); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2506 layer.SetFlipY(flipY_); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2507 } |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2508 |
| 1925 | 2509 if (lock->GetController().GetScene().HasLayer(LAYER_OVERLAY)) |
|
1924
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2510 { |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2511 OrthancStone::TextureBaseSceneLayer& layer = |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2512 dynamic_cast<OrthancStone::TextureBaseSceneLayer&>( |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2513 lock->GetController().GetScene().GetLayer(LAYER_OVERLAY)); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2514 |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2515 layer.SetFlipX(flipX_); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2516 layer.SetFlipY(flipY_); |
|
f4050908c6bc
display of overlays
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1916
diff
changeset
|
2517 } |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2518 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2519 lock->Invalidate(); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2520 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2521 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2522 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2523 |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2524 ViewerViewport(OrthancStone::WebAssemblyLoadersContext& context, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2525 const OrthancStone::DicomSource& source, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2526 const std::string& canvas, |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2527 boost::shared_ptr<FramesCache> cache, |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2528 bool softwareRendering) : |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2529 context_(context), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2530 source_(source), |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2531 framesCache_(cache), |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2532 fitNextContent_(true), |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2533 flipX_(false), |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2534 flipY_(false), |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2535 hasFocusOnInstance_(false), |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2536 focusFrameNumber_(0), |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2537 synchronizationOffset_(OrthancStone::LinearAlgebra::CreateVector(0, 0, 0)), |
|
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2538 synchronizationEnabled_(false), |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2539 centralPhysicalWidth_(1), |
|
1822
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2540 centralPhysicalHeight_(1), |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2541 centralPixelSpacingX_(1), |
|
0489fe25ce48
support of pixel spacing in ultrasound images from tag SequenceOfUltrasoundRegions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1816
diff
changeset
|
2542 centralPixelSpacingY_(1) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2543 { |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2544 if (!framesCache_) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2545 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2546 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2547 } |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2548 |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2549 if (softwareRendering) |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2550 { |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2551 LOG(INFO) << "Creating Cairo viewport in canvas: " << canvas; |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2552 viewport_ = OrthancStone::WebAssemblyCairoViewport::Create(canvas); |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2553 } |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2554 else |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2555 { |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2556 LOG(INFO) << "Creating WebGL viewport in canvas: " << canvas; |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2557 viewport_ = OrthancStone::WebGLViewport::Create(canvas); |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2558 } |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2559 |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2560 { |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2561 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2562 std::string ttf; |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2563 Orthanc::EmbeddedResources::GetFileResource(ttf, Orthanc::EmbeddedResources::UBUNTU_FONT); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2564 lock->GetCompositor().SetFont(0, ttf, 16 /* font size */, Orthanc::Encoding_Latin1); |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2565 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2566 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2567 emscripten_set_wheel_callback(viewport_->GetCanvasCssSelector().c_str(), this, true, OnWheel); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2568 |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
2569 SetWindowingPreset(); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2570 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2571 stoneAnnotations_.reset(new OrthancStone::AnnotationsSceneLayer(LAYER_ANNOTATIONS_STONE)); |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
2572 stoneAnnotations_->SetProbedLayer(LAYER_TEXTURE); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2573 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2574 |
|
1721
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2575 |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2576 void Handle(const OrthancStone::ViewportController::GrayscaleWindowingChanged& message) |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2577 { |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2578 // This event is triggered by the windowing mouse action, from class "GrayscaleWindowingSceneTracker" |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2579 windowingCenter_ = message.GetWindowingCenter(); |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2580 windowingWidth_ = message.GetWindowingWidth(); |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2581 |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2582 if (observer_.get() != NULL) |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2583 { |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2584 observer_->SignalWindowingUpdated(*this, message.GetWindowingCenter(), message.GetWindowingWidth()); |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2585 } |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2586 } |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2587 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2588 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2589 static EM_BOOL OnWheel(int eventType, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2590 const EmscriptenWheelEvent *wheelEvent, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2591 void *userData) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2592 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2593 ViewerViewport& that = *reinterpret_cast<ViewerViewport*>(userData); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2594 |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2595 if (that.frames_.get() != NULL && |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2596 that.cursor_.get() != NULL) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2597 { |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2598 const bool isCtrl = wheelEvent->mouse.ctrlKey; |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2599 const bool isShift = wheelEvent->mouse.shiftKey; |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2600 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2601 const size_t previousCursorIndex = that.cursor_->GetCurrentIndex(); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2602 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2603 if (wheelEvent->deltaY < 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2604 { |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2605 that.ChangeFrame(isCtrl ? SeriesCursor::Action_FastMinus : |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2606 SeriesCursor::Action_Minus, false /* not circular */); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2607 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2608 else if (wheelEvent->deltaY > 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2609 { |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2610 that.ChangeFrame(isCtrl ? SeriesCursor::Action_FastPlus : |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2611 SeriesCursor::Action_Plus, false /* not circular */); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2612 } |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2613 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2614 if (that.synchronizationEnabled_) |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2615 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2616 const size_t currentCursorIndex = that.cursor_->GetCurrentIndex(); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2617 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2618 const OrthancStone::CoordinateSystem3D current = |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2619 that.frames_->GetFrameGeometry(currentCursorIndex); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2620 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2621 if (isShift && |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2622 previousCursorIndex != currentCursorIndex) |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2623 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2624 const OrthancStone::CoordinateSystem3D previous = |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2625 that.frames_->GetFrameGeometry(previousCursorIndex); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2626 that.synchronizationOffset_ += previous.GetOrigin() - current.GetOrigin(); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2627 } |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2628 |
| 1694 | 2629 that.observer_->SignalSynchronizedBrowsing( |
| 2630 that, current.GetOrigin() + that.synchronizationOffset_, current.GetNormal()); | |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2631 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2632 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2633 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2634 return true; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2635 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2636 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2637 void Handle(const OrthancStone::DicomResourcesLoader::SuccessMessage& message) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2638 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2639 dynamic_cast<const ICommand&>(message.GetUserPayload()).Handle(message); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2640 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2641 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2642 void Handle(const OrthancStone::HttpCommand::SuccessMessage& message) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2643 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2644 dynamic_cast<const ICommand&>(message.GetOrigin().GetPayload()).Handle(message); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2645 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2646 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2647 void Handle(const OrthancStone::ParseDicomSuccessMessage& message) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2648 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2649 dynamic_cast<const ICommand&>(message.GetOrigin().GetPayload()).Handle(message); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2650 } |
|
1600
b253b79906fa
clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
2651 |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2652 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2653 void RefreshAnnotations(bool save) |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2654 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2655 { |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2656 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2657 stoneAnnotations_->Render(lock->GetController().GetScene()); |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2658 lock->Invalidate(); |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2659 } |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2660 |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2661 if (save) |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2662 { |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2663 if (cursor_.get() != NULL && |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2664 frames_.get() != NULL) |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2665 { |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2666 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2667 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2668 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2669 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2670 StoneAnnotationsRegistry::GetInstance().Save(instance.GetSopInstanceUid(), frameNumber, *stoneAnnotations_); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2671 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2672 if (observer_.get() != NULL) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2673 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2674 observer_->SignalStoneAnnotationsChanged(*this, instance.GetSopInstanceUid(), frameNumber); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2675 } |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2676 } |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2677 } |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2678 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2679 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2680 void Handle(const OrthancStone::ViewportController::SceneTransformChanged& message) |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2681 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2682 RefreshAnnotations(false /* don't save */); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2683 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2684 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2685 void Handle(const OrthancStone::AnnotationsSceneLayer::AnnotationChangedMessage& message) |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2686 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2687 RefreshAnnotations(true /* save */); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2688 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2689 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2690 void Handle(const OrthancStone::AnnotationsSceneLayer::AnnotationAddedMessage& message) |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2691 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2692 RefreshAnnotations(true /* save */); |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2693 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2694 if (observer_.get() != NULL) |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2695 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2696 observer_->SignalStoneAnnotationAdded(*this); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2697 } |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2698 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2699 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2700 void Handle(const OrthancStone::AnnotationsSceneLayer::AnnotationRemovedMessage& message) |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2701 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2702 RefreshAnnotations(true /* save */); |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2703 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2704 if (observer_.get() != NULL) |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2705 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2706 observer_->SignalStoneAnnotationRemoved(*this); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
2707 } |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2708 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2709 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2710 public: |
|
1622
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2711 virtual ~ViewerViewport() |
|
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2712 { |
|
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2713 // Unregister the callbacks to avoid any call with a "void*" that |
|
1623
74be0f498b08
Updated mechanism to avoid using deleted objects in RequestAnimationFrame callbacks.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1622
diff
changeset
|
2714 // has been destroyed. "WebAssemblyViewport::CreateObjectCookie()" |
|
1622
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2715 // provides a more advanced alternative. |
|
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2716 emscripten_set_wheel_callback(viewport_->GetCanvasCssSelector().c_str(), this, true, NULL); |
|
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2717 } |
|
0f8d6791b403
fix build by making the destructor of ViewerViewport public
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1620
diff
changeset
|
2718 |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2719 static boost::shared_ptr<ViewerViewport> Create(OrthancStone::WebAssemblyLoadersContext& context, |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2720 const OrthancStone::DicomSource& source, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2721 const std::string& canvas, |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2722 boost::shared_ptr<FramesCache> cache, |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
2723 bool softwareRendering) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2724 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2725 boost::shared_ptr<ViewerViewport> viewport( |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2726 new ViewerViewport(context, source, canvas, cache, softwareRendering)); |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2727 |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2728 { |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2729 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context.Lock()); |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2730 |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2731 viewport->loader_ = OrthancStone::DicomResourcesLoader::Create(*lock); |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2732 viewport->Register<OrthancStone::DicomResourcesLoader::SuccessMessage>( |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2733 *viewport->loader_, &ViewerViewport::Handle); |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2734 |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2735 viewport->Register<OrthancStone::HttpCommand::SuccessMessage>( |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2736 lock->GetOracleObservable(), &ViewerViewport::Handle); |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2737 |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2738 viewport->Register<OrthancStone::ParseDicomSuccessMessage>( |
|
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2739 lock->GetOracleObservable(), &ViewerViewport::Handle); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2740 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2741 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationChangedMessage>( |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2742 *viewport->stoneAnnotations_, &ViewerViewport::Handle); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2743 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2744 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationAddedMessage>( |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2745 *viewport->stoneAnnotations_, &ViewerViewport::Handle); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2746 |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2747 viewport->Register<OrthancStone::AnnotationsSceneLayer::AnnotationRemovedMessage>( |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2748 *viewport->stoneAnnotations_, &ViewerViewport::Handle); |
|
1675
6fa05252b085
don't load low-quality image if the parsed dicom file is cached by the oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1674
diff
changeset
|
2749 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2750 |
|
1721
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2751 { |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2752 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->viewport_->Lock()); |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2753 viewport->Register<OrthancStone::ViewportController::GrayscaleWindowingChanged>(lock->GetController(), &ViewerViewport::Handle); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2754 viewport->Register<OrthancStone::ViewportController::SceneTransformChanged>(lock->GetController(), &ViewerViewport::Handle); |
|
1721
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2755 } |
|
d4a8e2b19a65
new "GrayscaleWindowingChanged" message from GrayscaleWindowingSceneTracker
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1720
diff
changeset
|
2756 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2757 return viewport; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2758 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2759 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2760 void SetFrames(OrthancStone::SortedFrames* frames) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2761 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2762 if (frames == NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2763 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2764 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2765 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2766 |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2767 flipX_ = false; |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
2768 flipY_ = false; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2769 fitNextContent_ = true; |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2770 cineRate_ = DEFAULT_CINE_RATE; |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
2771 inverted_ = false; |
|
1682
84fe7089ccaa
switch to server-side transcoding on failed decoding (for jpeg2k)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1681
diff
changeset
|
2772 serverSideTranscoding_ = false; |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
2773 OrthancStone::LinearAlgebra::AssignVector(synchronizationOffset_, 0, 0, 0); |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
2774 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2775 frames_.reset(frames); |
|
1970
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2776 cursor_.reset(new SeriesCursor(frames_->GetFramesCount(), false)); |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2777 |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2778 if (frames_->GetFramesCount() != 0) |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2779 { |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2780 const OrthancStone::DicomInstanceParameters& firstInstance = frames_->GetInstanceOfFrame(0); |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2781 std::string modality; |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2782 if (firstInstance.GetTags().LookupStringValue(modality, Orthanc::DICOM_TAG_MODALITY, false)) |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2783 { |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2784 if (modality == "MR" || |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2785 modality == "CT" || |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2786 modality == "NM" || |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2787 modality == "OPT" || |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2788 modality == "PT" || |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2789 modality == "RTDOSE" || |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2790 modality == "XA") |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2791 { |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2792 // For series that might correspond to 3D images, use their |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2793 // central frame as the first frame to be displayed |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2794 cursor_.reset(new SeriesCursor(frames_->GetFramesCount(), true)); |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2795 } |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2796 } |
|
33d2ff1aeaae
start ultrasound series at their first frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1963
diff
changeset
|
2797 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2798 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2799 LOG(INFO) << "Number of frames in series: " << frames_->GetFramesCount(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2800 |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
2801 SetWindowingPreset(); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2802 ClearViewport(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2803 prefetchQueue_.clear(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2804 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2805 if (observer_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2806 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2807 observer_->SignalFrameUpdated(*this, cursor_->GetCurrentIndex(), |
|
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
2808 frames_->GetFramesCount(), DisplayedFrameQuality_None, 0, "", ""); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2809 } |
|
1665
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2810 |
|
1695
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2811 centralPhysicalWidth_ = 1; |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2812 centralPhysicalHeight_ = 1; |
|
a691ab50d416
support of series with instances of varying resolutions - LSD-479
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1694
diff
changeset
|
2813 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2814 if (frames_->GetFramesCount() != 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2815 { |
|
1665
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2816 const OrthancStone::DicomInstanceParameters& centralInstance = frames_->GetInstanceOfFrame(cursor_->GetCurrentIndex()); |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2817 |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2818 /** |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2819 * Avoid loading metadata if we know that this cannot be a |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2820 * "true" image with pixel data. Retrieving instance metadata on |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2821 * RTSTRUCT can lead to very large JSON whose parsing will |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2822 * freeze the browser for several seconds. |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2823 **/ |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2824 const OrthancStone::SopClassUid uid = centralInstance.GetSopClassUid(); |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2825 if (uid != OrthancStone::SopClassUid_EncapsulatedPdf && |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2826 uid != OrthancStone::SopClassUid_RTDose && |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2827 uid != OrthancStone::SopClassUid_RTPlan && |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2828 uid != OrthancStone::SopClassUid_RTStruct && |
|
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2829 GetSeriesThumbnailType(uid) != OrthancStone::SeriesThumbnailType_Video) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2830 { |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2831 // Fetch the details of the series from the central instance |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2832 const std::string uri = ("studies/" + frames_->GetStudyInstanceUid() + |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2833 "/series/" + frames_->GetSeriesInstanceUid() + |
|
1665
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
2834 "/instances/" + centralInstance.GetSopInstanceUid() + "/metadata"); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2835 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2836 loader_->ScheduleGetDicomWeb( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2837 boost::make_shared<OrthancStone::LoadedDicomResources>(Orthanc::DICOM_TAG_SOP_INSTANCE_UID), |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2838 0, source_, uri, new LoadSeriesDetailsFromInstance(GetSharedObserver())); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2839 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2840 } |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2841 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
2842 ApplyScheduledFocus(); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2843 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2844 |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
2845 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2846 // This method is used when the layout of the HTML page changes, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2847 // which does not trigger the "emscripten_set_resize_callback()" |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2848 void UpdateSize(bool fitContent) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2849 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2850 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
1576
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1575
diff
changeset
|
2851 lock->RefreshCanvasSize(); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2852 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2853 if (fitContent) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2854 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2855 lock->GetCompositor().FitContent(lock->GetController().GetScene()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2856 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2857 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2858 stoneAnnotations_->ClearHover(); |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
2859 stoneAnnotations_->Render(lock->GetController().GetScene()); |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
2860 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2861 lock->Invalidate(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2862 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2863 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2864 void AcquireObserver(IObserver* observer) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2865 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2866 observer_.reset(observer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2867 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2868 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2869 const std::string& GetCanvasId() const |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2870 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2871 assert(viewport_); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2872 return viewport_->GetCanvasId(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2873 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2874 |
|
1669
d82a141e08d7
make the viewer work even if missing cache space
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
2875 |
| 1668 | 2876 void Redraw() |
| 2877 { | |
| 2878 if (cursor_.get() != NULL && | |
| 2879 frames_.get() != NULL) | |
| 2880 { | |
| 2881 const size_t cursorIndex = cursor_->GetCurrentIndex(); | |
| 2882 | |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2883 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2884 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2885 |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2886 FramesCache::Accessor accessor(*framesCache_, instance.GetSopInstanceUid(), frameNumber); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2887 if (accessor.IsValid()) |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2888 { |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
2889 RenderCurrentScene(accessor.GetImage(), instance, frameNumber, frames_->GetFrameGeometry(cursorIndex)); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2890 |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2891 DisplayedFrameQuality quality; |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2892 |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2893 if (accessor.GetQuality() < QUALITY_FULL) |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2894 { |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2895 // This frame is only available in low-res: Download the full DICOM |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2896 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2897 quality = DisplayedFrameQuality_Low; |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2898 } |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2899 else |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2900 { |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2901 quality = DisplayedFrameQuality_High; |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2902 } |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2903 |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
2904 SetupPrefetchAfterRendering(accessor.GetImage(), quality); |
|
1671
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2905 } |
|
2c2512918a0f
fix in prefetching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
2906 else |
| 1668 | 2907 { |
| 2908 // This frame is not cached yet: Load it | |
| 2909 if (source_.HasDicomWebRendered()) | |
| 2910 { | |
| 2911 ScheduleLoadRenderedFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); | |
| 2912 } | |
| 2913 else | |
| 2914 { | |
| 2915 ScheduleLoadFullDicomFrame(cursorIndex, PRIORITY_HIGH, false /* not a prefetch */); | |
| 2916 } | |
| 2917 } | |
| 2918 } | |
| 2919 } | |
| 2920 | |
| 2921 | |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2922 // Returns "true" iff the frame has indeed changed |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2923 bool ChangeFrame(SeriesCursor::Action action, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2924 bool isCircular) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2925 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2926 if (cursor_.get() != NULL) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2927 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2928 size_t previous = cursor_->GetCurrentIndex(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2929 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2930 cursor_->Apply(action, isCircular); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2931 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2932 size_t current = cursor_->GetCurrentIndex(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2933 if (previous != current) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2934 { |
| 1668 | 2935 Redraw(); |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2936 return true; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2937 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2938 } |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2939 |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2940 return false; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2941 } |
|
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2942 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2943 |
|
1948
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2944 void SetFrame(unsigned int frameNumber) |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2945 { |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2946 if (cursor_.get() != NULL && |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2947 frameNumber < cursor_->GetFramesCount() && |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2948 frameNumber != cursor_->GetCurrentIndex()) |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2949 { |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2950 cursor_->SetCurrentIndex(frameNumber); |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2951 Redraw(); |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2952 } |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2953 } |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2954 |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
2955 |
|
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2956 void GoToFirstFrame() |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2957 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2958 if (cursor_.get() != NULL && |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2959 cursor_->GetCurrentIndex() != 0) |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2960 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2961 cursor_->SetCurrentIndex(0); |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2962 Redraw(); |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2963 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2964 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2965 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2966 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2967 void GoToLastFrame() |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2968 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2969 if (cursor_.get() != NULL) |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2970 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2971 size_t last = cursor_->GetFramesCount() - 1; |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2972 if (cursor_->GetCurrentIndex() != last) |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2973 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2974 cursor_->SetCurrentIndex(last); |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2975 Redraw(); |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2976 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2977 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
2978 } |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
2979 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2980 |
|
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2981 bool GetCurrentFrameOfReferenceUid(std::string& frameOfReferenceUid) const |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2982 { |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2983 if (cursor_.get() != NULL && |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2984 frames_.get() != NULL) |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2985 { |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2986 frameOfReferenceUid = frames_->GetInstanceOfFrame(cursor_->GetCurrentIndex()).GetFrameOfReferenceUid(); |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2987 return true; |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2988 } |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2989 else |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2990 { |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2991 return false; |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2992 } |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2993 } |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
2994 |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2995 bool GetCurrentPlane(OrthancStone::CoordinateSystem3D& plane) const |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2996 { |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2997 if (cursor_.get() != NULL && |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2998 frames_.get() != NULL) |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
2999 { |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3000 plane = frames_->GetFrameGeometry(cursor_->GetCurrentIndex()); |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3001 return true; |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3002 } |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3003 else |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3004 { |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3005 return false; |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3006 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3007 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3008 |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3009 void UpdateReferenceLines(const std::list<const ViewerViewport*>& viewports) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3010 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3011 std::unique_ptr<OrthancStone::PolylineSceneLayer> layer(new OrthancStone::PolylineSceneLayer); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3012 |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3013 if (cursor_.get() != NULL && |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3014 frames_.get() != NULL) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3015 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3016 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3017 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
|
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3018 const unsigned int frame = frames_->GetFrameNumberInInstance(cursorIndex); |
|
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3019 |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3020 for (std::list<const ViewerViewport*>::const_iterator |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3021 it = viewports.begin(); it != viewports.end(); ++it) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3022 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3023 assert(*it != NULL); |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3024 |
|
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3025 OrthancStone::CoordinateSystem3D otherPlane; |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3026 std::string otherFrameOfReferenceUid; |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3027 if ((*it)->GetCurrentPlane(otherPlane) && |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3028 (*it)->GetCurrentFrameOfReferenceUid(otherFrameOfReferenceUid) && |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3029 otherFrameOfReferenceUid == instance.GetFrameOfReferenceUid()) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3030 { |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3031 double x1, y1, x2, y2; |
|
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3032 if (GetReferenceLineCoordinates(x1, y1, x2, y2, instance, frame, otherPlane)) |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3033 { |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3034 OrthancStone::PolylineSceneLayer::Chain chain; |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3035 chain.push_back(OrthancStone::ScenePoint2D(x1, y1)); |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3036 chain.push_back(OrthancStone::ScenePoint2D(x2, y2)); |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3037 layer->AddChain(chain, false, 0, 255, 0); |
|
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3038 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3039 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3040 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3041 } |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3042 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3043 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3044 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3045 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3046 if (layer->GetChainsCount() == 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3047 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3048 lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3049 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3050 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3051 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3052 lock->GetController().GetScene().SetLayer(LAYER_REFERENCE_LINES, layer.release()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3053 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3054 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3055 //lock->GetCompositor().Refresh(lock->GetController().GetScene()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3056 lock->Invalidate(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3057 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3058 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3059 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3060 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3061 void ClearReferenceLines() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3062 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3063 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3064 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3065 lock->GetController().GetScene().DeleteLayer(LAYER_REFERENCE_LINES); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3066 lock->Invalidate(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3067 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3068 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3069 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3070 |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3071 void SetWindowingPreset() |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3072 { |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3073 assert(windowingPresetCenters_.size() == windowingPresetWidths_.size()); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3074 |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3075 if (windowingPresetCenters_.empty()) |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3076 { |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3077 SetWindowing(128, 256); |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3078 } |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3079 else |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3080 { |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3081 SetWindowing(windowingPresetCenters_[0], windowingPresetWidths_[0]); |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3082 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3083 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3084 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3085 void SetWindowing(float windowingCenter, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3086 float windowingWidth) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3087 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3088 windowingCenter_ = windowingCenter; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3089 windowingWidth_ = windowingWidth; |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3090 UpdateCurrentTextureParameters(); |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3091 |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3092 if (observer_.get() != NULL) |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3093 { |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3094 observer_->SignalWindowingUpdated(*this, windowingCenter, windowingWidth); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3095 } |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3096 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3097 |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3098 void FlipX() |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3099 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3100 flipX_ = !flipX_; |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3101 UpdateCurrentTextureParameters(); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3102 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3103 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3104 void FlipY() |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3105 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3106 flipY_ = !flipY_; |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
3107 UpdateCurrentTextureParameters(); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3108 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3109 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3110 void Invert() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3111 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3112 inverted_ = !inverted_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3113 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3114 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3115 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3116 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3117 if (lock->GetController().GetScene().HasLayer(LAYER_TEXTURE) && |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3118 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE).GetType() == |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3119 OrthancStone::ISceneLayer::Type_FloatTexture) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3120 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3121 OrthancStone::FloatTextureSceneLayer& layer = |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3122 dynamic_cast<OrthancStone::FloatTextureSceneLayer&>( |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3123 lock->GetController().GetScene().GetLayer(LAYER_TEXTURE)); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3124 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3125 // NB: Using "IsInverted()" instead of "inverted_" is for |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3126 // compatibility with MONOCHROME1 images |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3127 layer.SetInverted(!layer.IsInverted()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3128 lock->Invalidate(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3129 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3130 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3131 } |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3132 |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3133 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3134 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3135 class Interactor : public OrthancStone::DefaultViewportInteractor |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3136 { |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3137 private: |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3138 ViewerViewport& viewer_; |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3139 WebViewerAction leftAction_; |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3140 WebViewerAction middleAction_; |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3141 WebViewerAction rightAction_; |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3142 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3143 bool IsAction(const OrthancStone::PointerEvent& event, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3144 WebViewerAction action) |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3145 { |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3146 switch (event.GetMouseButton()) |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3147 { |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3148 case OrthancStone::MouseButton_Left: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3149 return (leftAction_ == action); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3150 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3151 case OrthancStone::MouseButton_Middle: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3152 return (middleAction_ == action); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3153 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3154 case OrthancStone::MouseButton_Right: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3155 return (rightAction_ == action); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3156 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3157 default: |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3158 return false; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3159 } |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3160 } |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3161 |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3162 public: |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3163 Interactor(ViewerViewport& viewer, |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3164 WebViewerAction leftAction, |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3165 WebViewerAction middleAction, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3166 WebViewerAction rightAction) : |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3167 viewer_(viewer), |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3168 leftAction_(leftAction), |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3169 middleAction_(middleAction), |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3170 rightAction_(rightAction) |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3171 { |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3172 SetLeftButtonAction(ConvertWebViewerAction(leftAction)); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3173 SetMiddleButtonAction(ConvertWebViewerAction(middleAction)); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3174 SetRightButtonAction(ConvertWebViewerAction(rightAction)); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3175 } |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3176 |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3177 virtual OrthancStone::IFlexiblePointerTracker* CreateTracker( |
| 1607 | 3178 boost::weak_ptr<OrthancStone::IViewport> viewport, |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3179 const OrthancStone::PointerEvent& event, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3180 unsigned int viewportWidth, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3181 unsigned int viewportHeight) ORTHANC_OVERRIDE |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3182 { |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3183 boost::shared_ptr<OrthancStone::IViewport> lock1(viewport.lock()); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3184 |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3185 if (lock1 && |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3186 IsAction(event, WebViewerAction_Crosshair)) |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3187 { |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3188 OrthancStone::CoordinateSystem3D plane; |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3189 if (viewer_.GetCurrentPlane(plane)) |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3190 { |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3191 std::unique_ptr<OrthancStone::IViewport::ILock> lock2(lock1->Lock()); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3192 |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3193 const OrthancStone::ScenePoint2D p = event.GetMainPosition(); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3194 double x = p.GetX(); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3195 double y = p.GetY(); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3196 lock2->GetController().GetCanvasToSceneTransform().Apply(x, y); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3197 |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3198 OrthancStone::Vector click = plane.MapSliceToWorldCoordinates(x, y); |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3199 if (viewer_.observer_.get() != NULL) |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3200 { |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3201 viewer_.observer_->SignalCrosshair(viewer_, click); |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3202 } |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3203 } |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3204 |
| 1580 | 3205 return NULL; // No need for a tracker, this is just a click |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3206 } |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3207 else |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3208 { |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3209 // Only the left mouse button can be used to edit/create/remove annotations |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3210 if (event.GetMouseButton() == OrthancStone::MouseButton_Left) |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3211 { |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3212 switch (leftAction_) |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3213 { |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3214 case WebViewerAction_CreateAngle: |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3215 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Angle); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3216 break; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3217 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3218 case WebViewerAction_CreateCircle: |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3219 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Circle); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3220 break; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3221 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3222 case WebViewerAction_CreateSegment: |
|
1978
95449b0e064a
pixel probe is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1977
diff
changeset
|
3223 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Segment); |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3224 break; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3225 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3226 case WebViewerAction_RemoveMeasure: |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3227 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Remove); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3228 break; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3229 |
|
1975
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3230 case WebViewerAction_CreatePixelProbe: |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3231 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_PixelProbe); |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3232 break; |
|
5a434f5889f8
starting pixel probe
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1970
diff
changeset
|
3233 |
|
1982
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3234 case WebViewerAction_CreateEllipseProbe: |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3235 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_EllipseProbe); |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3236 break; |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3237 |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3238 case WebViewerAction_CreateRectangleProbe: |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3239 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_RectangleProbe); |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3240 break; |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3241 |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3242 case WebViewerAction_CreateTextAnnotation: |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3243 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_TextAnnotation); |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3244 break; |
|
ba45e1b0812a
preparing interfaces for rectangle probe, ellipse probe and text annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1980
diff
changeset
|
3245 |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3246 default: |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3247 viewer_.stoneAnnotations_->SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Edit); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3248 break; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3249 } |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3250 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3251 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3252 std::unique_ptr<OrthancStone::IViewport::ILock> lock2(lock1->Lock()); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3253 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3254 std::unique_ptr<OrthancStone::IFlexiblePointerTracker> t; |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3255 t.reset(viewer_.stoneAnnotations_->CreateTracker(event.GetMainPosition(), lock2->GetController().GetScene())); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3256 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3257 if (t.get() != NULL) |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3258 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3259 return t.release(); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3260 } |
|
1809
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3261 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3262 } |
|
79a5838739a6
starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1795
diff
changeset
|
3263 |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3264 return DefaultViewportInteractor::CreateTracker( |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3265 viewport, event, viewportWidth, viewportHeight); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3266 } |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3267 } |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3268 |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3269 virtual bool HasMouseHover() const ORTHANC_OVERRIDE |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3270 { |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3271 return true; |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3272 } |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3273 |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3274 virtual void HandleMouseHover(OrthancStone::IViewport& viewport, |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3275 const OrthancStone::PointerEvent& event) ORTHANC_OVERRIDE |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3276 { |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3277 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport.Lock()); |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3278 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3279 if (viewer_.stoneAnnotations_->SetMouseHover(event.GetMainPosition(), lock->GetController().GetScene())) |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3280 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3281 viewer_.stoneAnnotations_->Render(lock->GetController().GetScene()); |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3282 lock->Invalidate(); |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3283 } |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3284 } |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3285 }; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3286 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3287 |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3288 void SetMouseButtonActions(WebViewerAction leftAction, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3289 WebViewerAction middleAction, |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3290 WebViewerAction rightAction) |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3291 { |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3292 assert(viewport_ != NULL); |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3293 viewport_->AcquireInteractor(new Interactor(*this, leftAction, middleAction, rightAction)); |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3294 } |
| 1575 | 3295 |
| 1578 | 3296 void FitForPrint() |
| 1575 | 3297 { |
| 3298 viewport_->FitForPrint(); | |
| 3299 } | |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3300 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3301 void SetOsiriXAnnotations(boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations> annotations) |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3302 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3303 osiriXAnnotations_ = annotations; |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3304 } |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
3305 |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3306 void ScheduleFrameFocus(const std::string& sopInstanceUid, |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3307 unsigned int frameNumber) |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3308 { |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3309 hasFocusOnInstance_ = true; |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3310 focusSopInstanceUid_ = sopInstanceUid; |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3311 focusFrameNumber_ = frameNumber; |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3312 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3313 ApplyScheduledFocus(); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3314 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3315 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3316 void ApplyScheduledFocus() |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3317 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3318 size_t cursorIndex; |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3319 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3320 if (hasFocusOnInstance_ && |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3321 cursor_.get() != NULL && |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3322 frames_.get() != NULL && |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3323 frames_->LookupFrame(cursorIndex, focusSopInstanceUid_, focusFrameNumber_)) |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3324 { |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3325 size_t current = cursor_->GetCurrentIndex(); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3326 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3327 if (current != cursorIndex) |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3328 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3329 cursor_->SetCurrentIndex(cursorIndex); |
| 1668 | 3330 Redraw(); |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3331 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3332 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3333 hasFocusOnInstance_ = false; |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3334 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3335 } |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3336 |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3337 void FocusOnPoint(const OrthancStone::Vector& p) |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3338 { |
|
1649
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3339 //static const double MAX_DISTANCE = 0.5; // 0.5 cm => TODO parameter? |
|
d77618883551
verification of FrameOfReferenceUID in reference lines
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1648
diff
changeset
|
3340 static const double MAX_DISTANCE = std::numeric_limits<double>::infinity(); |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3341 |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3342 size_t cursorIndex; |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3343 if (cursor_.get() != NULL && |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3344 frames_.get() != NULL && |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3345 frames_->FindClosestFrame(cursorIndex, p, MAX_DISTANCE)) |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3346 { |
|
1667
9584df157a9e
clarifying variable names
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1666
diff
changeset
|
3347 cursor_->SetCurrentIndex(cursorIndex); |
| 1668 | 3348 Redraw(); |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3349 } |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3350 } |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3351 |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3352 unsigned int GetCineRate() const |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3353 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3354 return cineRate_; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3355 } |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3356 |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3357 void FormatWindowingPresets(Json::Value& target) const |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3358 { |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3359 assert(windowingPresetCenters_.size() == windowingPresetWidths_.size()); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3360 |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3361 target = Json::arrayValue; |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3362 |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3363 for (size_t i = 0; i < windowingPresetCenters_.size(); i++) |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3364 { |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3365 const float c = windowingPresetCenters_[i]; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3366 const float w = windowingPresetWidths_[i]; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3367 |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3368 std::string name = "Preset"; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3369 if (windowingPresetCenters_.size() > 1) |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3370 { |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3371 name += " " + boost::lexical_cast<std::string>(i + 1); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3372 } |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3373 |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3374 Json::Value preset = Json::objectValue; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3375 preset["name"] = name; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3376 preset["center"] = c; |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3377 preset["width"] = w; |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3378 preset["info"] = |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3379 ("C " + boost::lexical_cast<std::string>(static_cast<int>(boost::math::iround<double>(c))) + |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3380 ", W " + boost::lexical_cast<std::string>(static_cast<int>(boost::math::iround<double>(w)))); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3381 |
|
1681
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3382 target.append(preset); |
|
f2e8b3ac1dcd
handling multiple windowing presets in the Stone web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
3383 } |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
3384 } |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3385 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3386 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3387 void SetSynchronizedBrowsingEnabled(int enabled) |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3388 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3389 OrthancStone::LinearAlgebra::AssignVector(synchronizationOffset_, 0, 0, 0); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3390 synchronizationEnabled_ = enabled; |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3391 } |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3392 |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3393 |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3394 void SignalStoneAnnotationsChanged(const std::string& sopInstanceUid, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3395 size_t frame) |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3396 { |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3397 if (cursor_.get() != NULL && |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3398 frames_.get() != NULL) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3399 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3400 const size_t cursorIndex = cursor_->GetCurrentIndex(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3401 const OrthancStone::DicomInstanceParameters& instance = frames_->GetInstanceOfFrame(cursorIndex); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3402 const size_t frameNumber = frames_->GetFrameNumberInInstance(cursorIndex); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3403 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3404 if (instance.GetSopInstanceUid() == sopInstanceUid && |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3405 frameNumber == frame) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3406 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3407 StoneAnnotationsRegistry::GetInstance().Load(*stoneAnnotations_, instance.GetSopInstanceUid(), frame); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3408 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3409 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3410 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport_->Lock()); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3411 stoneAnnotations_->Render(lock->GetController().GetScene()); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3412 lock->Invalidate(); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3413 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3414 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3415 } |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3416 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3417 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3418 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3419 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3420 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3421 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3422 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3423 typedef std::map<std::string, boost::shared_ptr<ViewerViewport> > Viewports; |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3424 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3425 static Viewports allViewports_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3426 static bool showReferenceLines_ = true; |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3427 static boost::shared_ptr<OrthancStone::OsiriX::CollectionOfAnnotations> osiriXAnnotations_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3428 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3429 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3430 static void UpdateReferenceLines() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3431 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3432 if (showReferenceLines_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3433 { |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3434 std::list<const ViewerViewport*> viewports; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3435 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3436 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3437 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3438 assert(it->second != NULL); |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3439 viewports.push_back(it->second.get()); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3440 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3441 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3442 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3443 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3444 assert(it->second != NULL); |
|
1647
adff3cd78775
removed class FrameExtent
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1646
diff
changeset
|
3445 it->second->UpdateReferenceLines(viewports); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3446 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3447 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3448 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3449 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3450 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3451 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3452 assert(it->second != NULL); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3453 it->second->ClearReferenceLines(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3454 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3455 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3456 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3457 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3458 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3459 class WebAssemblyObserver : public ResourcesLoader::IObserver, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3460 public ViewerViewport::IObserver |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3461 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3462 public: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3463 virtual void SignalResourcesLoaded() ORTHANC_OVERRIDE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3464 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3465 DISPATCH_JAVASCRIPT_EVENT("ResourcesLoaded"); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3466 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3467 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3468 virtual void SignalSeriesThumbnailLoaded(const std::string& studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3469 const std::string& seriesInstanceUid) ORTHANC_OVERRIDE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3470 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3471 EM_ASM({ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3472 const customEvent = document.createEvent("CustomEvent"); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3473 customEvent.initCustomEvent("ThumbnailLoaded", false, false, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3474 { "studyInstanceUid" : UTF8ToString($0), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3475 "seriesInstanceUid" : UTF8ToString($1) }); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3476 window.dispatchEvent(customEvent); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3477 }, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3478 studyInstanceUid.c_str(), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3479 seriesInstanceUid.c_str()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3480 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3481 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3482 virtual void SignalSeriesMetadataLoaded(const std::string& studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3483 const std::string& seriesInstanceUid) ORTHANC_OVERRIDE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3484 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3485 EM_ASM({ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3486 const customEvent = document.createEvent("CustomEvent"); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3487 customEvent.initCustomEvent("MetadataLoaded", false, false, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3488 { "studyInstanceUid" : UTF8ToString($0), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3489 "seriesInstanceUid" : UTF8ToString($1) }); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3490 window.dispatchEvent(customEvent); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3491 }, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3492 studyInstanceUid.c_str(), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3493 seriesInstanceUid.c_str()); |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3494 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3495 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3496 { |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3497 assert(it->second != NULL); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3498 it->second->ApplyScheduledFocus(); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
3499 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3500 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3501 |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3502 virtual void SignalSeriesDetailsReady(const ViewerViewport& viewport) ORTHANC_OVERRIDE |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3503 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3504 EM_ASM({ |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3505 const customEvent = document.createEvent("CustomEvent"); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3506 customEvent.initCustomEvent("SeriesDetailsReady", false, false, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3507 { "canvasId" : UTF8ToString($0) }); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3508 window.dispatchEvent(customEvent); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3509 }, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3510 viewport.GetCanvasId().c_str() |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3511 ); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3512 } |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
3513 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3514 virtual void SignalFrameUpdated(const ViewerViewport& viewport, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3515 size_t currentFrame, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3516 size_t countFrames, |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3517 DisplayedFrameQuality quality, |
|
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3518 unsigned int instanceNumber, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3519 const std::string& contentDate, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3520 const std::string& contentTime) ORTHANC_OVERRIDE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3521 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3522 EM_ASM({ |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3523 const customEvent = document.createEvent("CustomEvent"); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3524 customEvent.initCustomEvent("FrameUpdated", false, false, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3525 { "canvasId" : UTF8ToString($0), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3526 "currentFrame" : $1, |
|
1674
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
3527 "numberOfFrames" : $2, |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3528 "quality" : $3, |
|
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3529 "instanceNumber" : $4, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3530 "contentDate" : UTF8ToString($5), |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3531 "contentTime" : UTF8ToString($6), |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3532 }); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3533 window.dispatchEvent(customEvent); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3534 }, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3535 viewport.GetCanvasId().c_str(), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3536 static_cast<int>(currentFrame), |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3537 static_cast<int>(countFrames), |
|
1859
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3538 quality, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3539 instanceNumber, |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3540 contentDate.c_str(), |
|
58681a5c727b
overlay: display ContentDate/ContentTime instead of StudyDate if available + new 'TimeFormat' option
Alain Mazy <am@osimis.io>
parents:
1855
diff
changeset
|
3541 contentTime.c_str()); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3542 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3543 UpdateReferenceLines(); |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3544 } |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3545 |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3546 virtual void SignalCrosshair(const ViewerViewport& viewport, |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3547 const OrthancStone::Vector& click) ORTHANC_OVERRIDE |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3548 { |
|
1811
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3549 if (click.size() != 3u) |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3550 { |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3551 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3552 } |
|
fdc6a8089eb9
hovering of annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1809
diff
changeset
|
3553 |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3554 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3555 { |
| 1694 | 3556 // TODO - One could check the "Frame Of Reference UID" here |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3557 assert(it->second.get() != NULL); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3558 if (it->second.get() != &viewport) |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3559 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3560 it->second->FocusOnPoint(click); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
3561 } |
|
1648
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3562 } |
|
4a43106bc122
cross-hair starts to work
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1647
diff
changeset
|
3563 } |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3564 |
| 1694 | 3565 virtual void SignalSynchronizedBrowsing(const ViewerViewport& viewport, |
| 3566 const OrthancStone::Vector& click, | |
| 3567 const OrthancStone::Vector& normal) ORTHANC_OVERRIDE | |
| 3568 { | |
| 3569 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) | |
| 3570 { | |
| 3571 assert(it->second.get() != NULL); | |
| 3572 | |
| 3573 OrthancStone::CoordinateSystem3D plane; | |
| 3574 bool isOpposite; | |
| 3575 | |
| 3576 if (it->second.get() != &viewport && | |
| 3577 it->second->GetCurrentPlane(plane) && | |
| 3578 OrthancStone::GeometryToolbox::IsParallelOrOpposite(isOpposite, plane.GetNormal(), normal)) | |
| 3579 { | |
| 3580 it->second->FocusOnPoint(click); | |
| 3581 } | |
| 3582 } | |
| 3583 } | |
| 3584 | |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3585 virtual void SignalSeriesPdfLoaded(const std::string& studyInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3586 const std::string& seriesInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3587 const std::string& pdf) ORTHANC_OVERRIDE |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3588 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3589 EM_ASM({ |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3590 const customEvent = document.createEvent("CustomEvent"); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3591 customEvent.initCustomEvent("PdfLoaded", false, false, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3592 { "studyInstanceUid" : UTF8ToString($0), |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3593 "seriesInstanceUid" : UTF8ToString($1), |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3594 "pdfPointer" : $2, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3595 "pdfSize": $3}); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3596 window.dispatchEvent(customEvent); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3597 }, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3598 studyInstanceUid.c_str(), |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3599 seriesInstanceUid.c_str(), |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3600 pdf.empty() ? 0 : reinterpret_cast<intptr_t>(pdf.c_str()), // Explicit conversion to an integer |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3601 pdf.size()); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
3602 } |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3603 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3604 |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3605 virtual void SignalVirtualSeriesThumbnailLoaded(const std::string& virtualSeriesId, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3606 const std::string& jpeg) ORTHANC_OVERRIDE |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3607 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3608 std::string dataUriScheme; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3609 Orthanc::Toolbox::EncodeDataUriScheme(dataUriScheme, "image/jpeg", jpeg); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3610 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3611 EM_ASM({ |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3612 const customEvent = document.createEvent("CustomEvent"); |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3613 customEvent.initCustomEvent("VirtualSeriesThumbnailLoaded", false, false, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3614 { "virtualSeriesId" : UTF8ToString($0), |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3615 "thumbnail" : UTF8ToString($1) }); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3616 window.dispatchEvent(customEvent); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3617 }, |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
3618 virtualSeriesId.c_str(), |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3619 dataUriScheme.c_str()); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
3620 } |
|
1720
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3621 |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3622 virtual void SignalWindowingUpdated(const ViewerViewport& viewport, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3623 double windowingCenter, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3624 double windowingWidth) ORTHANC_OVERRIDE |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3625 { |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3626 EM_ASM({ |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3627 const customEvent = document.createEvent("CustomEvent"); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3628 customEvent.initCustomEvent("WindowingUpdated", false, false, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3629 { "canvasId" : UTF8ToString($0), |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3630 "windowingCenter" : $1, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3631 "windowingWidth" : $2 }); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3632 window.dispatchEvent(customEvent); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3633 }, |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3634 viewport.GetCanvasId().c_str(), |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3635 static_cast<int>(boost::math::iround<double>(windowingCenter)), |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3636 static_cast<int>(boost::math::iround<double>(windowingWidth))); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3637 |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3638 UpdateReferenceLines(); |
|
b8d19f53aaca
display the instance number, and the wc/ww info (work-in-progress)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1719
diff
changeset
|
3639 } |
|
1813
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3640 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3641 virtual void SignalStoneAnnotationsChanged(const ViewerViewport& viewport, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3642 const std::string& sopInstanceUid, |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3643 size_t frame) ORTHANC_OVERRIDE |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3644 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3645 for (Viewports::const_iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3646 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3647 assert(it->second.get() != NULL); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3648 |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3649 if (it->second.get() != &viewport) |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3650 { |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3651 it->second->SignalStoneAnnotationsChanged(sopInstanceUid, frame); |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3652 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3653 } |
|
53aa3f72b539
synchronization of annotations across viewports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1812
diff
changeset
|
3654 } |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3655 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3656 virtual void SignalStoneAnnotationAdded(const ViewerViewport& viewport) ORTHANC_OVERRIDE |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3657 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3658 EM_ASM({ |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3659 const customEvent = document.createEvent("CustomEvent"); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3660 customEvent.initCustomEvent("StoneAnnotationAdded", false, false, |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3661 { "canvasId" : UTF8ToString($0) }); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3662 window.dispatchEvent(customEvent); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3663 }, |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3664 viewport.GetCanvasId().c_str()); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3665 } |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3666 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3667 virtual void SignalStoneAnnotationRemoved(const ViewerViewport& viewport) ORTHANC_OVERRIDE |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3668 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3669 EM_ASM({ |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3670 const customEvent = document.createEvent("CustomEvent"); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3671 customEvent.initCustomEvent("StoneAnnotationRemoved", false, false, |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3672 { "canvasId" : UTF8ToString($0) }); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3673 window.dispatchEvent(customEvent); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3674 }, |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3675 viewport.GetCanvasId().c_str()); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
3676 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3677 }; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3678 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3679 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3680 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3681 static OrthancStone::DicomSource source_; |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
3682 static boost::shared_ptr<FramesCache> framesCache_; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3683 static boost::shared_ptr<OrthancStone::WebAssemblyLoadersContext> context_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3684 static std::string stringBuffer_; |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
3685 static bool softwareRendering_ = false; |
|
1701
b5a8bf32d969
new configuration options: "CombinedToolEnabled", "CombinedToolBehaviour" and "DownloadAsJpegEnabled"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1695
diff
changeset
|
3686 static WebViewerAction leftButtonAction_ = WebViewerAction_Windowing; |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3687 static WebViewerAction middleButtonAction_ = WebViewerAction_Pan; |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
3688 static WebViewerAction rightButtonAction_ = WebViewerAction_Zoom; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3689 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3690 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3691 static void FormatTags(std::string& target, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3692 const Orthanc::DicomMap& tags) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3693 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3694 Orthanc::DicomArray arr(tags); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3695 Json::Value v = Json::objectValue; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3696 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3697 for (size_t i = 0; i < arr.GetSize(); i++) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3698 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3699 const Orthanc::DicomElement& element = arr.GetElement(i); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3700 if (!element.GetValue().IsBinary() && |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3701 !element.GetValue().IsNull()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3702 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3703 v[element.GetTag().Format()] = element.GetValue().GetContent(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3704 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3705 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3706 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3707 target = v.toStyledString(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3708 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3709 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3710 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3711 static ResourcesLoader& GetResourcesLoader() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3712 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3713 static boost::shared_ptr<ResourcesLoader> resourcesLoader_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3714 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3715 if (!resourcesLoader_) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3716 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3717 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(context_->Lock()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3718 resourcesLoader_ = ResourcesLoader::Create(*lock, source_); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3719 resourcesLoader_->AcquireObserver(new WebAssemblyObserver); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3720 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3721 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3722 return *resourcesLoader_; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3723 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3724 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3725 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3726 static boost::shared_ptr<ViewerViewport> GetViewport(const std::string& canvas) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3727 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3728 Viewports::iterator found = allViewports_.find(canvas); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3729 if (found == allViewports_.end()) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3730 { |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
3731 boost::shared_ptr<ViewerViewport> viewport( |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
3732 ViewerViewport::Create(*context_, source_, canvas, framesCache_, softwareRendering_)); |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
3733 viewport->SetMouseButtonActions(leftButtonAction_, middleButtonAction_, rightButtonAction_); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3734 viewport->AcquireObserver(new WebAssemblyObserver); |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3735 viewport->SetOsiriXAnnotations(osiriXAnnotations_); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3736 allViewports_[canvas] = viewport; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3737 return viewport; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3738 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3739 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3740 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3741 return found->second; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3742 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3743 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3744 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3745 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3746 extern "C" |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3747 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3748 int main(int argc, char const *argv[]) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3749 { |
|
1665
f62f685e0eb2
avoid loading instance metadata on RTSTRUCT to avoid JSON parsing that freezes the browser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1663
diff
changeset
|
3750 printf("Initializing Stone\n"); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3751 Orthanc::InitializeFramework("", true); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3752 Orthanc::Logging::EnableInfoLevel(true); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3753 //Orthanc::Logging::EnableTraceLevel(true); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3754 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3755 context_.reset(new OrthancStone::WebAssemblyLoadersContext(1, 4, 1)); |
|
1663
fc883105ee11
enable cache of ParsedDicomFile in oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1657
diff
changeset
|
3756 context_->SetDicomCacheSize(128 * 1024 * 1024); // 128MB |
|
fc883105ee11
enable cache of ParsedDicomFile in oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1657
diff
changeset
|
3757 |
|
1676
5e76d5e8167a
limit the amount of frames to be prefetched
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1675
diff
changeset
|
3758 framesCache_.reset(new FramesCache); |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3759 osiriXAnnotations_.reset(new OrthancStone::OsiriX::CollectionOfAnnotations); |
|
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
3760 |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3761 DISPATCH_JAVASCRIPT_EVENT("StoneInitialized"); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3762 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3763 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3764 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3765 EMSCRIPTEN_KEEPALIVE |
|
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3766 void SetDicomWebRoot(const char* uri, |
|
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3767 int useRendered) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3768 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3769 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3770 { |
|
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3771 source_.SetDicomWebSource(uri); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3772 source_.SetDicomWebRendered(useRendered != 0); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3773 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3774 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3775 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3776 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3777 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3778 EMSCRIPTEN_KEEPALIVE |
|
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3779 void SetDicomWebThroughOrthanc(const char* orthancRoot, |
|
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3780 const char* serverName, |
|
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3781 int hasRendered) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3782 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3783 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3784 { |
|
1713
aec45e0b2528
configuration option "DicomWebRoot"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1704
diff
changeset
|
3785 context_->SetLocalOrthanc(orthancRoot); |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3786 source_.SetDicomWebThroughOrthancSource(serverName); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3787 source_.SetDicomWebRendered(hasRendered != 0); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3788 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3789 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3790 } |
|
1761
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3791 |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3792 |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3793 EMSCRIPTEN_KEEPALIVE |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3794 void AddHttpHeader(const char* header, |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3795 const char* value) |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3796 { |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3797 try |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3798 { |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3799 source_.AddHttpHeader(header, value); |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3800 } |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3801 EXTERN_CATCH_EXCEPTIONS; |
|
28755e42c007
Fix issue #197 (Support for passing credentials with all HTTP requests)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
3802 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3803 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3804 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3805 EMSCRIPTEN_KEEPALIVE |
|
1714
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3806 void SetDicomCacheSize(int sizeMB) |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3807 { |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3808 try |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3809 { |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3810 if (sizeMB == 0) |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3811 { |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3812 LOG(WARNING) << "The DICOM cache is disabled"; |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3813 } |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3814 else |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3815 { |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3816 LOG(INFO) << "The DICOM cache size is set to " << sizeMB << "MB"; |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3817 } |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3818 |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3819 if (sizeMB >= 0) |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3820 { |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3821 context_->SetDicomCacheSize(sizeMB * 1024 * 1024); |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3822 } |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3823 } |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3824 EXTERN_CATCH_EXCEPTIONS; |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3825 } |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3826 |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3827 |
|
a878e807cd96
configuration option "DicomCacheSize", warning if cache should be larger
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1713
diff
changeset
|
3828 EMSCRIPTEN_KEEPALIVE |
|
1862
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3829 void SetSkipSeriesFromModalities(const char* value) |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3830 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3831 try |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3832 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3833 LOG(WARNING) << "SetSkipSeriesFromModalities " << value; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3834 |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3835 Json::Value modalities; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3836 Orthanc::Toolbox::ReadJson(modalities, value); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3837 std::vector<std::string> skipSeriesFromModalities; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3838 |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3839 for (Json::Value::ArrayIndex i = 0; i < modalities.size(); i++) |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3840 { |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3841 skipSeriesFromModalities.push_back(modalities[i].asString()); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3842 } |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3843 GetResourcesLoader().SetSkipSeriesFromModalities(skipSeriesFromModalities); |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3844 } |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3845 EXTERN_CATCH_EXCEPTIONS; |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3846 } |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3847 |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3848 |
|
63587fdeec69
added 'SkipSeriesFromModalities' to ignore series from modality types
Alain Mazy <am@osimis.io>
parents:
1859
diff
changeset
|
3849 EMSCRIPTEN_KEEPALIVE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3850 void FetchAllStudies() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3851 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3852 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3853 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3854 GetResourcesLoader().FetchAllStudies(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3855 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3856 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3857 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3858 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3859 EMSCRIPTEN_KEEPALIVE |
|
1702
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3860 void FetchPatient(const char* patientId) |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3861 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3862 try |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3863 { |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3864 GetResourcesLoader().FetchPatient(patientId); |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3865 } |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3866 EXTERN_CATCH_EXCEPTIONS; |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3867 } |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3868 |
|
bc40b6450261
"patient" GET argument
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
3869 EMSCRIPTEN_KEEPALIVE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3870 void FetchStudy(const char* studyInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3871 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3872 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3873 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3874 GetResourcesLoader().FetchStudy(studyInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3875 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3876 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3877 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3878 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3879 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3880 void FetchSeries(const char* studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3881 const char* seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3882 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3883 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3884 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3885 GetResourcesLoader().FetchSeries(studyInstanceUid, seriesInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3886 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3887 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3888 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3889 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3890 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3891 int GetStudiesCount() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3892 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3893 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3894 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3895 return GetResourcesLoader().GetStudiesCount(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3896 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3897 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3898 return 0; // on exception |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3899 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3900 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3901 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3902 int GetSeriesCount() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3903 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3904 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3905 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3906 return GetResourcesLoader().GetSeriesCount(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3907 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3908 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3909 return 0; // on exception |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3910 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3911 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3912 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3913 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3914 const char* GetStringBuffer() |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3915 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3916 return stringBuffer_.c_str(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3917 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3918 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3919 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3920 EMSCRIPTEN_KEEPALIVE |
|
1827
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3921 const char* GetStoneWebViewerVersion() |
|
1824
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3922 { |
|
1827
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3923 return STONE_WEB_VIEWER_VERSION; |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3924 } |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3925 |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3926 |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3927 EMSCRIPTEN_KEEPALIVE |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3928 const char* GetEmscriptenVersion() |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3929 { |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3930 // WARNING - "static" is important, otherwise the string would be |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3931 // freed when returning to JavaScript |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3932 static const std::string EMSCRIPTEN_VERSION = ( |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3933 boost::lexical_cast<std::string>(__EMSCRIPTEN_major__) + "." + |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3934 boost::lexical_cast<std::string>(__EMSCRIPTEN_minor__) + "." + |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3935 boost::lexical_cast<std::string>(__EMSCRIPTEN_tiny__)); |
|
21ccc00839f7
upgrade to Emscripten 2.0.23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1824
diff
changeset
|
3936 return EMSCRIPTEN_VERSION.c_str(); |
|
1824
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3937 } |
|
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3938 |
|
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3939 |
|
a56bf4c534ef
display stone web viewer version in info panel
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1822
diff
changeset
|
3940 EMSCRIPTEN_KEEPALIVE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3941 void LoadStudyTags(int i) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3942 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3943 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3944 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3945 if (i < 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3946 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3947 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3948 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3949 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3950 Orthanc::DicomMap dicom; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3951 GetResourcesLoader().GetStudy(dicom, i); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3952 FormatTags(stringBuffer_, dicom); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3953 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3954 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3955 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3956 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3957 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3958 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3959 void LoadSeriesTags(int i) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3960 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3961 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3962 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3963 if (i < 0) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3964 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3965 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3966 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3967 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3968 Orthanc::DicomMap dicom; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3969 GetResourcesLoader().GetSeries(dicom, i); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3970 FormatTags(stringBuffer_, dicom); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3971 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3972 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3973 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3974 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3975 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3976 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3977 int LoadSeriesThumbnail(const char* seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3978 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3979 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3980 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3981 std::string image, mime; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3982 switch (GetResourcesLoader().GetSeriesThumbnail(image, mime, seriesInstanceUid)) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3983 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3984 case OrthancStone::SeriesThumbnailType_Image: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3985 Orthanc::Toolbox::EncodeDataUriScheme(stringBuffer_, mime, image); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3986 return ThumbnailType_Image; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3987 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3988 case OrthancStone::SeriesThumbnailType_Pdf: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3989 return ThumbnailType_Pdf; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3990 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3991 case OrthancStone::SeriesThumbnailType_Video: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3992 return ThumbnailType_Video; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3993 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3994 case OrthancStone::SeriesThumbnailType_NotLoaded: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3995 return ThumbnailType_Loading; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3996 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3997 case OrthancStone::SeriesThumbnailType_Unsupported: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3998 return ThumbnailType_NoPreview; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3999 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4000 default: |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4001 return ThumbnailType_Unknown; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4002 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4003 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4004 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4005 return ThumbnailType_Unknown; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4006 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4007 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4008 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4009 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4010 void SpeedUpFetchSeriesMetadata(const char* studyInstanceUid, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4011 const char* seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4012 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4013 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4014 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4015 GetResourcesLoader().FetchSeriesMetadata(PRIORITY_HIGH, studyInstanceUid, seriesInstanceUid); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4016 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4017 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4018 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4019 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4020 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4021 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4022 int IsSeriesComplete(const char* seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4023 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4024 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4025 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4026 return GetResourcesLoader().IsSeriesComplete(seriesInstanceUid) ? 1 : 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4027 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4028 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4029 return 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4030 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4031 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4032 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4033 int LoadSeriesInViewport(const char* canvas, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4034 const char* seriesInstanceUid) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4035 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4036 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4037 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4038 std::unique_ptr<OrthancStone::SortedFrames> frames(new OrthancStone::SortedFrames); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4039 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4040 if (GetResourcesLoader().SortSeriesFrames(*frames, seriesInstanceUid)) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4041 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4042 GetViewport(canvas)->SetFrames(frames.release()); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4043 return 1; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4044 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4045 else |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4046 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4047 return 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4048 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4049 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4050 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4051 return 0; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4052 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4053 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4054 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4055 EMSCRIPTEN_KEEPALIVE |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4056 int LoadVirtualSeriesInViewport(const char* canvas, |
|
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4057 const char* virtualSeriesId) |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4058 { |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4059 try |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4060 { |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4061 std::unique_ptr<OrthancStone::SortedFrames> frames(new OrthancStone::SortedFrames); |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4062 |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4063 if (GetResourcesLoader().SortVirtualSeriesFrames(*frames, virtualSeriesId)) |
|
1704
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4064 { |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4065 GetViewport(canvas)->SetFrames(frames.release()); |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4066 return 1; |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4067 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4068 else |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4069 { |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4070 return 0; |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4071 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4072 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4073 EXTERN_CATCH_EXCEPTIONS; |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4074 return 0; |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4075 } |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4076 |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4077 |
|
902d13889ae4
LoadMultipartInstanceInViewport() in C++
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1703
diff
changeset
|
4078 EMSCRIPTEN_KEEPALIVE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4079 void AllViewportsUpdateSize(int fitContent) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4080 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4081 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4082 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4083 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4084 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4085 assert(it->second != NULL); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4086 it->second->UpdateSize(fitContent != 0); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4087 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4088 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4089 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4090 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4091 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4092 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4093 EMSCRIPTEN_KEEPALIVE |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4094 int DecrementFrame(const char* canvas, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4095 int isCircular) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4096 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4097 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4098 { |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4099 return GetViewport(canvas)->ChangeFrame(SeriesCursor::Action_Minus, isCircular) ? 1 : 0; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4100 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4101 EXTERN_CATCH_EXCEPTIONS; |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4102 return 0; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4103 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4104 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4105 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4106 EMSCRIPTEN_KEEPALIVE |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4107 int IncrementFrame(const char* canvas, |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4108 int isCircular) |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4109 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4110 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4111 { |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4112 return GetViewport(canvas)->ChangeFrame(SeriesCursor::Action_Plus, isCircular) ? 1 : 0; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4113 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4114 EXTERN_CATCH_EXCEPTIONS; |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4115 return 0; |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4116 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4117 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4118 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4119 EMSCRIPTEN_KEEPALIVE |
|
1948
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4120 void SetFrame(const char* canvas, |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4121 int frameNumber) |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4122 { |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4123 try |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4124 { |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4125 if (frameNumber >= 0) |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4126 { |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4127 GetViewport(canvas)->SetFrame(static_cast<unsigned int>(frameNumber)); |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4128 } |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4129 } |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4130 EXTERN_CATCH_EXCEPTIONS; |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4131 } |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4132 |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4133 |
|
d459477804bf
added SetFrame() in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1925
diff
changeset
|
4134 EMSCRIPTEN_KEEPALIVE |
|
1719
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4135 void GoToFirstFrame(const char* canvas) |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4136 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4137 try |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4138 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4139 GetViewport(canvas)->GoToFirstFrame(); |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4140 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4141 EXTERN_CATCH_EXCEPTIONS; |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4142 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4143 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4144 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4145 EMSCRIPTEN_KEEPALIVE |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4146 void GoToLastFrame(const char* canvas) |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4147 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4148 try |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4149 { |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4150 GetViewport(canvas)->GoToLastFrame(); |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4151 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4152 EXTERN_CATCH_EXCEPTIONS; |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4153 } |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4154 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4155 |
|
9a1f79d21a3f
added buttons to go to the first and last frames
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1717
diff
changeset
|
4156 EMSCRIPTEN_KEEPALIVE |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4157 void ShowReferenceLines(int show) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4158 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4159 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4160 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4161 showReferenceLines_ = (show != 0); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4162 UpdateReferenceLines(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4163 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4164 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4165 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4166 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4167 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4168 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4169 void SetWindowing(const char* canvas, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4170 int center, |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4171 int width) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4172 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4173 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4174 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4175 GetViewport(canvas)->SetWindowing(center, width); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4176 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4177 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4178 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4179 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4180 |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4181 EMSCRIPTEN_KEEPALIVE |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4182 void InvertContrast(const char* canvas) |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4183 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4184 try |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4185 { |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4186 GetViewport(canvas)->Invert(); |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4187 } |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4188 EXTERN_CATCH_EXCEPTIONS; |
|
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4189 } |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4190 |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4191 |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4192 EMSCRIPTEN_KEEPALIVE |
|
1554
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4193 void FlipX(const char* canvas) |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4194 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4195 try |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4196 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4197 GetViewport(canvas)->FlipX(); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4198 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4199 EXTERN_CATCH_EXCEPTIONS; |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4200 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4201 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4202 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4203 EMSCRIPTEN_KEEPALIVE |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4204 void FlipY(const char* canvas) |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4205 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4206 try |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4207 { |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4208 GetViewport(canvas)->FlipY(); |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4209 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4210 EXTERN_CATCH_EXCEPTIONS; |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4211 } |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4212 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4213 |
|
6d14ed6163b1
flip x/y in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1552
diff
changeset
|
4214 EMSCRIPTEN_KEEPALIVE |
|
1552
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4215 void SetSoftwareRendering(int softwareRendering) |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4216 { |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4217 softwareRendering_ = softwareRendering; |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4218 } |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4219 |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4220 |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4221 EMSCRIPTEN_KEEPALIVE |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4222 int IsSoftwareRendering() |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4223 { |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4224 return softwareRendering_; |
|
a4d82f1bcb10
user preferences: not for diagnostic use, software rendering
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1551
diff
changeset
|
4225 } |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4226 |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4227 |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4228 EMSCRIPTEN_KEEPALIVE |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4229 void SetMouseButtonActions(int leftAction, |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4230 int middleAction, |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4231 int rightAction) |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4232 { |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4233 try |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4234 { |
|
1579
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
4235 leftButtonAction_ = static_cast<WebViewerAction>(leftAction); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
4236 middleButtonAction_ = static_cast<WebViewerAction>(middleAction); |
|
c476b0d5e59c
skeleton for cross-hair tool
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1578
diff
changeset
|
4237 rightButtonAction_ = static_cast<WebViewerAction>(rightAction); |
|
1561
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4238 |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4239 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4240 { |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4241 assert(it->second != NULL); |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4242 it->second->SetMouseButtonActions(leftButtonAction_, middleButtonAction_, rightButtonAction_); |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4243 } |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4244 } |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4245 EXTERN_CATCH_EXCEPTIONS; |
|
cf652990abb1
tunable mouse actions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1558
diff
changeset
|
4246 } |
| 1575 | 4247 |
| 4248 | |
| 4249 EMSCRIPTEN_KEEPALIVE | |
|
1815
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4250 int GetLeftMouseButtonAction() |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4251 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4252 return static_cast<int>(leftButtonAction_); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4253 } |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4254 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4255 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4256 EMSCRIPTEN_KEEPALIVE |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4257 int GetMiddleMouseButtonAction() |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4258 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4259 return static_cast<int>(middleButtonAction_); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4260 } |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4261 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4262 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4263 EMSCRIPTEN_KEEPALIVE |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4264 int GetRightMouseButtonAction() |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4265 { |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4266 return static_cast<int>(rightButtonAction_); |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4267 } |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4268 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4269 |
|
b81775f1b196
New tools for annotations: segment length, circle, angle and eraser
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1814
diff
changeset
|
4270 EMSCRIPTEN_KEEPALIVE |
| 1578 | 4271 void FitForPrint() |
| 1575 | 4272 { |
| 4273 try | |
| 4274 { | |
| 4275 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) | |
| 4276 { | |
| 4277 assert(it->second != NULL); | |
| 4278 it->second->FitForPrint(); | |
| 4279 } | |
| 4280 } | |
| 4281 EXTERN_CATCH_EXCEPTIONS; | |
| 4282 } | |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4283 |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4284 |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4285 // Side-effect: "GetStringBuffer()" is filled with the "Series |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4286 // Instance UID" of the first loaded annotation |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4287 EMSCRIPTEN_KEEPALIVE |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4288 int LoadOsiriXAnnotations(const char* xml, |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4289 int clearPreviousAnnotations) |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4290 { |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4291 try |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4292 { |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4293 if (clearPreviousAnnotations) |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4294 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4295 osiriXAnnotations_->Clear(); |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4296 } |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4297 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4298 osiriXAnnotations_->LoadXml(xml); |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4299 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4300 // Force redraw, as the annotations might have changed |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4301 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4302 { |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4303 assert(it->second != NULL); |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4304 it->second->Redraw(); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4305 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4306 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4307 if (osiriXAnnotations_->GetSize() == 0) |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4308 { |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4309 stringBuffer_.clear(); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4310 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4311 else |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4312 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4313 stringBuffer_ = osiriXAnnotations_->GetAnnotation(0).GetSeriesInstanceUid(); |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4314 } |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4315 |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4316 LOG(WARNING) << "Loaded " << osiriXAnnotations_->GetSize() << " annotations from OsiriX"; |
|
1593
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4317 return 1; |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4318 } |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4319 EXTERN_CATCH_EXCEPTIONS; |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4320 return 0; |
|
b782f78aed42
rendering osirix annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
4321 } |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4322 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4323 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4324 EMSCRIPTEN_KEEPALIVE |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4325 void FocusFirstOsiriXAnnotation(const char* canvas) |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4326 { |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4327 try |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4328 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4329 if (osiriXAnnotations_->GetSize() != 0) |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4330 { |
|
1812
db341679dc9f
ViewerViewport::StoneAnnotationsRegistry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1811
diff
changeset
|
4331 const OrthancStone::OsiriX::Annotation& annotation = osiriXAnnotations_->GetAnnotation(0); |
|
1603
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4332 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4333 boost::shared_ptr<ViewerViewport> viewport = GetViewport(canvas); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4334 viewport->ScheduleFrameFocus(annotation.GetSopInstanceUid(), 0 /* focus on first frame */); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4335 |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4336 // Force redraw, as the annotations might already have changed |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4337 viewport->Redraw(); |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4338 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4339 } |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4340 EXTERN_CATCH_EXCEPTIONS; |
|
595c0952ef7e
focusing on osirix annotations in Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1600
diff
changeset
|
4341 } |
|
1657
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4342 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4343 |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4344 EMSCRIPTEN_KEEPALIVE |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4345 void FetchPdf(const char* studyInstanceUid, |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4346 const char* seriesInstanceUid) |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4347 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4348 try |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4349 { |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4350 LOG(INFO) << "Fetching PDF series: " << seriesInstanceUid; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4351 GetResourcesLoader().FetchPdf(studyInstanceUid, seriesInstanceUid); |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4352 } |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4353 EXTERN_CATCH_EXCEPTIONS; |
|
66e5fcdf5597
pdf viewer is working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1654
diff
changeset
|
4354 } |
|
1672
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4355 |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4356 |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4357 EMSCRIPTEN_KEEPALIVE |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4358 unsigned int GetCineRate(const char* canvas) |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4359 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4360 try |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4361 { |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4362 return GetViewport(canvas)->GetCineRate(); |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4363 } |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4364 EXTERN_CATCH_EXCEPTIONS; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4365 return 0; |
|
570398585b5f
start support of cine sequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1671
diff
changeset
|
4366 } |
|
1674
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4367 |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4368 |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4369 EMSCRIPTEN_KEEPALIVE |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4370 unsigned int GetSeriesNumberOfFrames(const char* seriesInstanceUid) |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4371 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4372 try |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4373 { |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4374 return GetResourcesLoader().GetSeriesNumberOfFrames(seriesInstanceUid); |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4375 } |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4376 EXTERN_CATCH_EXCEPTIONS; |
|
0621e523b670
number of frames in badge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1672
diff
changeset
|
4377 return 0; |
|
1679
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4378 } |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4379 |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4380 |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4381 EMSCRIPTEN_KEEPALIVE |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4382 void LoadWindowingPresets(const char* canvas) |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4383 { |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4384 try |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4385 { |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4386 Json::Value v; |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4387 GetViewport(canvas)->FormatWindowingPresets(v); |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4388 stringBuffer_ = v.toStyledString(); |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4389 } |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4390 EXTERN_CATCH_EXCEPTIONS; |
|
5b8b88e5bfd6
successfully running unit tests in WebAssembly
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1677
diff
changeset
|
4391 } |
|
1693
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4392 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4393 |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4394 EMSCRIPTEN_KEEPALIVE |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4395 void SetSynchronizedBrowsingEnabled(int enabled) |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4396 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4397 try |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4398 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4399 for (Viewports::iterator it = allViewports_.begin(); it != allViewports_.end(); ++it) |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4400 { |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4401 assert(it->second != NULL); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4402 it->second->SetSynchronizedBrowsingEnabled(enabled); |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4403 } |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4404 } |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4405 EXTERN_CATCH_EXCEPTIONS; |
|
eafb10992e73
synchronized browsing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
4406 } |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4407 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4408 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4409 EMSCRIPTEN_KEEPALIVE |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4410 int LookupVirtualSeries(const char* seriesInstanceUid) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4411 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4412 try |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4413 { |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4414 typedef std::map<std::string, unsigned int> VirtualSeries; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4415 |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4416 VirtualSeries virtualSeries; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4417 if (GetResourcesLoader().LookupVirtualSeries(virtualSeries, seriesInstanceUid)) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4418 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4419 Json::Value json = Json::arrayValue; |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4420 for (VirtualSeries::const_iterator it = virtualSeries.begin(); it != virtualSeries.end(); ++it) |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4421 { |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4422 Json::Value item = Json::objectValue; |
|
1850
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4423 item["ID"] = it->first; |
|
932dc2265baa
Group together in a single "virtual series" all the instances without the tag "NumberOfFrames"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1849
diff
changeset
|
4424 item["NumberOfFrames"] = it->second; |
|
1849
023cce3d7844
introduction of the concept of "virtual series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1827
diff
changeset
|
4425 json.append(item); |
|
1703
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4426 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4427 |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4428 stringBuffer_ = json.toStyledString(); |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4429 return true; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4430 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4431 else |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4432 { |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4433 return false; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4434 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4435 } |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4436 EXTERN_CATCH_EXCEPTIONS; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4437 return false; |
|
76c590a62755
start work on series with multiple multiframe instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1702
diff
changeset
|
4438 } |
|
1495
fb74ed5d8c22
initial commit of the Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4439 } |